X-Git-Url: https://git.cworth.org/git?p=wordgame;a=blobdiff_plain;f=rack-fancy.c;h=c764677e6599eab7ff9dc6cd75e5f21f008333a3;hp=834492af00ba8ca33509444c5ec5e63941b7677d;hb=HEAD;hpb=0dd9b1cd908b90236fba38ef4d7402c8fbcbb99b diff --git a/rack-fancy.c b/rack-fancy.c index 834492a..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 @@ -47,6 +48,7 @@ typedef struct _rack int guess_length; bag_t bag; dict_t dict; + dict_t obscure; dict_t solution; int solution_total; GooCanvasItem *solution_item; @@ -96,7 +98,7 @@ dict_paint_action (void *closure, char *word, dict_entry_t *entry) double new_x, new_y; int found, show_blanks = FALSE; - if (strlen (word) < 3) + if (strlen (word) < 5) return; found = *entry & RACK_DICT_ENTRY_FOUND; @@ -119,6 +121,18 @@ dict_paint_action (void *closure, char *word, dict_entry_t *entry) 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); @@ -323,6 +337,9 @@ rack_init (rack_t *rack, 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; @@ -332,37 +349,84 @@ rack_init (rack_t *rack, } static void -rack_new_game (rack_t *rack) +_flag_obscure_word (void *closure, char *word, dict_entry_t *entry) { - int i; - char *draw; - char word[8]; + dict_t *obscure = closure; + dict_entry_t *obscure_entry; - /* Clean up any remnants from the last game */ - dict_fini (&rack->solution); + obscure_entry = dict_lookup (obscure, word); + if (DICT_ENTRY_IS_WORD (obscure_entry)) + *entry |= RACK_DICT_ENTRY_OBSCURE; +} - bag_shuffle (&rack->bag); +static void +_at_least_one_is_not_obscure (void *closure, char *word, dict_entry_t *entry) +{ + int *result = closure; - /* Keep drawing until we get 7 non-blank tiles */ - i = 0; - draw = rack->bag.tiles; - while (i < 7) { - if (*draw != '?') - word[i++] = *draw; - draw++; - } - word[7] = '\0'; + if ((*entry & RACK_DICT_ENTRY_OBSCURE) == 0) + *result = 1; +} - for (i = 0; i < 7; i++) { - rack->tiles[i]->letter = toupper (word[i]); - goo_canvas_item_simple_changed (GOO_CANVAS_ITEM_SIMPLE (rack->tiles[i]->item), FALSE); +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++; + } } - rack->num_tiles = 7; - dict_init (&rack->solution); - subanagram_expand (word, &rack->dict, &rack->solution); + 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 < 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 @@ -500,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); @@ -528,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); @@ -538,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);