X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-conf.c;h=d0fc6e9de712ca11ba90c39f6d3b73d1564c1c86;hb=f5dd6243820dbcd19c1d3201436fc01fffc475e5;hp=dbcdf0e01f08d94907fedab3e43486e2a874c812;hpb=22f5cb71af029deb1c919b7c6bc958572f8da9f9;p=pspp diff --git a/src/ui/gui/psppire-conf.c b/src/ui/gui/psppire-conf.c index dbcdf0e01f..d0fc6e9de7 100644 --- a/src/ui/gui/psppire-conf.c +++ b/src/ui/gui/psppire-conf.c @@ -24,46 +24,17 @@ #include #include +#include + #include "psppire-conf.h" -static void psppire_conf_init (PsppireConf *conf); -static void psppire_conf_class_init (PsppireConfClass *class); +G_DEFINE_TYPE (PsppireConf, psppire_conf, G_TYPE_OBJECT) static void psppire_conf_finalize (GObject *object); static void psppire_conf_dispose (GObject *object); static GObjectClass *parent_class = NULL; - -GType -psppire_conf_get_type (void) -{ - static GType conf_type = 0; - - if (!conf_type) - { - static const GTypeInfo conf_info = - { - sizeof (PsppireConfClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) psppire_conf_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (PsppireConf), - 0, - (GInstanceInitFunc) psppire_conf_init, - }; - - conf_type = g_type_register_static (G_TYPE_OBJECT, - "PsppireConf", - &conf_info, 0); - } - - return conf_type; -} - - static void conf_read (PsppireConf *conf) { @@ -73,21 +44,34 @@ conf_read (PsppireConf *conf) NULL); } -static void -conf_write (PsppireConf *conf) +static gboolean +flush_conf (PsppireConf *conf) { gsize length = 0; gchar *kf = g_key_file_to_data (conf->keyfile, &length, NULL); + GError *err = NULL; - if ( ! g_file_set_contents (conf->filename, kf, length, NULL) ) + if (! g_file_set_contents (conf->filename, kf, length, &err)) { - g_warning ("Cannot open %s for writing", conf->filename); + g_warning ("Cannot open %s for writing: %s", conf->filename, err->message); + g_error_free (err); } 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) { @@ -130,12 +114,11 @@ psppire_conf_class_init (PsppireConfClass *class) GObjectClass *object_class; parent_class = g_type_class_peek_parent (class); - object_class = (GObjectClass*) class; + object_class = G_OBJECT_CLASS (class); object_class->finalize = psppire_conf_finalize; object_class->dispose = psppire_conf_dispose; object_class->constructor = psppire_conf_construct; - } @@ -150,13 +133,13 @@ psppire_conf_init (PsppireConf *conf) to want to put files there. */ dirname = g_get_user_config_dir (); if (stat (dirname, &s) == -1 && errno == ENOENT) - mkdir (dirname, 0777); + 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; } @@ -180,7 +163,7 @@ psppire_conf_get_int (PsppireConf *conf, const gchar *base, name, &err); ok = (err == NULL); - if ( err != NULL ) + if (err != NULL) g_error_free (err); return ok; @@ -199,7 +182,7 @@ psppire_conf_get_boolean (PsppireConf *conf, const gchar *base, name, &err); ok = (err == NULL); - if ( err != NULL ) + if (err != NULL) g_error_free (err); if (ok) @@ -209,6 +192,87 @@ psppire_conf_get_boolean (PsppireConf *conf, const gchar *base, } + +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, @@ -227,6 +291,46 @@ psppire_conf_set_boolean (PsppireConf *conf, 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); +} + + + /* A convenience function to set the geometry of a window from from a saved config @@ -242,19 +346,19 @@ psppire_conf_set_window_geometry (PsppireConf *conf, if (psppire_conf_get_int (conf, base, "height", &height) && - psppire_conf_get_int (conf, base, "width", &width) ) + psppire_conf_get_int (conf, base, "width", &width)) { gtk_window_set_default_size (window, width, height); } - if ( psppire_conf_get_int (conf, base, "x", &x) + if (psppire_conf_get_int (conf, base, "x", &x) && - psppire_conf_get_int (conf, base, "y", &y) ) + psppire_conf_get_int (conf, base, "y", &y)) { gtk_window_move (window, x, y); } - if ( psppire_conf_get_boolean (conf, base, "maximize", &maximize)) + if (psppire_conf_get_boolean (conf, base, "maximize", &maximize)) { if (maximize) gtk_window_maximize (window); @@ -286,10 +390,11 @@ psppire_conf_save_window_geometry (PsppireConf *conf, if (!maximized) { - gint width, height; gint x, y; - gdk_drawable_get_size (w, &width, &height); + 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);