X-Git-Url: https://git.cworth.org/git?p=wordgame;a=blobdiff_plain;f=rack-fancy.c;h=c764677e6599eab7ff9dc6cd75e5f21f008333a3;hp=3631a05809b25b079090a65671520d06c609ccac;hb=HEAD;hpb=a2dddc88ee72109bd3cb34f676b5fc8587abe389 diff --git a/rack-fancy.c b/rack-fancy.c index 3631a05..c764677 100644 --- a/rack-fancy.c +++ b/rack-fancy.c @@ -1,7 +1,7 @@ /* * 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. @@ -27,7 +27,8 @@ #include "word-game.h" #include "demo-item.h" -#define RACK_DICT_ENTRY_FOUND (1<<1) +#define RACK_DICT_ENTRY_OBSCURE (1<<1) +#define RACK_DICT_ENTRY_FOUND (1<<2) #define MAX_TILES 7 typedef struct _tile @@ -45,7 +46,11 @@ typedef struct _rack int num_tiles; char guess[MAX_TILES+1]; int guess_length; - dict_t *solution; + bag_t bag; + dict_t dict; + dict_t obscure; + dict_t solution; + int solution_total; GooCanvasItem *solution_item; gboolean done; } rack_t; @@ -67,6 +72,13 @@ rack_tile_position (int i, int *x, int *y) *y += (LETTER_SIZE + LETTER_PAD); } +typedef enum dict_paint_cursor_show +{ + DICT_PAINT_CURSOR_SHOW_FOUND, + DICT_PAINT_CURSOR_SHOW_UNFOUND_BLANKS, + DICT_PAINT_CURSOR_SHOW_ALL +} dict_paint_cursor_show_t; + typedef struct _dict_paint_cursor { cairo_t *cr; @@ -75,7 +87,7 @@ typedef struct _dict_paint_cursor int y; int max_column_width; int max_y; - gboolean show_all; + dict_paint_cursor_show_t show; } dict_paint_cursor_t; static void @@ -84,21 +96,50 @@ 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; + int found, show_blanks = FALSE; - if (strlen (word) < 3) + if (strlen (word) < 5) return; - cairo_move_to (cr, cursor->x, cursor->y); - if (*entry & RACK_DICT_ENTRY_FOUND || cursor->show_all) { - if (*entry & RACK_DICT_ENTRY_FOUND) - cairo_set_source_rgb (cr, 0, 0, 0); /* black */ - else + found = *entry & RACK_DICT_ENTRY_FOUND; + + cairo_set_source_rgb (cr, 0, 0, 0); /* black */ + + switch (cursor->show) { + case DICT_PAINT_CURSOR_SHOW_FOUND: + if (! found) + return; + break; + case DICT_PAINT_CURSOR_SHOW_UNFOUND_BLANKS: + if (found) + return; + show_blanks = TRUE; + break; + case DICT_PAINT_CURSOR_SHOW_ALL: + if (! found) cairo_set_source_rgb (cr, 1, 0, 0); /* red */ - cairo_show_text (cr, word); - } else { + break; + } + + /* "Obscure" words get some special coloring. */ + if (*entry & RACK_DICT_ENTRY_OBSCURE) { + if (found) { + cairo_set_source_rgb (cr, 0, 1, 0); /* green */ + } else { + if (cursor->show == DICT_PAINT_CURSOR_SHOW_ALL) + cairo_set_source_rgb (cr, 0, 0, 1); /* blue */ + else + return; + } + } + + cairo_move_to (cr, cursor->x, cursor->y); + if (show_blanks) { int i, length = strlen (word); for (i = 0; i < length; i++) cairo_show_text (cr, "_"); + } else { + cairo_show_text (cr, word); } cairo_get_current_point (cr, &new_x, &new_y); if (new_x > cursor->max_column_width) @@ -118,6 +159,7 @@ dict_paint (cairo_t *cr, void *closure, double width, double height) { rack_t *rack = closure; dict_paint_cursor_t cursor; + int length, count; cairo_save (cr); cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); /* black */ @@ -134,11 +176,24 @@ dict_paint (cairo_t *cr, void *closure, double width, double height) cursor.max_column_width = 0; cursor.max_y = height; - cursor.show_all = rack->done; - - dict_for_each_by_length (rack->solution, - dict_paint_action, - &cursor); + length = 1; + count = 0; + do { + if (rack->done) + cursor.show = DICT_PAINT_CURSOR_SHOW_ALL; + else + cursor.show = DICT_PAINT_CURSOR_SHOW_FOUND; + count += dict_for_each_of_length (&rack->solution, + dict_paint_action, &cursor, + length, length); + if (! rack->done) { + cursor.show = DICT_PAINT_CURSOR_SHOW_UNFOUND_BLANKS; + dict_for_each_of_length (&rack->solution, + dict_paint_action, &cursor, + length, length); + } + length++; + } while (count < rack->solution_total); cairo_restore (cr); } @@ -265,32 +320,113 @@ shuffle (int *array, int length) static void rack_init (rack_t *rack, - dict_t *solution) + GooCanvas *canvas) { int i; + GooCanvasItem *root = goo_canvas_get_root_item (canvas); for (i = 0; i < MAX_TILES; i++) rack->tiles[i] = NULL; rack->num_tiles = 0; rack->guess_length = 0; - rack->solution = solution; - rack->solution_item = NULL; rack->done = FALSE; + + bag_init (&rack->bag); + + dict_init (&rack->dict); + dict_add_words_from_file (&rack->dict, "words.txt"); + + dict_init (&rack->obscure); + dict_add_words_from_file (&rack->obscure, "obscure.txt"); + + dict_init (&rack->solution); + rack->solution_total = 0; + + for (i = 0; i < MAX_TILES; i++) + rack->tiles[i] = tile_create (root, 'A', i); + rack->num_tiles = 0; } static void -rack_create_tiles (rack_t *rack, - GooCanvas *canvas, - char *word) +_flag_obscure_word (void *closure, char *word, dict_entry_t *entry) { - int i; + dict_t *obscure = closure; + dict_entry_t *obscure_entry; - GooCanvasItem *root = goo_canvas_get_root_item (canvas); + obscure_entry = dict_lookup (obscure, word); + if (DICT_ENTRY_IS_WORD (obscure_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 has_full_length_non_obscure_word; + + /* We'll shuffle as many times as necessary until we can find a + * sequence of letters with at least one full-length + * word. */ + while (1) { + bag_shuffle (&rack->bag); + + /* In this game, we're not interested in blank tiles, so first + * find any blanks and sort them to the bottom of the bag. */ + i = 0; + bottom = BAG_SIZE - 1; + for (i = 0; i < bottom; i++) { + if (rack->bag.tiles[i] == '?') { + rack->bag.tiles[i] = rack->bag.tiles[bottom]; + rack->bag.tiles[bottom] = '?'; + bottom--; + /* Re-examine ith element */ + i--; + } + } + + /* 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); + 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: + rack->solution_total = dict_count (&rack->solution); + goo_canvas_item_simple_changed (GOO_CANVAS_ITEM_SIMPLE (rack->solution_item), FALSE); - for (i = 0; i < MIN (MAX_TILES, strlen (word)); i++) - rack->tiles[i] = tile_create (root, word[i], i); - rack->num_tiles = i; + for (i = 0; i < length; i++) { + rack->tiles[i]->letter = toupper (word[i]); + goo_canvas_item_simple_changed (GOO_CANVAS_ITEM_SIMPLE (rack->tiles[i]->item), FALSE); + } + rack->num_tiles = length; } static gboolean @@ -356,8 +492,13 @@ on_key_press_event (GtkWidget *widget, if (event->keyval == GDK_Return) { dict_entry_t *entry; + if (rack->done) { + rack->done = FALSE; + rack_new_game (rack); + return TRUE; + } if (rack->guess_length >= 3) { - entry = dict_lookup (rack->solution, rack->guess); + entry = dict_lookup (&rack->solution, rack->guess); if (DICT_ENTRY_IS_WORD (entry)) { *entry = *entry | RACK_DICT_ENTRY_FOUND; goo_canvas_item_simple_changed (GOO_CANVAS_ITEM_SIMPLE (rack->solution_item), FALSE); @@ -400,7 +541,7 @@ on_key_press_event (GtkWidget *widget, /* XXX: event->string is deprecated, but the non-deprecated * input-method stuff (GtkIMContext) is extremely non-obvious to * use. */ - guess_letter = tolower (event->string[0]); + guess_letter = toupper (event->string[0]); for (i = 0; i < rack->num_tiles; i++) { if (guess_letter == rack->tiles[i]->letter && ! rack->tiles[i]->guessed) @@ -423,7 +564,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), 490, 490); gtk_widget_show (window); g_signal_connect (window, "delete_event", (GtkSignalFunc) on_delete_event, NULL); @@ -451,8 +592,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, 460, 460); + goo_canvas_set_bounds (GOO_CANVAS (canvas), 0, 0, 460, 460); gtk_widget_show (canvas); gtk_container_add (GTK_CONTAINER (parent), canvas); @@ -461,7 +602,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)), + 460 - 20, 460 - (LETTER_PAD + 2 * (LETTER_SIZE + 2 * LETTER_PAD)), dict_paint, rack, NULL); @@ -471,46 +612,23 @@ create_canvas (GtkWidget *parent, rack_t *rack) int main (int argc, char *argv[]) { - dict_t dict, solution; struct timeval tv; - bag_t bag; rack_t rack; - char word[8]; - int i; - char *draw; GtkWidget *window; GooCanvas *canvas; gettimeofday (&tv, NULL); srand (tv.tv_sec ^ tv.tv_usec); - bag_init (&bag); - bag_shuffle (&bag); - - /* Keep drawing until we get 7 non-blank tiles */ - i = 0; - draw = bag.tiles; - while (i < 7) { - if (*draw != '?') - word[i++] = toupper (*draw); - draw++; - } - - dict_init (&dict); - dict_add_words_from_file (&dict, "words.txt"); - - dict_init (&solution); - subanagram_expand (word, &dict, &solution); - gtk_init (&argc, &argv); - rack_init (&rack, &solution); - window = create_window (&rack); canvas = create_canvas (window, &rack); - rack_create_tiles (&rack, canvas, word); + rack_init (&rack, canvas); + + rack_new_game (&rack); gtk_main ();