summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Fontaine <arnau@debian.org>2011-08-11 21:10:58 +0900
committerArnaud Fontaine <arnau@debian.org>2011-08-29 11:06:48 +0900
commit23a4eb6059e0a694e342c3ff41ab076dad50b745 (patch)
treea00319bd96180cef7e7b33d03266ffbe4d16c1e0
parente08332c4a61f9825fc8893025ffa8f89d67a8900 (diff)
downloadutil-wm-23a4eb6059e0a694e342c3ff41ab076dad50b745.tar.gz
Fix incomplete implementation of _NET_SUPPORTING_WM_CHECK.
EWMH specification states that _NET_SUPPORTING_WM_CHECK must also be set on the child window, not only on the root window.
-rw-r--r--ewmh/ewmh.c.m44
-rw-r--r--ewmh/xcb_ewmh.h.m416
2 files changed, 10 insertions, 10 deletions
diff --git a/ewmh/ewmh.c.m4 b/ewmh/ewmh.c.m4
index 7192ee6..6fafa0a 100644
--- a/ewmh/ewmh.c.m4
+++ b/ewmh/ewmh.c.m4
@@ -780,8 +780,8 @@ DO_REPLY_LIST_VALUES(workarea, XCB_ATOM_CARDINAL, xcb_ewmh_geometry_t)
* _NET_SUPPORTING_WM_CHECK
*/
-DO_ROOT_SINGLE_VALUE(supporting_wm_check, _NET_SUPPORTING_WM_CHECK,
- XCB_ATOM_WINDOW, xcb_window_t)
+DO_SINGLE_VALUE(supporting_wm_check, _NET_SUPPORTING_WM_CHECK,
+ XCB_ATOM_WINDOW, xcb_window_t)
/**
* _NET_VIRTUAL_ROOTS
diff --git a/ewmh/xcb_ewmh.h.m4 b/ewmh/xcb_ewmh.h.m4
index 676e700..4f3e77a 100644
--- a/ewmh/xcb_ewmh.h.m4
+++ b/ewmh/xcb_ewmh.h.m4
@@ -1427,20 +1427,20 @@ void xcb_ewmh_get_workarea_reply_wipe(xcb_ewmh_get_workarea_reply_t *r);
* _NET_SUPPORTING_WM_CHECK, WINDOW/32
*
* @param ewmh The per-screen EWMH information
- * @param screen_nbr The screen number
- * @param new_window The child window created by the WM
+ * @param parent_window The root window or child window created by the WM
+ * @param child_window The child window created by the WM
* @return Cookie associated with the ChangeProperty _NET_SUPPORTING_WM_CHECK request
*/
xcb_void_cookie_t xcb_ewmh_set_supporting_wm_check(xcb_ewmh_connection_t *ewmh,
- int screen_nbr,
- xcb_window_t new_window);
+ xcb_window_t parent_window,
+ xcb_window_t child_window);
/**
* @see xcb_ewmh_set_supporting_wm_check
*/
xcb_void_cookie_t xcb_ewmh_set_supporting_wm_check_checked(xcb_ewmh_connection_t *ewmh,
- int screen_nbr,
- xcb_window_t new_window);
+ xcb_window_t parent_window,
+ xcb_window_t child_window);
/**
* @brief Send GetProperty request to get _NET_SUPPORTING_WM_CHECK
@@ -1451,13 +1451,13 @@ xcb_void_cookie_t xcb_ewmh_set_supporting_wm_check_checked(xcb_ewmh_connection_t
* @return The _NET_SUPPORTING_WM_CHECK cookie of the GetProperty request
*/
xcb_get_property_cookie_t xcb_ewmh_get_supporting_wm_check_unchecked(xcb_ewmh_connection_t *ewmh,
- int screen_nbr);
+ xcb_window_t window);
/**
* @see xcb_ewmh_get_supporting_wm_check_unchecked
*/
xcb_get_property_cookie_t xcb_ewmh_get_supporting_wm_check(xcb_ewmh_connection_t *ewmh,
- int screen_nbr);
+ xcb_window_t window);
/**
* @brief Get the list of client windows from a GetProperty