Save windows' maximized status as well as their geometry.

diff --git a/src/ui/gui/psppire-conf.c b/src/ui/gui/psppire-conf.c
index 36ef97f44fe9de1dcdea27c0cbbda34ec821c318..d9f6800ffd0d494278e29b0ca8a3dc2304b4f6e2 100644 (file)
--- a/src/ui/gui/psppire-conf.c
+++ b/src/ui/gui/psppire-conf.c
@@ -176,6 +176,25 @@ psppire_conf_get_int (PsppireConf *conf, const gchar *base,
   return ok;
 }
 
+gboolean
+psppire_conf_get_boolean (PsppireConf *conf, const gchar *base,
+                         const gchar *name, gboolean *value)
+{
+  gboolean ok;
+  GError *err = NULL;
+  conf_read (conf);
+  *value = g_key_file_get_boolean (conf->keyfile,
+                                  base,
+                                  name, &err);
+
+  ok = (err == NULL);
+  if ( err != NULL )
+    g_error_free (err);
+
+  return ok;
+}
+
+
 void
 psppire_conf_set_int (PsppireConf *conf,
                      const gchar *base, const gchar *name,
@@ -185,7 +204,14 @@ psppire_conf_set_int (PsppireConf *conf,
   conf_write (conf);
 }
 
-
+void
+psppire_conf_set_boolean (PsppireConf *conf,
+                         const gchar *base, const gchar *name,
+                         gboolean value)
+{
+  g_key_file_set_boolean (conf->keyfile, base, name, value);
+  conf_write (conf);
+}
 
 /*
   A convenience function to set the geometry of a
@@ -198,6 +224,7 @@ psppire_conf_set_window_geometry (PsppireConf *conf,
 {
   gint height, width;
   gint x, y;
+  gboolean maximize;
 
   if (psppire_conf_get_int (conf, base, "height", &height)
       &&
@@ -212,22 +239,57 @@ psppire_conf_set_window_geometry (PsppireConf *conf,
     {
       gtk_window_move (window, x, y);
     }
+
+  if ( psppire_conf_get_boolean (conf, base, "maximize", &maximize))
+    {
+      if (maximize)
+       gtk_window_maximize (window);
+      else
+       gtk_window_unmaximize (window);
+    }
 }
 
 
 /*
    A convenience function to save the window geometry.
    This should typically be called from a window's
-   "configure-event" signal handler
+   "configure-event" and "window-state-event" signal handlers
  */
 void
 psppire_conf_save_window_geometry (PsppireConf *conf,
                                   const gchar *base,
-                                  GdkEventConfigure *event)
+                                  GdkEvent *e)
 {
-  psppire_conf_set_int (conf, base, "height", event->height);
-  psppire_conf_set_int (conf, base, "width", event->width);
+  switch (e->type)
+    {
+    case GDK_CONFIGURE:
+      {
+       GdkEventConfigure *event = &e->configure;
+
+       if ( gdk_window_get_state (event->window) &
+            GDK_WINDOW_STATE_MAXIMIZED )
+         return;
 
-  psppire_conf_set_int (conf, base, "x", event->x);
-  psppire_conf_set_int (conf, base, "y", event->y);
+       if ( event->send_event )
+         return;
+
+       psppire_conf_set_int (conf, base, "height", event->height);
+       psppire_conf_set_int (conf, base, "width", event->width);
+
+       psppire_conf_set_int (conf, base, "x", event->x);
+       psppire_conf_set_int (conf, base, "y", event->y);
+      }
+      break;
+    case GDK_WINDOW_STATE:
+      {
+       GdkEventWindowState *event = &e->window_state;
+
+       psppire_conf_set_boolean (conf, base, "maximize",
+                                 event->new_window_state &
+                                 GDK_WINDOW_STATE_MAXIMIZED );
+      }
+      break;
+    default:
+      break;
+    };
 }

diff --git a/src/ui/gui/psppire-conf.h b/src/ui/gui/psppire-conf.h
index b98c1e65ffd7e0607a8970e060e7162eef951ae9..a7415b2451010b081b0774c9b014c8b205c34613 100644 (file)
--- a/src/ui/gui/psppire-conf.h
+++ b/src/ui/gui/psppire-conf.h
@@ -78,17 +78,25 @@ PsppireConf * psppire_conf_new (void);
 gboolean psppire_conf_get_int (PsppireConf *,
                               const gchar *, const gchar *, int *);
 
+gboolean psppire_conf_get_boolean (PsppireConf *,
+                                  const gchar *, const gchar *, gboolean *);
+
 void psppire_conf_set_int (PsppireConf *conf,
                           const gchar *base, const gchar *name,
                           gint value);
 
+void psppire_conf_set_boolean (PsppireConf *conf,
+                              const gchar *base, const gchar *name,
+                              gboolean value);
+
+
 void psppire_conf_set_window_geometry (PsppireConf *conf,
                                       const gchar *base,
                                       GtkWindow *window);
 
 void psppire_conf_save_window_geometry (PsppireConf *,
                                        const gchar *,
-                                       GdkEventConfigure *);
+                                       GdkEvent *);
 
 
 G_END_DECLS

diff --git a/src/ui/gui/psppire-dialog.c b/src/ui/gui/psppire-dialog.c
index 854380036d6faf41fac477e1c12b6e9fea9a68b4..22b4cf4eb339d752f0442fa6231b66696e10c29e 100644 (file)
--- a/src/ui/gui/psppire-dialog.c
+++ b/src/ui/gui/psppire-dialog.c
@@ -267,7 +267,7 @@ delete_event_callback (GtkWidget *w, GdkEvent *e, gpointer data)
 
 static gboolean
 configure_event_callback (GtkDialog *dialog,
-                         GdkEventConfigure *event, gpointer data)
+                         GdkEvent *event, gpointer data)
 {
   gchar *base = NULL;
 

diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c
index 103bcdadf361e9f5b3389119bfe52c23da06a503..d5f3948ff78073fe3da1527c88f479c2ca111ceb 100644 (file)
--- a/src/ui/gui/psppire-window.c
+++ b/src/ui/gui/psppire-window.c
@@ -203,7 +203,7 @@ on_realize (GtkWindow *window, gpointer data)
 
 
 static gboolean
-on_configure (GtkWidget *window, GdkEventConfigure *event, gpointer data)
+save_geometry (GtkWidget *window, GdkEvent *event, gpointer data)
 {
   const gchar *base = G_OBJECT_TYPE_NAME (window);
 
@@ -431,7 +431,10 @@ psppire_window_init (PsppireWindow *window)
   g_object_set (window, "icon-name", "psppicon", NULL);
 
   g_signal_connect (window, "configure-event",
-                   G_CALLBACK (on_configure), window);
+                   G_CALLBACK (save_geometry), window);
+
+  g_signal_connect (window, "window-state-event",
+                   G_CALLBACK (save_geometry), window);
 
   g_signal_connect (window, "realize",
                    G_CALLBACK (on_realize), window);