X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/95c76d7c0c76081ab4f389aa1bb7667ee08c99eb..8b5625f56baa192a745a6c43755f65ec92294d65:/gtk.c

diff --git a/gtk.c b/gtk.c
index 4ef0839..c17ffe2 100644
--- a/gtk.c
+++ b/gtk.c
@@ -79,6 +79,8 @@ void fatal(char *fmt, ...)
  * GTK front end to puzzles.
  */
 
+static void changed_preset(frontend *fe);
+
 struct font {
 #ifdef USE_PANGO
     PangoFontDescription *desc;
@@ -122,6 +124,10 @@ struct frontend {
     int pw, ph;                        /* pixmap size (w, h are area size) */
     int ox, oy;                        /* offset of pixmap in drawing area */
     char *filesel_name;
+    int npresets;
+    GtkWidget **preset_bullets;
+    GtkWidget *preset_custom_bullet;
+    GtkWidget *copy_menu_item;
 };
 
 void get_random_seed(void **randseed, int *randseedsize)
@@ -844,6 +850,7 @@ static void config_ok_button_clicked(GtkButton *button, gpointer data)
     else {
 	fe->cfgret = TRUE;
 	gtk_widget_destroy(fe->cfgbox);
+	changed_preset(fe);
     }
 }
 
@@ -1100,15 +1107,48 @@ static void get_size(frontend *fe, int *px, int *py)
 	gdk_window_resize(GTK_WIDGET(win)->window, x, y)
 #endif
 
-static void menu_preset_event(GtkMenuItem *menuitem, gpointer data)
+static void update_menuitem_bullet(GtkWidget *label, int visible)
+{
+    if (visible) {
+	gtk_label_set_text(GTK_LABEL(label), "\xE2\x80\xA2");
+    } else {
+	gtk_label_set_text(GTK_LABEL(label), "");
+    }
+}
+
+/*
+ * 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);
+    }
+    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)
 {
-    frontend *fe = (frontend *)data;
-    game_params *params =
-        (game_params *)gtk_object_get_data(GTK_OBJECT(menuitem), "user-data");
     int x, y;
 
-    midend_set_params(fe->me, params);
-    midend_new_game(fe->me);
     get_size(fe, &x, &y);
     fe->w = x;
     fe->h = y;
@@ -1118,6 +1158,24 @@ static void menu_preset_event(GtkMenuItem *menuitem, gpointer data)
         gtk_widget_size_request(GTK_WIDGET(fe->window), &req);
         gtk_window_resize(GTK_WINDOW(fe->window), req.width, req.height);
     }
+    /*
+     * Now that we've established the preferred size of the window,
+     * reduce the drawing area's size request so the user can shrink
+     * the window.
+     */
+    gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), 1, 1);
+}
+
+static void menu_preset_event(GtkMenuItem *menuitem, gpointer data)
+{
+    frontend *fe = (frontend *)data;
+    game_params *params =
+        (game_params *)gtk_object_get_data(GTK_OBJECT(menuitem), "user-data");
+
+    midend_set_params(fe->me, params);
+    midend_new_game(fe->me);
+    changed_preset(fe);
+    resize_fe(fe);
 }
 
 GdkAtom compound_text_atom, utf8_string_atom;
@@ -1270,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 = errno;
 }
 
 static int savefile_read(void *wctx, void *buf, int len)
@@ -1315,9 +1379,21 @@ 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) {
+		char boxmsg[512];
+		sprintf(boxmsg, "Error writing save file: %.400s",
+			strerror(errno));
+		error_box(fe->window, boxmsg);
+		return;
+	    }
+	}
 
-        fclose(fp);
     }
 }
 
@@ -1325,7 +1401,6 @@ static void menu_load_event(GtkMenuItem *menuitem, gpointer data)
 {
     frontend *fe = (frontend *)data;
     char *name, *err;
-    int x, y;
 
     name = file_selector(fe, "Enter name of saved game file to load", FALSE);
 
@@ -1347,16 +1422,8 @@ static void menu_load_event(GtkMenuItem *menuitem, gpointer data)
             return;
         }
 
-        get_size(fe, &x, &y);
-        fe->w = x;
-        fe->h = y;
-        gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), x, y);
-        {
-            GtkRequisition req;
-            gtk_widget_size_request(GTK_WIDGET(fe->window), &req);
-            gtk_window_resize(GTK_WINDOW(fe->window), req.width, req.height);
-        }
-
+	changed_preset(fe);
+        resize_fe(fe);
     }
 }
 
@@ -1383,21 +1450,12 @@ static void menu_config_event(GtkMenuItem *menuitem, gpointer data)
     frontend *fe = (frontend *)data;
     int which = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(menuitem),
 						    "user-data"));
