Experimenting with save/commit immediately after switching from

	      master branch to this test branch

diff --git a/kub.c b/kub.c
index 489effb4cd77945d570c5b58bf81c2307f4a5896..4f0c9fccac026204b6f16be4fbd4e48759f5438b 100644 (file)
--- a/kub.c
+++ b/kub.c
@@ -53,6 +53,7 @@ typedef struct tile {
     int number;
     int x;
     int y;
+    int selected;
 } tile_t;
 
 #define DECK_MAX_TILES 104
@@ -97,6 +98,7 @@ typedef struct game {
     RsvgHandle *blanktile;
 
     int current_tile;
+    int select_mode;
     int diff_x, diff_y;
     int click_x, click_y;
     int release_x, release_y;    /*Currently unused*/
@@ -480,9 +482,8 @@ static void game_init(game_t *game)
     if (error)
        FATAL_ERROR (error->message);
 
-    /*This line appears to be useless, has been replaced by line below*/
-    //game->current_tile = game->deck.num_tiles - 1;
-    game->current_tile = -1;
+    game->current_tile = game->deck.num_tiles - 1;
+    game->select_mode = 1;
 
     game->diff_x = game->diff_y = 0;
 }
@@ -523,12 +524,13 @@ static gboolean on_button_press_event (GtkWidget *widget, GdkEventButton *event,
        if (event->x >= tile_x && event->x <= (tile_x + TILE_WIDTH) &&
            event->y >= tile_y && event->y <= (tile_y + TILE_HEIGHT) )
         {
+           game->select_mode = 0;
            game->current_tile = i;
            game->diff_x = event->x - tile_x;
            game->diff_y = event->y - tile_y;
         }
     }
-    if (game->current_tile == -1)
+    if (game->select_mode)
     {
        game->selection_box.visible = 1;
        /*These next two lines are likely to be replaced by...*/
@@ -543,31 +545,44 @@ static gboolean on_button_press_event (GtkWidget *widget, GdkEventButton *event,
 
 static gboolean on_button_release_event (GtkWidget *widget, GdkEventButton *event, game_t *game)
 {
-    if (game->current_tile == -1)
+    if (game->select_mode)
     {
+       game->select_mode = 0;
        selection_box_t *box;
        box = &game->selection_box;
 
-       int x = MIN(box->x1, box->x2);
-       int y = MIN(box->y1, box->y2);
+       int x_min = MIN(box->x1, box->x2);
+       int x_max = MAX(box->x1, box->x2);
+       int y_min = MIN(box->y1, box->y2);
+       int y_max = MAX(box->y1, box->y2);
        int width = abs(box->x2 - box->x1);
        int height = abs(box->y2 - box->y1);
 
        box->visible = 0;       
-       gtk_widget_queue_draw_area (widget, x, y, width, height);
+       gtk_widget_queue_draw_area (widget, x_min, y_min, width, height);
 
        tile_group_t group;
        group.num_tiles = 0;
 
-       int i, tile_x, tile_y;
+       int i, tile_x1, tile_y1, tile_x2, tile_y2;
        for (i = 0; i < game->deck.num_tiles; i++)
         {
-           tile_x = game->deck.tiles[i].x;
-           tile_y = game->deck.tiles[i].y;
-           if ( (event->x >= tile_x && game->click_x <= tile_x &&
-                 event->y >= tile_y && game->click_y <= tile_y) ||
-                (event->x >= tile_x && game->click_x <= tile_x &&
-                 event->y <= (tile_y + TILE_HEIGHT) && game->click_y >= tile_y) )
+           tile_x1 = game->deck.tiles[i].x;
+           tile_y1 = game->deck.tiles[i].y;
+           tile_x2 = tile_x + TILE_WIDTH;
+           tile_y2 = tile_y + TILE_HEIGHT;
+           if (/*If top-left corner*/
+               (tile_x1 >= x_min && tile_x1 <= x_max &&
+                tile_y1 >= y_min && tile_y1 <= y_max) ||
+               /*or bottom-right corner*/
+               (tile_x2 >= x_min && tile_x2 <= x_max &&
+                tile_y2 >= y_min && tile_y2 <= y_max) ||
+               /*or bottom-left corner*/
+               (tile_x1 >= x_min && tile_x1 <= x_max &&
+                tile_y2 >= y_min && tile_y2 <= y_max) ||
+               /*or top-right corner of tile selected*/
+               (tile_x2 >= x_min && tile_x2 <= x_max &&
+                tile_y1 >= y_min && tile_y1 <= y_max) )
             {
                group.tiles[group.num_tiles] = game->deck.tiles[i];
                group.num_tiles++;
@@ -579,7 +594,7 @@ static gboolean on_button_release_event (GtkWidget *widget, GdkEventButton *even
            tile_print(group.tiles[i]);
     }
 
-    game->current_tile = -1;
+    game->select_mode = 1;
 
     return TRUE;
 }
@@ -587,18 +602,22 @@ static gboolean on_button_release_event (GtkWidget *widget, GdkEventButton *even
 static gboolean on_button_motion_event (GtkWidget *widget, GdkEventMotion *event,
                                        game_t *game, cairo_t *cr)
 {
-    if (game->current_tile == -1)
+    if (game->select_mode)
     {
        selection_box_t *box;
        box = &game->selection_box;
        box->visible = 1;
 
-       gtk_widget_queue_draw_area ( widget,  MIN(box->x1, box->x2), MIN(box->y1, box->y2), abs(box->x2 - box->x1), abs(box->y2 - box->y1) );
+       gtk_widget_queue_draw_area ( widget,  MIN(box->x1, box->x2),
+                                    MIN(box->y1, box->y2), abs(box->x2 - box->x1),
+                                    abs(box->y2 - box->y1) );
 
        box->x2 = event->x;
        box->y2 = event->y;
 
-       gtk_widget_queue_draw_area ( widget, MIN(box->x1, box->x2), MIN(box->y1, box->y2), abs(box->x2 - box->x1), abs(box->y2 - box->y1) );
+       gtk_widget_queue_draw_area ( widget, MIN(box->x1, box->x2),
+                                    MIN(box->y1, box->y2), abs(box->x2 - box->x1),
+                                    abs(box->y2 - box->y1) );
     }
     else
     {
@@ -606,7 +625,8 @@ static gboolean on_button_motion_event (GtkWidget *widget, GdkEventMotion *event
        tile = &game->deck.tiles[game->current_tile];
 
        /* First, invalidate the region where the tile currently is. */
-       gtk_widget_queue_draw_area (widget, tile->x - 1, tile->y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2);
+       gtk_widget_queue_draw_area (widget, tile->x - 1, tile->y - 1, TILE_WIDTH +
+                                   1, TILE_HEIGHT + 2);
 
     /* Then, move the tile */
        tile->x = event->x - game->diff_x;