X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=draw.c;h=a3a9cb1c5768da77411fe22b1427b77b89bcacae;hb=fa1ce90bbcd27d332afebd9ecbd4e0ed662c4940;hp=c681eaed4407eee25ce299e0ce76a7750d44d1b1;hpb=a009a27e8c1e0bfa818f12fdcae675d0babc510a;p=xboard.git

diff --git a/draw.c b/draw.c
index c681eae..a3a9cb1 100644
--- a/draw.c
+++ b/draw.c
@@ -124,13 +124,10 @@ struct {
   int x1, x2, y1, y2;
 } gridSegments[BOARD_RANKS + BOARD_FILES + 2];
 
-static int dual = 0;
-
 void
-SwitchWindow ()
+SwitchWindow (int main)
 {
-    dual = !dual;
-    currBoard = (dual ? &mainOptions[W_BOARD] : &dualOptions[3]);
+    currBoard = (main ? &mainOptions[W_BOARD] : &dualOptions[3]);
     csBoardWindow = DRAWABLE(currBoard);
 }
 
@@ -158,6 +155,11 @@ SelectPieces(VariantClass v)
 	   pngPieceBitmaps[i][(int)WhiteAngel]    = pngPieceBitmaps2[i][(int)WhiteFalcon];
 	   pngPieceBitmaps[i][(int)WhiteMarshall] = pngPieceBitmaps2[i][(int)WhiteAlfil];
 	}
+	if(v == VariantChu) {
+	   pngPieceBitmaps[i][(int)WhiteUnicorn] = pngPieceBitmaps2[i][(int)WhiteCat];
+	   pngPieceBitmaps[i][(int)WhiteSilver]  = pngPieceBitmaps2[i][(int)WhiteSword];
+	   pngPieceBitmaps[i][(int)WhiteFalcon]  = pngPieceBitmaps2[i][(int)WhiteDagger];
+	}
     }
 }
 
@@ -168,7 +170,7 @@ InitDrawingSizes (BoardSize boardSize, int flags)
     int boardWidth, boardHeight;
     static int oldWidth, oldHeight;
     static VariantClass oldVariant;
-    static int oldMono = -1, oldTwoBoards = 0;
+    static int oldTwoBoards = 0;
 
     if(!mainOptions[W_BOARD].handle) return;
 
@@ -199,11 +201,9 @@ InitDrawingSizes (BoardSize boardSize, int flags)
 
     SelectPieces(gameInfo.variant);
 
-    oldMono = -10; // kludge to force recreation of animation masks
     oldVariant = gameInfo.variant;
   }
   CreateAnimVars();
-  oldMono = appData.monoMode;
 }
 
 void
@@ -232,8 +232,10 @@ CreatePNGBoard (char *s, int kind)
 }
 
 char *pngPieceNames[] = // must be in same order as internal piece encoding