-    int x, y;
 
     if (!get_config(fe, which))
 	return;
 
     midend_new_game(fe->me);
-    get_size(fe, &x, &y);
-    fe->w = x;
-    fe->h = y;
-    gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), x, y);
-    {
-        GtkRequisition req;
-        gtk_widget_size_request(GTK_WIDGET(fe->window), &req);
-        gtk_window_resize(GTK_WINDOW(fe->window), req.width, req.height);
-    }
+    resize_fe(fe);
 }
 
 static void menu_about_event(GtkMenuItem *menuitem, gpointer data)
@@ -1455,6 +1513,34 @@ static void add_menu_separator(GtkContainer *cont)
 
 enum { ARG_EITHER, ARG_SAVE, ARG_ID }; /* for argtype */
 
+static GtkWidget *make_preset_menuitem(GtkWidget **bulletlabel,
+				       const char *name)
+{
+    GtkWidget *hbox, *lab1, *lab2, *menuitem;
+    GtkRequisition req;
+
+    hbox = gtk_hbox_new(FALSE, 0);
+    gtk_widget_show(hbox);
+    lab1 = gtk_label_new("\xE2\x80\xA2 ");
+    gtk_widget_show(lab1);
+    gtk_box_pack_start(GTK_BOX(hbox), lab1, FALSE, FALSE, 0);
+    gtk_misc_set_alignment(GTK_MISC(lab1), 0.0, 0.0);
+    lab2 = gtk_label_new(name);
+    gtk_widget_show(lab2);
+    gtk_box_pack_start(GTK_BOX(hbox), lab2, TRUE, TRUE, 0);
+    gtk_misc_set_alignment(GTK_MISC(lab2), 0.0, 0.0);
+
+    gtk_widget_size_request(lab1, &req);
+    gtk_widget_set_usize(lab1, req.width, -1);
+    gtk_label_set_text(GTK_LABEL(lab1), "");
+
+    menuitem = gtk_menu_item_new();
+    gtk_container_add(GTK_CONTAINER(menuitem), hbox);
+
+    *bulletlabel = lab1;
+    return menuitem;
+}
+
 static frontend *new_window(char *arg, int argtype, char **error)
 {
     frontend *fe;
@@ -1590,13 +1676,17 @@ static frontend *new_window(char *arg, int argtype, char **error)
         submenu = gtk_menu_new();
         gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
 
+	fe->npresets = n;
+	fe->preset_bullets = snewn(n, GtkWidget *);
+
         for (i = 0; i < n; i++) {
             char *name;
             game_params *params;
 
             midend_fetch_preset(fe->me, i, &name, &params);
 
-            menuitem = gtk_menu_item_new_with_label(name);
+	    menuitem = make_preset_menuitem(&fe->preset_bullets[i], name);
+
             gtk_container_add(GTK_CONTAINER(submenu), menuitem);
             gtk_object_set_data(GTK_OBJECT(menuitem), "user-data", params);
             gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
@@ -1605,23 +1695,31 @@ static frontend *new_window(char *arg, int argtype, char **error)
         }
 
 	if (thegame.can_configure) {
-            menuitem = gtk_menu_item_new_with_label("Custom...");
+	    menuitem = make_preset_menuitem(&fe->preset_custom_bullet,
+					    "Custom...");
+
+            gtk_container_add(GTK_CONTAINER(submenu), menuitem);
             gtk_object_set_data(GTK_OBJECT(menuitem), "user-data",
 				GPOINTER_TO_INT(CFG_SETTINGS));
-            gtk_container_add(GTK_CONTAINER(submenu), menuitem);
             gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
                                GTK_SIGNAL_FUNC(menu_config_event), fe);
             gtk_widget_show(menuitem);
-	}
+	} else
+	    fe->preset_custom_bullet = NULL;
+
+    } else {
+	fe->npresets = 0;
+	fe->preset_bullets = NULL;
+	fe->preset_custom_bullet = NULL;
     }
 
     add_menu_separator(GTK_CONTAINER(menu));
-    menuitem = gtk_menu_item_new_with_label("Load");
+    menuitem = gtk_menu_item_new_with_label("Load...");
     gtk_container_add(GTK_CONTAINER(menu), menuitem);
     gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
 		       GTK_SIGNAL_FUNC(menu_load_event), fe);
     gtk_widget_show(menuitem);
-    menuitem = gtk_menu_item_new_with_label("Save");
+    menuitem = gtk_menu_item_new_with_label("Save...");
     gtk_container_add(GTK_CONTAINER(menu), menuitem);
     gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
 		       GTK_SIGNAL_FUNC(menu_save_event), fe);
