*click_to_focus* is now a button name

[bspwm.git] / src / pointer.c

diff --git a/src/pointer.c b/src/pointer.c
index 5275cd39befe0c239da8213059dd14eb683c5977..1bdb6c673b58e6383290b01a6914a3df6f06cac7 100644 (file)
--- a/src/pointer.c
+++ b/src/pointer.c
@@ -50,13 +50,12 @@ void pointer_init(void)
 
 void window_grab_buttons(xcb_window_t win)
 {
-       if (click_to_focus) {
-               window_grab_button(win, XCB_BUTTON_INDEX_1, XCB_NONE);
-       }
-       uint8_t buttons[] = {XCB_BUTTON_INDEX_1, XCB_BUTTON_INDEX_2, XCB_BUTTON_INDEX_3};
-       for (unsigned int i = 0; i < LENGTH(buttons); i++) {
+       for (unsigned int i = 0; i < LENGTH(BUTTONS); i++) {
+               if (click_to_focus == XCB_BUTTON_INDEX_ANY || click_to_focus == BUTTONS[i]) {
+                       window_grab_button(win, BUTTONS[i], XCB_NONE);
+               }
                if (pointer_actions[i] != ACTION_NONE) {
-                       window_grab_button(win, buttons[i], pointer_modifier);
+                       window_grab_button(win, BUTTONS[i], pointer_modifier);
                }
        }
 }