X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=rack-fancy.c;h=3631a05809b25b079090a65671520d06c609ccac;hb=a2dddc88ee72109bd3cb34f676b5fc8587abe389;hp=87b39f56c74283d05bd34f4382d00d362b434365;hpb=c11f1953e31a1baa1d6785757169c7fd35cdc51d;p=wordgame diff --git a/rack-fancy.c b/rack-fancy.c index 87b39f5..3631a05 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 @@ -45,10 +46,10 @@ typedef struct _rack char guess[MAX_TILES+1]; int guess_length; dict_t *solution; + GooCanvasItem *solution_item; + gboolean done; } rack_t; -static rack_t the_rack; - #define LETTER_SIZE 60 #define LETTER_PAD 5 @@ -74,6 +75,7 @@ typedef struct _dict_paint_cursor int y; int max_column_width; int max_y; + gboolean show_all; } dict_paint_cursor_t; static void @@ -83,22 +85,38 @@ dict_paint_action (void *closure, char *word, dict_entry_t *entry) cairo_t *cr = cursor->cr; double new_x, new_y; + if (strlen (word) < 3) + return; + cairo_move_to (cr, cursor->x, cursor->y); - cairo_show_text (cr, word); + if (*entry & RACK_DICT_ENTRY_FOUND || cursor->show_all) { + if (*entry & RACK_DICT_ENTRY_FOUND) + cairo_set_source_rgb (cr, 0, 0, 0); /* black */ + else + cairo_set_source_rgb (cr, 1, 0, 0); /* red */ + 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; cursor->y += cursor->line_height; if (cursor->y > cursor->max_y) { cursor->x = cursor->max_column_width + cursor->line_height / 2; - cursor->y = 0; + cursor->y = cursor->line_height; } } +#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) { - dict_t *dict = closure; + rack_t *rack = closure; dict_paint_cursor_t cursor; cairo_save (cr); @@ -106,16 +124,19 @@ 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; + cursor.y = cursor.line_height; cursor.max_column_width = 0; cursor.max_y = height; - dict_for_each_by_length (dict, + cursor.show_all = rack->done; + + dict_for_each_by_length (rack->solution, dict_paint_action, &cursor); @@ -243,17 +264,33 @@ shuffle (int *array, int length) } static void -rack_init (rack_t *rack, GooCanvasItem *parent, char *word, dict_t *solution) +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; + rack->done = FALSE; +} + +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 @@ -310,13 +347,25 @@ on_key_press_event (GtkWidget *widget, char guess_letter; rack_t *rack = user_data; + if (event->state & GDK_CONTROL_MASK && + event->keyval == GDK_c) + { + rack->done = TRUE; + goo_canvas_item_simple_changed (GOO_CANVAS_ITEM_SIMPLE (rack->solution_item), FALSE); + } + if (event->keyval == GDK_Return) { dict_entry_t *entry; - entry = dict_lookup (rack->solution, rack->guess); - if (DICT_ENTRY_IS_WORD (entry)) - printf ("%s is good\n", rack->guess); - else - printf ("%s is not a word\n", rack->guess); + if (rack->guess_length >= 3) { + 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); + } else { + printf ("\a"); + fflush (stdout); + } + } rack_return_all (rack); return TRUE; } @@ -369,7 +418,7 @@ on_key_press_event (GtkWidget *widget, } static GtkWidget * -create_window (void) +create_window (rack_t *rack) { GtkWidget *window, *scrolled_window; @@ -381,7 +430,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), @@ -395,28 +444,28 @@ 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; canvas = goo_canvas_new (); - gtk_widget_set_size_request (canvas, 400, 400); - goo_canvas_set_bounds (GOO_CANVAS (canvas), 0, 0, 400, 400); + gtk_widget_set_size_request (canvas, 400, 480); + goo_canvas_set_bounds (GOO_CANVAS (canvas), 0, 0, 400, 480); gtk_widget_show (canvas); gtk_container_add (GTK_CONTAINER (parent), canvas); root = goo_canvas_get_root_item (GOO_CANVAS (canvas)); - rack_init (&the_rack, root, word, solution); + rack->solution_item = goo_demo_item_new (root, + 20, + LETTER_PAD + 2 * (LETTER_SIZE + 2 * LETTER_PAD), + 400 - 20, 480 - (LETTER_PAD + 2 * (LETTER_SIZE + 2 * LETTER_PAD)), + dict_paint, rack, + 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 @@ -425,9 +474,12 @@ 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; + char *draw; GtkWidget *window; + GooCanvas *canvas; gettimeofday (&tv, NULL); srand (tv.tv_sec ^ tv.tv_usec); @@ -435,22 +487,30 @@ main (int argc, char *argv[]) bag_init (&bag); bag_shuffle (&bag); - memcpy (rack, bag.tiles, 7); - rack[7] = '\0'; - - for (i = 0; i < 7; i++) - rack[i] = toupper (rack[i]); + /* Keep drawing until we get 7 non-blank tiles */ + i = 0; + draw = bag.tiles; + while (i < 7) { + if (*draw != '?') + word[i++] = toupper (*draw); + draw++; + } 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 ();