X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=kub.c;h=a6b1f3ff02603f7c1648df0f702621ea11efda52;hb=700c1ef19a5819d3a9dea3108c5782a90b3919a8;hp=9494a466914ee64632d202053419adc907d820f4;hpb=399827aa4f8633152d1cfdfa58abd989c5fa7516;p=kub

diff --git a/kub.c b/kub.c
index 9494a46..a6b1f3f 100644
--- a/kub.c
+++ b/kub.c
@@ -447,26 +447,6 @@ static gboolean on_button_press_event (GtkWidget *widget, GdkEventButton *event,
 
 	    game->current_tile = i;
     }
-    /*Carl's Code*/
-    tile_t *tile;
-
-    tile = &game->deck.tiles[game->current_tile];
-
-    printf ("Placing tile #%d\n", game->current_tile);
-
-    /* First, invalidate the region where the tile currently is. */
-    gtk_widget_queue_draw_area (widget, tile->x, tile->y, TILE_WIDTH, TILE_HEIGHT);
-			
-    /* Then, move the tile */
-    tile->x = event->x;
-    tile->y = event->y;
-
-    /* Finally, invalidate the region where the tile is now. */
-    gtk_widget_queue_draw_area (widget, tile->x, tile->y, TILE_WIDTH, TILE_HEIGHT);
-
-    game->current_tile--;
-    if (game->current_tile < 0)
-	game->current_tile = game->deck.num_tiles - 1;
 
     return TRUE;
 }
@@ -481,11 +461,20 @@ 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)
 {
-    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);    
-
+    tile_t *tile;
+    
+    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);
+    
+    /* Then, move the tile */
+    tile->x = event->x;
+    tile->y = event->y;
+    
+    /* Finally, invalidate the region where the tile is now. */
+    gtk_widget_queue_draw_area (widget, tile->x - 1, tile->y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2);
+    
     return TRUE;
 }
 
@@ -528,7 +517,7 @@ 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_signal_connect (G_OBJECT (window), "motion_notify_event",
 		      G_CALLBACK (on_button_motion_event), &game);