X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=kub.c;h=530fc4133043a00606d1537f16689195127afc46;hb=4c4fd783b71ae0330e16781581f3530ddd9b8ad8;hp=a6b1f3ff02603f7c1648df0f702621ea11efda52;hpb=700c1ef19a5819d3a9dea3108c5782a90b3919a8;p=kub diff --git a/kub.c b/kub.c index a6b1f3f..530fc41 100644 --- a/kub.c +++ b/kub.c @@ -12,7 +12,7 @@ * ||/ / * || | TILE_WIDTH = 40 * || | / - * | | + * | | * +-----+ - TILE_NUMBER_Y_OFFSET = 3 - * |+---+| - | * || || | @@ -22,7 +22,7 @@ * | / \ | | * || || TILE_SUN_HEIGHT = 20 | * | \_/ | _ | - * | | TILE_SUN_Y_OFFSET = 3 | + * | | TILE_SUN_Y_OFFSET = 3 | * +-----+ - - * || | TILE_SUN_WIDTH = 20 * || @@ -41,7 +41,7 @@ #define TILE_SUN_WIDTH 20 #define TILE_SUN_HEIGHT 20 -#define FATAL_ERROR(msg) \ +#define FATAL_ERROR(msg) \ do { fprintf (stderr, "Error: %s\n", msg); exit (1); } while (0) char *colors[] = {"Black", "Blue", "Red", "Yellow"}; @@ -80,6 +80,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,13 +93,33 @@ typedef struct game { int num_players; board_t board; deck_t deck; + selection_box_t selection_box; RsvgHandle *blanktile; int current_tile; + int select_mode; + int diff_x, diff_y; + int click_x, click_y; + int release_x, release_y; /*Currently unused*/ } game_t; -static void -tile_init (tile_t *tile, color_t color, int number) +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; @@ -103,15 +127,29 @@ tile_init (tile_t *tile, color_t color, int number) tile->y = 0; } +static void tile_set_x_y (tile_t *tile, int x, int y) +{ + tile->x = x; + tile->y = y; +} + static void tile_print(tile_t tile) { printf("%6s %2d\n", colors[tile.color], tile.number + 1); } -static void tile_draw(game_t *game, tile_t *tile, cairo_t *cr) +static void tile_draw(game_t *game, tile_t *tile, cairo_t *cr, GdkRegion *region) { char number_string[3]; int len; + GdkRectangle rectangle; + + rectangle.x = tile->x - 1; + rectangle.y = tile->y - 1; + rectangle.width = TILE_WIDTH + 2; + rectangle.height = TILE_HEIGHT + 2; + if (gdk_region_rect_in (region, &rectangle) == GDK_OVERLAP_RECTANGLE_OUT) + return; len = snprintf (number_string, 3, "%d", tile->number + 1); if (len < 0 || len >= 3) @@ -120,19 +158,22 @@ static void tile_draw(game_t *game, tile_t *tile, cairo_t *cr) cairo_save(cr); cairo_translate(cr, tile->x, tile->y); rsvg_handle_render_cairo (game->blanktile, cr); - + if (tile->color == BLACK) - cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); + cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); if (tile->color == BLUE) - cairo_set_source_rgb (cr, 0.0, 0.0, 1.0); + cairo_set_source_rgb (cr, 0.0, 0.0, 1.0); if (tile->color == RED) - cairo_set_source_rgb (cr, 1.0, 0.0, 0.0); + cairo_set_source_rgb (cr, 1.0, 0.0, 0.0); if (tile->color == YELLOW) cairo_set_source_rgb (cr, 1.0, .843, 0.0); - cairo_move_to (cr, 10, 25); + if (tile->number + 1 > 9) + cairo_move_to (cr, 1, 25); + else + cairo_move_to (cr, 10, 25); cairo_set_font_size(cr, 25); cairo_show_text (cr, number_string); - + cairo_restore(cr); } @@ -145,8 +186,8 @@ static void board_init(board_t *board) { int i; board->num_groups = 0; - - for (i = 0; i <= BOARD_MAX_TILE_GROUPS; ++i) + + for (i = 0; i <= BOARD_MAX_TILE_GROUPS; ++i) { tile_group_init(&board->groups[i]); } @@ -173,20 +214,26 @@ static int tile_group_is_run_one(tile_group_t *tile_group) int i; qsort (&tile_group->tiles[0], tile_group->num_tiles, sizeof (tile_t), tile_compare); - + if (tile_group->num_tiles > 13 || tile_group->num_tiles < 3) { + printf("fail run - invalid num tiles; "); return 0; } for (i = 0; i < tile_group->num_tiles - 1; ++i) + { if(tile_group->tiles[i].color != tile_group->tiles[i + 1].color) - { + { + printf("fail run - colors don't match; "); return 0; - } - if(tile_group->tiles[i].number != tile_group->tiles[i + 1].number -1) - { + } + if( tile_group->tiles[i].number != tile_group->tiles[i + 1].number -1 && + i+1 != tile_group->num_tiles) + { + printf("fail run - invalid number sequence; "); return 0; - } + } + } return 1; } @@ -256,27 +303,32 @@ static int tile_group_is_run_two(tile_group_t *tile_group) static int tile_group_is_set(tile_group_t *tile_group) { int i; - color_t seen_color[tile_group->num_tiles]; - + color_t seen_color[4]; + for (i = 0; i < 4; i++) + seen_color[i] = 0; + if (tile_group->num_tiles > 4 || tile_group->num_tiles < 3) { + printf("fail set - invalid num tiles; "); return 0; } - for (i = 0; i < tile_group->num_tiles - 1; ++i) + for (i = 0; i <= tile_group->num_tiles - 1; ++i) { - if (tile_group->tiles[i].number != tile_group->tiles[i + 1].number) - { + if (tile_group->tiles[i].number != tile_group->tiles[i + 1].number && + i+1 != tile_group->num_tiles) + { + printf("fail set - numbers don't match; "); return 0; - } + } + seen_color[tile_group->tiles[i].color] += 1; } - seen_color[i] = tile_group->tiles[i].color; - for (i = 0; i < tile_group->num_tiles; ++i) + for (i = 0; i < 4; i++) { - seen_color[tile_group->tiles[i].color]++; - if (seen_color[tile_group->tiles[i].color] > 1) - { + if (seen_color[i] > 1) + { + printf("fail set - repeat color; "); return 0; - } + } } return 1; } @@ -286,7 +338,7 @@ static void deck_deal(game_t *game, deck_t *deck) tile_t temp; int rand_tile; int i, j, newline; - + printf ("How many players(1-4) should I deal in? "); game->num_players = getchar(); if (game->num_players == EOF) @@ -294,9 +346,9 @@ static void deck_deal(game_t *game, deck_t *deck) printf ("\nGoodbye.\n"); exit (1); } - newline = getchar(); + newline = getchar(); game->num_players -= '0'; - + for (i = 0; i < game->num_players; ++i) { for (j = 0; j < 14; ++j) @@ -314,20 +366,20 @@ static void deck_deal(game_t *game, deck_t *deck) static void deck_init(deck_t *deck) { - int h, i, j; + int h, i, j; deck->num_tiles = 0; for (h = 0; h <= 1; ++h) { - for (i = 0; i <= 3; ++i) + for (i = 0; i <= 3; ++i) { - for (j = 0; j <= 12; ++j) + for (j = 0; j <= 12; ++j) { tile_init (&deck->tiles[deck->num_tiles++], i, j); printf ("There are %d tiles in the deck\n", deck->num_tiles); } } } -} +} static void deck_shuffle(deck_t *deck) { @@ -345,7 +397,7 @@ static void deck_shuffle(deck_t *deck) static void deck_print(deck_t *deck) { - int h, i, j; + int h, i, j; for (h = 0; h < 2; ++h) { for (i = 0; i < 4; ++i) @@ -372,21 +424,38 @@ static void deck_spread(deck_t *deck) } } -static void deck_draw(game_t *game, cairo_t *cr) +static void deck_draw(game_t *game, cairo_t *cr, GdkRegion *region) { int i; for (i = 0; i < game->deck.num_tiles; i++) { - tile_draw(game, &game->deck.tiles[i], cr); + tile_draw(game, &game->deck.tiles[i], cr, region); } -} +} -static void hand_print(game_t *game) +static void hand_print(game_t *game, int player) { int i; - for (i = 0; i < game->players[0].hand.num_tiles; ++i) + for (i = 0; i < game->players[player].hand.num_tiles; i++) { - tile_print(game->players[0].hand.tiles[i]); + tile_print(game->players[player].hand.tiles[i]); + } +} + +static void hand_draw(game_t *game, int player, cairo_t *cr, GdkRegion *region) +{ + int i; + int gwdw = GAME_WINDOW_DEFAULT_WIDTH; + int gwdh = GAME_WINDOW_DEFAULT_HEIGHT; + for (i = 0; i < game->players[player].hand.num_tiles; i++) + { + tile_set_x_y(&game->players[player].hand.tiles[i], + ((gwdw / game->players[player].hand.num_tiles)) * i, + (gwdh - TILE_HEIGHT - 6) ); + } + for (i = 0; i < game->players[player].hand.num_tiles; i++) + { + tile_draw(game, &game->players[player].hand.tiles[i], cr, region); } } @@ -396,13 +465,14 @@ static void game_init(game_t *game) GError *error = NULL; game->num_players = 0; - + for (i = 0; i < GAME_MAX_PLAYERS; ++i) { 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); @@ -412,6 +482,9 @@ static void game_init(game_t *game) FATAL_ERROR (error->message); game->current_tile = game->deck.num_tiles - 1; + game->select_mode = 1; + + game->diff_x = game->diff_y = 0; } static gboolean on_expose_event (GtkWidget *widget, GdkEventExpose *event, game_t *game) @@ -420,7 +493,12 @@ static gboolean on_expose_event (GtkWidget *widget, GdkEventExpose *event, game_ cr = gdk_cairo_create (widget->window); - deck_draw(game, cr); + 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); @@ -442,39 +520,102 @@ static gboolean on_button_press_event (GtkWidget *widget, GdkEventButton *event, { 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) && + 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; + } + } + if (game->select_mode) + { + 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.y1 = event->y; } - return TRUE; } static gboolean on_button_release_event (GtkWidget *widget, GdkEventButton *event, game_t *game) { - printf ("You released button %d\n", event->button); + if (game->select_mode) + { + game->select_mode = 0; + selection_box_t *box; + box = &game->selection_box; + + int x = MIN(box->x1, box->x2); + int y = MIN(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); + + tile_group_t group; + group.num_tiles = 0; + + int i, tile_x, tile_y; + 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++; + } + } + 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]); + } + + game->select_mode = 1; return TRUE; } -static gboolean on_button_motion_event (GtkWidget *widget, GdkEventMotion *event, +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); - + if (game->select_mode) + { + selection_box_t *box; + 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) ); + + 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) ); + } + 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); + /* Then, move the tile */ - tile->x = event->x; - tile->y = event->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; } @@ -482,16 +623,16 @@ int main(int argc, char *argv[]) { GtkWidget *window; game_t game; - + srand(time(NULL)); gtk_init (&argc, &argv); - + game_init(&game); deck_print(&game.deck); deck_spread(&game.deck); - //deck_deal(&game, &game.deck); - //hand_print(&game); + deck_deal(&game, &game.deck); + //hand_print(&game, 0); //With Zero being passed, will print hand for player 1(players[0]) //deck_print(&game.deck); /* Create a new window */ @@ -502,9 +643,9 @@ int main(int argc, char *argv[]) gtk_widget_set_events (window, GDK_EXPOSURE_MASK | - GDK_KEY_PRESS_MASK | + GDK_KEY_PRESS_MASK | GDK_BUTTON_MOTION_MASK | - GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); g_signal_connect (G_OBJECT (window), "delete_event",