X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=draw.c;h=193f65ce030f191d833230e55bf3066d81f2f71d;hb=ee187f36388670ebf4e2666c8118d7344d670ed9;hp=0b63833dc81260648a87bd5b7bc054009bf7cdd0;hpb=ef69c417ccc6498ba0c13591b4deaa34a9a76ba1;p=xboard.git

diff --git a/draw.c b/draw.c
index 0b63833..193f65c 100644
--- a/draw.c
+++ b/draw.c
@@ -55,6 +55,8 @@
 #include <math.h>
 #include <cairo/cairo.h>
 #include <cairo/cairo-xlib.h>
+#include <librsvg/rsvg.h>
+#include <librsvg/rsvg-cairo.h>
 
 #if STDC_HEADERS
 # include <stdlib.h>
@@ -76,15 +78,8 @@ extern char *getenv();
 // [HGM] bitmaps: put before incuding the bitmaps / pixmaps, to know how many piece types there are.
 #include "common.h"
 
-#if HAVE_LIBXPM
-#include "pixmaps/pixmaps.h"
-#else
-#include "bitmaps/bitmaps.h"
-#endif
-
 #include "frontend.h"
 #include "backend.h"
-#include "xboard.h"
 #include "xevalgraph.h"
 #include "board.h"
 #include "menus.h"
@@ -111,9 +106,12 @@ extern char *getenv();
 #define SOLID 0
 #define OUTLINE 1
 Boolean cairoAnimate;
-static cairo_surface_t *csBoardWindow, *csBoardBackup, *csDualBoard;
+Option *currBoard;
+cairo_surface_t *csBoardWindow;
+static cairo_surface_t *pngPieceImages[2][(int)BlackPawn+4];   // png 256 x 256 images
 static cairo_surface_t *pngPieceBitmaps[2][(int)BlackPawn];    // scaled pieces as used
 static cairo_surface_t *pngPieceBitmaps2[2][(int)BlackPawn+4]; // scaled pieces in store
+static RsvgHandle *svgPieces[2][(int)BlackPawn+4]; // vector pieces in store
 static cairo_surface_t *pngBoardBitmap[2];
 int useTexture, textureW[2], textureH[2];
 
@@ -126,26 +124,14 @@ struct {
   int x1, x2, y1, y2;
 } gridSegments[BOARD_RANKS + BOARD_FILES + 2];
 
-void
-SwitchWindow ()
-{
-    cairo_surface_t *cstmp = csBoardWindow;
-    csBoardWindow = csDualBoard;
-    if(!csDualBoard && cstmp) {
-	int boardWidth = lineGap + BOARD_WIDTH * (squareSize + lineGap);
-	int boardHeight = lineGap + BOARD_HEIGHT * (squareSize + lineGap);
-	csBoardWindow = cairo_xlib_surface_create(xDisplay, xBoardWindow, DefaultVisual(xDisplay, 0), boardWidth, boardHeight);
-    }
-}
+static int dual = 0;
 
 void
-NewSurfaces ()
+SwitchWindow ()
 {
-    // delete surfaces after size becomes invalid, so they will be recreated
-    if(csBoardWindow) cairo_surface_destroy(csBoardWindow);
-    if(csBoardBackup) cairo_surface_destroy(csBoardBackup);
-    if(csDualBoard) cairo_surface_destroy(csDualBoard);
-    csBoardWindow = csBoardBackup = csDualBoard = NULL;
+    dual = !dual;
+    currBoard = (dual ? &mainOptions[W_BOARD] : &dualOptions[3]);
+    csBoardWindow = DRAWABLE(currBoard);
 }
 
 #define BoardSize int
@@ -154,9 +140,10 @@ 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 Dimension oldWidth, oldHeight;
+    static int oldWidth, oldHeight;
     static VariantClass oldVariant;
     static int oldMono = -1, oldTwoBoards = 0;
+    extern Widget formWidget;
 
     if(!formWidget) return;
 
@@ -171,12 +158,11 @@ InitDrawingSizes (BoardSize boardSize, int flags)
 
     oldWidth = boardWidth; oldHeight = boardHeight;
     CreateGrid();
