Since r6711, puzzles built with Gtk 1.2 would take double actions when a menu

[sgt/puzzles] / gtk.c

diff --git a/gtk.c b/gtk.c
index 07f2535..99cc4cb 100644 (file)
--- a/gtk.c
+++ b/gtk.c
@@ -96,6 +96,7 @@ struct font {
  */
 struct frontend {
     GtkWidget *window;
+    GtkAccelGroup *accelgroup;
     GtkWidget *area;
     GtkWidget *statusbar;
     guint statusctx;
@@ -517,6 +518,16 @@ static gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
     if (!fe->pixmap)
         return TRUE;
 
+#if !GTK_CHECK_VERSION(2,0,0)
+    /* Gtk 1.2 passes a key event to this function even if it's also
+     * defined as an accelerator.
+     * Gtk 2 doesn't do this, and this function appears not to exist there. */
+    if (fe->accelgroup &&
+        gtk_accel_group_get_entry(fe->accelgroup,
+        event->keyval, event->state))
+        return TRUE;
+#endif
+
     if (event->keyval == GDK_Up)
         keyval = shift | ctrl | CURSOR_UP;
     else if (event->keyval == GDK_KP_Up || event->keyval == GDK_KP_8)
@@ -671,6 +682,8 @@ static gint configure_area(GtkWidget *widget,
     gc = gdk_gc_new(fe->area->window);
     gdk_gc_set_foreground(gc, &fe->colours[0]);
     gdk_draw_rectangle(fe->pixmap, gc, 1, 0, 0, fe->pw, fe->ph);
+    gdk_draw_rectangle(widget->window, gc, 1, 0, 0,
+                      event->width, event->height);
     gdk_gc_unref(gc);
 
     midend_force_redraw(fe->me);
@@ -1404,11 +1417,29 @@ static GtkWidget *add_menu_item_with_key(frontend *fe, GtkContainer *cont,
                                          char *text, int key)
 {
     GtkWidget *menuitem = gtk_menu_item_new_with_label(text);
+    int keyqual;
     gtk_container_add(cont, menuitem);
     gtk_object_set_data(GTK_OBJECT(menuitem), "user-data",
                         GINT_TO_POINTER(key));
     gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
                       GTK_SIGNAL_FUNC(menu_key_event), fe);
+    switch (key & ~0x1F) {
+      case 0x00:
+       key += 0x60;
+       keyqual = GDK_CONTROL_MASK;
+       break;
+      case 0x40:
+       key += 0x20;
+       keyqual = GDK_SHIFT_MASK;
+       break;
+      default:
+       keyqual = 0;
+       break;
+    }
+    gtk_widget_add_accelerator(menuitem,
+                              "activate", fe->accelgroup,
+                              key, keyqual,
+                              GTK_ACCEL_VISIBLE);
     gtk_widget_show(menuitem);
     return menuitem;
 }
@@ -1474,15 +1505,14 @@ static frontend *new_window(char *arg, char **error)
 
     fe->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     gtk_window_set_title(GTK_WINDOW(fe->window), thegame.name);
-#if 0
-    gtk_window_set_resizable(GTK_WINDOW(fe->window), FALSE);
-#else
-    gtk_window_set_policy(GTK_WINDOW(fe->window), FALSE, FALSE, TRUE);
-#endif
+
     vbox = GTK_BOX(gtk_vbox_new(FALSE, 0));
     gtk_container_add(GTK_CONTAINER(fe->window), GTK_WIDGET(vbox));
     gtk_widget_show(GTK_WIDGET(vbox));
 
+    fe->accelgroup = gtk_accel_group_new();
+    gtk_window_add_accel_group(GTK_WINDOW(fe->window), fe->accelgroup);
+
     menubar = gtk_menu_bar_new();
     gtk_box_pack_start(vbox, menubar, FALSE, FALSE, 0);
     gtk_widget_show(menubar);
@@ -1567,7 +1597,7 @@ static frontend *new_window(char *arg, char **error)
     gtk_widget_show(menuitem);
     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", '\x12');
+    add_menu_item_with_key(fe, GTK_CONTAINER(menu), "Redo", 'r');
     if (thegame.can_format_as_text) {
        add_menu_separator(GTK_CONTAINER(menu));
        menuitem = gtk_menu_item_new_with_label("Copy");