diff options
| author | Dana Jansens <danakj@orodu.net> | 2010-02-11 10:58:16 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2010-02-11 11:01:18 -0500 |
| commit | 8add92416dc9e43f689db64161cfc55fa1a73f10 (patch) | |
| tree | 5bd2990c3285f8fa7916601f4533aeef08562d12 | |
| parent | 580e2167f86c821d34bbe7e2c3011e68df3f151e (diff) | |
check the xkb version before using it
| -rw-r--r-- | obt/display.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/obt/display.c b/obt/display.c index f34fc574..37b12157 100644 --- a/obt/display.c +++ b/obt/display.c @@ -58,8 +58,8 @@ gboolean obt_display_open(const char *display_name) n = display_name ? g_strdup(display_name) : NULL; obt_display = d = XOpenDisplay(n); if (d) { - gint junk; - (void)junk; + gint junk, major, minor; + (void)junk, (void)major, (void)minor; if (fcntl(ConnectionNumber(d), F_SETFD, 1) == -1) g_message("Failed to set display as close-on-exec"); @@ -67,12 +67,14 @@ gboolean obt_display_open(const char *display_name) /* read what extensions are present */ #ifdef XKB + major = XkbMajorVersion; + minor = XkbMinorVersion; obt_display_extension_xkb = XkbQueryExtension(d, &junk, &obt_display_extension_xkb_basep, &junk, - NULL, NULL); + &major, &minor); if (!obt_display_extension_xkb) - g_message("XKB extension is not present on the server"); + g_message("XKB extension is not present on the server or too old"); #endif #ifdef SHAPE |