Add keypress handler for Return

Currently just sends the guessed letters back to the rack.
Does not yet do any checking of the guess.

diff --git a/rack-fancy.c b/rack-fancy.c
index 393c7bed85396b4bf0da36bb5688514fddfca16c..bd9f83caca55db91530eaf99563694208dadca08 100644 (file)
--- a/rack-fancy.c
+++ b/rack-fancy.c
@@ -42,13 +42,12 @@ typedef struct _rack
 {
     tile_t *tiles[MAX_TILES];
     int num_tiles;
+    char guess[MAX_TILES];
+    int guess_length;
 } 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
 
@@ -252,6 +251,7 @@ 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;
 }
 
 static gboolean
@@ -274,6 +274,29 @@ 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--;
+}
+
+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;
+}
+
 static gboolean
 on_key_press_event (GtkWidget  *widget,
                    GdkEventKey *event,
@@ -283,15 +306,13 @@ on_key_press_event (GtkWidget     *widget,
     char guess_letter;
     rack_t *rack = user_data;
 
+    if (event->keyval == GDK_Return) {
+       rack_return_all (rack);
+       return TRUE;
+    }
+
     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;
-           }
-       }
-       the_guess_index = 0;
+       rack_return_all (rack);
        rack_shuffle (rack);
        return TRUE;
     }
@@ -302,7 +323,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 +332,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 +346,10 @@ 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;
            return TRUE;
        }
     }