-    NewSurfaces();
 
     /*
      * Inhibit shell resizing.
      */
-    ResizeBoardWindow(boardWidth, boardHeight, !cairoAnimate);
+    ResizeBoardWindow(boardWidth, boardHeight, 0);
 
     DelayedDrag();
   }
@@ -234,32 +220,105 @@ char *pngPieceNames[] = // must be in same order as internal piece encoding
   "GoldKnight", "GoldLance", "GoldPawn", "GoldSilver", NULL
 };
 
+RsvgHandle *
+LoadSVG (char *dir, int color, int piece)
+{
+    char buf[MSG_SIZ];
+  RsvgHandle *svg=svgPieces[color][piece];
+  RsvgDimensionData svg_dimensions;
+  GError **svgerror=NULL;
+  cairo_surface_t *img;
+  cairo_t *cr;
+
+    snprintf(buf, MSG_SIZ, "%s/%s%s.svg", dir, color ? "Black" : "White", pngPieceNames[piece]);
+
+    if(svg || *dir && (svg = rsvg_handle_new_from_file(buf,svgerror))) {
+
+      rsvg_handle_get_dimensions(svg, &svg_dimensions);
+      img = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, squareSize,  squareSize);
+
+      cr = cairo_create(img);
+      cairo_scale(cr, squareSize/(double) svg_dimensions.width, squareSize/(double) svg_dimensions.height);
+      rsvg_handle_render_cairo(svg, cr);
+      if(cairo_surface_status(img) == CAIRO_STATUS_SUCCESS) {
+        if(pngPieceImages[color][piece]) cairo_surface_destroy(pngPieceImages[color][piece]);
+        pngPieceImages[color][piece] = img;
+      }
+      cairo_destroy(cr);
+
+      return svg;
+    }
+    return NULL;
+}
+
 static void
-ScaleOnePiece (char *name, int color, int piece)
+ScaleOnePiece (int color, int piece)
 {
-  int w, h;
+  float w, h;
   char buf[MSG_SIZ];
   cairo_surface_t *img, *cs;
   cairo_t *cr;
-  static cairo_surface_t *pngPieceImages[2][(int)BlackPawn+4];   // png 256 x 256 images
 
-  if((img = pngPieceImages[color][piece]) == NULL) { // if PNG file for this piece was not yet read, read it now and store it
-    snprintf(buf, MSG_SIZ, "%s/%s%s.png", appData.pngDirectory, color ? "Black" : "White", pngPieceNames[piece]);
-    pngPieceImages[color][piece] = img = cairo_image_surface_create_from_png (buf);
-    w = cairo_image_surface_get_width (img);
-    h = cairo_image_surface_get_height (img);
-    if(w != 64 || h != 64) { printf("Bad png size %dx%d in %s\n", w, h, buf); exit(1); }
+  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
   }
+
+  if(!pngPieceImages[color][piece]) { // we don't have cached bitmap (implying we did not have cached svg)
+    if(*appData.pieceDirectory) { // user specified piece directory
+      snprintf(buf, MSG_SIZ, "%s/%s%s.png", appData.pieceDirectory, color ? "Black" : "White", pngPieceNames[piece]);
+      pngPieceImages[color][piece] = img = cairo_image_surface_create_from_png (buf); // try if there are png pieces there
+      if(cairo_surface_status(img) != CAIRO_STATUS_SUCCESS) { // there were not
+	svgPieces[color][piece] = LoadSVG(appData.pieceDirectory, color, piece); // so try if he has svg there
+      }
+    }
+  }
+
+  if(!pngPieceImages[color][piece]) { // we still did not manage to acquire a piece bitmap
+    if(!(svgPieces[color][piece] = LoadSVG(appData.svgDirectory, color, piece))) // try to fall back on installed svg
+      DisplayError(_("No default pieces installed\nSelect your own -pieceImageDirectory"), 0); // give up
+  }
+
+  img = pngPieceImages[color][piece];
+
   // create new bitmap to hold scaled piece image (and remove any old)
   if(pngPieceBitmaps2[color][piece]) cairo_surface_destroy (pngPieceBitmaps2[color][piece]);
   pngPieceBitmaps2[color][piece] = cs = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, squareSize, squareSize);
   if(piece <= WhiteKing) pngPieceBitmaps[color][piece] = cs;
