X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard.c;h=ede493d90c5156a2941dd6cb37bed06ce0d232e2;hb=18f63518ed5d7c91bcaf737924e6ccf31ad3e0d4;hp=4d8b3f2e715ea72db498ff646a59f755d24fc79d;hpb=224ed6301ed95439f1fe5b8b678d671cbeeaa2dc;p=xboard.git

diff --git a/xboard.c b/xboard.c
index 4d8b3f2..ede493d 100644
--- a/xboard.c
+++ b/xboard.c
@@ -1261,6 +1261,8 @@ main (int argc, char **argv)
 #else
 						clockFontStruct);
 #endif
+    InitDrawingHandle(optList + W_BOARD);
+    currBoard        = &optList[W_BOARD];
     boardWidget      = optList[W_BOARD].handle;
     menuBarWidget    = optList[W_MENU].handle;
     dropMenu         = optList[W_DROP].handle;
@@ -1669,14 +1671,6 @@ SetupDropMenu ()
     }
 }
 
-cairo_surface_t *
-GetOutputSurface(Option *opt, int w, int h)
-{
-	if(w == 0) w = lineGap + BOARD_WIDTH * (squareSize + lineGap);
-	if(h == 0) h = lineGap + BOARD_HEIGHT * (squareSize + lineGap);
-        return cairo_xlib_surface_create(xDisplay, XtWindow(opt->handle), DefaultVisual(xDisplay, 0), w, h);
-}
-
 static void
 do_flash_delay (unsigned long msec)
 {
@@ -1745,10 +1739,9 @@ ReSize (WindowPlacement *wp)
 	if(sqy < sqx) sqx = sqy;
 	if(sqx != squareSize) {
 	    squareSize = sqx; // adopt new square size
-	    NewSurfaces();
 	    CreatePNGPieces(); // make newly scaled pieces
 	    InitDrawingSizes(0, 0); // creates grid etc.
-	}
+	} else ResizeBoardWindow(BOARD_WIDTH * (squareSize + lineGap) + lineGap, BOARD_HEIGHT * (squareSize + lineGap) + lineGap, 0);
 }
 
 static XtIntervalId delayedDragID = 0;
@@ -1913,7 +1906,7 @@ ModeHighlight ()
     /* Maybe all the enables should be handled here, not just this one */
     EnableNamedMenuItem("Mode.Training", gameMode == Training || gameMode == PlayFromGameFile);
 
-    DisplayLogos(optList[W_WHITE-1].handle, optList[W_BLACK+1].handle);
+    DisplayLogos(&optList[W_WHITE-1], &optList[W_BLACK+1]);
 }
 
 
@@ -2561,7 +2554,7 @@ UpdateLogos (int displ)
     if(optList[W_WHITE-1].handle == NULL) return;
     LoadLogo(&first, 0, 0);
     LoadLogo(&second, 1, appData.icsActive);
-    if(displ) DisplayLogos(optList[W_WHITE-1].handle, optList[W_BLACK+1].handle);
+    if(displ) DisplayLogos(&optList[W_WHITE-1], &optList[W_BLACK+1]);
     return;
 }