X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=kub.c;h=6a2a3a5903e7ca4a51590430747e1bd5a325ca16;hb=e03d6fa328956896006b17f49d885923a20db8e1;hp=a2e34a11924a99ae3f17af7c4826d9284bfd0957;hpb=8b60f53889d02bb82812b3cc866018dc792d1455;p=kub

diff --git a/kub.c b/kub.c
index a2e34a1..6a2a3a5 100644
--- a/kub.c
+++ b/kub.c
@@ -92,6 +92,7 @@ typedef struct game {
     RsvgHandle *blanktile;
 
     int current_tile;
+    int diff_x, diff_y;
 } game_t;
 
 static void
@@ -359,6 +360,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)
 {
@@ -378,6 +391,11 @@ static void hand_print(game_t *game)
     }
 }
 
+/* static void hand_draw(game_t *game) */
+/* { */
+    
+/* } */
+
 static void game_init(game_t *game)
 {
     int i;
@@ -400,6 +418,7 @@ static void game_init(game_t *game)
 	FATAL_ERROR (error->message);
 
     game->current_tile = game->deck.num_tiles - 1;
+    game->diff_x = game->diff_y = 0;
 }
 
 static gboolean on_expose_event (GtkWidget *widget, GdkEventExpose *event, game_t *game)
@@ -424,36 +443,52 @@ static gboolean on_key_press_event (GtkWidget *widget, GdkEventKey *event, game_
 
 static gboolean on_button_press_event (GtkWidget *widget, GdkEventButton *event, game_t *game)
 {
-    tile_t *tile;
+    int i, tile_x, tile_y;
 
-    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;
+    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;
+	    game->diff_x = event->x - tile_x;
+	    game->diff_y = event->y - tile_y;
+	}
+    }
 
     return TRUE;
 }
 
 static gboolean on_button_release_event (GtkWidget *widget, GdkEventButton *event, game_t *game)
 {
+    game->current_tile = -1;
     printf ("You released button %d\n", event->button);
 
     return TRUE;
 }
 
+static gboolean on_button_motion_event (GtkWidget *widget, GdkEventMotion *event, 
+					game_t *game, cairo_t *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 - game->diff_x;
+    tile->y = event->y - game->diff_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;
+}
+
 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 ();