+
   // scaled copying of the raw png image
   cr = cairo_create(cs);
-  cairo_scale(cr, squareSize/64., squareSize/64.);
+  w = cairo_image_surface_get_width (img);
+  h = cairo_image_surface_get_height (img);
+  cairo_scale(cr, squareSize/w, squareSize/h);
   cairo_set_source_surface (cr, img, 0, 0);
   cairo_paint (cr);
   cairo_destroy (cr);
+
+  if(!appData.trueColors || !*appData.pieceDirectory && !appData.svgDirectory) { // operate on bitmap to color it (king-size hack...)
+    int stride = cairo_image_surface_get_stride(cs)/4;
+    int *buf = (int *) cairo_image_surface_get_data(cs);
+    int i, j, p;
+    sscanf(color ? appData.blackPieceColor+1 : appData.whitePieceColor+1, "%x", &p); // replacement color
+    cairo_surface_flush(cs);
+    for(i=0; i<squareSize; i++) for(j=0; j<squareSize; j++) {
+	int r, a;
+	float f;
+	unsigned int c = buf[i*stride + j];
+	a = c >> 24; r = c >> 16 & 255;     // alpha and red, where red is the 'white' weight, since white is #FFFFCC in the source images
+        f = (color ? a - r : r)/255.;       // fraction of black or white in the mix that has to be replaced
+	buf[i*stride + j] = c & 0xFF000000; // alpha channel is kept at same opacity
+	buf[i*stride + j] += ((int)(f*(p&0xFF0000)) & 0xFF0000) + ((int)(f*(p&0xFF00)) & 0xFF00) + (int)(f*(p&0xFF)); // add desired fraction of new color
+	if(color) buf[i*stride + j] += r | r << 8 | r << 16; // details on black pieces get their weight added in pure white
+	if(appData.monoMode) {
+	    if(a < 64) buf[i*stride + j] = 0; // if not opaque enough, totally transparent
+	    else if(2*r < a) buf[i*stride + j] = 0xFF000000; // if not light enough, totally black
+            else buf[i*stride + j] = 0xFFFFFFFF; // otherwise white
+	}
+    }
+    cairo_surface_mark_dirty(cs);
+  }
 }
 
 void
@@ -268,28 +327,31 @@ CreatePNGPieces ()
   int p;
 
   for(p=0; pngPieceNames[p]; p++) {
-    ScaleOnePiece(pngPieceNames[p], 0, p);
-    ScaleOnePiece(pngPieceNames[p], 1, p);
+    ScaleOnePiece(0, p);
+    ScaleOnePiece(1, p);
   }
 }
 
-int
+void
 CreateAnyPieces ()
 {   // [HGM] taken out of main
-    if (appData.pngDirectory[0] != NULLCHAR) {
-      CreatePNGPieces();
-    }
+    CreatePNGPieces();
     CreatePNGBoard(appData.liteBackTextureFile, 1);
     CreatePNGBoard(appData.darkBackTextureFile, 0);
-    cairoAnimate = *appData.pngDirectory && useTexture == 3
-	&& strstr(appData.liteBackTextureFile, ".png") && strstr(appData.darkBackTextureFile, ".png");
-    return cairoAnimate;
 }
 
 void
-InitDrawingParams ()
+InitDrawingParams (int reloadPieces)
 {
+    int i, p;
     MakeColors();
+    if(reloadPieces)
+    for(i=0; i<2; i++) for(p=0; p<BlackPawn+4; p++) {
+	if(pngPieceImages[i][p]) cairo_surface_destroy(pngPieceImages[i][p]);
+	pngPieceImages[i][p] = NULL;
+	if(svgPieces[i][p]) rsvg_handle_close(svgPieces[i][p], NULL);
+	svgPieces[i][p] = NULL;
+    }
     CreateAnyPieces();
 }
 
