Couple of solving-related mid-end tweaks. Firstly, when we generate

[sgt/puzzles] / gtk.c

diff --git a/gtk.c b/gtk.c
index 1f991d6..29b215e 100644 (file)
--- a/gtk.c
+++ b/gtk.c
@@ -79,7 +79,7 @@ void fatal(char *fmt, ...)
  * GTK front end to puzzles.
  */
 
-static void update_preset_tick(frontend *fe);
+static void changed_preset(frontend *fe);
 
 struct font {
 #ifdef USE_PANGO
@@ -127,6 +127,7 @@ struct frontend {
     int npresets;
     GtkWidget **preset_bullets;
     GtkWidget *preset_custom_bullet;
+    GtkWidget *copy_menu_item;
 };
 
 void get_random_seed(void **randseed, int *randseedsize)
@@ -849,7 +850,7 @@ static void config_ok_button_clicked(GtkButton *button, gpointer data)
     else {
        fe->cfgret = TRUE;
        gtk_widget_destroy(fe->cfgbox);
-       update_preset_tick(fe);
+       changed_preset(fe);
     }
 }
 
@@ -1115,11 +1116,18 @@ static void update_menuitem_bullet(GtkWidget *label, int visible)
     }
 }
 
-static void update_preset_tick(frontend *fe)
+/*
+ * Called when any other code in this file has changed the
+ * selected game parameters.
+ */
+static void changed_preset(frontend *fe)
 {
     int n = midend_which_preset(fe->me);
     int i;
 
+    /*
+     * Update the tick mark in the Type menu.
+     */
     if (fe->preset_bullets) {
        for (i = 0; i < fe->npresets; i++)
            update_menuitem_bullet(fe->preset_bullets[i], n == i);
@@ -1127,6 +1135,14 @@ static void update_preset_tick(frontend *fe)
     if (fe->preset_custom_bullet) {
        update_menuitem_bullet(fe->preset_custom_bullet, n < 0);
     }
+
+    /*
+     * Update the greying on the Copy menu option.
+     */
+    if (fe->copy_menu_item) {
+       int enabled = midend_can_format_as_text_now(fe->me);
+       gtk_widget_set_sensitive(fe->copy_menu_item, enabled);
+    }
 }
 
 static void resize_fe(frontend *fe)
@@ -1158,7 +1174,7 @@ static void menu_preset_event(GtkMenuItem *menuitem, gpointer data)
 
     midend_set_params(fe->me, params);
     midend_new_game(fe->me);
-    update_preset_tick(fe);
+    changed_preset(fe);
     resize_fe(fe);
 }
 
@@ -1312,10 +1328,16 @@ static char *file_selector(frontend *fe, char *title, int save)
     return fe->filesel_name;
 }
 
+struct savefile_write_ctx {
+    FILE *fp;
+    int error;
+};
+
 static void savefile_write(void *wctx, void *buf, int len)
 {
-    FILE *fp = (FILE *)wctx;
-    fwrite(buf, 1, len, fp);
+    struct savefile_write_ctx *ctx = (struct savefile_write_ctx *)wctx;
+    if (fwrite(buf, 1, len, ctx->fp) < len)
+       ctx->error = 1;
 }
 
 static int savefile_read(void *wctx, void *buf, int len)
@@ -1357,9 +1379,18 @@ static void menu_save_event(GtkMenuItem *menuitem, gpointer data)
             return;
         }
 
-        midend_serialise(fe->me, savefile_write, fp);
+       {
+           struct savefile_write_ctx ctx;
+           ctx.fp = fp;
+           ctx.error = 0;
+           midend_serialise(fe->me, savefile_write, &ctx);
+           fclose(fp);
+           if (ctx.error) {
+               error_box(fe->window, "Error writing save file");
+               return;
+           }
+       }
 
-        fclose(fp);
     }
 }
 
@@ -1388,7 +1419,7 @@ static void menu_load_event(GtkMenuItem *menuitem, gpointer data)
             return;
         }
 
-       update_preset_tick(fe);
+       changed_preset(fe);
         resize_fe(fe);
     }
 }
@@ -1673,7 +1704,6 @@ static frontend *new_window(char *arg, int argtype, char **error)
        } else
            fe->preset_custom_bullet = NULL;
 
-       update_preset_tick(fe);
     } else {
        fe->npresets = 0;
        fe->preset_bullets = NULL;
@@ -1694,13 +1724,16 @@ static frontend *new_window(char *arg, int argtype, char **error)
     add_menu_separator(GTK_CONTAINER(menu));
     add_menu_item_with_key(fe, GTK_CONTAINER(menu), "Undo", 'u');
     add_menu_item_with_key(fe, GTK_CONTAINER(menu), "Redo", 'r');
-    if (thegame.can_format_as_text) {
+    if (thegame.can_format_as_text_ever) {
        add_menu_separator(GTK_CONTAINER(menu));
        menuitem = gtk_menu_item_new_with_label("Copy");
        gtk_container_add(GTK_CONTAINER(menu), menuitem);
        gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
                           GTK_SIGNAL_FUNC(menu_copy_event), fe);
        gtk_widget_show(menuitem);
+       fe->copy_menu_item = menuitem;
+    } else {
+       fe->copy_menu_item = NULL;
     }
     if (thegame.can_solve) {
        add_menu_separator(GTK_CONTAINER(menu));
@@ -1726,6 +1759,8 @@ static frontend *new_window(char *arg, int argtype, char **error)
                       GTK_SIGNAL_FUNC(menu_about_event), fe);
     gtk_widget_show(menuitem);
 
+    changed_preset(fe);
+
     {
         int i, ncolours;
         float *colours;
@@ -1744,11 +1779,12 @@ static frontend *new_window(char *arg, int argtype, char **error)
         gdk_colormap_alloc_colors(fe->colmap, fe->colours, ncolours,
                                   FALSE, FALSE, success);
         for (i = 0; i < ncolours; i++) {
-            if (!success[i])
+            if (!success[i]) {
                 g_error("couldn't allocate colour %d (#%02x%02x%02x)\n",
                         i, fe->colours[i].red >> 8,
                         fe->colours[i].green >> 8,
                         fe->colours[i].blue >> 8);
+            }
         }
     }