summaryrefslogtreecommitdiff
path: root/src/core/display.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/display.c')
-rw-r--r--src/core/display.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/src/core/display.c b/src/core/display.c
index ff909a62..17a4eaf7 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -64,6 +64,7 @@
#include <X11/extensions/Xcomposite.h>
#include <X11/extensions/Xdamage.h>
#include <X11/extensions/Xfixes.h>
+#include <X11/extensions/XRes.h>
#include <string.h>
#include "compositor/meta-compositor-none.h"
@@ -687,6 +688,26 @@ meta_display_open (void)
the_display->xfixes_event_base);
}
+ {
+ int event_base;
+ int error_base;
+ int major;
+ int minor;
+
+ event_base = error_base = major = minor = 0;
+ the_display->have_xres = FALSE;
+
+ if (XResQueryExtension (the_display->xdisplay, &event_base, &error_base) &&
+ XResQueryVersion (the_display->xdisplay, &major, &minor) == 1)
+ {
+ if (major > 1 || (major == 1 && minor >= 2))
+ the_display->have_xres = TRUE;
+ }
+
+ meta_verbose ("Attempted to init XRes, found version %d.%d error base %d event base %d\n",
+ major, minor, error_base, event_base);
+ }
+
#ifdef HAVE_XCURSOR
{
XcursorSetTheme (the_display->xdisplay, meta_prefs_get_cursor_theme ());