X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-conf.c;h=07db3b58c21e5d07e16d8789a285f2ad20978450;hb=e1ada75b2678c524f5089f6b83f2547aa3ee1fd7;hp=36ef97f44fe9de1dcdea27c0cbbda34ec821c318;hpb=c1c6d7c7e942d47f65b112fdd7cdc64361ef2ea4;p=pspp

diff --git a/src/ui/gui/psppire-conf.c b/src/ui/gui/psppire-conf.c
index 36ef97f44f..07db3b58c2 100644
--- a/src/ui/gui/psppire-conf.c
+++ b/src/ui/gui/psppire-conf.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2009  Free Software Foundation
+   Copyright (C) 2009, 2010  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -176,6 +176,29 @@ 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;
+  gboolean b;
+  GError *err = NULL;
+  conf_read (conf);
+  b = g_key_file_get_boolean (conf->keyfile,
+			      base,
+			      name, &err);
+
+  ok = (err == NULL);
+  if ( err != NULL )
+    g_error_free (err);
+
+  if (ok)
+    *value = b;
+
+  return ok;
+}
+
+
 void
 psppire_conf_set_int (PsppireConf *conf,
 		      const gchar *base, const gchar *name,
@@ -185,7 +208,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 +228,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 +243,48 @@ 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)
+				   GtkWindow *gtk_window)
 {
-  psppire_conf_set_int (conf, base, "height", event->height);
-  psppire_conf_set_int (conf, base, "width", event->width);
+  gboolean maximized;
+  GdkWindow *w;
+
+  w = gtk_widget_get_window (GTK_WIDGET (gtk_window));
+  if (w == NULL)
+    return;
 
-  psppire_conf_set_int (conf, base, "x", event->x);
-  psppire_conf_set_int (conf, base, "y", event->y);
+  maximized = (gdk_window_get_state (w) & GDK_WINDOW_STATE_MAXIMIZED) != 0;
+  psppire_conf_set_boolean (conf, base, "maximize", maximized);
+
+  if (!maximized)
+    {
+      gint width, height;
+      gint x, y;
+
+      gdk_drawable_get_size (w, &width, &height);
+      gdk_window_get_position (w, &x, &y);
+
+      psppire_conf_set_int (conf, base, "height", height);
+      psppire_conf_set_int (conf, base, "width", width);
+      psppire_conf_set_int (conf, base, "x", x);
+      psppire_conf_set_int (conf, base, "y", y);
+    }
 }