Cosmetic changes

[bspwm.git] / bspwm.c

diff --git a/bspwm.c b/bspwm.c
index 51692209d5dda12f8a6169a6625bb4b021d0c779..55886601d54bacdd097ac2d71445d9f8b064a2ca 100644 (file)
--- a/bspwm.c
+++ b/bspwm.c
@@ -12,6 +12,7 @@
 #include <xcb/xcb.h>
 #include <xcb/xcb_event.h>
 #include <xcb/xcb_ewmh.h>
+#include <xcb/xinerama.h>
 #include "types.h"
 #include "settings.h"
 #include "messages.h"
@@ -31,15 +32,19 @@ void quit(void)
 void register_events(void)
 {
     uint32_t values[] = {ROOT_EVENT_MASK};
-    xcb_generic_error_t *err = xcb_request_check(dpy, xcb_change_window_attributes_checked(dpy, screen->root, XCB_CW_EVENT_MASK, values));
-    if (err != NULL) {
+    xcb_generic_error_t *e = xcb_request_check(dpy, xcb_change_window_attributes_checked(dpy, screen->root, XCB_CW_EVENT_MASK, values));
+    if (e != NULL) {
         xcb_disconnect(dpy);
-        die("another WM is already running\n");
+        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)
@@ -47,7 +52,7 @@ void setup(void)
     ewmh_init();
     screen = xcb_setup_roots_iterator(xcb_get_setup(dpy)).data;
     if (!screen)
-        die("error: cannot aquire screen\n");
+        err("error: cannot aquire screen\n");
 
     screen_width = screen->width_in_pixels;
     screen_height = screen->height_in_pixels;
@@ -59,20 +64,50 @@ void setup(void)
                               ewmh->_NET_CURRENT_DESKTOP,
                               ewmh->_NET_CLIENT_LIST,
                               ewmh->_NET_ACTIVE_WINDOW,
+                              ewmh->_NET_WM_DESKTOP,
                               ewmh->_NET_WM_STATE,
                               ewmh->_NET_WM_STATE_FULLSCREEN,
                               ewmh->_NET_WM_WINDOW_TYPE,
+                              ewmh->_NET_WM_WINDOW_TYPE_DOCK,
+                              ewmh->_NET_WM_WINDOW_TYPE_NOTIFICATION,
                               ewmh->_NET_WM_WINDOW_TYPE_DIALOG,
                               ewmh->_NET_WM_WINDOW_TYPE_UTILITY,
                               ewmh->_NET_WM_WINDOW_TYPE_TOOLBAR};
 
     xcb_ewmh_set_supported(ewmh, default_screen, LENGTH(net_atoms), net_atoms);
 
-    desk = make_desktop(DEFAULT_DESK_NAME);
-    last_desk = NULL;
-    desk_head = desk;
-    desk_tail = desk;
-    num_desktops++;
+    monitor_uid = desktop_uid = client_uid = 0;
+    mon = last_mon = mon_head = mon_tail = NULL;
+
+    bool xinerama_is_active = false;
+
+    if (xcb_get_extension_data(dpy, &xcb_xinerama_id)->present) {
+        xcb_xinerama_is_active_reply_t *xia = xcb_xinerama_is_active_reply(dpy, xcb_xinerama_is_active(dpy), NULL);
+        if (xia != NULL) {
+            xinerama_is_active = xia->state;
+            free(xia);
+        }
+    }
+
+    if (xinerama_is_active) {
+        xcb_xinerama_query_screens_reply_t *xsq = xcb_xinerama_query_screens_reply(dpy, xcb_xinerama_query_screens(dpy), NULL);
+        xcb_xinerama_screen_info_t *xsi = xcb_xinerama_query_screens_screen_info(xsq);
+        int n = xcb_xinerama_query_screens_screen_info_length(xsq);
+        PRINTF("number of monitors: %d\n", n);
+        for (int i = 0; i < n; i++) {
+            xcb_xinerama_screen_info_t info = xsi[i];
+            xcb_rectangle_t rect = (xcb_rectangle_t) {info.x_org, info.y_org, info.width, info.height};
+            add_monitor(&rect);
+        }
+        free(xsq);
+    } else {
+        warn("Xinerama is inactive");
+        xcb_rectangle_t rect = (xcb_rectangle_t) {0, 0, screen_width, screen_height};
+        add_monitor(&rect);
+    }
+
+    for (monitor_t *m = mon_head; m != NULL; m = m->next)
+        add_desktop(m, NULL);
 
     ewmh_update_number_of_desktops();
     ewmh_update_desktop_names();
@@ -84,7 +119,7 @@ void setup(void)
 int main(void)
 {
     fd_set descriptors;
-    char socket_path[BUFSIZ];
+    char socket_path[MAXLEN];
     int sock_fd, ret_fd, dpy_fd, sel, n;
     struct sockaddr_un sock_address;
     size_t rsplen = 0;
@@ -98,7 +133,7 @@ int main(void)
     dpy = xcb_connect(NULL, &default_screen);
 
     if (xcb_connection_has_error(dpy))
-        die("error: cannot open display\n");
+        err("error: cannot open display\n");
 
     setup();
     register_events();
@@ -116,7 +151,7 @@ int main(void)
     sock_fd = socket(AF_UNIX, SOCK_STREAM, 0);
 
     if (sock_fd == -1)
-        die("error: could not create socket\n");
+        err("error: could not create socket\n");
 
     bind(sock_fd, (struct sockaddr *) &sock_address, sizeof(sock_address));
     listen(sock_fd, SOMAXCONN);
@@ -126,7 +161,7 @@ int main(void)
     load_settings();
     run_autostart();
     ewmh_update_wm_name();
-    update_root_dimensions();
+    grab_buttons();
 
     while (running) {
 
@@ -148,6 +183,7 @@ int main(void)
                         rsp[--rsplen] = '\0';
                     send(ret_fd, rsp, rsplen, 0);
                     close(ret_fd);
+                    rsp[0] = '\0';
                 }
             }
 
@@ -161,7 +197,7 @@ int main(void)
         }
 
         if (xcb_connection_has_error(dpy)) {
-            die("connection has errors\n");
+            err("connection has errors\n");
         }
     }