@@ -329,6 +391,7 @@ void DrawSeekAxis( int x, int y, int xTo, int yTo )
 
     /* free memory */
     cairo_destroy (cr);
+    GraphExpose(currBoard, x-1, yTo-1, xTo-x+2, y-yTo+2);
 }
 
 void DrawSeekBackground( int left, int top, int right, int bottom )
@@ -342,6 +405,7 @@ void DrawSeekBackground( int left, int top, int right, int bottom )
 
     /* free memory */
     cairo_destroy (cr);
+    GraphExpose(currBoard, left, top, right-left, bottom-top);
 }
 
 void DrawSeekText(char *buf, int x, int y)
@@ -360,6 +424,7 @@ void DrawSeekText(char *buf, int x, int y)
 
     /* free memory */
     cairo_destroy (cr);
+    GraphExpose(currBoard, x-5, y-10, 60, 15);
 }
 
 void DrawSeekDot(int x, int y, int colorNr)
@@ -384,22 +449,13 @@ void DrawSeekDot(int x, int y, int colorNr)
 
     /* free memory */
     cairo_destroy (cr);
+    GraphExpose(currBoard, x-squareSize/8, y-squareSize/8, 2*(squareSize/8), 2*(squareSize/8));
 }
 
 void
-DrawSeekOpen ()
-{
-    int boardWidth = lineGap + BOARD_WIDTH * (squareSize + lineGap);
-    int boardHeight = lineGap + BOARD_HEIGHT * (squareSize + lineGap);
-    if(!csBoardWindow) {
-	csBoardWindow = cairo_xlib_surface_create(xDisplay, xBoardWindow, DefaultVisual(xDisplay, 0), boardWidth, boardHeight);
-	csBoardBackup = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, boardWidth, boardHeight);
-    }
-}
-
-void
-DrawSeekClose ()
+InitDrawingHandle (Option *opt)
 {
+    csBoardWindow = DRAWABLE(opt);
 }
 
 void
@@ -429,15 +485,15 @@ CreateGrid ()
 }
 
 void
-DoDrawGrid(cairo_surface_t *cs)
+DrawGrid()
 {
   /* draws a grid starting around Nx, Ny squares starting at x,y */
   int i;
+  float odd = (lineGap & 1)/2.;
   cairo_t *cr;
 
-  DrawSeekOpen();
   /* get a cairo_t */
-  cr = cairo_create (cs);
+  cr = cairo_create (csBoardWindow);
 
   cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
   SetPen(cr, lineGap, "#000000", 0);
@@ -445,8 +501,8 @@ DoDrawGrid(cairo_surface_t *cs)
   /* lines in X */
   for (i = 0; i < BOARD_WIDTH + BOARD_HEIGHT + 2; i++)
     {
-      cairo_move_to (cr, gridSegments[i].x1, gridSegments[i].y1);
-      cairo_line_to (cr, gridSegments[i].x2, gridSegments[i].y2);
+      cairo_move_to (cr, gridSegments[i].x1 + odd, gridSegments[i].y1 + odd);
+      cairo_line_to (cr, gridSegments[i].x2 + odd, gridSegments[i].y2 + odd);
       cairo_stroke (cr);
     }
 
@@ -457,17 +513,9 @@ DoDrawGrid(cairo_surface_t *cs)
 }
 
 void
-DrawGrid()
-{
-  DoDrawGrid(csBoardWindow);
-  DoDrawGrid(csBoardBackup);
-}
-
-void
-DoDrawBorder (cairo_surface_t *cs, int x, int y, int type)
+DrawBorder (int x, int y, int type, int odd)
 {
     cairo_t *cr;
-    DrawSeekOpen();
     char *col;
 
     switch(type) {
@@ -475,18 +523,13 @@ DoDrawBorder (cairo_surface_t *cs, int x, int y, int type)
 	case 1: col = appData.highlightSquareColor; break;
 	case 2: col = appData.premoveHighlightColor; break;
     }
-    cr = cairo_create(cs);
+    cr = cairo_create(csBoardWindow);
     cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
-    cairo_rectangle(cr, x, y, squareSize+lineGap, squareSize+lineGap);
+    cairo_rectangle(cr, x+odd/2., y+odd/2., squareSize+lineGap, squareSize+lineGap);
     SetPen(cr, lineGap, col, 0);
     cairo_stroke(cr);
-}
-
-void
-DrawBorder (int x, int y, int type)
-{
-  DoDrawBorder(csBoardWindow, x, y, type);
-  DoDrawBorder(csBoardBackup, x, y, type);
+    cairo_destroy(cr);
+    GraphExpose(currBoard, x - lineGap/2, y - lineGap/2, squareSize+2*lineGap+odd, squareSize+2*lineGap+odd);
 }
 
 static int
