Attempt at dragging tiles(compiles, but no dragging)

diff --git a/kub.c b/kub.c
index df363f54f40e182e467c6f6c096d61f5d4cc371c..9494a466914ee64632d202053419adc907d820f4 100644 (file)
--- a/kub.c
+++ b/kub.c
@@ -436,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];
@@ -466,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;
@@ -491,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);
 
@@ -504,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), "button_motion_event",
+                     G_CALLBACK (on_button_motion_event), &game);
+
 
     gtk_widget_show_all (window);
     gtk_main ();