Implement automatic pass (when there is no legal move) and end-of-game

[dvonn] / dvonn.c

diff --git a/dvonn.c b/dvonn.c
index 896edc36ab49a346e98af873ea16f7bcae518d1e..c1762ed19be159f67832ce71fe032e85e0331ee0 100644 (file)
--- a/dvonn.c
+++ b/dvonn.c
@@ -55,6 +55,7 @@ struct _dvonn_game {
     int selected_y;
 
     PangoFontDescription *font;
+    PangoFontDescription *ring_font;
 
     dvonn_bool_t dual_window_mode;
     GtkWidget *windows[2];
@@ -77,10 +78,13 @@ on_delete_event_quit (GtkWidget  *widget,
 
 #define RED_RING_COLOR 0.8, 0.2, 0.2
 
+#define DVONN_FONT "sans"
+#define DVONN_FONT_SIZE 12
+
 /* Relative to a unit square. */
 #define RING_OUTER_RADIUS 0.4
 #define RING_INNER_RADIUS 0.2
-#define FONT_SIZE (RING_INNER_RADIUS * 1.5)
+#define RING_FONT_SIZE (RING_INNER_RADIUS * 1.5)
 
 /* XXX: This really should have an interest rectangle. */
 static void
@@ -173,13 +177,6 @@ on_button_press_event (GtkWidget   *widget,
     if (event->type >= GDK_2BUTTON_PRESS)
        return TRUE;
 
-    /* Right-click means pass, (yes, it would be better to add some
-     * actual UI elements... */
-    if (event->button == 3) {
-       dvonn_board_pass (&game->board);
-       return TRUE;
-    }
-
     x = event->x;
     y = event->y;
     layout_device_to_board (layout, &x, &y);
@@ -208,7 +205,7 @@ on_button_press_event (GtkWidget    *widget,
     }
 
     if (! game->has_selected) {
-       if (game->board.cells[x][y].type == game->board.player &&
+       if (dvonn_board_cell_owned_by (&game->board, x, y, game->board.player) &&
            ! dvonn_board_cell_surrounded (&game->board, x, y))
            {
                    game->has_selected = TRUE;
@@ -225,7 +222,7 @@ on_button_press_event (GtkWidget    *widget,
        dvonn_game_update_windows (game);
        return TRUE;
     }
-       
+
     if (dvonn_board_move (&game->board,
                          game->selected_x, game->selected_y,
                          x, y, &error))
@@ -328,6 +325,7 @@ on_expose_event_draw (GtkWidget             *widget,
     dvonn_game_t *game = view->game;
     cairo_t *cr;
     int x, y;
+    PangoLayout *to_move;
 
     if (layout->width != widget->allocation.width ||
        layout->height != widget->allocation.height)
@@ -349,12 +347,13 @@ on_expose_event_draw (GtkWidget           *widget,
        layout->x_offset = (layout->width - x_size) / 2;
        layout->y_offset = (layout->height - y_size) / 2;
 
-       if (game->font == NULL) {
-           game->font = pango_font_description_new ();
-           pango_font_description_set_family (game->font, "sans");
+       if (game->ring_font == NULL) {
+           game->ring_font = pango_font_description_new ();
+           pango_font_description_set_family (game->ring_font,
+                                              DVONN_FONT);
        }
-       pango_font_description_set_absolute_size (game->font,
-                                                 FONT_SIZE * PANGO_SCALE);
+       pango_font_description_set_absolute_size (game->ring_font,
+                                                 RING_FONT_SIZE * PANGO_SCALE);
     }
 
     cr = gdk_cairo_create (widget->window);
@@ -362,6 +361,51 @@ on_expose_event_draw (GtkWidget            *widget,
     cairo_set_source_rgb (cr, BACKGROUND_COLOR);
     cairo_paint (cr);
 
+    if (game->font == NULL) {
+       game->font = pango_font_description_new ();
+       pango_font_description_set_family (game->font, DVONN_FONT);
+       pango_font_description_set_absolute_size (game->font, DVONN_FONT_SIZE * PANGO_SCALE);
+    }
+    if (game->board.phase == DVONN_PHASE_GAME_OVER) {
+       if (game->board.score[DVONN_PLAYER_WHITE] >
+           game->board.score[DVONN_PLAYER_BLACK])
+       {
+           to_move = _create_layout_printf (cr, game->font,
+                                            "White wins (%d to %d)\n",
+                                            game->board.score[DVONN_PLAYER_WHITE],
+                                            game->board.score[DVONN_PLAYER_BLACK]);
+       }
+       else if  (game->board.score[DVONN_PLAYER_BLACK] >
+                 game->board.score[DVONN_PLAYER_WHITE])
+       {
+           to_move = _create_layout_printf (cr, game->font,
+                                            "Black wins (%d to %d)\n",
+                                            game->board.score[DVONN_PLAYER_BLACK],
+                                            game->board.score[DVONN_PLAYER_WHITE]);
+       }
+       else
+       {
+           to_move = _create_layout_printf (cr, game->font,
+                                            "Tie game (%d to %d)\n",
+                                            game->board.score[DVONN_PLAYER_WHITE],
+                                            game->board.score[DVONN_PLAYER_BLACK]);
+
+       }
+    } else {
+       to_move = _create_layout_printf (cr, game->font,
+                                        "%s to %s.",
+                                        game->board.player == DVONN_PLAYER_WHITE ?
+                                        "White" : "Black",
+                                        game->board.phase == DVONN_PHASE_PLACEMENT ?
+                                        "place" : "move");
+    }
+    cairo_move_to (cr, 2, 2);
+    if (game->board.player == DVONN_PLAYER_WHITE)
+       cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
+    else
+       cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
+    _show_layout (cr, to_move);
+
     cairo_translate (cr, layout->x_offset, layout->y_offset);
     cairo_scale (cr, layout->cell_size, layout->cell_size);
 
@@ -415,7 +459,7 @@ on_expose_event_draw (GtkWidget             *widget,
                cairo_move_to (cr,
                               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",
+               height = _create_layout_printf (cr, game->ring_font, "%d",
                                                game->board.cells[x][y].height);
                _show_layout (cr, height);
            }
@@ -440,6 +484,7 @@ dvonn_game_init (dvonn_game_t *game)
     dvonn_board_init (&game->board);
 
     game->font = NULL;
+    game->ring_font = NULL;
 
     game->dual_window_mode = 0;
     game->windows[0] = NULL;