@@ -508,34 +551,32 @@ CutOutSquare (int x, int y, int *x0, int *y0, int  kind)
 }
 
 void
-DrawLogo (void *handle, void *logo)
+DrawLogo (Option *opt, void *logo)
 {
-    cairo_surface_t *img, *cs;
+    cairo_surface_t *img;
     cairo_t *cr;
     int w, h;
 
-    if(!logo || !handle) return;
-    cs = cairo_xlib_surface_create(xDisplay, XtWindow(handle), DefaultVisual(xDisplay, 0), appData.logoSize, appData.logoSize/2);
+    if(!logo || !opt) return;
     img = cairo_image_surface_create_from_png (logo);
     w = cairo_image_surface_get_width (img);
     h = cairo_image_surface_get_height (img);
-    cr = cairo_create(cs);
+    cr = cairo_create(DRAWABLE(opt));
     cairo_scale(cr, (float)appData.logoSize/w, appData.logoSize/(2.*h));
     cairo_set_source_surface (cr, img, 0, 0);
     cairo_paint (cr);
     cairo_destroy (cr);
     cairo_surface_destroy (img);
-    cairo_surface_destroy (cs);
+    GraphExpose(opt, 0, 0, appData.logoSize, appData.logoSize/2);
 }
 
 static void
-BlankSquare (int x, int y, int color, ChessSquare piece, cairo_surface_t *dest, int fac)
+BlankSquare (cairo_surface_t *dest, int x, int y, int color, ChessSquare piece, int fac)
 {   // [HGM] extra param 'fac' for forcing destination to (0,0) for copying to animation buffer
     int x0, y0;
     cairo_t *cr;
 
-    DrawSeekOpen();
-    cr = cairo_create (fac ? csBoardWindow : dest);
+    cr = cairo_create (dest);
 
     if ((useTexture & color+1) && CutOutSquare(x, y, &x0, &y0, color)) {
 	    cairo_set_source_surface (cr, pngBoardBitmap[color], x*fac - x0, y*fac - y0);
@@ -543,14 +584,6 @@ BlankSquare (int x, int y, int color, ChessSquare piece, cairo_surface_t *dest,
 	    cairo_rectangle (cr, x*fac, y*fac, squareSize, squareSize);
 	    cairo_fill (cr);
 	    cairo_destroy (cr);
-	   if(fac) {
-	    cr = cairo_create (csBoardBackup);
-	    cairo_set_source_surface (cr, pngBoardBitmap[color], x*fac - x0, y*fac - y0);
-	    cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
-	    cairo_rectangle (cr, x*fac, y*fac, squareSize, squareSize);
-	    cairo_fill (cr);
-	    cairo_destroy (cr);
-	   }
     } else { // evenly colored squares
 	char *col;
 	switch (color) {
@@ -559,21 +592,15 @@ BlankSquare (int x, int y, int color, ChessSquare piece, cairo_surface_t *dest,
 	  case 2: col = "#000000"; break;
 	}
 	SetPen(cr, 2.0, col, 0);
-	cairo_rectangle (cr, x, y, squareSize, squareSize);
-	cairo_fill (cr);
-	cairo_destroy (cr);
-	if(fac) {
-	cr = cairo_create (csBoardBackup);
-	SetPen(cr, 2.0, col, 0);
-	cairo_rectangle (cr, x, y, squareSize, squareSize);
+	cairo_rectangle (cr, fac*x, fac*y, squareSize, squareSize);
+	cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
 	cairo_fill (cr);
 	cairo_destroy (cr);
-	}
     }
 }
 
 static void
-pngDrawPiece (ChessSquare piece, int square_color, int x, int y, cairo_surface_t *dest)
+pngDrawPiece (cairo_surface_t *dest, ChessSquare piece, int square_color, int x, int y)
 {
     int kind, p = piece;
     cairo_t *cr;
@@ -585,23 +612,18 @@ pngDrawPiece (ChessSquare piece, int square_color, int x, int y, cairo_surface_t
 	piece -= BlackPawn;
     }
     if(appData.upsideDown && flipView) { p += p < BlackPawn ? BlackPawn : -BlackPawn; }// swap white and black pieces
-    BlankSquare(x, y, square_color, piece, dest, 1); // erase previous contents with background
-    DrawSeekOpen();
-    cr = cairo_create (csBoardWindow);
-    cairo_set_source_surface (cr, pngPieceBitmaps[kind][piece], x, y);
-    cairo_paint(cr);
-    cairo_destroy (cr);
-    cr = cairo_create (csBoardBackup);
+    BlankSquare(dest, x, y, square_color, piece, 1); // erase previous contents with background
+    cr = cairo_create (dest);
     cairo_set_source_surface (cr, pngPieceBitmaps[kind][piece], x, y);
     cairo_paint(cr);
     cairo_destroy (cr);
 }
 
 void
-DoDrawDot (int marker, int x, int y, int r, cairo_surface_t *cs)
+DoDrawDot (cairo_surface_t *cs, int marker, int x, int y, int r)
 {
 	cairo_t *cr;
-	DrawSeekOpen();
+
 	cr = cairo_create(cs);
 	cairo_arc(cr, x+r/2, y+r/2, r/2, 0.0, 2*M_PI);
 	if(appData.monoMode) {
@@ -612,67 +634,53 @@ DoDrawDot (int marker, int x, int y, int r, cairo_surface_t *cs)
 	    SetPen(cr, 2, marker == 2 ? "#FF0000" : "#FFFF00", 0);
 	}
 	cairo_fill(cr);
-	cairo_stroke(cr);
 
 	cairo_destroy(cr);
 }
 
 void
 DrawDot (int marker, int x, int y, int r)
-{
-  DoDrawDot(marker, x, y, r, csBoardWindow);
-  DoDrawDot(marker, x, y, r, csBoardBackup);
+{ // used for atomic captures; no need to draw on backup
+  DoDrawDot(csBoardWindow, marker, x, y, r);
+  GraphExpose(currBoard, x-r, y-r, 2*r, 2*r);
 }
 
 void
 DrawOneSquare (int x, int y, ChessSquare piece, int square_color, int marker, char *string, int align)
 {   // basic front-end board-draw function: takes care of everything that can be in square:
     // piece, background, coordinate/count, marker dot
-    int direction, font_ascent, font_descent;
-    XCharStruct overall;
     cairo_t *cr;
 
     if (piece == EmptySquare) {
-	BlankSquare(x, y, square_color, piece, csBoardWindow, 1);
+	BlankSquare(csBoardWindow, x, y, square_color, piece, 1);
     } else {
-	pngDrawPiece(piece, square_color, x, y, csBoardWindow);
+	pngDrawPiece(csBoardWindow, piece, square_color, x, y);
     }
 
     if(align) { // square carries inscription (coord or piece count)
 	int xx = x, yy = y;
-	// first calculate where it goes
-	XTextExtents(countFontStruct, string, 1, &direction,
-			 &font_ascent, &font_descent, &overall);
-	if (align == 1) {
-	    xx += squareSize - overall.width - 2;
-	    yy += squareSize - font_descent - 1;
-	} else if (align == 2) {
-	    xx += 2, yy += font_ascent + 1;
-	} else if (align == 3) {
-	    xx += squareSize - overall.width - 2;
-	    yy += font_ascent + 1;
-	} else if (align == 4) {
-	    xx += 2, yy += font_ascent + 1;
-	}
+	cairo_text_extents_t te;
+
 	cr = cairo_create (csBoardWindow);
 	cairo_select_font_face (cr, "Sans",
 		    CAIRO_FONT_SLANT_NORMAL,
 		    CAIRO_FONT_WEIGHT_BOLD);
 
 	cairo_set_font_size (cr, squareSize/4);
+	// calculate where it goes
+	cairo_text_extents (cr, string, &te);
 
-	cairo_move_to (cr, xx-1, yy);
-	if(align < 3) cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
-	else          cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
-	cairo_show_text (cr, string);
-	cairo_destroy (cr);
-
-	cr = cairo_create (csBoardBackup);
-	cairo_select_font_face (cr, "Sans",
-			    CAIRO_FONT_SLANT_NORMAL,
-			    CAIRO_FONT_WEIGHT_BOLD);
-
-	cairo_set_font_size (cr, squareSize/4);
+	if (align == 1) {
+	    xx += squareSize - te.width - te.x_bearing - 1;
+	    yy += squareSize - te.height - te.y_bearing - 1;
+	} else if (align == 2) {
+	    xx += te.x_bearing + 1, yy += -te.y_bearing + 1;
+	} else if (align == 3) {
+	    xx += squareSize - te.width -te.x_bearing - 1;
+	    yy += -te.y_bearing + 3;
+	} else if (align == 4) {
+	    xx += te.x_bearing + 1, yy += -te.y_bearing + 3;
+	}
 
 	cairo_move_to (cr, xx-1, yy);
 	if(align < 3) cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
@@ -682,7 +690,7 @@ DrawOneSquare (int x, int y, ChessSquare piece, int square_color, int marker, ch
     }
 
     if(marker) { // print fat marker dot, if requested
-	DrawDot(marker, x + squareSize/4, y+squareSize/4, squareSize/2);
+	DoDrawDot(csBoardWindow, marker, x + squareSize/4, y+squareSize/4, squareSize/2);
     }
 }
 
@@ -699,7 +707,6 @@ static cairo_surface_t *c_animBufs[3*NrOfAnims]; // newBuf, saveBuf
 static void
 InitAnimState (AnimNr anr)
 {
-    DrawSeekOpen(); // set cs to board widget
     if(c_animBufs[anr]) cairo_surface_destroy (c_animBufs[anr]);
     if(c_animBufs[anr+2]) cairo_surface_destroy (c_animBufs[anr+2]);
     c_animBufs[anr+4] = csBoardWindow;
@@ -734,28 +741,19 @@ InsertPiece (AnimNr anr, ChessSquare piece)
 void
 DrawBlank (AnimNr anr, int x, int y, int startColor)
 {
-    BlankSquare(x, y, startColor, EmptySquare, c_animBufs[anr+2], 0);
+    BlankSquare(c_animBufs[anr+2], x, y, startColor, EmptySquare, 0);
 }
 
 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]);
-	cr = cairo_create (c_animBufs[anr+destBuf]);
-	if(c_animBufs[anr+srcBuf] == csBoardWindow)
-	cairo_set_source_surface (cr, csBoardBackup, destX - srcX, destY - srcY);
-	else
+	cairo_t *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);
 	cairo_destroy (cr);
-	if(c_animBufs[anr+destBuf] == csBoardWindow) {
-	cr = cairo_create (csBoardBackup); // also draw to backup
-	cairo_set_source_surface (cr, c_animBufs[anr+srcBuf], destX - srcX, destY - srcY);
-	cairo_rectangle (cr, destX, destY, width, height);
-	cairo_fill (cr);
-	cairo_destroy (cr);
-	}
+	if(c_animBufs[anr+destBuf] == csBoardWindow)
+	    GraphExpose(currBoard, destX, destY, squareSize, squareSize);
 }
 
 void
@@ -791,7 +789,7 @@ void
 DrawPolygon (Pnt arrow[], int nr)
 {
     DoDrawPolygon(csBoardWindow, arrow, nr);
-    DoDrawPolygon(csBoardBackup, arrow, nr);
+//    if(!dual) DoDrawPolygon(csBoardBackup, arrow, nr);
 }