Don't let one player place the opponent's pieces

[dvonn] / dvonn.c

diff --git a/dvonn.c b/dvonn.c
index 806a8e69247c289f3a712d12293b610f54e43384..896edc36ab49a346e98af873ea16f7bcae518d1e 100644 (file)
--- a/dvonn.c
+++ b/dvonn.c
@@ -55,6 +55,9 @@ struct _dvonn_game {
     int selected_y;
 
     PangoFontDescription *font;
+
+    dvonn_bool_t dual_window_mode;
+    GtkWidget *windows[2];
 };
 
 static gboolean
@@ -157,6 +160,26 @@ on_button_press_event (GtkWidget   *widget,
     int x, y;
     char *error;
 
+    /* Ignore events from the non-player. (Obviously when we add more
+     * interaction abilities, we will want to allow those even for the
+     * non-player---things like quit, etc.). */
+    if (game->dual_window_mode &&
+       widget->parent != game->windows[game->board.player])
+    {
+       return TRUE;
+    }
+
+    /* Ignore double and triple clicks. */
+    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);
@@ -185,12 +208,14 @@ on_button_press_event (GtkWidget  *widget,
     }
 
     if (! game->has_selected) {
-       if (game->board.cells[x][y].type == game->board.player) {
-           game->has_selected = TRUE;
-           game->selected_x = x;
-           game->selected_y = y;
-           dvonn_game_update_windows (game);
-       }
+       if (game->board.cells[x][y].type == game->board.player &&
+           ! dvonn_board_cell_surrounded (&game->board, x, y))
+           {
+                   game->has_selected = TRUE;
+                   game->selected_x = x;
+                   game->selected_y = y;
+                   dvonn_game_update_windows (game);
+           }
        return TRUE;
     }
 
@@ -415,6 +440,10 @@ dvonn_game_init (dvonn_game_t *game)
     dvonn_board_init (&game->board);
 
     game->font = NULL;
+
+    game->dual_window_mode = 0;
+    game->windows[0] = NULL;
+    game->windows[1] = NULL;
 }
 
 static void
@@ -427,7 +456,7 @@ view_init (view_t *view, dvonn_game_t *game, GtkWidget *window)
     view->layout.height = 0;
 }
 
-static void
+static GtkWidget*
 dvonn_game_create_view (dvonn_game_t *game)
 {
     view_t *view;
@@ -470,20 +499,50 @@ dvonn_game_create_view (dvonn_game_t *game)
                      G_CALLBACK (on_button_press_event), view);
 
     gtk_widget_show_all (window);
+
+    return window;
 }
 
 int
 main (int argc, char *argv[])
 {
+    GtkWidget *window0, *window1;
+    GdkDisplay *display;
+    GdkScreen *screen;
     dvonn_game_t game;
 
     dvonn_game_init (&game);
 
     gtk_init (&argc, &argv);
 
-    /* Create two views of the game (one for each player) */
-    dvonn_game_create_view (&game);
-    dvonn_game_create_view (&game);
+    /* Create a view for player 1. */
+    window0 = dvonn_game_create_view (&game);
+
+    /* Ugly little hack to get Xauthority data from keithp. Obviously
+     * won't work for any other user.
+     *
+    setenv ("XAUTHORITY", "/home/keithp/.Xauthority", 1);
+    */
+
+    /* Also ugly that localhost:10.0 is hard-coded, but this will work
+     * for many situations--both for when keithp attaches to my
+     * machine, and for when I connect to anyone's machine and then
+     * connect back, (assuming I haven't made other X forwardings
+     * first).
+     *
+     * Clearly we'll want some actual UI to select the right thing
+     * here.
+     */
+    display = gdk_display_open ("localhost:10.0");
+    if (display) {
+       screen = gdk_display_get_default_screen (display);
+       window1 = dvonn_game_create_view (&game);
+       gtk_window_set_screen (GTK_WINDOW (window1), screen);
+
+       game.dual_window_mode = 1;
+       game.windows[0] = window0;
+       game.windows[1] = window1;
+    }
     
     gtk_main ();