Updated copyright notice to 2014

[xboard.git] / draw.c

diff --git a/draw.c b/draw.c
index b7f5aeb..a306aba 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -5,7 +5,7 @@
  * Massachusetts.
  *
  * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
  *
  * The following terms apply to Digital Equipment Corporation's copyright
  * interest in XBoard:
@@ -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);
 }
 
@@ -544,6 +541,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);
@@ -608,11 +606,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);
@@ -625,7 +624,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) {
@@ -634,7 +633,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);
@@ -668,21 +667,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",
@@ -710,6 +700,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