X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=kub.c;h=a029c137b845d6228a4cf9d61ce531ef0b2ba85b;hb=7c79fd8f543f46d54b5823620faa604b436f967b;hp=8ad1bd992fe5739e2259cac03820ed89bf76aeb0;hpb=8928a6baa8ab82c164e020efc5c74dabbcfe4bc0;p=kub

diff --git a/kub.c b/kub.c
index 8ad1bd9..a029c13 100644
--- a/kub.c
+++ b/kub.c
@@ -53,6 +53,7 @@ typedef struct tile {
     int number;
     int x;
     int y;
+    int selected;
 } tile_t;
 
 #define DECK_MAX_TILES 104
@@ -80,6 +81,10 @@ typedef struct player {
     tile_group_t hand;
 } player_t;
 
+typedef struct selection_box {
+    int x1, x2, y1, y2, visible;
+} selection_box_t;
+
 #define GAME_MAX_PLAYERS 4
 #define GAME_WINDOW_DEFAULT_WIDTH  800
 #define GAME_WINDOW_DEFAULT_HEIGHT 600
@@ -89,20 +94,40 @@ typedef struct game {
     int num_players;
     board_t board;
     deck_t deck;
+    selection_box_t selection_box;
     RsvgHandle *blanktile;
+    RsvgHandle *selectedtile;
 
     int current_tile;
+    int select_mode;
     int diff_x, diff_y;
     int click_x, click_y;
-    int release_x, release_y;
+    int release_x, release_y;    /*Currently unused*/
 } game_t;
 
+static void selection_box_init(selection_box_t *box)
+{
+    box->x1 = 0;
+    box->x2 = 0;
+    box->y1 = 0;
+    box->y2 = 0;
+    box->visible = 0;
+}
+
+static void selection_box_draw(selection_box_t *box, cairo_t *cr)
+{
+    cairo_rectangle (cr, box->x1, box->y1, box->x2 - box->x1, box->y2 - box->y1);
+    cairo_set_source_rgba(cr, 0.0, 0.1, 0.2, 0.5);
+    cairo_fill (cr);
+}
+
 static void tile_init (tile_t *tile, color_t color, int number)
 {
     tile->color = color;
     tile->number = number;
     tile->x = 0;
     tile->y = 0;
+    tile->selected = 0;
 }
 
 static void tile_set_x_y (tile_t *tile, int x, int y)
@@ -135,7 +160,11 @@ static void tile_draw(game_t *game, tile_t *tile, cairo_t *cr, GdkRegion *region
 
     cairo_save(cr);
     cairo_translate(cr, tile->x, tile->y);
-    rsvg_handle_render_cairo (game->blanktile, cr);
+
+    if (tile->selected)
+	rsvg_handle_render_cairo (game->selectedtile, cr);
+    else
+	rsvg_handle_render_cairo (game->blanktile, cr);
 
     if (tile->color == BLACK)
 	cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
@@ -449,18 +478,22 @@ static void game_init(game_t *game)
 	player_init(&game->players[i]);
 	game->num_players += 1;
     }
-
+    
+    selection_box_init(&game->selection_box);
     board_init(&game->board);
     deck_init(&game->deck);
     deck_shuffle(&game->deck);
 
+    game->selectedtile = rsvg_handle_new_from_file ("tiles/selectedtile.svg", &error);
+    if (error)
+	FATAL_ERROR (error->message);
+
     game->blanktile = rsvg_handle_new_from_file ("tiles/blanktile.svg", &error);
     if (error)
 	FATAL_ERROR (error->message);
 
-    /*This line appears to be useless, has been replaced by line below*/
-    //game->current_tile = game->deck.num_tiles - 1;
-    game->current_tile = -1;
+    game->current_tile = game->deck.num_tiles - 1;
+    game->select_mode = 1;
 
     game->diff_x = game->diff_y = 0;
 }
