projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
examples: Change extensions from .stat to .sps.
[pspp]
/
src
/
ui
/
gui
/
psppire-conf.c
diff --git
a/src/ui/gui/psppire-conf.c
b/src/ui/gui/psppire-conf.c
index 4090b74c3ea9dce414e42cb59bb643c6c312a15e..fe4f934bd640193e382f1fc077c7ff661f91850b 100644
(file)
--- 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.
/* 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
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 <config.h>
*/
#include <config.h>
+#include <errno.h>
#include <stdio.h>
#include <stdio.h>
+#include <sys/stat.h>
+
+#include <glib.h>
#include "psppire-conf.h"
#include "psppire-conf.h"
@@
-71,8
+75,8
@@
conf_read (PsppireConf *conf)
NULL);
}
NULL);
}
-static
void
-
conf_write
(PsppireConf *conf)
+static
gboolean
+
flush_conf
(PsppireConf *conf)
{
gsize length = 0;
{
gsize length = 0;
@@
-84,8
+88,19
@@
conf_write (PsppireConf *conf)
}
g_free (kf);
}
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)
{
static void
psppire_conf_dispose (GObject *object)
{
@@
-140,13
+155,22
@@
psppire_conf_class_init (PsppireConfClass *class)
static void
psppire_conf_init (PsppireConf *conf)
{
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->filename = g_strdup_printf ("%s/%s", dirname, "psppirerc");
conf->keyfile = g_key_file_new ();
conf->dispose_has_run = FALSE;
+ conf->idle = 0;
}
}
@@
-262,36
+286,29
@@
psppire_conf_set_window_geometry (PsppireConf *conf,
void
psppire_conf_save_window_geometry (PsppireConf *conf,
const gchar *base,
void
psppire_conf_save_window_geometry (PsppireConf *conf,
const gchar *base,
- G
dkEvent *e
)
+ G
tkWindow *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 width, height;
+ gint x, y;
- psppire_conf_set_boolean (conf, base, "maximize",
- event->new_window_state &
- GDK_WINDOW_STATE_MAXIMIZED );
- }
- break;
- default:
- break;
- };
+ 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);
+ }
}
}