X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=draw.c;h=53ac879f499eb1d967d5a55617123e93c13d7d07;hb=116c9bb53aaee3d776248107585b36793f32dab1;hp=45aaf01fa3ff52b3a71fe567b3834e51d81063f1;hpb=b7d7c902b3f869f85816a2da3872b03119affd3a;p=xboard.git

diff --git a/draw.c b/draw.c
index 45aaf01..53ac879 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);
 }
 
@@ -644,6 +641,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 +655,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);