Cosmetic changes

[bspwm.git] / bspwm.c

diff --git a/bspwm.c b/bspwm.c
index bc3be55674ef98c1200c1f5dc4d96a151b5b85c8..55886601d54bacdd097ac2d71445d9f8b064a2ca 100644 (file)
--- a/bspwm.c
+++ b/bspwm.c
@@ -38,9 +38,13 @@ void register_events(void)
         err("another WM is already running\n");
     }
 
-    xcb_grab_button(dpy, false, screen->root, XCB_EVENT_MASK_BUTTON_PRESS, XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, XCB_NONE, XCB_NONE, XCB_BUTTON_INDEX_1, BUTTON_MODIFIER);
-    xcb_grab_button(dpy, false, screen->root, XCB_EVENT_MASK_BUTTON_PRESS, XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, XCB_NONE, XCB_NONE, XCB_BUTTON_INDEX_2, BUTTON_MODIFIER);
-    xcb_grab_button(dpy, false, screen->root, XCB_EVENT_MASK_BUTTON_PRESS, XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, XCB_NONE, XCB_NONE, XCB_BUTTON_INDEX_3, BUTTON_MODIFIER);
+}
+
+void grab_buttons(void)
+{
+    xcb_grab_button(dpy, false, screen->root, XCB_EVENT_MASK_BUTTON_PRESS, XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, XCB_NONE, XCB_NONE, XCB_BUTTON_INDEX_1, button_modifier);
+    xcb_grab_button(dpy, false, screen->root, XCB_EVENT_MASK_BUTTON_PRESS, XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, XCB_NONE, XCB_NONE, XCB_BUTTON_INDEX_2, button_modifier);
+    xcb_grab_button(dpy, false, screen->root, XCB_EVENT_MASK_BUTTON_PRESS, XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, XCB_NONE, XCB_NONE, XCB_BUTTON_INDEX_3, button_modifier);
 }
 
 void setup(void)
@@ -72,7 +76,7 @@ void setup(void)
 
     xcb_ewmh_set_supported(ewmh, default_screen, LENGTH(net_atoms), net_atoms);
 
-    monitor_uid = desktop_uid = 0;
+    monitor_uid = desktop_uid = client_uid = 0;
     mon = last_mon = mon_head = mon_tail = NULL;
 
     bool xinerama_is_active = false;
@@ -157,6 +161,7 @@ int main(void)
     load_settings();
     run_autostart();
     ewmh_update_wm_name();
+    grab_buttons();
 
     while (running) {