/*
* Copyright © 2006 Carl Worth
*
- * This program is free software; you can redistribute it and\/or modify
+ * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
#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
{
*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
}
}
+ /* 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);
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);
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);
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);