X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=kub.c;fp=kub.c;h=f4a57887caa7e78eddbe1a7a65b743d6c0683ad1;hb=8089441bdd45e81e838ecef4110195426186b57e;hp=558a280828adf582630ef3fc6f40d531434056a2;hpb=320ef475fdad0ee5db34de1698a01cd75b747f54;p=kub

diff --git a/kub.c b/kub.c
old mode 100644
new mode 100755
index 558a280..f4a5788
--- a/kub.c
+++ b/kub.c
@@ -100,8 +100,10 @@ typedef struct game {
     RsvgHandle *selectedtile;
     RsvgHandle *ownedtile;
 
-    int current_tile;
+    tile_t *current_tile;
+//    int current_tile;
     int select_mode;
+    int drag_group_mode;
     int diff_x, diff_y;
     int click_x, click_y;
     int release_x, release_y;    /*Currently unused*/
@@ -502,8 +504,10 @@ static void game_init(game_t *game)
     if (error)
 	FATAL_ERROR (error->message);
 
-    game->current_tile = game->deck.num_tiles - 1;
+//    game->current_tile = game->deck.num_tiles - 1;
+    game->current_tile = &game->deck.tiles[0];
     game->select_mode = 1;
+    game->drag_group_mode = 0;
 
     game->diff_x = game->diff_y = 0;
 }
@@ -529,6 +533,8 @@ static gboolean on_expose_event (GtkWidget *widget, GdkEventExpose *event, game_
 static gboolean on_key_press_event (GtkWidget *widget, GdkEventKey *event, game_t *game)
 {
     printf ("You pressed key %d\n", event->keyval);
+    if (event->keyval == 65505 || event->keyval == 65506)
+	game->drag_group_mode = 1;
 
     return TRUE;
 }
@@ -536,8 +542,39 @@ 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;
-    tile_t *curr_tile = &game->deck.tiles[game->current_tile];    
+    tile_t *curr_tile;
+    player_t *curr_player = &game->players[0];
 
+    /*Handle tiles in player's hand */
+    for (i = 0; i < curr_player->hand.num_tiles; i++)
+    {
+	curr_tile = &curr_player->hand.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 = curr_player->hand.tiles[i].x;
+	tile_y = curr_player->hand.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->select_mode = 0;
+
+	    game->current_tile = curr_tile;
+
+	    if (!curr_tile->selected)
+		curr_tile->selected = 1;
+	    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);
+
+	    game->diff_x = event->x - tile_x;
+	    game->diff_y = event->y - tile_y;
+        }
+    }
+
+    /*Handle tiles in deck */
     for (i = 0; i < game->deck.num_tiles; i++)
     {
 	curr_tile = &game->deck.tiles[i];
@@ -554,8 +591,10 @@ static gboolean on_button_press_event (GtkWidget *widget, GdkEventButton *event,
         {
 	    game->select_mode = 0;
  
-	    game->current_tile = i;
-	    curr_tile = &game->deck.tiles[game->current_tile];
+//	    game->current_tile = i;
+	    game->current_tile = curr_tile;
+
+//delete_this?	    curr_tile = &game->deck.tiles[game->current_tile];
 	    if (!curr_tile->selected)
 		curr_tile->selected = 1;
 	    else
@@ -568,14 +607,15 @@ static gboolean on_button_press_event (GtkWidget *widget, GdkEventButton *event,
     }
     if (game->select_mode)
     {
-	game->deck.tiles[game->current_tile].selected = 0;
+//	game->deck.tiles[game->current_tile].selected = 0;
+	game->current_tile->selected = 0;
 	gtk_widget_queue_draw_area (widget, curr_tile->x - 1, curr_tile->y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2);
 
 	game->selection_box.visible = 1;
-	/*These next two lines are likely to be replaced by...*/
+	/*These next two lines appear to be dead
 	game->click_x = event->x;
-	game->click_y = event->y;
-	/*...these two lines*/
+	game->click_y = event->y;*/
+
 	game->selection_box.x1 = event->x;
 	game->selection_box.x2 = event->x;
 	game->selection_box.y1 = event->y;
@@ -760,8 +800,14 @@ static gboolean on_button_motion_event (GtkWidget *widget, GdkEventMotion *event
     }
     else
     {
+	if (game->drag_group_mode)
+	{
+
+	}
+
 	tile_t *tile;
-	tile = &game->deck.tiles[game->current_tile];
+//	tile = &game->deck.tiles[game->current_tile];
+	tile = 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);