summaryrefslogtreecommitdiff
path: root/gdk/x11/gdkscreen-x11.h
diff options
context:
space:
mode:
Diffstat (limited to 'gdk/x11/gdkscreen-x11.h')
-rw-r--r--gdk/x11/gdkscreen-x11.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/gdk/x11/gdkscreen-x11.h b/gdk/x11/gdkscreen-x11.h
index f4a15b8b2b..5c88a1a782 100644
--- a/gdk/x11/gdkscreen-x11.h
+++ b/gdk/x11/gdkscreen-x11.h
@@ -25,7 +25,6 @@
#include "gdkscreenprivate.h"
#include "gdkx11screen.h"
#include "gdkvisual.h"
-#include "xsettings-client.h"
#include <X11/X.h>
#include <X11/Xlib.h>
@@ -56,11 +55,15 @@ struct _GdkX11Screen
gint xft_dpi;
/* Window manager */
- GdkAtom cm_selection_atom;
long last_wmspec_check_time;
Window wmspec_check_window;
char *window_manager_name;
+ /* X Settings */
+ GdkWindow *xsettings_manager_window;
+ Atom xsettings_selection_atom;
+ GHashTable *xsettings; /* string of GDK settings name => GValue */
+
/* TRUE if wmspec_check_window has changed since last
* fetch of _NET_SUPPORTED
*/
@@ -69,7 +72,6 @@ struct _GdkX11Screen
* fetch of window manager name
*/
guint need_refetch_wm_name : 1;
- guint xsettings_in_init : 1;
guint is_composited : 1;
guint xft_init : 1; /* Whether we've intialized these values yet */
guint xft_antialias : 1;
@@ -86,9 +88,6 @@ struct _GdkX11Screen
GHashTable *visual_hash;
GdkVisual *rgba_visual;
- /* X settings */
- XSettingsClient *xsettings_client;
-
/* cache for window->translate vfunc */
GC subwindow_gcs[32];