X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=dvonn.c;h=806a8e69247c289f3a712d12293b610f54e43384;hb=1e29ece3252138d372b47499dd4c77f01413c7fc;hp=1442923c0acf27243f9ce42fc6de2766abb453bf;hpb=2c8c385d00f60fad7a4b74b0b66516fbce62c50f;p=dvonn

diff --git a/dvonn.c b/dvonn.c
index 1442923..806a8e6 100644
--- a/dvonn.c
+++ b/dvonn.c
@@ -72,6 +72,8 @@ on_delete_event_quit (GtkWidget  *widget,
 /* Something like buff */
 #define BACKGROUND_COLOR 0.89, 0.70, 0.40
 
+#define RED_RING_COLOR 0.8, 0.2, 0.2
+
 /* Relative to a unit square. */
 #define RING_OUTER_RADIUS 0.4
 #define RING_INNER_RADIUS 0.2
@@ -350,6 +352,14 @@ on_expose_event_draw (GtkWidget		*widget,
 	    cairo_translate(cr,
 			    x + (y - DVONN_BOARD_Y_SIZE/2) / 2.0,
 			    M_SQRT1_2 * y);
+	    if (cell.contains_red && cell.type != DVONN_CELL_RED) {
+		cairo_new_sub_path (cr);
+		cairo_arc (cr, 0.5, 0.5,
+			   (RING_INNER_RADIUS + RING_OUTER_RADIUS)/2.0,
+			   0, 2 * M_PI);
+		cairo_set_source_rgb (cr, RED_RING_COLOR);
+		cairo_fill (cr);
+	    }
 	    ring_path (cr);
 	    switch (cell.type) {
 	    case DVONN_CELL_WHITE:
@@ -359,7 +369,7 @@ on_expose_event_draw (GtkWidget		*widget,
 		cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); /* black */
 		break;
 	    case DVONN_CELL_RED:
-		cairo_set_source_rgb (cr, 0.8, 0.2, 0.2); /* red */
+		cairo_set_source_rgb (cr, RED_RING_COLOR);
 		break;
 	    case DVONN_CELL_EMPTY:
 	    default:
@@ -375,10 +385,10 @@ on_expose_event_draw (GtkWidget		*widget,
 	    }
 	    cairo_fill (cr);
 
-	    if (game->board.cells[x][y].height) {
+	    if (game->board.cells[x][y].height > 1) {
 		PangoLayout *height;
 		cairo_move_to (cr,
-			       0.5 - 0.8 * RING_INNER_RADIUS * cos (M_PI_4),
+			       0.5 - 0.7 * RING_INNER_RADIUS * cos (M_PI_4),
 			       0.5 - 1.2 * RING_INNER_RADIUS * sin (M_PI_4));
 		height = _create_layout_printf (cr, game->font, "%d",
 						game->board.cells[x][y].height);