X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=kub.c;h=65b7d3e593d9c38e65409061b792c784f8b9bc49;hb=128be2d8da52865131653f197c05dd5f6830958a;hp=0f195740f64b4f0b156412961a312157ee3e3349;hpb=d5fffb73ddb4b6f189d333daa9c1d65f41b6fc6a;p=kub diff --git a/kub.c b/kub.c index 0f19574..65b7d3e 100644 --- a/kub.c +++ b/kub.c @@ -5,6 +5,42 @@ #include #include +/* + * TILE_NUMBER_X_OFFSET = 3 + * // + * || TILE_NUMBER_WIDTH = 34 + * ||/ / + * || | TILE_WIDTH = 40 + * || | / + * | | + * +-----+ - TILE_NUMBER_Y_OFFSET = 3 - + * |+---+| - | + * || || | + * || || TILE_NUMBER_HEIGHT = 24 | + * |+---+| - | + * | _ | _ |-TILE_HEIGHT = 50 + * | / \ | | + * || || TILE_SUN_HEIGHT = 20 | + * | \_/ | _ | + * | | TILE_SUN_Y_OFFSET = 3 | + * +-----+ - - + * || | TILE_SUN_WIDTH = 20 + * || + * || TILE_SUN_X_OFFSET = 10 + */ +#define TILE_WIDTH 40 +#define TILE_HEIGHT 50 + +#define TILE_NUMBER_X_OFFSET 3 +#define TILE_NUMBER_Y_OFFSET 3 +#define TILE_NUMBER_WIDTH 34 +#define TILE_NUMBER_HEIGHT 24 + +#define TILE_SUN_X_OFFSET 10 +#define TILE_SUN_Y_OFFSET 3 +#define TILE_SUN_WIDTH 20 +#define TILE_SUN_HEIGHT 20 + #define FATAL_ERROR(msg) \ do { fprintf (stderr, "Error: %s\n", msg); exit (1); } while (0) @@ -15,6 +51,8 @@ typedef enum {BLACK, BLUE, RED, YELLOW} color_t; typedef struct tile { color_t color; int number; + int x; + int y; } tile_t; #define DECK_MAX_TILES 104 @@ -52,13 +90,25 @@ typedef struct game { board_t board; deck_t deck; RsvgHandle *blanktile; + + int current_tile; + int diff_x, diff_y; + int click_x, click_y; + int release_x, release_y; } game_t; -static void -tile_init (tile_t *tile, color_t color, int number) +static void tile_init (tile_t *tile, color_t color, int number) { tile->color = color; tile->number = number; + tile->x = 0; + 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) @@ -66,17 +116,25 @@ 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, int x, int y) +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) FATAL_ERROR ("snprintf failed"); cairo_save(cr); - cairo_translate(cr, x, y); + cairo_translate(cr, tile->x, tile->y); rsvg_handle_render_cairo (game->blanktile, cr); if (tile->color == BLACK) @@ -86,8 +144,11 @@ static void tile_draw(game_t *game, tile_t *tile, cairo_t *cr, int x, int y) if (tile->color == RED) 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); + cairo_set_source_rgb (cr, 1.0, .843, 0.0); + 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); @@ -130,21 +191,27 @@ 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); - + sizeof (tile_t), tile_compare); + if (tile_group->num_tiles > 13 || tile_group->num_tiles < 3) { - return 0; + 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) - { - return 0; - } - if(tile_group->tiles[i].number != tile_group->tiles[i + 1].number -1) - { - return 0; - } + { + 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 && + i+1 != tile_group->num_tiles) + { + printf("fail run - invalid number sequence; "); + return 0; + } + } return 1; } @@ -214,27 +281,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) { - return 0; + 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) - { - return 0; - } + 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) - { - return 0; - } + if (seen_color[i] > 1) + { + printf("fail set - repeat color; "); + return 0; + } } return 1; } @@ -317,26 +389,51 @@ static void deck_print(deck_t *deck) printf ("There are %d tiles in the deck\n" , deck->num_tiles); } -static void deck_draw(game_t *game, cairo_t *cr) +static void deck_spread(deck_t *deck) { int i, j; - - for (i = 0; i < 8; ++i) + for (i = 0; i < 8; i++) { - for (j = 0; j < 13; ++j) + for (j = 0; j < 13; j++) { - tile_draw(game, &game->deck.tiles[j + (i * 13)], - cr, 45 * j, 55 * i); + 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, GdkRegion *region) +{ + int i; + for (i = 0; i < game->deck.num_tiles; i++) + { + 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); } } @@ -360,6 +457,12 @@ static void game_init(game_t *game) 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->diff_x = game->diff_y = 0; } static gboolean on_expose_event (GtkWidget *widget, GdkEventExpose *event, game_t *game) @@ -368,7 +471,9 @@ 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); + + hand_draw(game, 0, cr, event->region); cairo_destroy (cr); @@ -384,18 +489,80 @@ static gboolean on_key_press_event (GtkWidget *widget, GdkEventKey *event, game_ static gboolean on_button_press_event (GtkWidget *widget, GdkEventButton *event, game_t *game) { - printf ("You pressed button %d\n", event->button); - + 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 && 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->current_tile == -1) + { + game->click_x = event->x; + game->click_y = 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->current_tile == -1) + { + 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->current_tile = -1; 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; @@ -407,9 +574,10 @@ int main(int argc, char *argv[]) game_init(&game); deck_print(&game.deck); - //deck_deal(&game, &game.deck); - hand_print(&game); - deck_print(&game.deck); + deck_spread(&game.deck); + 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 */ window = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -420,6 +588,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); @@ -433,6 +602,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 ();