Clean up whitespace

diff --git a/kub.c b/kub.c
index f4a57887caa7e78eddbe1a7a65b743d6c0683ad1..223e4ea8e9c61ddbfb13dda4c6703b35ab1d21b3 100755 (executable)
--- a/kub.c
+++ b/kub.c
@@ -90,16 +90,24 @@ typedef struct selection_box {
 #define GAME_WINDOW_DEFAULT_WIDTH  800
 #define GAME_WINDOW_DEFAULT_HEIGHT 600
 
+typedef struct state {
+    player_t players[GAME_MAX_PLAYERS];
+    board_t board;
+    deck_t deck;
+} state_t;
+
 typedef struct game {
     player_t players[GAME_MAX_PLAYERS];
     int num_players;
     board_t board;
     deck_t deck;
     selection_box_t selection_box;
+    state_t state;
     RsvgHandle *blanktile;
     RsvgHandle *selectedtile;
     RsvgHandle *ownedtile;
 
+    int current_player;
     tile_t *current_tile;
 //    int current_tile;
     int select_mode;
@@ -223,6 +231,18 @@ static int tile_compare(const void *one, const void *two)
     return tile_one->number - tile_two->number;
 }
 
+static int tile_compare_1(tile_t *tile_one, tile_t *tile_two)
+{
+    return tile_one->number - tile_two->number;
+}
+
+/*
+static int tile_in_box(game_t *game, tile_t *tile)
+{
+
+}
+*/
+
 static int tile_group_is_run_one(tile_group_t *tile_group)
 {
     int i;
@@ -457,16 +477,18 @@ static void hand_print(game_t *game, int player)
     }
 }
 
-static void hand_draw(game_t *game, int player, cairo_t *cr, GdkRegion *region)
+static void hand_draw(game_t *game, int player, cairo_t *cr, GdkRegion *region, GtkWidget *widget)
 {
     int i;
-    int gwdw = GAME_WINDOW_DEFAULT_WIDTH;
-    int gwdh = GAME_WINDOW_DEFAULT_HEIGHT;
+    int window_width = widget->allocation.width;
+//    int window_width = GAME_WINDOW_DEFAULT_WIDTH;
+    int window_height = widget->allocation.height;
+//    int window_height = GAME_WINDOW_DEFAULT_HEIGHT;
     for (i = 0; i < game->players[player].hand.num_tiles; i++)
     {
        tile_set_x_y(&game->players[player].hand.tiles[i],
-                    ((gwdw / game->players[player].hand.num_tiles)) * i,
-                    (gwdh - TILE_HEIGHT - 6) );
+                    ((window_width / game->players[player].hand.num_tiles)) * i,
+                    (window_height - TILE_HEIGHT - 6) );
     }
     for (i = 0; i < game->players[player].hand.num_tiles; i++)
     {
@@ -474,6 +496,21 @@ static void hand_draw(game_t *game, int player, cairo_t *cr, GdkRegion *region)
     }
 }
 
+static void save_state(game_t *game)
+{
+    //DO STUFF HERE
+    game->state.board = game->board;
+    game->state.deck = game->deck;
+    //game->state.players = game->players;
+}
+
+static void restore_state(game_t *game)
+{
+    game->board = game->state.board;
+    game->deck = game->state.deck;
+    //game->players = game->state.players;
+}
+
 static void game_init(game_t *game)
 {
     int i;
@@ -486,6 +523,7 @@ static void game_init(game_t *game)
        player_init(&game->players[i]);
        game->num_players += 1;
     }
+    game->current_player = 0;
     
     selection_box_init(&game->selection_box);
     board_init(&game->board);
