X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard.c;h=9c8be9b330075a859e568076c54fc14c01b61bbf;hb=87f92ae18b9ce2ad0f230609d7d90f2fbf0a1c7b;hp=5dc557c53293cb2a5248a8b901c02d30653e923e;hpb=464c850454acd87b1f293c00d138a932a8641eba;p=xboard.git

diff --git a/xboard.c b/xboard.c
index 5dc557c..9c8be9b 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;
@@ -2520,11 +2534,17 @@ DoDrawBorder (cairo_surface_t *cs, int x, int y, int type)
 {
     cairo_t *cr;
     DrawSeekOpen();
+    char *col;
 
+    switch(type) {
+	case 0: col = "#000000"; break;
+	case 1: col = appData.highlightSquareColor; break;
+	case 2: col = appData.premoveHighlightColor; break;
+    }
     cr = cairo_create(cs);
     cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
     cairo_rectangle(cr, x, y, squareSize+lineGap, squareSize+lineGap);
-    SetPen(cr, lineGap, type == 1 ? appData.highlightSquareColor : appData.premoveHighlightColor, 0);
+    SetPen(cr, lineGap, col, 0);
     cairo_stroke(cr);
 }
 
@@ -4132,14 +4152,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