nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

handlers.c: cb_property_handler_t: take Con instead of xcb_window_t 

Since every handler calls con_by_window_id() and checks for NULL, it is
better to move this call into property_notify().
This commit is contained in:
Albert Safin 2020-04-08 08:32:39 +00:00
parent e03fdef3e5
commit d9d366a656
1 changed files with 19 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/handlers.c
View File

@ -558,11 +558,7 @@ static bool window_name_changed(i3Window *window, char *old_name) {
* Called when a window changes its title
*
*/
static bool handle_windowname_change(xcb_window_t window, xcb_get_property_reply_t *prop) {
Con *con;
if ((con = con_by_window_id(window)) == NULL || con->window == NULL)
return false;
static bool handle_windowname_change(Con *con, xcb_get_property_reply_t *prop) {
char *old_name = (con->window->name != NULL ? sstrdup(i3string_as_utf8(con->window->name)) : NULL);
window_update_name(con->window, prop);
@ -584,11 +580,7 @@ static bool handle_windowname_change(xcb_window_t window, xcb_get_property_reply
* window_update_name_legacy().
*
*/
static bool handle_windowname_change_legacy(xcb_window_t window, xcb_get_property_reply_t *prop) {
Con *con;
if ((con = con_by_window_id(window)) == NULL || con->window == NULL)
return false;
static bool handle_windowname_change_legacy(Con *con, xcb_get_property_reply_t *prop) {
char *old_name = (con->window->name != NULL ? sstrdup(i3string_as_utf8(con->window->name)) : NULL);
window_update_name_legacy(con->window, prop);
@ -609,11 +601,7 @@ static bool handle_windowname_change_legacy(xcb_window_t window, xcb_get_propert
* Called when a window changes its WM_WINDOW_ROLE.
*
*/
static bool handle_windowrole_change(xcb_window_t window, xcb_get_property_reply_t *prop) {
Con *con;
if ((con = con_by_window_id(window)) == NULL || con->window == NULL)
return false;
static bool handle_windowrole_change(Con *con, xcb_get_property_reply_t *prop) {
window_update_role(con->window, prop);
con = remanage_window(con);
@ -953,11 +941,7 @@ static void handle_client_message(xcb_client_message_event_t *event) {
}
}
static bool handle_window_type(xcb_window_t window, xcb_get_property_reply_t *reply) {
Con *con;
if ((con = con_by_window_id(window)) == NULL || con->window == NULL)
return false;
static bool handle_window_type(Con *con, xcb_get_property_reply_t *reply) {
window_update_type(con->window, reply);
return true;
}
@ -969,13 +953,7 @@ static bool handle_window_type(xcb_window_t window, xcb_get_property_reply_t *re
* See ICCCM 4.1.2.3 for more details
*
*/
static bool handle_normal_hints(xcb_window_t window, xcb_get_property_reply_t *reply) {
Con *con = con_by_window_id(window);
if (con == NULL) {
DLOG("Received WM_NORMAL_HINTS for unknown client\n");
return false;
}
static bool handle_normal_hints(Con *con, xcb_get_property_reply_t *reply) {
bool changed = window_update_normal_hints(con->window, reply, NULL);
if (changed) {
@ -994,18 +972,11 @@ static bool handle_normal_hints(xcb_window_t window, xcb_get_property_reply_t *r
* Handles the WM_HINTS property for extracting the urgency state of the window.
*
*/
static bool handle_hints(xcb_window_t window, xcb_get_property_reply_t *reply) {
Con *con = con_by_window_id(window);
if (con == NULL) {
DLOG("Received WM_HINTS for unknown client\n");
return false;
}
static bool handle_hints(Con *con, xcb_get_property_reply_t *reply) {
bool urgency_hint;
window_update_hints(con->window, reply, &urgency_hint);
con_set_urgency(con, urgency_hint);
tree_render();
return true;
}
@ -1016,16 +987,8 @@ static bool handle_hints(xcb_window_t window, xcb_get_property_reply_t *reply) {
* See ICCCM 4.1.2.6 for more details
*
*/
static bool handle_transient_for(xcb_window_t window, xcb_get_property_reply_t *prop) {
Con *con;
if ((con = con_by_window_id(window)) == NULL || con->window == NULL) {
DLOG("No such window\n");
return false;
}
static bool handle_transient_for(Con *con, xcb_get_property_reply_t *prop) {
window_update_transient_for(con->window, prop);
return true;
}
@ -1034,13 +997,8 @@ static bool handle_transient_for(xcb_window_t window, xcb_get_property_reply_t *
* toolwindow (or similar) and to which window it belongs (logical parent).
*
*/
static bool handle_clientleader_change(xcb_window_t window, xcb_get_property_reply_t *prop) {
Con *con;
if ((con = con_by_window_id(window)) == NULL || con->window == NULL)
return false;
static bool handle_clientleader_change(Con *con, xcb_get_property_reply_t *prop) {
window_update_leader(con->window, prop);
return true;
}
@ -1120,15 +1078,9 @@ static void handle_configure_notify(xcb_configure_notify_event_t *event) {
* Handles the WM_CLASS property for assignments and criteria selection.
*
*/
static bool handle_class_change(xcb_window_t window, xcb_get_property_reply_t *prop) {
Con *con;
if ((con = con_by_window_id(window)) == NULL || con->window == NULL)
return false;
static bool handle_class_change(Con *con, xcb_get_property_reply_t *prop) {
window_update_class(con->window, prop);
con = remanage_window(con);
return true;
}
@ -1136,11 +1088,7 @@ static bool handle_class_change(xcb_window_t window, xcb_get_property_reply_t *p
* Handles the _MOTIF_WM_HINTS property of specifing window deocration settings.
*
*/
static bool handle_motif_hints_change(xcb_window_t window, xcb_get_property_reply_t *prop) {
Con *con;
if ((con = con_by_window_id(window)) == NULL || con->window == NULL)
return false;
static bool handle_motif_hints_change(Con *con, xcb_get_property_reply_t *prop) {
border_style_t motif_border_style;
window_update_motif_hints(con->window, prop, &motif_border_style);
@ -1158,16 +1106,7 @@ static bool handle_motif_hints_change(xcb_window_t window, xcb_get_property_repl
* Handles the _NET_WM_STRUT_PARTIAL property for allocating space for dock clients.
*
*/
static bool handle_strut_partial_change(xcb_window_t window, xcb_get_property_reply_t *prop) {
DLOG("strut partial change for window 0x%08x\n", window);
Con *con;
if ((con = con_by_window_id(window)) == NULL || con->window == NULL) {
return false;
}
DLOG("That is con %p / %s\n", con, con->name);
static bool handle_strut_partial_change(Con *con, xcb_get_property_reply_t *prop) {
window_update_strut_partial(con->window, prop);
/* we only handle this change for dock clients */
@ -1219,7 +1158,7 @@ static bool handle_strut_partial_change(xcb_window_t window, xcb_get_property_re
/* Returns false if the event could not be processed (e.g. the window could not
* be found), true otherwise */
typedef bool (*cb_property_handler_t)(xcb_window_t window, xcb_get_property_reply_t *property);
typedef bool (*cb_property_handler_t)(Con *con, xcb_get_property_reply_t *property);
struct property_handler_t {
xcb_atom_t atom;
@ -1266,6 +1205,7 @@ static void property_notify(uint8_t state, xcb_window_t window, xcb_atom_t atom)
struct property_handler_t *handler = NULL;
xcb_get_property_reply_t *propr = NULL;
xcb_generic_error_t *err = NULL;
Con *con;
for (size_t c = 0; c < NUM_HANDLERS; c++) {
if (property_handlers[c].atom != atom)
@ -1280,6 +1220,11 @@ static void property_notify(uint8_t state, xcb_window_t window, xcb_atom_t atom)
return;
}
if ((con = con_by_window_id(window)) == NULL || con->window == NULL) {
DLOG("Received property for atom %d for unknown client\n", atom);
return;
}
if (state != XCB_PROPERTY_DELETE) {
xcb_get_property_cookie_t cookie = xcb_get_property(conn, 0, window, atom, XCB_GET_PROPERTY_TYPE_ANY, 0, handler->long_len);
propr = xcb_get_property_reply(conn, cookie, &err);
@ -1291,7 +1236,7 @@ static void property_notify(uint8_t state, xcb_window_t window, xcb_atom_t atom)
}
/* the handler will free() the reply unless it returns false */
if (!handler->cb(window, propr))
if (!handler->cb(con, propr))
FREE(propr);
}