From aedea014a9c8d0fd16e8cee24ae440220e55bd68 Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Fri, 28 Sep 2018 18:31:00 +0200 Subject: [PATCH] Replace XFixes initialisation with xcb XFixesQueryExtension() does an XFixes QueryVersion request internally, so one was added here. Signed-off-by: Uli Schlachter --- Makefile | 2 +- src/compton.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 57475e1..67cabf0 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ MANDIR ?= $(PREFIX)/share/man/man1 APPDIR ?= $(PREFIX)/share/applications ICODIR ?= $(PREFIX)/share/icons/hicolor/ -PACKAGES = x11 x11-xcb xcb-renderutil xcb-render xcb-damage xcb-randr xcb-image xcomposite xfixes xext +PACKAGES = x11 x11-xcb xcb-renderutil xcb-render xcb-damage xcb-randr xcb-xfixes xfixes xcb-image xcomposite xext LIBS = -lm -lrt INCS = diff --git a/src/compton.c b/src/compton.c index 04eab3e..d24115d 100644 --- a/src/compton.c +++ b/src/compton.c @@ -5349,6 +5349,7 @@ session_init(session_t *ps_old, int argc, char **argv) { xcb_prefetch_extension_data(c, &xcb_render_id); xcb_prefetch_extension_data(c, &xcb_damage_id); + xcb_prefetch_extension_data(c, &xcb_xfixes_id); xcb_prefetch_extension_data(c, &xcb_randr_id); ext_info = xcb_get_extension_data(c, &xcb_render_id); @@ -5386,10 +5387,15 @@ session_init(session_t *ps_old, int argc, char **argv) { xcb_discard_reply(c, xcb_damage_query_version(c, XCB_DAMAGE_MAJOR_VERSION, XCB_DAMAGE_MINOR_VERSION).sequence); - if (!XFixesQueryExtension(ps->dpy, &ps->xfixes_event, &ps->xfixes_error)) { + ext_info = xcb_get_extension_data(c, &xcb_xfixes_id); + if (!ext_info || !ext_info->present) { fprintf(stderr, "No XFixes extension\n"); exit(1); } + ps->xfixes_event = ext_info->first_event; + ps->xfixes_error = ext_info->first_error; + xcb_discard_reply(c, + xcb_xfixes_query_version(c, XCB_XFIXES_MAJOR_VERSION, XCB_XFIXES_MINOR_VERSION).sequence); // Build a safe representation of display name {