@@ -473,6 +506,9 @@ static gboolean on_expose_event (GtkWidget *widget, GdkEventExpose *event, game_
 
     deck_draw(game, cr, event->region);
 
+    if (game->selection_box.visible)
+	selection_box_draw(&game->selection_box, cr);
+
     hand_draw(game, 0, cr, event->region);
 
     cairo_destroy (cr);
@@ -490,6 +526,7 @@ 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];    
 
     for (i = 0; i < game->deck.num_tiles; i++)
     {
@@ -498,35 +535,94 @@ static gboolean on_button_press_event (GtkWidget *widget, GdkEventButton *event,
 	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;
+ 
+	    curr_tile = &game->deck.tiles[game->current_tile];
+	    game->deck.tiles[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->current_tile = i;
+	    curr_tile = &game->deck.tiles[game->current_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;
         }
     }
-    if (game->current_tile == -1)
+    if (game->select_mode)
     {
+	game->deck.tiles[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...*/
 	game->click_x = event->x;
 	game->click_y = event->y;
+	/*...these two lines*/
+	game->selection_box.x1 = event->x;
+	game->selection_box.x2 = event->x;
+	game->selection_box.y1 = event->y;
+	game->selection_box.y2 = event->y;
     }
     return TRUE;
 }
 
 static gboolean on_button_release_event (GtkWidget *widget, GdkEventButton *event, game_t *game)
 {
-    if (game->current_tile == -1)
+    if (game->select_mode)
     {
+	game->select_mode = 0;
+	selection_box_t *box;
+	box = &game->selection_box;
+
+	int x_min = MIN(box->x1, box->x2);
+	int x_max = MAX(box->x1, box->x2);
+	int y_min = MIN(box->y1, box->y2);
+	int y_max = MAX(box->y1, box->y2);
+	int width = abs(box->x2 - box->x1);
+	int height = abs(box->y2 - box->y1);
+
+	box->visible = 0;	
+	gtk_widget_queue_draw_area (widget, x_min, y_min, width, height);
+
 	tile_group_t group;
 	group.num_tiles = 0;
 
-	int i, tile_x, tile_y;
+	int i, tile_x, tile_y, tile_x2, tile_y2;
 	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 && game->click_x <= tile_x &&
-		  event->y >= tile_y && game->click_y <= tile_y) ||
-		 (event->x >= tile_x && game->click_x <= tile_x &&
-		  event->y <= (tile_y + TILE_HEIGHT) && game->click_y >= tile_y) )
+	    tile_x2 = tile_x + TILE_WIDTH;
+	    tile_y2 = tile_y + TILE_HEIGHT;
+	    if (/*If top-left corner*/
+		(tile_x >= x_min && tile_x <= x_max &&
+		 tile_y >= y_min && tile_y <= y_max) ||
+		/*or bottom-right corner*/
+		(tile_x2 >= x_min && tile_x2 <= x_max &&
+		 tile_y2 >= y_min && tile_y2 <= y_max) ||
+		/*or bottom-left corner*/
+		(tile_x >= x_min && tile_x <= x_max &&
+		 tile_y2 >= y_min && tile_y2 <= y_max) ||
+		/*or top-right corner of tile selected*/
+		(tile_x2 >= x_min && tile_x2 <= x_max &&
+		 tile_y >= y_min && tile_y <= y_max) ||
+		/*or left edge*/
+		(y_min >= tile_y && y_min <= tile_y2 &&
+		 x_min <= tile_x && x_max >= tile_x) ||
+		/*or top edge*/
+		(x_min >= tile_x && x_min <= tile_x2 &&
+		 y_min <= tile_y && y_max >= tile_y) ||
+		/*or right edge*/
+		(y_min >= tile_y && y_min <= tile_y2 &&
+		 x_min >= tile_x && x_min <= tile_x2) ||
+		/*or bottom edge*/
+		(x_min >= tile_x && x_min <= tile_x2 &&
+		 y_min >= tile_y && y_min <= tile_y) )
             {
 		group.tiles[group.num_tiles] = game->deck.tiles[i];
 		group.num_tiles++;
@@ -536,9 +632,8 @@ static gboolean on_button_release_event (GtkWidget *widget, GdkEventButton *even
 	printf("is set %d\n", tile_group_is_set(&group) );
 	for (i = 0; i < group.num_tiles; i++)
 	    tile_print(group.tiles[i]);
-    }
-
-    game->current_tile = -1;
+    }    
+    game->select_mode = 1;
 
     return TRUE;
 }
@@ -546,20 +641,49 @@ 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)
 {
-    tile_t *tile;
+    if (game->select_mode)
+    {
+	selection_box_t *box;
+	box = &game->selection_box;
+	box->visible = 1;
 
-    tile = &game->deck.tiles[game->current_tile];
+	gtk_widget_queue_draw_area ( widget,  MIN(box->x1, box->x2), MIN(box->y1,box->y2), abs(box->x2 - box->x1), abs(box->y2 - box->y1) );
+
+	box->x2 = event->x;
+	box->y2 = event->y;
+
+	gtk_widget_queue_draw_area ( widget, MIN(box->x1, box->x2), MIN(box->y1, box->y2), abs(box->x2 - box->x1), abs(box->y2 - box->y1) );
+
+	int i;
+	tile_t *curr_tile;
+	for (i = 0; i < game->deck.num_tiles; i++)
+	{
+	    if ((event->x >= game->deck.tiles[i].x &&
+		 event->x <= game->deck.tiles[i].x + TILE_WIDTH) &&
+		(event->y >= game->deck.tiles[i].y &&
+		 event->y <= game->deck.tiles[i].y + TILE_HEIGHT))
+	    {
+		curr_tile = &game->deck.tiles[i];
+		curr_tile->selected = 1;
+		gtk_widget_queue_draw_area (widget, curr_tile->x - 1, curr_tile->y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2);
+	    }
+	}
+    }
+    else
+    {
+	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);
+	/* 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;
+	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);
-
+	gtk_widget_queue_draw_area (widget, tile->x - 1, tile->y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2);
+    }
     return TRUE;
 }