Cleanse back-end code of all references to X11 types

[xboard.git] / draw.c

diff --git a/draw.c b/draw.c
index 84fb6a1..03160f0 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -74,11 +74,8 @@ extern char *getenv();
 #include <locale.h>
 #endif
 
-
-// [HGM] bitmaps: put before incuding the bitmaps / pixmaps, to know how many piece types there are.
 #include "common.h"
 
-#include "frontend.h"
 #include "backend.h"
 #include "xevalgraph.h"
 #include "board.h"
@@ -166,13 +163,11 @@ void
 InitDrawingSizes (BoardSize boardSize, int flags)
 {   // [HGM] resize is functional now, but for board format changes only (nr of ranks, files)
     int boardWidth, boardHeight;
-    int i;
     static int oldWidth, oldHeight;
     static VariantClass oldVariant;
     static int oldMono = -1, oldTwoBoards = 0;
-    extern Widget formWidget;
 
-    if(!formWidget) return;
+    if(!mainOptions[W_BOARD].handle) return;
 
     if(oldTwoBoards && !twoBoards) PopDown(DummyDlg);
     oldTwoBoards = twoBoards;
@@ -282,9 +277,7 @@ ScaleOnePiece (int color, int piece)
 
   g_type_init ();
 
-  if(!svgPieces[color][piece]) { // try to freshly render cached svg pieces first, to supply the source bitmap
-    svgPieces[color][piece] = LoadSVG("", color, piece); // this fills pngPieceImages if we had cached svg with bitmap of wanted size
-  }
+  svgPieces[color][piece] = LoadSVG("", color, piece); // this fills pngPieceImages if we had cached svg with bitmap of wanted size
 
   if(!pngPieceImages[color][piece]) { // we don't have cached bitmap (implying we did not have cached svg)
     if(*appData.pieceDirectory) { // user specified piece directory
@@ -775,7 +768,9 @@ DrawBlank (AnimNr anr, int x, int y, int startColor)
 void CopyRectangle (AnimNr anr, int srcBuf, int destBuf,
                 int srcX, int srcY, int width, int height, int destX, int destY)
 {
-       cairo_t *cr = cairo_create (c_animBufs[anr+destBuf]);
+       cairo_t *cr;
+       c_animBufs[anr+4] = csBoardWindow;
+       cr = cairo_create (c_animBufs[anr+destBuf]);
        cairo_set_source_surface (cr, c_animBufs[anr+srcBuf], destX - srcX, destY - srcY);
        cairo_rectangle (cr, destX, destY, width, height);
        cairo_fill (cr);