-{ "Pawn", "Knight", "Bishop", "Rook", "Queen", "Advisor", "Elephant", "Archbishop", "Marshall", "Gold", "Commoner", 
-  "Canon", "Nightrider", "CrownedBishop", "CrownedRook", "Princess", "Chancellor", "Hawk", "Lance", "Cobra", "Unicorn", "King", 
+{ "Pawn", "Knight", "Bishop", "Rook", "Queen", "Advisor", "Elephant", "Archbishop", "Marshall", "Gold", "Commoner",
+  "Canon", "Nightrider", "CrownedBishop", "CrownedRook", "Princess", "Chancellor", "Hawk", "Lance", "Cobra", "Unicorn", "Lion",
+  "GoldPawn", "HSword", "PromoHorse", "PromoDragon", "Leopard", "PromoSword", "King", "Queen", "Lion", "PromoRook", "PromoHSword",
+  "Dolphin", "Chancellor", "Unicorn", "Hawk", "Sword", "Princess", "HCrown", "Knight", "Elephant", "PromoBishop", "King",
   "GoldKnight", "GoldLance", "GoldPawn", "GoldSilver", NULL
 };
 
@@ -295,7 +297,7 @@ ScaleOnePiece (int color, int piece)
   if(!pngPieceImages[color][piece]) { // we still did not manage to acquire a piece bitmap
     static int warned = 0;
     if(!(svgPieces[color][piece] = LoadSVG(SVGDIR, color, piece)) && !warned) { // try to fall back on installed svg
-      char *msg = _("No default pieces installed\nSelect your own -pieceImageDirectory");
+      char *msg = _("No default pieces installed!\nSelect your own using '-pieceImageDirectory'.");
       printf("%s\n", msg); // give up
       DisplayError(msg, 0);
       warned = 1; // prevent error message being repeated for each piece type
@@ -546,6 +548,7 @@ DrawBorder (int x, int y, int type, int odd)
 	case 0: col = "#000000"; break;
 	case 1: col = appData.highlightSquareColor; break;
 	case 2: col = appData.premoveHighlightColor; break;
+	default: col = "#808080"; break; // cannot happen
     }
     cr = cairo_create(csBoardWindow);
     cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
@@ -610,11 +613,12 @@ BlankSquare (cairo_surface_t *dest, int x, int y, int color, ChessSquare piece,
 	    cairo_fill (cr);
 	    cairo_destroy (cr);
     } else { // evenly colored squares
-	char *col;
+	char *col = NULL;
 	switch (color) {
 	  case 0: col = appData.darkSquareColor; break;
 	  case 1: col = appData.lightSquareColor; break;
 	  case 2: col = "#000000"; break;
+	  default: col = "#808080"; break; // cannot happen
 	}
 	SetPen(cr, 2.0, col, 0);
 	cairo_rectangle (cr, fac*x, fac*y, squareSize, squareSize);
@@ -627,7 +631,7 @@ BlankSquare (cairo_surface_t *dest, int x, int y, int color, ChessSquare piece,
 static void
 pngDrawPiece (cairo_surface_t *dest, ChessSquare piece, int square_color, int x, int y)
 {
-    int kind, p = piece;
+    int kind;
     cairo_t *cr;
 
     if ((int)piece < (int) BlackPawn) {
@@ -636,7 +640,7 @@ pngDrawPiece (cairo_surface_t *dest, ChessSquare piece, int square_color, int x,
 	kind = 1;
 	piece -= BlackPawn;
     }
-    if(appData.upsideDown && flipView) { p += p < BlackPawn ? BlackPawn : -BlackPawn; }// swap white and black pieces
+    if(appData.upsideDown && flipView) kind = 1 - kind; // swap white and black pieces
     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);
@@ -644,6 +648,8 @@ pngDrawPiece (cairo_surface_t *dest, ChessSquare piece, int square_color, int x,
     cairo_destroy (cr);
 }
 
+static char *markerColor[8] = { "#FFFF00", "#FF0000", "#00FF00", "#0000FF", "#00FFFF", "#FF00FF", "#FFFFFF", "#000000" };
+
 void
 DoDrawDot (cairo_surface_t *cs, int marker, int x, int y, int r)
 {
@@ -656,7 +662,7 @@ DoDrawDot (cairo_surface_t *cs, int marker, int x, int y, int r)
 	    cairo_stroke_preserve(cr);
 	    SetPen(cr, 2, marker == 2 ? "#FFFFFF" : "#000000", 0);
 	} else {
-	    SetPen(cr, 2, marker == 2 ? "#FF0000" : "#FFFF00", 0);
+	    SetPen(cr, 2, markerColor[marker-1], 0);
 	}
 	cairo_fill(cr);
 
@@ -670,21 +676,12 @@ DrawDot (int marker, int x, int y, int 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
-    cairo_t *cr;
-
-    if (piece == EmptySquare) {
-	BlankSquare(csBoardWindow, x, y, square_color, piece, 1);
-    } else {
-	pngDrawPiece(csBoardWindow, piece, square_color, x, y);
-    }
-
-    if(align) { // square carries inscription (coord or piece count)
+static void
+DrawText (char *string, int x, int y, int align)
+{
 	int xx = x, yy = y;
 	cairo_text_extents_t te;
+	cairo_t *cr;
 
 	cr = cairo_create (csBoardWindow);
 	cairo_select_font_face (cr, "Sans",
@@ -712,6 +709,22 @@ DrawOneSquare (int x, int y, ChessSquare piece, int square_color, int marker, ch
 	else          cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
 	cairo_show_text (cr, string);
 	cairo_destroy (cr);
+}
+
+void
+DrawOneSquare (int x, int y, ChessSquare piece, int square_color, int marker, char *tString, char *bString, int align)
+{   // basic front-end board-draw function: takes care of everything that can be in square:
+    // piece, background, coordinate/count, marker dot
+
+    if (piece == EmptySquare) {
+	BlankSquare(csBoardWindow, x, y, square_color, piece, 1);
+    } else {
+	pngDrawPiece(csBoardWindow, piece, square_color, x, y);
+    }
+
+    if(align) { // square carries inscription (coord or piece count)
+	if(align > 1) DrawText(tString, x, y, align);       // top (rank or count)
+	if(bString && *bString) DrawText(bString, x, y, 1); // bottom (always lower right file ID)
     }
 
     if(marker) { // print fat marker dot, if requested
@@ -921,5 +934,3 @@ DrawEvalText (char *buf, int cbBuf, int y)
   /* free memory */
   cairo_destroy (cr);
 }
-
-