From e4f6c33da5f975be934b99945c9aed295ef7f12b Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Tue, 30 Oct 2012 23:40:23 +0000 Subject: Update xcb_ewmh_set_supporting_wm_check() for and require xcb-util-wm 0.3.9 xcb-util-wm commit 23a4eb6059e0a694e342c3ff41ab076dad50b745, present in 0.3.9, changes the xcb_ewmh_set_supporting_wm_check() API. Update for that and require xcb-util-wm 0.3.9 Use the updated xcb_ewmh_set_supporting_wm_check() to more correctly implement EWMH, setting the _NET_SUPPORTING_WM_CHECK property on the root *and* child window. Signed-off-by: Jon TURNEY Reviewed-by: Jeremy Huddleston Sequoia --- configure.ac | 2 +- src/libxcwm/atoms.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 700835a..b848f5b 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AC_PROG_OBJC AC_PROG_INSTALL # Checks for libraries. -NEEDED="xcb-damage xcb-composite xcb-event xcb-xtest xcb-image xcb-keysyms xcb-icccm xcb-atom xcb-ewmh" +NEEDED="xcb-damage xcb-composite xcb-event xcb-xtest xcb-image xcb-keysyms xcb-icccm >= 0.3.9 xcb-atom xcb-ewmh" PKG_CHECK_MODULES(XCB, $NEEDED) AC_SUBST(NEEDED) diff --git a/src/libxcwm/atoms.c b/src/libxcwm/atoms.c index 00620f5..fc810f1 100644 --- a/src/libxcwm/atoms.c +++ b/src/libxcwm/atoms.c @@ -202,7 +202,11 @@ create_wm_cm_window(xcwm_context_t *context) strlen("xcwm"), "xcwm"); xcb_ewmh_set_supporting_wm_check(&context->atoms->ewmh_conn, - context->conn_screen, + context->root_window->window_id, + context->wm_cm_window); + + xcb_ewmh_set_supporting_wm_check(&context->atoms->ewmh_conn, + context->wm_cm_window, context->wm_cm_window); } -- cgit v1.2.3