X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard.c;h=9c8be9b330075a859e568076c54fc14c01b61bbf;hb=87f92ae18b9ce2ad0f230609d7d90f2fbf0a1c7b;hp=83715629acefbe0bec786662eb74920b63d93033;hpb=30bee1681398fd9d9dfbcfc9fcb5d4e5180415bd;p=xboard.git

diff --git a/xboard.c b/xboard.c
index 8371562..9c8be9b 100644
--- a/xboard.c
+++ b/xboard.c
@@ -1055,9 +1055,22 @@ InitDrawingSizes (BoardSize boardSize, int flags)
     }
     for(i=0; i<2; i++) {
 	int p;
-printf("Copy pieces\n");
 	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;
@@ -2521,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);
 }
 
@@ -2602,6 +2621,24 @@ BlankSquare (int x, int y, int color, ChessSquare piece, Drawable dest, int fac)
 	XCopyArea(xDisplay, xpmBoardBitmap[color], dest, wlPieceGC, x0, y0,
 		  squareSize, squareSize, x*fac, y*fac);
     } else
+    if(csBoardWindow) {
+	cairo_t *cr = cairo_create (csBoardWindow);
+	char *col;
+	switch (color) {
+	  case 0: col = appData.darkSquareColor; break;
+	  case 1: col = appData.lightSquareColor; break;
+	  case 2: col = "#000000"; break;
+	}
+	SetPen(cr, 2.0, col, 0);
+	cairo_rectangle (cr, x, y, squareSize, squareSize);
+	cairo_fill (cr);
+	cairo_destroy (cr);
+	cr = cairo_create (csBoardBackup);
+	SetPen(cr, 2.0, col, 0);
+	cairo_rectangle (cr, x, y, squareSize, squareSize);
+	cairo_fill (cr);
+	cairo_destroy (cr);
+    } else
     if (useImages && useImageSqs) {
 	Pixmap pm;
 	switch (color) {
@@ -2870,8 +2907,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);
@@ -4104,13 +4151,18 @@ CairoOverlayPiece (ChessSquare piece, cairo_surface_t *dest)
   static ChessSquare oldPiece = -1;
   static int oldSize;
   static cairo_t *pieceSource;
-  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;
-  }
-  cairo_paint(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;
+//  }
+  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