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

diff --git a/gtk.c b/gtk.c
index 4ef0839..1f991d6 100644
--- a/gtk.c
+++ b/gtk.c
@@ -79,6 +79,8 @@ void fatal(char *fmt, ...)
  * GTK front end to puzzles.
  */
 
+static void update_preset_tick(frontend *fe);
+
 struct font {
 #ifdef USE_PANGO
     PangoFontDescription *desc;
@@ -122,6 +124,9 @@ 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;
 };
 
 void get_random_seed(void **randseed, int *randseedsize)
@@ -844,6 +849,7 @@ static void config_ok_button_clicked(GtkButton *button, gpointer data)
     else {
 	fe->cfgret = TRUE;
 	gtk_widget_destroy(fe->cfgbox);
+	update_preset_tick(fe);
     }
 }
 
@@ -1100,15 +1106,33 @@ 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), "");
+    }
+}
+
+static void update_preset_tick(frontend *fe)
+{
+    int n = midend_which_preset(fe->me);
+    int i;
+
+    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);
+    }
+}
+
+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 +1142,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);
+    update_preset_tick(fe);
+    resize_fe(fe);
 }
 
 GdkAtom compound_text_atom, utf8_string_atom;
@@ -1325,7 +1367,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 +1388,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);
-        }
-
+	update_preset_tick(fe);
+        resize_fe(fe);
     }
 }
 
@@ -1383,21 +1416,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 +1479,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 +1642,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 +1661,32 @@ 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;
+
+	update_preset_tick(fe);
+    } 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);
@@ -1769,6 +1834,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]);
 
@@ -2097,12 +2169,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);
 	}