@@ -1629,13 +1727,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));
@@ -1661,6 +1762,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;
@@ -1679,11 +1782,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);
+            }
         }
     }
 
@@ -1769,6 +1873,13 @@ static frontend *new_window(char *arg, int argtype, char **error)
     gtk_widget_show(fe->area);
     gtk_widget_show(fe->window);
 
+    /*
+     * Now that we've established the preferred size of the window,
+     * reduce the drawing area's size request so the user can shrink
+     * the window.
+     */
+    gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), 1, 1);
+
     gdk_window_set_background(fe->area->window, &fe->colours[0]);
     gdk_window_set_background(fe->window->window, &fe->colours[0]);
 
@@ -1802,6 +1913,7 @@ int main(int argc, char **argv)
     int soln = FALSE, colour = FALSE;
     float scale = 1.0F;
     float redo_proportion = 0.0F;
+    char *savefile = NULL, *savesuffix = NULL;
     char *arg = NULL;
     int argtype = ARG_EITHER;
     char *screenshot_file = NULL;
@@ -1850,6 +1962,23 @@ int main(int argc, char **argv)
 		}
 	    } else
 		ngenerate = 1;
+	} else if (doing_opts && !strcmp(p, "--save")) {
+	    if (--ac > 0) {
+		savefile = *++av;
+	    } else {
+		fprintf(stderr, "%s: '--save' expected a filename\n",
+			pname);
+		return 1;
+	    }
+	} else if (doing_opts && (!strcmp(p, "--save-suffix") ||
+				  !strcmp(p, "--savesuffix"))) {
+	    if (--ac > 0) {
+		savesuffix = *++av;
+	    } else {
+		fprintf(stderr, "%s: '--save-suffix' expected a filename\n",
+			pname);
+		return 1;
+	    }
 	} else if (doing_opts && !strcmp(p, "--print")) {
 	    if (!thegame.can_print) {
 		fprintf(stderr, "%s: this game does not support printing\n",
@@ -1980,7 +2109,7 @@ int main(int argc, char **argv)
      * you may specify it to be 1). Sorry; that was the
      * simplest-to-parse command-line syntax I came up with.
      */
-    if (ngenerate > 0 || print) {
+    if (ngenerate > 0 || print || savefile || savesuffix) {
 	int i, n = 1;
 	midend *me;
 	char *id;
@@ -1991,6 +2120,11 @@ int main(int argc, char **argv)
 	me = midend_new(NULL, &thegame, NULL, NULL);
 	i = 0;
 
+	if (savefile && !savesuffix)
+	    savesuffix = "";
+	if (!savefile && savesuffix)
+	    savefile = "";
+
 	if (print)
 	    doc = document_new(px, py, scale);
 
@@ -2047,7 +2181,32 @@ int main(int argc, char **argv)
 		    fprintf(stderr, "%s: error in printing: %s\n", pname, err);
 		    return 1;
 		}
-	    } else {
+	    }
+	    if (savefile) {
+		struct savefile_write_ctx ctx;
+		char *realname = snewn(40 + strlen(savefile) +
+				       strlen(savesuffix), char);
+		sprintf(realname, "%s%d%s", savefile, i, savesuffix);
+		ctx.fp = fopen(realname, "w");
+		if (!ctx.fp) {
+		    fprintf(stderr, "%s: open: %s\n", realname,
+			    strerror(errno));
+		    return 1;
+		}
+		sfree(realname);
+		midend_serialise(me, savefile_write, &ctx);
+		if (ctx.error) {
+		    fprintf(stderr, "%s: write: %s\n", realname,
+			    strerror(ctx.error));
+		    return 1;
+		}
+		if (fclose(ctx.fp)) {
+		    fprintf(stderr, "%s: close: %s\n", realname,
+			    strerror(errno));
+		    return 1;
+		}
+	    }
+	    if (!doc && !savefile) {
 		id = midend_get_game_id(me);
 		puts(id);
 		sfree(id);
@@ -2097,12 +2256,13 @@ int main(int argc, char **argv)
 
 	if (screenshot_file) {
 	    GdkPixbuf *pb;
+            GError *gerror = NULL;
 
 	    midend_redraw(fe->me);
 
 	    pb = gdk_pixbuf_get_from_drawable(NULL, fe->pixmap,
 					      NULL, 0, 0, 0, 0, -1, -1);
-	    gdk_pixbuf_save(pb, screenshot_file, "png", NULL);
+	    gdk_pixbuf_save(pb, screenshot_file, "png", &gerror, NULL);
 
 	    exit(0);
 	}