all repos — openbox @ 8add92416dc9e43f689db64161cfc55fa1a73f10

openbox fork - make it a bit more like ryudo

check the xkb version before using it
Dana Jansens danakj@orodu.net
commit

8add92416dc9e43f689db64161cfc55fa1a73f10

parent

580e2167f86c821d34bbe7e2c3011e68df3f151e

1 files changed, 6 insertions(+), 4 deletions(-)

jump to
M obt/display.cobt/display.c

@@ -58,8 +58,8 @@

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 @@ XSetErrorHandler(xerror_handler);

/* 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