From 66882bf445970588c6c7a6a2c2e08a38ad0b9536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20B=C3=BCrk?= Date: Wed, 11 Nov 2015 20:21:26 +0100 Subject: [PATCH 1/2] Extract function to grab buttons when managing a window. We refactor the button grabbing into a function to allow the next patch both to - conditionally grab different sets of buttons - grab the buttons again when reloading the config. relates to #2049 --- include/xcb.h | 6 ++++++ src/manage.c | 7 +------ src/xcb.c | 11 +++++++++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/include/xcb.h b/include/xcb.h index 2c87a19c..27d8986f 100644 --- a/include/xcb.h +++ b/include/xcb.h @@ -160,3 +160,9 @@ void xcb_add_property_atom(xcb_connection_t *conn, xcb_window_t window, xcb_atom * */ void xcb_remove_property_atom(xcb_connection_t *conn, xcb_window_t window, xcb_atom_t property, xcb_atom_t atom); + +/** + * Grab the specified buttons on a window when managing it. + * + */ +void xcb_grab_buttons(xcb_connection_t *conn, xcb_window_t window, uint8_t* buttons); diff --git a/src/manage.c b/src/manage.c index 0dec2844..033d55e1 100644 --- a/src/manage.c +++ b/src/manage.c @@ -168,12 +168,7 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki cwindow->id = window; cwindow->depth = get_visual_depth(attr->visual); - /* We need to grab buttons 1-3 for click-to-focus and buttons 1-5 - * to allow for mouse bindings using --whole-window to work correctly. */ - xcb_grab_button(conn, false, window, XCB_EVENT_MASK_BUTTON_PRESS, - XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC, root, XCB_NONE, - XCB_BUTTON_INDEX_ANY, - XCB_BUTTON_MASK_ANY /* don’t filter for any modifiers */); + xcb_grab_buttons(conn, window, (uint8_t[]) {XCB_BUTTON_INDEX_ANY}); /* update as much information as possible so far (some replies may be NULL) */ window_update_class(cwindow, xcb_get_property_reply(conn, class_cookie, NULL), true); diff --git a/src/xcb.c b/src/xcb.c index f98115f5..cafc29ca 100644 --- a/src/xcb.c +++ b/src/xcb.c @@ -319,3 +319,14 @@ release_grab: FREE(reply); xcb_ungrab_server(conn); } + +/* + * Grab the specified buttons on a window when managing it. + * + */ +void xcb_grab_buttons(xcb_connection_t *conn, xcb_window_t window, uint8_t* buttons) { + for (int i = 0; i < sizeof(buttons) / sizeof(uint8_t); i++) { + xcb_grab_button(conn, false, window, XCB_EVENT_MASK_BUTTON_PRESS, XCB_GRAB_MODE_SYNC, + XCB_GRAB_MODE_ASYNC, root, XCB_NONE, buttons[i], XCB_BUTTON_MASK_ANY); + } +} From 029d78c0bf771dd98f80699dcc16b3e962895455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20B=C3=BCrk?= Date: Wed, 11 Nov 2015 20:40:25 +0100 Subject: [PATCH 2/2] Only grab scrollwheel buttons if necessary. With this patch, we only grab the scrollwheel buttons (4 and 5) when managing a window if a whole window key binding exists for these buttons. This allows both of these usecases: - Bindings to scrollwheel buttons using --whole-window (see #1701). - Scrolling in a window without focusing it if no such binding exists (see #2049). Furthermore, we drop all button grabs and regrab them after a config reload in order to reevaluate the new bindings correctly. fixes #2049 --- include/bindings.h | 16 +++++++++++++++ include/xcb.h | 2 +- src/bindings.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ src/config.c | 1 + src/manage.c | 2 +- src/xcb.c | 15 ++++++++++++-- 6 files changed, 83 insertions(+), 4 deletions(-) diff --git a/include/bindings.h b/include/bindings.h index e9e5dac9..da81de24 100644 --- a/include/bindings.h +++ b/include/bindings.h @@ -33,6 +33,13 @@ Binding *configure_binding(const char *bindtype, const char *modifiers, const ch */ void grab_all_keys(xcb_connection_t *conn); +/** + * Release the button grabs on all managed windows and regrab them, + * reevaluating which buttons need to be grabbed. + * + */ +void regrab_all_buttons(xcb_connection_t *conn); + /** * Returns a pointer to the Binding that matches the given xcb event or NULL if * no such binding exists. @@ -95,3 +102,12 @@ CommandResult *run_binding(Binding *bind, Con *con); * */ bool load_keymap(void); + +/** + * Returns true if the current config has any binding to a scroll wheel button + * (4 or 5) which is a whole-window binding. + * We need this to figure out whether we should grab all buttons or just 1-3 + * when managing a window. See #2049. + * + */ +bool bindings_should_grab_scrollwheel_buttons(void); diff --git a/include/xcb.h b/include/xcb.h index 27d8986f..c1f989bd 100644 --- a/include/xcb.h +++ b/include/xcb.h @@ -165,4 +165,4 @@ void xcb_remove_property_atom(xcb_connection_t *conn, xcb_window_t window, xcb_a * Grab the specified buttons on a window when managing it. * */ -void xcb_grab_buttons(xcb_connection_t *conn, xcb_window_t window, uint8_t* buttons); +void xcb_grab_buttons(xcb_connection_t *conn, xcb_window_t window, bool bind_scrollwheel); diff --git a/src/bindings.c b/src/bindings.c index 7ea087e6..471e4783 100644 --- a/src/bindings.c +++ b/src/bindings.c @@ -146,6 +146,27 @@ void grab_all_keys(xcb_connection_t *conn) { } } +/* + * Release the button grabs on all managed windows and regrab them, + * reevaluating which buttons need to be grabbed. + * + */ +void regrab_all_buttons(xcb_connection_t *conn) { + bool grab_scrollwheel = bindings_should_grab_scrollwheel_buttons(); + xcb_grab_server(conn); + + Con *con; + TAILQ_FOREACH(con, &all_cons, all_cons) { + if (con->window == NULL) + continue; + + xcb_ungrab_button(conn, XCB_BUTTON_INDEX_ANY, con->window->id, XCB_BUTTON_MASK_ANY); + xcb_grab_buttons(conn, con->window->id, grab_scrollwheel); + } + + xcb_ungrab_server(conn); +} + /* * Returns a pointer to the Binding with the specified modifiers and * keycode or NULL if no such binding exists. @@ -778,3 +799,33 @@ bool load_keymap(void) { return true; } + +/* + * Returns true if the current config has any binding to a scroll wheel button + * (4 or 5) which is a whole-window binding. + * We need this to figure out whether we should grab all buttons or just 1-3 + * when managing a window. See #2049. + * + */ +bool bindings_should_grab_scrollwheel_buttons(void) { + Binding *bind; + TAILQ_FOREACH(bind, bindings, bindings) { + /* We are only interested in whole window mouse bindings. */ + if (bind->input_type != B_MOUSE || !bind->whole_window) + continue; + + char *endptr; + long button = strtol(bind->symbol + (sizeof("button") - 1), &endptr, 10); + if (button == LONG_MAX || button == LONG_MIN || button < 0 || *endptr != '\0' || endptr == bind->symbol) { + ELOG("Could not parse button number, skipping this binding. Please report this bug in i3.\n"); + continue; + } + + /* If the binding is for either scrollwheel button, we need to grab everything. */ + if (button == 4 || button == 5) { + return true; + } + } + + return false; +} diff --git a/src/config.c b/src/config.c index f146b906..fac4e265 100644 --- a/src/config.c +++ b/src/config.c @@ -229,6 +229,7 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath, if (reload) { translate_keysyms(); grab_all_keys(conn); + regrab_all_buttons(conn); } if (config.font.type == FONT_TYPE_NONE) { diff --git a/src/manage.c b/src/manage.c index 033d55e1..98051ec3 100644 --- a/src/manage.c +++ b/src/manage.c @@ -168,7 +168,7 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki cwindow->id = window; cwindow->depth = get_visual_depth(attr->visual); - xcb_grab_buttons(conn, window, (uint8_t[]) {XCB_BUTTON_INDEX_ANY}); + xcb_grab_buttons(conn, window, bindings_should_grab_scrollwheel_buttons()); /* update as much information as possible so far (some replies may be NULL) */ window_update_class(cwindow, xcb_get_property_reply(conn, class_cookie, NULL), true); diff --git a/src/xcb.c b/src/xcb.c index cafc29ca..90d591c7 100644 --- a/src/xcb.c +++ b/src/xcb.c @@ -324,8 +324,19 @@ release_grab: * Grab the specified buttons on a window when managing it. * */ -void xcb_grab_buttons(xcb_connection_t *conn, xcb_window_t window, uint8_t* buttons) { - for (int i = 0; i < sizeof(buttons) / sizeof(uint8_t); i++) { +void xcb_grab_buttons(xcb_connection_t *conn, xcb_window_t window, bool bind_scrollwheel) { + uint8_t buttons[3]; + int num = 0; + + if (bind_scrollwheel) { + buttons[num++] = XCB_BUTTON_INDEX_ANY; + } else { + buttons[num++] = XCB_BUTTON_INDEX_1; + buttons[num++] = XCB_BUTTON_INDEX_2; + buttons[num++] = XCB_BUTTON_INDEX_3; + } + + for (int i = 0; i < num; i++) { xcb_grab_button(conn, false, window, XCB_EVENT_MASK_BUTTON_PRESS, XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC, root, XCB_NONE, buttons[i], XCB_BUTTON_MASK_ANY); }