X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=rack-fancy.c;h=bff8ddc2d6957835edbec91df470b6d78cae1661;hb=9e378f70ad5f23c0191b4351c45e60a31b0035c8;hp=bd9f83caca55db91530eaf99563694208dadca08;hpb=aa0ff4160f5b7311fca900d90b1436dbaebef70a;p=wordgame diff --git a/rack-fancy.c b/rack-fancy.c index bd9f83c..bff8ddc 100644 --- a/rack-fancy.c +++ b/rack-fancy.c @@ -27,6 +27,7 @@ #include "word-game.h" #include "demo-item.h" +#define RACK_DICT_ENTRY_FOUND (1<<1) #define MAX_TILES 7 typedef struct _tile @@ -42,12 +43,12 @@ typedef struct _rack { tile_t *tiles[MAX_TILES]; int num_tiles; - char guess[MAX_TILES]; + char guess[MAX_TILES+1]; int guess_length; + dict_t *solution; + GooCanvasItem *solution_item; } rack_t; -static rack_t the_rack; - #define LETTER_SIZE 60 #define LETTER_PAD 5 @@ -76,14 +77,20 @@ typedef struct _dict_paint_cursor } dict_paint_cursor_t; static void -dict_paint_action (void *closure, char *word) +dict_paint_action (void *closure, char *word, dict_entry_t *entry) { dict_paint_cursor_t *cursor = closure; cairo_t *cr = cursor->cr; double new_x, new_y; cairo_move_to (cr, cursor->x, cursor->y); - cairo_show_text (cr, word); + if (*entry & RACK_DICT_ENTRY_FOUND) { + cairo_show_text (cr, word); + } else { + int i, length = strlen (word); + for (i = 0; i < length; i++) + cairo_show_text (cr, "_"); + } cairo_get_current_point (cr, &new_x, &new_y); if (new_x > cursor->max_column_width) cursor->max_column_width = new_x; @@ -94,6 +101,9 @@ dict_paint_action (void *closure, char *word) } } +#define SOLUTION_FONT_SIZE 12 +#define SOLUTION_LINE_HEIGHT (1.5 * SOLUTION_FONT_SIZE) + static void dict_paint (cairo_t *cr, void *closure, double width, double height) { @@ -105,8 +115,9 @@ dict_paint (cairo_t *cr, void *closure, double width, double height) cursor.cr = cr; - cairo_set_font_size (cr, 12); - cursor.line_height = 14; + cairo_select_font_face (cr, "mono", 0, 0); + cairo_set_font_size (cr, SOLUTION_FONT_SIZE); + cursor.line_height = SOLUTION_LINE_HEIGHT; cursor.x = 0; cursor.y = 0; @@ -242,16 +253,32 @@ shuffle (int *array, int length) } static void -rack_init (rack_t *rack, GooCanvasItem *parent, char *word) +rack_init (rack_t *rack, + dict_t *solution) { int i; - for (i = 0; i < MIN (MAX_TILES, strlen (word)); i++) - rack->tiles[i] = tile_create (parent, word[i], i); - rack->num_tiles = i; - while (i < MAX_TILES) + for (i = 0; i < MAX_TILES; i++) rack->tiles[i] = NULL; + rack->num_tiles = 0; + rack->guess_length = 0; + rack->solution = solution; + rack->solution_item = NULL; +} + +static void +rack_create_tiles (rack_t *rack, + GooCanvas *canvas, + char *word) +{ + int i; + + GooCanvasItem *root = goo_canvas_get_root_item (canvas); + + for (i = 0; i < MIN (MAX_TILES, strlen (word)); i++) + rack->tiles[i] = tile_create (root, word[i], i); + rack->num_tiles = i; } static gboolean @@ -283,6 +310,7 @@ rack_return_tile (rack_t *rack, tile_t *tile) tile_glide_to (tile, x, y); tile->guessed = FALSE; rack->guess_length--; + rack->guess[rack->guess_length] = '\0'; } static void @@ -295,6 +323,7 @@ rack_return_all (rack_t *rack) rack_return_tile (rack, rack->tiles[i]); } rack->guess_length = 0; + rack->guess[0] = '\0'; } static gboolean @@ -307,6 +336,12 @@ on_key_press_event (GtkWidget *widget, rack_t *rack = user_data; if (event->keyval == GDK_Return) { + dict_entry_t *entry; + entry = dict_lookup (rack->solution, rack->guess); + if (DICT_ENTRY_IS_WORD (entry)) { + *entry = *entry | RACK_DICT_ENTRY_FOUND; + goo_canvas_item_simple_changed (GOO_CANVAS_ITEM_SIMPLE (rack->solution_item), FALSE); + } rack_return_all (rack); return TRUE; } @@ -350,6 +385,7 @@ on_key_press_event (GtkWidget *widget, tile_glide_to (rack->tiles[i], x, y); rack->tiles[i]->guessed = TRUE; rack->guess[rack->guess_length++] = guess_letter; + rack->guess[rack->guess_length] = '\0'; return TRUE; } } @@ -358,7 +394,7 @@ on_key_press_event (GtkWidget *widget, } static GtkWidget * -create_window (void) +create_window (rack_t *rack) { GtkWidget *window, *scrolled_window; @@ -370,7 +406,7 @@ create_window (void) gtk_widget_add_events (window, GDK_KEY_PRESS_MASK); g_signal_connect (window, "key_press_event", - (GtkSignalFunc) on_key_press_event, &the_rack); + (GtkSignalFunc) on_key_press_event, rack); scrolled_window = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), @@ -384,8 +420,8 @@ create_window (void) return scrolled_window; } -static void -create_canvas (GtkWidget *parent, char *word, dict_t *solution) +static GooCanvas * +create_canvas (GtkWidget *parent, rack_t *rack) { GtkWidget *canvas; GooCanvasItem *root; @@ -398,14 +434,14 @@ create_canvas (GtkWidget *parent, char *word, dict_t *solution) root = goo_canvas_get_root_item (GOO_CANVAS (canvas)); - rack_init (&the_rack, root, word); + rack->solution_item = goo_demo_item_new (root, + LETTER_PAD + SOLUTION_LINE_HEIGHT, + LETTER_PAD + 2 * (LETTER_SIZE + 2 * LETTER_PAD), + 400, 400 - (2 * (LETTER_SIZE + 2 * LETTER_PAD)), + dict_paint, rack->solution, + NULL); - goo_demo_item_new (root, - LETTER_PAD, - LETTER_PAD + 2 * (LETTER_SIZE + 2 * LETTER_PAD), - 400, 400 - (2 * (LETTER_SIZE + 2 * LETTER_PAD)), - dict_paint, - solution, NULL); + return GOO_CANVAS (canvas); } int @@ -414,9 +450,11 @@ main (int argc, char *argv[]) dict_t dict, solution; struct timeval tv; bag_t bag; - char rack[8]; + rack_t rack; + char word[8]; int i; GtkWidget *window; + GooCanvas *canvas; gettimeofday (&tv, NULL); srand (tv.tv_sec ^ tv.tv_usec); @@ -424,22 +462,27 @@ main (int argc, char *argv[]) bag_init (&bag); bag_shuffle (&bag); - memcpy (rack, bag.tiles, 7); - rack[7] = '\0'; + memcpy (word, bag.tiles, 7); + word[7] = '\0'; for (i = 0; i < 7; i++) - rack[i] = toupper (rack[i]); + word[i] = toupper (word[i]); dict_init (&dict); dict_add_words_from_file (&dict, "words.txt"); dict_init (&solution); - subanagram_expand (rack, &dict, &solution); + subanagram_expand (word, &dict, &solution); gtk_init (&argc, &argv); - window = create_window (); - create_canvas (window, rack, &solution); + rack_init (&rack, &solution); + + window = create_window (&rack); + + canvas = create_canvas (window, &rack); + + rack_create_tiles (&rack, canvas, word); gtk_main ();