Only show solution words after found (with refresh bug)

[wordgame] / rack-fancy.c

diff --git a/rack-fancy.c b/rack-fancy.c
index 393c7bed85396b4bf0da36bb5688514fddfca16c..f2caa13adae6daa53bd43cf896903fda61598dde 100644 (file)
--- 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,13 +43,13 @@ typedef struct _rack
 {
     tile_t *tiles[MAX_TILES];
     int num_tiles;
+    char guess[MAX_TILES+1];
+    int guess_length;
+    dict_t *solution;
 } rack_t;
 
 static rack_t the_rack;
 
-static char the_guess[MAX_TILES];
-static int the_guess_index = 0;
-
 #define LETTER_SIZE 60
 #define LETTER_PAD 5
 
@@ -77,14 +78,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;
@@ -243,7 +250,7 @@ shuffle (int *array, int length)
 }
 
 static void
-rack_init (rack_t *rack, GooCanvasItem *parent, char *word)
+rack_init (rack_t *rack, GooCanvasItem *parent, char *word, dict_t *solution)
 {
     int i;
 
@@ -252,6 +259,8 @@ rack_init (rack_t *rack, GooCanvasItem *parent, char *word)
     rack->num_tiles = i;
     while (i < MAX_TILES)
        rack->tiles[i] = NULL;
+    rack->guess_length = 0;
+    rack->solution = solution;
 }
 
 static gboolean
@@ -274,6 +283,31 @@ rack_shuffle (rack_t *rack)
     return TRUE;
 }
 
+static void
+rack_return_tile (rack_t *rack, tile_t *tile)
+{
+    int x, y;
+
+    rack_tile_position (tile->rack_index, &x, &y);
+    tile_glide_to (tile, x, y);
+    tile->guessed = FALSE;
+    rack->guess_length--;
+    rack->guess[rack->guess_length] = '\0';
+}
+
+static void
+rack_return_all (rack_t *rack)
+{
+    int i;
+
+    for (i = 0; i < rack->num_tiles; i++) {
+       if (rack->tiles[i]->guessed)
+           rack_return_tile (rack, rack->tiles[i]);
+    }
+    rack->guess_length = 0;
+    rack->guess[0] = '\0';
+}
+
 static gboolean
 on_key_press_event (GtkWidget  *widget,
                    GdkEventKey *event,
@@ -283,15 +317,21 @@ on_key_press_event (GtkWidget     *widget,
     char guess_letter;
     rack_t *rack = user_data;
 
-    if (event->keyval == GDK_space) {
-       for (i = 0; i < rack->num_tiles; i++) {
-           if (rack->tiles[i]->guessed) {
-               rack_tile_position (rack->tiles[i]->rack_index, &x, &y);
-               tile_glide_to (rack->tiles[i], x, y);
-               rack->tiles[i]->guessed = FALSE;
-           }
+    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;
+           printf ("%s is good\n", rack->guess);
+       } else {
+           printf ("%s is not a word\n", rack->guess);
        }
-       the_guess_index = 0;
+       rack_return_all (rack);
+       return TRUE;
+    }
+
+    if (event->keyval == GDK_space) {
+       rack_return_all (rack);
        rack_shuffle (rack);
        return TRUE;
     }
@@ -302,7 +342,7 @@ on_key_press_event (GtkWidget       *widget,
        x = 0;
        for (i = 0; i < rack->num_tiles; i++) {
            /* XXX: evil stuff here... please refactor a lot */
-           if (the_guess[the_guess_index-1] == rack->tiles[i]->letter &&
+           if (rack->guess[rack->guess_length-1] == rack->tiles[i]->letter &&
                rack->tiles[i]->guessed &&
                rack->tiles[i]->x > x)
            {
@@ -311,10 +351,7 @@ on_key_press_event (GtkWidget      *widget,
            }
        }
        if (found) {
-           rack_tile_position (rack->tiles[found_index]->rack_index, &x, &y);
-           tile_glide_to (rack->tiles[found_index], x, y);
-           rack->tiles[found_index]->guessed = FALSE;
-           the_guess_index--;
+           rack_return_tile (rack, rack->tiles[found_index]);
            return TRUE;
        }
        return FALSE;
@@ -328,10 +365,11 @@ on_key_press_event (GtkWidget     *widget,
        if (guess_letter == rack->tiles[i]->letter && 
            ! rack->tiles[i]->guessed)
        {
-           guess_tile_position (the_guess_index, &x, &y);
+           guess_tile_position (rack->guess_length, &x, &y);
            tile_glide_to (rack->tiles[i], x, y);
            rack->tiles[i]->guessed = TRUE;
-           the_guess[the_guess_index++] = guess_letter;
+           rack->guess[rack->guess_length++] = guess_letter;
+           rack->guess[rack->guess_length] = '\0';
            return TRUE;
        }
     }
@@ -380,7 +418,7 @@ 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_init (&the_rack, root, word, solution);
 
     goo_demo_item_new (root,
                       LETTER_PAD,