X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-conf.c;h=09f6d68a124b5cabaa2c6e5d07fb0aefc1be4c14;hb=c8f16e229dede3bf3ec30c329cccc6924778553a;hp=ed2f9178c7c6d26977b0e840bf8632c7e287ae4f;hpb=2d983f3e5bd2d5f531cbcbdcebe078034ddb8955;p=pspp diff --git a/src/ui/gui/psppire-conf.c b/src/ui/gui/psppire-conf.c index ed2f9178c7..09f6d68a12 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) { @@ -95,7 +110,6 @@ static void psppire_conf_finalize (GObject *object) { PsppireConf *conf = PSPPIRE_CONF (object); - g_mutex_free (conf->mutex); g_key_file_free (conf->keyfile); g_free (conf->filename); } @@ -134,21 +148,29 @@ psppire_conf_class_init (PsppireConfClass *class) object_class->finalize = psppire_conf_finalize; object_class->dispose = psppire_conf_dispose; object_class->constructor = psppire_conf_construct; + } static void psppire_conf_init (PsppireConf *conf) { - const gchar *dirname = g_get_user_config_dir (); + const gchar *dirname; + struct stat s; - conf->mutex = g_mutex_new (); + /* 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; } @@ -166,8 +188,6 @@ psppire_conf_get_int (PsppireConf *conf, const gchar *base, { gboolean ok; GError *err = NULL; - - g_mutex_lock (conf->mutex); conf_read (conf); *value = g_key_file_get_integer (conf->keyfile, base, @@ -177,9 +197,6 @@ psppire_conf_get_int (PsppireConf *conf, const gchar *base, if ( err != NULL ) g_error_free (err); - - g_mutex_unlock (conf->mutex); - return ok; } @@ -190,8 +207,6 @@ psppire_conf_get_boolean (PsppireConf *conf, const gchar *base, gboolean ok; gboolean b; GError *err = NULL; - g_mutex_lock (conf->mutex); - conf_read (conf); b = g_key_file_get_boolean (conf->keyfile, base, @@ -204,21 +219,42 @@ psppire_conf_get_boolean (PsppireConf *conf, const gchar *base, if (ok) *value = b; - g_mutex_unlock (conf->mutex); + 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; } + void psppire_conf_set_int (PsppireConf *conf, const gchar *base, const gchar *name, gint value) { - g_mutex_lock (conf->mutex); g_key_file_set_integer (conf->keyfile, base, name, value); conf_write (conf); - g_mutex_unlock (conf->mutex); } void @@ -226,12 +262,22 @@ psppire_conf_set_boolean (PsppireConf *conf, const gchar *base, const gchar *name, gboolean value) { - g_mutex_lock (conf->mutex); g_key_file_set_boolean (conf->keyfile, base, name, value); conf_write (conf); - g_mutex_unlock (conf->mutex); } + +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); +} + + + /* A convenience function to set the geometry of a window from from a saved config @@ -277,36 +323,30 @@ psppire_conf_set_window_geometry (PsppireConf *conf, void psppire_conf_save_window_geometry (PsppireConf *conf, const gchar *base, - GdkEvent *e) + GtkWindow *gtk_window) { - switch (e->type) - { - case GDK_CONFIGURE: - { - GdkEventConfigure *event = &e->configure; + gboolean maximized; + GdkWindow *w; - if ( gdk_window_get_state (event->window) & - GDK_WINDOW_STATE_MAXIMIZED ) - return; + w = gtk_widget_get_window (GTK_WIDGET (gtk_window)); + if (w == NULL) + return; - psppire_conf_set_int (conf, base, "height", event->height); - psppire_conf_set_int (conf, base, "width", event->width); + maximized = (gdk_window_get_state (w) & GDK_WINDOW_STATE_MAXIMIZED) != 0; + psppire_conf_set_boolean (conf, base, "maximize", maximized); - 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; + if (!maximized) + { + gint x, y; - psppire_conf_set_boolean (conf, base, "maximize", - event->new_window_state & - GDK_WINDOW_STATE_MAXIMIZED ); - } - break; - default: - break; - }; + 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); + } }