Remove dependency on xcb-property

This commit is contained in:
Michael Stapelberg 2011-05-03 22:49:59 +02:00
parent de92142085
commit 498a38ac0a
2 changed files with 8 additions and 8 deletions

View File

@ -38,7 +38,6 @@ endif
LDFLAGS += -lm LDFLAGS += -lm
LDFLAGS += -lxcb-event LDFLAGS += -lxcb-event
LDFLAGS += -lxcb-property
LDFLAGS += -lxcb-keysyms LDFLAGS += -lxcb-keysyms
ifeq ($(shell pkg-config --exists xcb-util || echo 1),1) ifeq ($(shell pkg-config --exists xcb-util || echo 1),1)
CFLAGS += -DXCB_COMPAT CFLAGS += -DXCB_COMPAT

View File

@ -167,13 +167,14 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
xcb_change_window_attributes(conn, child, mask, values); xcb_change_window_attributes(conn, child, mask, values);
/* Place requests for properties ASAP */ /* Place requests for properties ASAP */
wm_type_cookie = xcb_get_any_property_unchecked(conn, false, child, A__NET_WM_WINDOW_TYPE, UINT32_MAX); #define GET_PROPERTY(atom, len) xcb_get_property_unchecked(conn, false, child, atom, XCB_GET_PROPERTY_TYPE_ANY, 0, len)
strut_cookie = xcb_get_any_property_unchecked(conn, false, child, A__NET_WM_STRUT_PARTIAL, UINT32_MAX); wm_type_cookie = GET_PROPERTY(A__NET_WM_WINDOW_TYPE, UINT32_MAX);
state_cookie = xcb_get_any_property_unchecked(conn, false, child, A__NET_WM_STATE, UINT32_MAX); strut_cookie = GET_PROPERTY(A__NET_WM_STRUT_PARTIAL, UINT32_MAX);
utf8_title_cookie = xcb_get_any_property_unchecked(conn, false, child, A__NET_WM_NAME, 128); state_cookie = GET_PROPERTY(A__NET_WM_STATE, UINT32_MAX);
leader_cookie = xcb_get_any_property_unchecked(conn, false, child, A_WM_CLIENT_LEADER, UINT32_MAX); utf8_title_cookie = GET_PROPERTY(A__NET_WM_NAME, 128);
title_cookie = xcb_get_any_property_unchecked(conn, false, child, A_WM_NAME, 128); leader_cookie = GET_PROPERTY(A_WM_CLIENT_LEADER, UINT32_MAX);
class_cookie = xcb_get_any_property_unchecked(conn, false, child, A_WM_CLASS, 128); title_cookie = GET_PROPERTY(A_WM_NAME, 128);
class_cookie = GET_PROPERTY(A_WM_CLASS, 128);
Client *new = table_get(&by_child, child); Client *new = table_get(&by_child, child);