int number;
int x;
int y;
+ int selected;
+ int owned;
} tile_t;
#define DECK_MAX_TILES 104
deck_t deck;
selection_box_t selection_box;
RsvgHandle *blanktile;
+ 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*/
tile->number = number;
tile->x = 0;
tile->y = 0;
+ tile->selected = 0;
+ tile->owned = 0;
}
static void tile_set_x_y (tile_t *tile, int x, int y)
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);
+ if (tile->owned)
+ rsvg_handle_render_cairo (game->ownedtile, cr);
+ else
+ rsvg_handle_render_cairo (game->blanktile, cr);
if (tile->color == BLACK)
cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
temp = deck->tiles[rand_tile];
deck->tiles[rand_tile] = deck->tiles[deck->num_tiles - 1];
game->players[i].hand.tiles[j] = temp;
+ game->players[i].hand.tiles[j].owned = 1;
deck->num_tiles -= 1;
game->players[i].hand.num_tiles += 1;
}
deck_init(&game->deck);
deck_shuffle(&game->deck);
- game->blanktile = rsvg_handle_new_from_file ("tiles/blanktile.svg", &error);
+ game->selectedtile = rsvg_handle_new_from_file ("tiles/selected_tile.svg", &error);
+ if (error)
+ FATAL_ERROR (error->message);
+
+ game->ownedtile = rsvg_handle_new_from_file ("tiles/owned_tile.svg", &error);
+ if (error)
+ FATAL_ERROR (error->message);
+
+ game->blanktile = rsvg_handle_new_from_file ("tiles/blank_tile.svg", &error);
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;
}
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;
}
static gboolean on_button_press_event (GtkWidget *widget, GdkEventButton *event, game_t *game)
{
int i, tile_x, tile_y;
+ 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];
+ 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 = 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->select_mode = 0;
+
+// 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
+ 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->select_mode)
{
+// 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;
+ game->selection_box.y2 = event->y;
}
return TRUE;
}
selection_box_t *box;
box = &game->selection_box;
- int x = MIN(box->x1, box->x2);
- int y = MIN(box->y1, box->y2);
+ 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, y, width, height);
+ gtk_widget_queue_draw_area (widget, x_min, y_min, width, height);
- tile_group_t group;
- group.num_tiles = 0;
+// tile_group_t group;
+// group.num_tiles = 0;
- int i, tile_x, tile_y;
+ tile_t* group[TILE_GROUP_MAX_TILES];
+ int num_tiles = 0;
+
+ 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) )
- {
- group.tiles[group.num_tiles] = game->deck.tiles[i];
- group.num_tiles++;
+ 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++;
+
+ group[num_tiles] = &game->deck.tiles[i];;
+ num_tiles++;
}
}
- printf("is run %d\n", tile_group_is_run_one(&group) );
- printf("is set %d\n", tile_group_is_set(&group) );
- for (i = 0; i < group.num_tiles; i++)
- tile_print(group.tiles[i]);
- }
+ //printf("is run %d\n", tile_group_is_run_one(&group) );
+ //printf("is set %d\n", tile_group_is_set(&group) );
+// int matching_y = y_min;
+
+// for (i = 0; i < group.num_tiles; i++)
+ for (i = 0; i < num_tiles; i++)
+ {
+// tile_print(group.tiles[i]);
+ gtk_widget_queue_draw_area (widget, group[i]->x - 1 , group[i]->y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2);
+ group[i]->x = x_min + (i * (TILE_WIDTH));
+ group[i]->y = y_min;
+ gtk_widget_queue_draw_area (widget, group[i]->x - 1 , group[i]->y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2);
+ }
+/* int j;
+ int new_x = 0;
+ for (i = 0; i < group.num_tiles; i++)
+ {
+ for (j = 0; j < game->deck.num_tiles; j++)
+ {
+ if (group.tiles[i].x == game->deck.tiles[j].x &&
+ group.tiles[i].y == game->deck.tiles[j].y)
+ {
+ new_x = x_min + (i * (TILE_WIDTH));
+ gtk_widget_queue_draw_area (widget, game->deck.tiles[j].x - 1 , game->deck.tiles[j].y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2);
+ game->deck.tiles[j].x = new_x;
+ game->deck.tiles[j].y = matching_y;
+ gtk_widget_queue_draw_area (widget, new_x - 1 , matching_y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2);
+ }
+ }
+ }*/
+ }
game->select_mode = 1;
return TRUE;
box = &game->selection_box;
box->visible = 1;
- 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 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);
+
+ gtk_widget_queue_draw_area ( widget, x_min, y_min, width, height );
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_x, tile_y, tile_x2, tile_y2;
+ tile_t *curr_tile;
+ for (i = 0; i < game->deck.num_tiles; i++)
+ {
+ curr_tile = &game->deck.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 = game->deck.tiles[i].x;
+ tile_y = game->deck.tiles[i].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) )
+ {
+ 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
+ {
+ curr_tile->selected = 0;
+ gtk_widget_queue_draw_area (widget, curr_tile->x - 1, curr_tile->y - 1, TILE_WIDTH + 1, TILE_HEIGHT + 2);
+ }*/
+ }
}
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);
projects / kub / blobdiff