X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard.c;h=a0fa610e987fdebaab7dcee130518411f06f7b4b;hb=61b69f49dbec48869a2aba5e982a79087c226b7a;hp=4f53763d1a3b81e94866afeb44f406ecee5d9c33;hpb=2317c584881b1dcb47e71abe5c44800d2369ac64;p=xboard.git

diff --git a/xboard.c b/xboard.c
index 4f53763..a0fa610 100644
--- a/xboard.c
+++ b/xboard.c
@@ -1057,6 +1057,20 @@ InitDrawingSizes (BoardSize boardSize, int flags)
 	int p;
 	for(p=0; p<=(int)WhiteKing; p++)
 	   pngPieceBitmaps[i][p] = pngPieceBitmaps2[i][p]; // defaults
+	if(gameInfo.variant == VariantShogi) {
+	   pngPieceBitmaps[i][(int)WhiteCannon] = pngPieceBitmaps2[i][(int)WhiteKing+1];
+	   pngPieceBitmaps[i][(int)WhiteNightrider] = pngPieceBitmaps2[i][(int)WhiteKing+2];
+	   pngPieceBitmaps[i][(int)WhiteSilver] = pngPieceBitmaps2[i][(int)WhiteKing+3];
+	   pngPieceBitmaps[i][(int)WhiteGrasshopper] = pngPieceBitmaps2[i][(int)WhiteKing+4];
+	   pngPieceBitmaps[i][(int)WhiteQueen] = pngPieceBitmaps2[i][(int)WhiteLance];
+	}
+	if(gameInfo.variant == VariantGothic) {
+	   pngPieceBitmaps[i][(int)WhiteMarshall] = pngPieceBitmaps2[i][(int)WhiteSilver];
+	}
+	if(gameInfo.variant == VariantSChess) {
+	   pngPieceBitmaps[i][(int)WhiteAngel]    = pngPieceBitmaps2[i][(int)WhiteFalcon];
+	   pngPieceBitmaps[i][(int)WhiteMarshall] = pngPieceBitmaps2[i][(int)WhiteAlfil];
+	}
     }
     oldMono = -10; // kludge to force recreation of animation masks
     oldVariant = gameInfo.variant;
@@ -2887,8 +2901,18 @@ DrawOneSquare (int x, int y, ChessSquare piece, int square_color, int marker, ch
 		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);
 
-		/* free memory */
+		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);
 	    } else
 	    XDrawString(xDisplay, xBoardWindow, hGC, xx, yy, string, 1);
@@ -4122,14 +4146,17 @@ CairoOverlayPiece (ChessSquare piece, cairo_surface_t *dest)
   static int oldSize;
   static cairo_t *pieceSource;
   extern int doubleClick; // in backend.c
-  if(piece != oldPiece || squareSize != oldSize) { // try make it faster by only changing cr if we need other piece
-    if(pieceSource) cairo_destroy (pieceSource);
-    pieceSource = cairo_create (dest);
-    cairo_set_source_surface (pieceSource, pngPieceBitmaps[!White(piece)][piece % BlackPawn], 0, 0);
-    oldPiece = piece; oldSize = squareSize;
-  }
+//  if(piece != oldPiece || squareSize != oldSize) { // try make it faster by only changing cr if we need other piece
+//    if(pieceSource) cairo_destroy (pieceSource);
+//    pieceSource = cairo_create (dest);
+//    cairo_set_source_surface (pieceSource, pngPieceBitmaps[!White(piece)][piece % BlackPawn], 0, 0);
+//    oldPiece = piece; oldSize = squareSize;
+//  }
+  pieceSource = cairo_create (dest);
+  cairo_set_source_surface (pieceSource, pngPieceBitmaps[!White(piece)][piece % BlackPawn], 0, 0);
   if(doubleClick) cairo_paint_with_alpha (pieceSource, 0.6);
   else cairo_paint(pieceSource);
+  cairo_destroy (pieceSource);
 }
 
 void