X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=bspwm.c;h=55886601d54bacdd097ac2d71445d9f8b064a2ca;hb=554e99d93d282270994364e44603e2d451328b49;hp=e70edef87b1ab88c243500e3193c5afa3b5fb13b;hpb=24507288bfffcd4ad10d2c53fb370699ba96c387;p=bspwm.git diff --git a/bspwm.c b/bspwm.c index e70edef..5588660 100644 --- a/bspwm.c +++ b/bspwm.c @@ -12,14 +12,14 @@ #include #include #include -#include "helpers.h" +#include #include "types.h" #include "settings.h" #include "messages.h" #include "rules.h" #include "events.h" #include "common.h" -#include "utils.h" +#include "helpers.h" #include "bspwm.h" #include "tree.h" #include "ewmh.h" @@ -29,58 +29,102 @@ void quit(void) running = false; } -int register_events(void) +void register_events(void) { - uint32_t values[] = {XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY | XCB_EVENT_MASK_PROPERTY_CHANGE | XCB_EVENT_MASK_BUTTON_PRESS}; - xcb_generic_error_t *err = xcb_request_check(dpy, xcb_change_window_attributes_checked(dpy, screen->root, XCB_CW_EVENT_MASK, values)); - xcb_flush(dpy); - if (err != NULL) - return 1; - return 0; + uint32_t values[] = {ROOT_EVENT_MASK}; + 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); + err("another WM is already running\n"); + } + } -void handle_zombie(int sig) +void grab_buttons(void) { - while (waitpid(-1, NULL, WNOHANG) > 0) - ; - signal(sig, handle_zombie); + 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(int default_screen) +void setup(void) { - signal(SIGCHLD, handle_zombie); 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; - - xcb_atom_t net_atoms[] = {ewmh->_NET_SUPPORTED, ewmh->_NET_WM_STATE_FULLSCREEN, ewmh->_NET_WM_STATE, ewmh->_NET_ACTIVE_WINDOW}; + root_depth = screen->root_depth; + + xcb_atom_t net_atoms[] = {ewmh->_NET_SUPPORTED, + ewmh->_NET_DESKTOP_NAMES, + ewmh->_NET_NUMBER_OF_DESKTOPS, + 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(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(); - rule_head = make_rule(); - + frozen_pointer = make_pointer_state(); split_mode = MODE_AUTOMATIC; } int main(void) { fd_set descriptors; - int sock_fd, ret_fd, dpy_fd, sel, nbr; + char socket_path[MAXLEN]; + int sock_fd, ret_fd, dpy_fd, sel, n; struct sockaddr_un sock_address; - char *sock_path; - char msg[BUFSIZ], rsp[BUFSIZ]; + size_t rsplen = 0; + char msg[BUFSIZ] = {0}; + char rsp[BUFSIZ] = {0}; xcb_generic_event_t *event; @@ -89,30 +133,25 @@ int main(void) dpy = xcb_connect(NULL, &default_screen); if (xcb_connection_has_error(dpy)) - die("error: cannot open display\n"); - - setup(default_screen); + err("error: cannot open display\n"); - if (register_events() == 1) { - xcb_disconnect(dpy); - die("another WM is already running\n"); - } + setup(); + register_events(); dpy_fd = xcb_get_file_descriptor(dpy); - sock_path = getenv(SOCK_PATH); + char *sp = getenv(SOCKET_ENV_VAR); - if (sock_path == NULL) - die("BSPWM_SOCKET environment variable is not set\n"); + strncpy(socket_path, (sp == NULL ? DEFAULT_SOCKET_PATH : sp), sizeof(socket_path)); sock_address.sun_family = AF_UNIX; - strcpy(sock_address.sun_path, sock_path); - unlink(sock_path); + strncpy(sock_address.sun_path, socket_path, sizeof(sock_address.sun_path)); + unlink(socket_path); sock_fd = socket(AF_UNIX, SOCK_STREAM, 0); - if (sock_fd == -1) - die("error: could not create socket\n"); + if (sock_fd == -1) + err("error: could not create socket\n"); bind(sock_fd, (struct sockaddr *) &sock_address, sizeof(sock_address)); listen(sock_fd, SOMAXCONN); @@ -122,7 +161,7 @@ int main(void) load_settings(); run_autostart(); ewmh_update_wm_name(); - update_root_dimensions(); + grab_buttons(); while (running) { @@ -136,12 +175,15 @@ int main(void) if (FD_ISSET(sock_fd, &descriptors)) { ret_fd = accept(sock_fd, NULL, 0); - if (ret_fd > 0 && (nbr = recv(ret_fd, msg, sizeof(msg), 0)) > 0) { - msg[nbr] = '\0'; - strcpy(rsp, EMPTY_RESPONSE); + if (ret_fd > 0 && (n = recv(ret_fd, msg, sizeof(msg), 0)) > 0) { + msg[n] = '\0'; process_message(msg, rsp); - send(ret_fd, rsp, strlen(rsp), 0); + rsplen = strlen(rsp); + if (rsp[rsplen - 1] == '\n') + rsp[--rsplen] = '\0'; + send(ret_fd, rsp, rsplen, 0); close(ret_fd); + rsp[0] = '\0'; } } @@ -155,7 +197,7 @@ int main(void) } if (xcb_connection_has_error(dpy)) { - die("connection has errors\n"); + err("connection has errors\n"); } }