Produce shorter Filling descriptions by run-length encoding 0s.

[sgt-puzzles.git] / gtk.c

diff --git a/gtk.c b/gtk.c
index 0333e5466223385d1afb52f945ff24415d3f3063..37eb50922605089a3244c8d03d25de6af2713803 100644 (file)
--- a/gtk.c
+++ b/gtk.c
@@ -1205,10 +1205,14 @@ static gint button_event(GtkWidget *widget, GdkEventButton *event,
        button = RIGHT_BUTTON;
     else if (event->button == 1)
        button = LEFT_BUTTON;
+    else if (event->button == 8 && event->type == GDK_BUTTON_PRESS)
+        button = 'u';
+    else if (event->button == 9 && event->type == GDK_BUTTON_PRESS)
+        button = 'r';
     else
        return FALSE;                  /* don't even know what button! */
 
-    if (event->type == GDK_BUTTON_RELEASE)
+    if (event->type == GDK_BUTTON_RELEASE && button >= LEFT_BUTTON)
         button += LEFT_RELEASE - LEFT_BUTTON;
 
     if (!midend_process_key(fe->me, event->x - fe->ox,
@@ -2094,8 +2098,9 @@ static char *file_selector(frontend *fe, char *title, int save)
                                    NULL);
 
     if (gtk_dialog_run(GTK_DIALOG(filesel)) == GTK_RESPONSE_ACCEPT) {
-        const char *name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(filesel));
+        char *name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(filesel));
         filesel_name = dupstr(name);
+        g_free(name);
     }
 
     gtk_widget_destroy(filesel);
@@ -2145,15 +2150,14 @@ static void menu_save_event(GtkMenuItem *menuitem, gpointer data)
                    " file \"%.*s\"?",
                    FILENAME_MAX, name);
            if (!message_box(fe->window, "Question", buf, TRUE, MB_YESNO))
-               return;
+                goto free_and_return;
        }
 
        fp = fopen(name, "w");
-        sfree(name);
 
         if (!fp) {
             error_box(fe->window, "Unable to open save file");
-            return;
+            goto free_and_return;
         }
 
        {
@@ -2167,10 +2171,11 @@ static void menu_save_event(GtkMenuItem *menuitem, gpointer data)
                sprintf(boxmsg, "Error writing save file: %.400s",
                        strerror(errno));
                error_box(fe->window, boxmsg);
-               return;
+               goto free_and_return;
            }
        }
-
+    free_and_return:
+        sfree(name);
     }
 }