Fix typo (should be motion_notify_event, not button_motion_event)

[kub] / kub.c

diff --git a/kub.c b/kub.c
index a2e34a11924a99ae3f17af7c4826d9284bfd0957..e879e8b1f5f86c5bbf52e8149806669f43392093 100644 (file)
--- a/kub.c
+++ b/kub.c
@@ -359,6 +359,18 @@ static void deck_print(deck_t *deck)
     printf ("There are %d tiles in the deck\n" , deck->num_tiles);
 }
 
+static void deck_spread(deck_t *deck)
+{
+    int i, j;
+    for (i = 0; i < 8; i++)
+    {
+       for (j = 0; j < 13; j++)
+       {
+           deck->tiles[j + (i * 13)].x = j * 50;
+           deck->tiles[j + (i * 13)].y = i * 60;
+       }
+    }
+}
 
 static void deck_draw(game_t *game, cairo_t *cr)
 {
@@ -424,6 +436,18 @@ static gboolean on_key_press_event (GtkWidget *widget, GdkEventKey *event, game_
 
 static gboolean on_button_press_event (GtkWidget *widget, GdkEventButton *event, game_t *game)
 {
+    int i, tile_x, tile_y;
+
+    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 && event->x <= (tile_x + TILE_WIDTH) &&
+           event->y >= tile_y && event->y <= (tile_y + TILE_HEIGHT) )
+
+           game->current_tile = i;
+    }
+    /*Carl's Code*/
     tile_t *tile;
 
     tile = &game->deck.tiles[game->current_tile];
@@ -454,6 +478,17 @@ static gboolean on_button_release_event (GtkWidget *widget, GdkEventButton *even
     return TRUE;
 }
 
+static gboolean on_button_motion_event (GtkWidget *widget, GdkEventMotion *event, 
+                                       game_t *game, cairo_t *cr)
+{
+    game->deck.tiles[game->current_tile].x = event->x;
+    game->deck.tiles[game->current_tile].y = event->y;
+
+    tile_draw(game, &game->deck.tiles[game->current_tile], cr);    
+
+    return TRUE;
+}
+
 int main(int argc, char *argv[])
 {
     GtkWidget *window;
@@ -465,9 +500,10 @@ int main(int argc, char *argv[])
     
     game_init(&game);
     deck_print(&game.deck);
+    deck_spread(&game.deck);
     //deck_deal(&game, &game.deck);
-    hand_print(&game);
-    deck_print(&game.deck);
+    //hand_print(&game);
+    //deck_print(&game.deck);
 
     /* Create a new window */
     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -478,6 +514,7 @@ int main(int argc, char *argv[])
     gtk_widget_set_events (window,
                           GDK_EXPOSURE_MASK |
                           GDK_KEY_PRESS_MASK | 
+                          GDK_BUTTON_MOTION_MASK |
                           GDK_BUTTON_PRESS_MASK | 
                           GDK_BUTTON_RELEASE_MASK);
 
@@ -491,6 +528,9 @@ int main(int argc, char *argv[])
                      G_CALLBACK (on_button_press_event), &game);
     g_signal_connect (G_OBJECT (window), "button_release_event",
                      G_CALLBACK (on_button_release_event), &game);
+    g_signal_connect (G_OBJECT (window), "motion_notify_event",
+                     G_CALLBACK (on_button_motion_event), &game);
+
 
     gtk_widget_show_all (window);
     gtk_main ();