X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-conf.c;h=d0b082cbe3f587d2da753681548d7ebbf5732a3c;hb=7d4150d7cba15550753a0a574685de26656c0633;hp=36ef97f44fe9de1dcdea27c0cbbda34ec821c318;hpb=c1c6d7c7e942d47f65b112fdd7cdc64361ef2ea4;p=pspp diff --git a/src/ui/gui/psppire-conf.c b/src/ui/gui/psppire-conf.c index 36ef97f44f..d0b082cbe3 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 @@ -20,7 +20,11 @@ */ #include +#include #include +#include + +#include #include "psppire-conf.h" @@ -71,8 +75,8 @@ conf_read (PsppireConf *conf) NULL); } -static void -conf_write (PsppireConf *conf) +static gboolean +flush_conf (PsppireConf *conf) { gsize length = 0; @@ -84,8 +88,19 @@ conf_write (PsppireConf *conf) } g_free (kf); + conf->idle = 0; + return FALSE; +} + +static void +conf_write (PsppireConf *conf) +{ + if ( conf->idle == 0) + conf->idle = g_idle_add_full (G_PRIORITY_LOW, + (GSourceFunc) flush_conf, conf, NULL); } + static void psppire_conf_dispose (GObject *object) { @@ -140,13 +155,22 @@ psppire_conf_class_init (PsppireConfClass *class) static void psppire_conf_init (PsppireConf *conf) { - const gchar *dirname = g_get_user_config_dir (); + const gchar *dirname; + struct stat s; + + /* Get the name of the directory for user configuration files, then, if it + doesn't already exist, create it, since we might be the first program + to want to put files there. */ + dirname = g_get_user_config_dir (); + if (stat (dirname, &s) == -1 && errno == ENOENT) + mkdir (dirname, 0700); conf->filename = g_strdup_printf ("%s/%s", dirname, "psppirerc"); conf->keyfile = g_key_file_new (); conf->dispose_has_run = FALSE; + conf->idle = 0; } @@ -176,6 +200,110 @@ 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; +} + + + +gboolean +psppire_conf_get_string (PsppireConf *conf, const gchar *base, + const gchar *name, gchar **value) +{ + gboolean ok; + gchar *b; + GError *err = NULL; + conf_read (conf); + b = g_key_file_get_string (conf->keyfile, + base, + name, &err); + + ok = (err == NULL); + if ( err != NULL ) + g_error_free (err); + + if (ok) + *value = b; + + return ok; +} + + + + +gboolean +psppire_conf_get_variant (PsppireConf *conf, const gchar *base, + const gchar *name, GVariant **v) +{ + gboolean ok; + gchar *b; + GError *err = NULL; + conf_read (conf); + b = g_key_file_get_string (conf->keyfile, + base, + name, &err); + + ok = (err == NULL); + if ( err != NULL ) + g_error_free (err); + + if (ok) + { + *v = g_variant_parse (NULL, b, NULL, NULL, NULL); + g_free (b); + } + + return ok; +} + +gboolean +psppire_conf_get_enum (PsppireConf *conf, const gchar *base, + const gchar *name, + GType t, + int *v) +{ + gboolean ok; + gchar *b; + GError *err = NULL; + conf_read (conf); + b = g_key_file_get_string (conf->keyfile, + base, + name, &err); + + ok = (err == NULL); + if ( err != NULL ) + g_error_free (err); + + if (ok) + { + GEnumClass *ec = g_type_class_ref (t); + GEnumValue *ev = g_enum_get_value_by_nick (ec, b); + *v = ev->value; + g_type_class_unref (ec); + g_free (b); + } + + return ok; +} + void psppire_conf_set_int (PsppireConf *conf, const gchar *base, const gchar *name, @@ -185,6 +313,53 @@ 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); +} + + +void +psppire_conf_set_string (PsppireConf *conf, + const gchar *base, const gchar *name, + const gchar *value) +{ + g_key_file_set_string (conf->keyfile, base, name, value); + conf_write (conf); +} + +void +psppire_conf_set_variant (PsppireConf *conf, + const gchar *base, const gchar *name, + GVariant *value) +{ + gchar *v = g_variant_print (value, FALSE); + g_key_file_set_string (conf->keyfile, base, name, v); + conf_write (conf); + g_free (v); +} + +void +psppire_conf_set_enum (PsppireConf *conf, + const gchar *base, const gchar *name, + GType enum_type, + int value) +{ + GEnumClass *ec = g_type_class_ref (enum_type); + GEnumValue *ev = g_enum_get_value (ec, value); + + g_key_file_set_string (conf->keyfile, base, name, + ev->value_nick); + + g_type_class_unref (ec); + + conf_write (conf); +} + /* @@ -198,6 +373,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 +388,49 @@ 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 x, y; + + gint width = gdk_window_get_width (w); + gint height= gdk_window_get_height (w); + + 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); + } }