Merge pull request #2061 from Airblader/bug-2049

Only grab scrollwheel buttons if necessary

diff --combined src/bindings.c
index 49f6159022f88253fe119821a53c9ef41022d61d,471e4783decab4958a9eb940139eba6d2b404229..b9d994ea3ce566db2d96ed53bb35f79bb2b94254
--- 1/src/bindings.c
--- 2/src/bindings.c
+++ b/src/bindings.c
@@@ -146,6 -146,27 +146,27 @@@ void grab_all_keys(xcb_connection_t *co
      }
  }
  
+ /*
+  * 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.
@@@ -165,28 -186,18 +186,28 @@@ static Binding *get_binding(i3_event_st
          }
      }
  
 +    const uint32_t xkb_group_state = (state_filtered & 0xFFFF0000);
 +    const uint32_t modifiers_state = (state_filtered & 0x0000FFFF);
      TAILQ_FOREACH(bind, bindings, bindings) {
 -        bool state_matches;
 -        if ((bind->event_state_mask & 0xFFFF) == 0) {
 +        const uint32_t xkb_group_mask = (bind->event_state_mask & 0xFFFF0000);
 +        /* modifiers_mask is a special case: a value of 0 does not mean “match all”,
 +         * but rather “match exactly when no modifiers are present”. */
 +        const uint32_t modifiers_mask = (bind->event_state_mask & 0x0000FFFF);
 +        const bool groups_match = ((xkb_group_state & xkb_group_mask) == xkb_group_mask);
 +        bool mods_match;
 +        if (modifiers_mask == 0) {
              /* Verify no modifiers are pressed. A bitwise AND would lead to
               * false positives, see issue #2002. */
 -            state_matches = (state_filtered == bind->event_state_mask);
 +            mods_match = (modifiers_state == 0);
          } else {
 -            state_matches = ((state_filtered & bind->event_state_mask) == bind->event_state_mask);
 +            mods_match = ((modifiers_state & modifiers_mask) == modifiers_mask);
          }
 +        const bool state_matches = (groups_match && mods_match);
  
 -        DLOG("binding with event_state_mask 0x%x, state_filtered 0x%x, match: %s\n",
 -             bind->event_state_mask, state_filtered, (state_matches ? "yes" : "no"));
 +        DLOG("binding groups_match = %s, mods_match = %s, state_matches = %s\n",
 +             (groups_match ? "yes" : "no"),
 +             (mods_match ? "yes" : "no"),
 +             (state_matches ? "yes" : "no"));
          /* First compare the state_filtered (unless this is a
           * B_UPON_KEYRELEASE_IGNORE_MODS binding and this is a KeyRelease
           * event) */
@@@ -788,3 -799,33 +809,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;
+ }