@@ -523,7 +561,8 @@ static gboolean on_expose_event (GtkWidget *widget, GdkEventExpose *event, game_
     if (game->selection_box.visible)
        selection_box_draw(&game->selection_box, cr);
 
-    hand_draw(game, 0, cr, event->region);
+    hand_draw(game, game->current_player, cr, event->region, widget);
+//    hand_draw(game, 0, cr, event->region);
 
     cairo_destroy (cr);
 
@@ -532,7 +571,38 @@ static gboolean on_expose_event (GtkWidget *widget, GdkEventExpose *event, game_
 
 static gboolean on_key_press_event (GtkWidget *widget, GdkEventKey *event, game_t *game)
 {
+    cairo_t *cr;
+
+    cr = gdk_cairo_create (widget->window);
+
     printf ("You pressed key %d\n", event->keyval);
+
+    if (event->keyval == 65293)                //HIT ENTER
+    {
+       save_state(game);
+       printf ("\tEnd of player %d's turn\n", game->current_player + 1);
+       if (game->current_player == game->num_players - 1)
+           game->current_player = 0;
+       else
+           game->current_player += 1;
+       gtk_widget_queue_draw(widget);
+    }
+
+    if (event->keyval == 65307)                //HIT ESCAPE
+    {
+       restore_state(game);
+       printf ("\tChanges Reverted\n");
+       gtk_widget_queue_draw(widget);
+    }
+
+    if (event->keyval == 112)          //HIT "P"
+    {
+       deck_print(&game->deck);
+       //hand_draw(game, game->current_player, cr, event->region, widget);
+       //on_expose_event(widget, event, game);
+    }
+
+
     if (event->keyval == 65505 || event->keyval == 65506)
        game->drag_group_mode = 1;
 
@@ -664,7 +734,7 @@ static gboolean on_button_release_event (GtkWidget *widget, GdkEventButton *even
                /*or bottom-left corner*/
                (tile_x >= x_min && tile_x <= x_max &&
                 tile_y2 >= y_min && tile_y2 <= y_max) ||
-               /*or top-right corner of tile selected*/
+               /*or top-right corner*/
                (tile_x2 >= x_min && tile_x2 <= x_max &&
                 tile_y >= y_min && tile_y <= y_max) ||
                /*or left edge*/
@@ -676,14 +746,14 @@ static gboolean on_button_release_event (GtkWidget *widget, GdkEventButton *even
                /*or right edge*/
                (y_min >= tile_y && y_min <= tile_y2 &&
                 x_min >= tile_x && x_min <= tile_x2) ||
-               /*or bottom edge*/
+               /*or bottom edge of tile selected*/
                (x_min >= tile_x && x_min <= tile_x2 &&
                 y_min >= tile_y && y_min <= tile_y) )
             {          
 //             group.tiles[group.num_tiles] = game->deck.tiles[i];
 //             group.num_tiles++;
 
-               group[num_tiles] = &game->deck.tiles[i];;
+               group[num_tiles] = &game->deck.tiles[i];
                num_tiles++;
             }
         }
@@ -693,6 +763,7 @@ static gboolean on_button_release_event (GtkWidget *widget, GdkEventButton *even
 //     int matching_y = y_min;
        
 //     for (i = 0; i < group.num_tiles; i++)
+
        for (i = 0; i < num_tiles; i++)
        {
 //         tile_print(group.tiles[i]);
@@ -752,11 +823,6 @@ static gboolean on_button_motion_event (GtkWidget *widget, GdkEventMotion *event
        for (i = 0; i < game->deck.num_tiles; i++)
         {
            curr_tile = &game->deck.tiles[i];
-           if (curr_tile->selected)
-           {
-               curr_tile->selected = 0;
-               gtk_widget_queue_draw_area (widget, curr_tile->x - 1, curr_tile->y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2);
-           }
 
            tile_x = game->deck.tiles[i].x;
            tile_y = game->deck.tiles[i].y;
@@ -771,7 +837,7 @@ static gboolean on_button_motion_event (GtkWidget *widget, GdkEventMotion *event
                /*or bottom-left corner*/
                (tile_x >= x_min && tile_x <= x_max &&
                 tile_y2 >= y_min && tile_y2 <= y_max) ||
-               /*or top-right corner of tile selected*/
+               /*or top-right corner*/
                (tile_x2 >= x_min && tile_x2 <= x_max &&
                 tile_y >= y_min && tile_y <= y_max) ||
                /*or left edge*/
@@ -783,19 +849,22 @@ static gboolean on_button_motion_event (GtkWidget *widget, GdkEventMotion *event
                /*or right edge*/
                (y_min >= tile_y && y_min <= tile_y2 &&
                 x_min >= tile_x && x_min <= tile_x2) ||
-               /*or bottom edge*/
+               /*or bottom edge of tile selected*/
                (x_min >= tile_x && x_min <= tile_x2 &&
                 y_min >= tile_y && y_min <= tile_y) )
            {
                curr_tile->selected = 1;
                gtk_widget_queue_draw_area (widget, curr_tile->x - 1, curr_tile->y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2);
            }
-/*
+
            else
            {
-               curr_tile->selected = 0;
-               gtk_widget_queue_draw_area (widget, curr_tile->x - 1, curr_tile->y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2);
-               }*/
+               if (curr_tile->selected)
+               {
+                   curr_tile->selected = 0;
+                   gtk_widget_queue_draw_area (widget, curr_tile->x - 1, curr_tile->y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2);
+               }
+           }
        }
     }
     else

diff --git a/tiles/blank_tile.svg b/tiles/blank_tile.svg
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/tiles/owned_tile.svg b/tiles/owned_tile.svg
old mode 100644 (file)
new mode 100755 (executable)