X-Git-Url: https://git.cworth.org/git?p=wordgame;a=blobdiff_plain;f=rack-fancy.c;h=fbc6e119a471df41aadef06008cde4a2d3aecb8f;hp=65e0b0c6268120ce4ac3ae1e0c40c8e4997c6d0c;hb=0a8d1f741a919c9c7e5ae0b8d0261759cca9bc05;hpb=68466572ce337908614fb489601cd1590e142677

diff --git a/rack-fancy.c b/rack-fancy.c
index 65e0b0c..fbc6e11 100644
--- a/rack-fancy.c
+++ b/rack-fancy.c
@@ -29,7 +29,7 @@
 
 #define RACK_DICT_ENTRY_OBSCURE	(1<<1)
 #define RACK_DICT_ENTRY_FOUND	(1<<2)
-#define MAX_TILES 7
+#define MAX_TILES 6
 
 typedef struct _tile
 {
@@ -354,13 +354,22 @@ _flag_obscure_word (void *closure, char *word, dict_entry_t *entry)
 	*entry |= RACK_DICT_ENTRY_OBSCURE;
 }
 
+static void
+_at_least_one_is_not_obscure (void *closure, char *word, dict_entry_t *entry)
+{
+    int *result = closure;
+
+    if ((*entry & RACK_DICT_ENTRY_OBSCURE) == 0)
+	*result = 1;
+}
+
 static void
 rack_new_game (rack_t *rack)
 {
     int i, bottom;
     char word[MAX_TILES + 1];
     int length = MAX_TILES;
-    int count;
+    int has_full_length_non_obscure_word;
 
     /* We'll shuffle as many times as necessary until we can find a
      * sequence of <length> letters with at least one full-length
@@ -382,24 +391,29 @@ rack_new_game (rack_t *rack)
 	    }
 	}
 
+	/* Look at each successive run of tiles in the bag until
+	 * finding one that has at least one non-obscure word using
+	 * all of its leters. */
 	for (i = 0; i + length <= bottom + 1; i++) {
 	    memcpy (word, &rack->bag.tiles[i], length);
 	    word[length] = '\0';
 	    dict_fini (&rack->solution);
 	    dict_init (&rack->solution);
 	    subanagram_expand (word, &rack->dict, &rack->solution);
-	    count = dict_for_each_of_length (&rack->solution,
-					     NULL, NULL,
-					     length, length);
-	    if (count)
+	    dict_for_each (&rack->solution,
+			   _flag_obscure_word, &rack->obscure);
+	    has_full_length_non_obscure_word = 0;
+	    dict_for_each_of_length (&rack->solution,
+				     _at_least_one_is_not_obscure,
+				     &has_full_length_non_obscure_word,
+				     length, length);
+	    if (has_full_length_non_obscure_word)
 		goto DONE;
 	    i++;
 	}
     }
 
   DONE:
-    dict_for_each (&rack->solution,
-		   _flag_obscure_word, &rack->obscure);
     rack->solution_total = dict_count (&rack->solution);
     goo_canvas_item_simple_changed (GOO_CANVAS_ITEM_SIMPLE (rack->solution_item), FALSE);
 
@@ -545,7 +559,7 @@ create_window (rack_t *rack)
     GtkWidget *window, *scrolled_window;
 
     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_default_size (GTK_WINDOW (window), 500, 500);
+    gtk_window_set_default_size (GTK_WINDOW (window), 430, 430);
     gtk_widget_show (window);
     g_signal_connect (window, "delete_event",
 		      (GtkSignalFunc) on_delete_event, NULL);
@@ -573,8 +587,8 @@ create_canvas (GtkWidget *parent, rack_t *rack)
     GooCanvasItem *root;
 
     canvas = goo_canvas_new ();
-    gtk_widget_set_size_request (canvas, 400, 480);
-    goo_canvas_set_bounds (GOO_CANVAS (canvas), 0, 0, 400, 480);
+    gtk_widget_set_size_request (canvas, 400, 400);
+    goo_canvas_set_bounds (GOO_CANVAS (canvas), 0, 0, 400, 400);
     gtk_widget_show (canvas);
     gtk_container_add (GTK_CONTAINER (parent), canvas);
 
@@ -583,7 +597,7 @@ create_canvas (GtkWidget *parent, rack_t *rack)
     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)),
+					     400 - 20, 400 - (LETTER_PAD + 2 * (LETTER_SIZE + 2 * LETTER_PAD)),
 					     dict_paint, rack,
 					     NULL);