#include "obt/prop.h"
#include "obt/internal.h"
#include "obt/keyboard.h"
+#include "obt/xqueue.h"
#ifdef HAVE_STRING_H
# include <string.h>
# include <unistd.h>
#endif
+/* from xqueue.c */
+extern void xqueue_init(void);
+extern void xqueue_destroy(void);
+
Display* obt_display = NULL;
gboolean obt_display_error_occured = FALSE;
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");
/* 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
}
g_free(n);
+ if (obt_display)
+ xqueue_init();
+
return obt_display != NULL;
}
void obt_display_close(void)
{
obt_keyboard_shutdown();
- if (obt_display) XCloseDisplay(obt_display);
+ if (obt_display) {
+ xqueue_destroy();
+ XCloseDisplay(obt_display);
+ }
}
static gint xerror_handler(Display *d, XErrorEvent *e)
XGetErrorText(d, e->error_code, errtxt, 127);
if (!xerror_ignore) {
if (e->error_code == BadWindow)
- /*g_message(_("X Error: %s\n"), errtxt)*/;
+ /*g_debug(_("X Error: %s\n"), errtxt)*/;
else
g_error("X Error: %s", errtxt);
} else
- g_message("Ignoring XError code %d '%s'", e->error_code, errtxt);
+ g_debug("Ignoring XError code %d '%s'", e->error_code, errtxt);
#else
(void)d; (void)e;
#endif