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

diff --git a/include/xcb.h b/include/xcb.h
index 2c87a19c688499aaa977eadbb41efe3e3c210b7f..27d8986f1de8025491989dd9ed15d3ba85e34a97 100644 (file)
--- 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 0dec28443906c3a209342d6e0a3cb25d8479e8ee..033d55e12f8ccf14dee1c34c1a156cb0d38bcc3d 100644 (file)
--- 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 f98115f5c80ce25049e081d9ea303636acc180bd..cafc29ca239d8a816ad860a3dc5b5f03bc098dca 100644 (file)
--- 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);
+    }
+}