X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=draw.c;h=53156f0a0c629e51e0bf9ab7f8c90f49531cc3b7;hb=dd67211f46050409861a109a9778af6594279569;hp=c681eaed4407eee25ce299e0ce76a7750d44d1b1;hpb=a009a27e8c1e0bfa818f12fdcae675d0babc510a;p=xboard.git diff --git a/draw.c b/draw.c index c681eae..53156f0 100644 --- a/draw.c +++ b/draw.c @@ -168,7 +168,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 +199,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 +230,8 @@ 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", "King", "GoldKnight", "GoldLance", "GoldPawn", "GoldSilver", NULL }; @@ -546,6 +544,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 +609,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); @@ -670,21 +670,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 +703,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 +928,3 @@ DrawEvalText (char *buf, int cbBuf, int y) /* free memory */ cairo_destroy (cr); } - -