Allow a new game to be started by pressing Enter after Control-C

This took a fair amount of refactoring, but things are generally much
cleaner now, (even if the rack_t structure has long since outgrown its
name---it should be game_t now or so).

diff --git a/rack-fancy.c b/rack-fancy.c
index 3631a05809b25b079090a65671520d06c609ccac..80279637458e08775e9d2ae9353bd0eb03389c82 100644 (file)
--- a/rack-fancy.c
+++ b/rack-fancy.c
@@ -45,7 +45,9 @@ typedef struct _rack
     int num_tiles;
     char guess[MAX_TILES+1];
     int guess_length;
-    dict_t *solution;
+    bag_t bag;
+    dict_t dict;
+    dict_t solution;
     GooCanvasItem *solution_item;
     gboolean done;
 } rack_t;
@@ -136,7 +138,7 @@ dict_paint (cairo_t *cr, void *closure, double width, double height)
 
     cursor.show_all = rack->done;
 
-    dict_for_each_by_length (rack->solution,
+    dict_for_each_by_length (&rack->solution,
                             dict_paint_action,
                             &cursor);
 
@@ -265,32 +267,61 @@ shuffle (int *array, int length)
 
 static void
 rack_init (rack_t      *rack,
-          dict_t       *solution)
+          GooCanvas    *canvas)
 {
     int i;
+    GooCanvasItem *root = goo_canvas_get_root_item (canvas);
 
     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;
+
+    bag_init (&rack->bag);
+
+    dict_init (&rack->dict);
+    dict_add_words_from_file (&rack->dict, "words.txt");
+
+    dict_init (&rack->solution);
+
+    for (i = 0; i < MAX_TILES; i++)
+       rack->tiles[i] = tile_create (root, 'A', i);
+    rack->num_tiles = 0;
 }
 
 static void
-rack_create_tiles (rack_t      *rack,
-                  GooCanvas    *canvas,
-                  char         *word)
+rack_new_game (rack_t *rack)
 {
     int i;
+    char *draw;
+    char word[8];
 
-    GooCanvasItem *root = goo_canvas_get_root_item (canvas);
+    /* Clean up any remnants from the last game */
+    dict_fini (&rack->solution);
+
+    bag_shuffle (&rack->bag);
+
+    /* Keep drawing until we get 7 non-blank tiles */
+    i = 0;
+    draw = rack->bag.tiles;
+    while (i < 7) {
+       if (*draw != '?')
+           word[i++] = *draw;
+       draw++;
+    }
+    word[7] = '\0';
 
-    for (i = 0; i < MIN (MAX_TILES, strlen (word)); i++)
-       rack->tiles[i] = tile_create (root, word[i], i);
-    rack->num_tiles = i;
+    for (i = 0; i < 7; i++) {
+       rack->tiles[i]->letter = toupper (word[i]);
+       goo_canvas_item_simple_changed (GOO_CANVAS_ITEM_SIMPLE (rack->tiles[i]->item), FALSE);
+    }
+    rack->num_tiles = 7;
+
+    dict_init (&rack->solution);
+    subanagram_expand (word, &rack->dict, &rack->solution);
+    goo_canvas_item_simple_changed (GOO_CANVAS_ITEM_SIMPLE (rack->solution_item), FALSE);
 }
 
 static gboolean
@@ -356,8 +387,13 @@ on_key_press_event (GtkWidget      *widget,
 
     if (event->keyval == GDK_Return) {
        dict_entry_t *entry;
+       if (rack->done) {
+           rack->done = FALSE;
+           rack_new_game (rack);
+           return TRUE;
+       }
        if (rack->guess_length >= 3) {
-           entry = dict_lookup (rack->solution, rack->guess);
+           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);
@@ -400,7 +436,7 @@ on_key_press_event (GtkWidget       *widget,
     /* XXX: event->string is deprecated, but the non-deprecated
      * input-method stuff (GtkIMContext) is extremely non-obvious to
      * use. */
-    guess_letter = tolower (event->string[0]);
+    guess_letter = toupper (event->string[0]);
     for (i = 0; i < rack->num_tiles; i++) {
        if (guess_letter == rack->tiles[i]->letter && 
            ! rack->tiles[i]->guessed)
@@ -471,46 +507,23 @@ create_canvas (GtkWidget *parent, rack_t *rack)
 int
 main (int argc, char *argv[])
 {
-    dict_t dict, solution;
     struct timeval tv;
-    bag_t bag;
     rack_t rack;
-    char word[8];
-    int i;
-    char *draw;
     GtkWidget *window;
     GooCanvas *canvas;
 
     gettimeofday (&tv, NULL);
     srand (tv.tv_sec ^ tv.tv_usec);
 
-    bag_init (&bag);
-    bag_shuffle (&bag);
-
-    /* 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 (word, &dict, &solution);
-
     gtk_init (&argc, &argv);
 
-    rack_init (&rack, &solution);
-
     window = create_window (&rack);
 
     canvas = create_canvas (window, &rack);
 
-    rack_create_tiles (&rack, canvas, word);
+    rack_init (&rack, canvas);
+
+    rack_new_game (&rack);
 
     gtk_main ();