koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only grab scrollwheel buttons if necessary.

Browse Source 
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
This commit is contained in:
Ingo Bürk
2015-11-11 20:40:25 +01:00
parent 66882bf445
commit 029d78c0bf
6 changed files with 83 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/xcb.c
View File

@ -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);
}