X-Git-Url: https://git.cworth.org/git?p=wordgame;a=blobdiff_plain;f=rack-fancy.c;h=393c7bed85396b4bf0da36bb5688514fddfca16c;hp=abd22286f155ad02347875aeaf1507230768af5d;hb=2379e94a6780633c5100d4b0982d7b806b2afa1c;hpb=a5187a6b925208af24014e40290f323f8ecd9be7

diff --git a/rack-fancy.c b/rack-fancy.c
index abd2228..393c7be 100644
--- a/rack-fancy.c
+++ b/rack-fancy.c
@@ -34,7 +34,6 @@ typedef struct _tile
     char letter;
     int rack_index;
     int x, y;
-    int size;
     GooCanvasItem *item;
     gboolean guessed;
 } tile_t;
@@ -54,28 +53,84 @@ static int the_guess_index = 0;
 #define LETTER_PAD 5
 
 static void
-rack_tile_position (int i, int *x, int *y)
+guess_tile_position (int i, int *x, int *y)
 {
     *x = 20 + i * (LETTER_SIZE + LETTER_PAD);
-    *y = 85;
+    *y = LETTER_PAD;
 }
 
 static void
-guess_tile_position (int i, int *x, int *y)
+rack_tile_position (int i, int *x, int *y)
+{
+    guess_tile_position (i, x, y);
+    *y += (LETTER_SIZE + LETTER_PAD);
+}
+
+typedef struct _dict_paint_cursor
+{
+    cairo_t *cr;
+    int line_height;
+    int x;
+    int y;
+    int max_column_width;
+    int max_y;
+} dict_paint_cursor_t;
+
+static void
+dict_paint_action (void *closure, char *word)
+{
+    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);
+    cairo_get_current_point (cr, &new_x, &new_y);
+    if (new_x > cursor->max_column_width)
+	cursor->max_column_width = new_x;
+    cursor->y += cursor->line_height;
+    if (cursor->y > cursor->max_y) {
+	cursor->x = cursor->max_column_width + cursor->line_height / 2;
+	cursor->y = 0;
+    }
+}
+
+static void
+dict_paint (cairo_t *cr, void *closure, double width, double height)
 {
-    rack_tile_position (i, x, y);
-    *y -= (LETTER_SIZE + LETTER_PAD);
+    dict_t *dict = closure;
+    dict_paint_cursor_t cursor;
+
+    cairo_save (cr);
+    cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); /* black */
+
+    cursor.cr = cr;
+
+    cairo_set_font_size (cr, 12);
+    cursor.line_height = 14;
+    
+    cursor.x = 0;
+    cursor.y = 0;
+
+    cursor.max_column_width = 0;
+    cursor.max_y = height;
+
+    dict_for_each_by_length (dict,
+			     dict_paint_action,
+			     &cursor);
+
+    cairo_restore (cr);
 }
 
 static void
-tile_paint (cairo_t *cr, void *closure)
+tile_paint (cairo_t *cr, void *closure, double width, double height)
 {
     tile_t *tile = closure;
 
     cairo_pattern_t *gradient;
     cairo_text_extents_t extents;
-    int rad = (int) (tile->size / 2);
-    int cx = tile->size / 2;
+    int rad = (int) MIN (width / 2, height / 2);
+    int cx = width / 2;
     int cy = cx;
     int tx, ty;
     double spot_angle = M_PI / 4.0;
@@ -127,15 +182,6 @@ tile_paint (cairo_t *cr, void *closure)
     cairo_restore (cr);
 }
 
-static void
-tile_move_to (tile_t *tile, int x, int y)
-{
-    cairo_matrix_t matrix;
-
-    cairo_matrix_init_translate (&matrix, x, y);
-    goo_canvas_item_set_transform (tile->item, &matrix);
-}
-
 static void
 tile_glide_to (tile_t *tile, int x, int y)
 {
@@ -157,13 +203,11 @@ tile_create (GooCanvasItem *parent,
     tile->letter = tolower (letter);
     tile->rack_index = rack_index;
     rack_tile_position (rack_index, &tile->x, &tile->y);
-    tile->size = LETTER_SIZE;
     tile->item = goo_demo_item_new (parent,
-				    tile->size,
+				    tile->x, tile->y,
+				    LETTER_SIZE, LETTER_SIZE,
 				    tile_paint,
-				    tile);
-
-    tile_move_to (tile, tile->x, tile->y);
+				    tile, NULL);
 
     tile->guessed = FALSE;
 
@@ -323,7 +367,7 @@ create_window (void)
 }
 
 static void
-create_canvas (GtkWidget *parent, char *word)
+create_canvas (GtkWidget *parent, char *word, dict_t *solution)
 {
     GtkWidget *canvas;
     GooCanvasItem *root;
@@ -337,11 +381,19 @@ create_canvas (GtkWidget *parent, char *word)
     root = goo_canvas_get_root_item (GOO_CANVAS (canvas));
 
     rack_init (&the_rack, root, word);
+
+    goo_demo_item_new (root,
+		       LETTER_PAD,
+		       LETTER_PAD + 2 * (LETTER_SIZE + 2 * LETTER_PAD),
+		       400, 400 - (2 * (LETTER_SIZE + 2 * LETTER_PAD)),
+		       dict_paint,
+		       solution, NULL);
 }
 
 int
 main (int argc, char *argv[])
 {
+    dict_t dict, solution;
     struct timeval tv;
     bag_t bag;
     char rack[8];
@@ -360,10 +412,16 @@ main (int argc, char *argv[])
     for (i = 0; i < 7; i++)
 	rack[i] = toupper (rack[i]);
 
+    dict_init (&dict);
+    dict_add_words_from_file (&dict, "words.txt");
+
+    dict_init (&solution);
+    subanagram_expand (rack, &dict, &solution);
+
     gtk_init (&argc, &argv);
     window = create_window ();
 
-    create_canvas (window, rack);
+    create_canvas (window, rack, &solution);
 
     gtk_main ();