running = false;
}
+void cleanup(void)
+{
+ while (mon_head != NULL)
+ remove_monitor(mon_head);
+ while (rule_head != NULL)
+ remove_rule(rule_head);
+ free(frozen_pointer);
+}
+
void register_events(void)
{
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));
+ xcb_generic_error_t *e = xcb_request_check(dpy, xcb_change_window_attributes_checked(dpy, root, XCB_CW_EVENT_MASK, values));
if (e != NULL) {
xcb_disconnect(dpy);
- err("another wm is already running\n");
+ err("Another window manager is already running.\n");
}
}
-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 ungrab_buttons(void)
-{
- xcb_ungrab_button(dpy, XCB_BUTTON_INDEX_1, screen->root, button_modifier);
- xcb_ungrab_button(dpy, XCB_BUTTON_INDEX_2, screen->root, button_modifier);
- xcb_ungrab_button(dpy, XCB_BUTTON_INDEX_3, screen->root, button_modifier);
-}
-
void setup(void)
{
ewmh_init();
screen = xcb_setup_roots_iterator(xcb_get_setup(dpy)).data;
if (!screen)
- err("can't acquire screen\n");
+ err("Can't acquire the default screen.\n");
+ root = screen->root;
register_events();
screen_width = screen->width_in_pixels;
xcb_ewmh_set_supported(ewmh, default_screen, LENGTH(net_atoms), net_atoms);
- monitor_uid = desktop_uid = client_uid = 0;
+ monitor_uid = desktop_uid = client_uid = rule_uid = 0;
mon = last_mon = mon_head = mon_tail = NULL;
bool xinerama_is_active = false;
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};
}
free(xsq);
} else {
- warn("Xinerama is inactive");
+ warn("Xinerama is inactive.");
xcb_rectangle_t rect = (xcb_rectangle_t) {0, 0, screen_width, screen_height};
add_monitor(&rect);
}
ewmh_update_number_of_desktops();
ewmh_update_desktop_names();
ewmh_update_current_desktop();
- rule_head = make_rule();
+ rule_head = rule_tail = NULL;
frozen_pointer = make_pointer_state();
- get_pointer_position(&pointer_position);
+ update_pointer_position(&pointer_position);
+ last_entered = XCB_NONE;
split_mode = MODE_AUTOMATIC;
+ visible = true;
+ exit_status = 0;
}
int main(int argc, char *argv[])
{
- if (argc == 2 && strcmp(argv[1], "-v") == 0) {
- printf("%s\n", VERSION);
- exit(EXIT_SUCCESS);
- }
-
fd_set descriptors;
char socket_path[MAXLEN];
+ char *fifo_path = NULL;
int sock_fd, ret_fd, dpy_fd, sel, n;
struct sockaddr_un sock_address;
size_t rsplen = 0;
char msg[BUFSIZ] = {0};
char rsp[BUFSIZ] = {0};
-
xcb_generic_event_t *event;
+ char opt;
+
+ while ((opt = getopt(argc, argv, "vs:")) != -1) {
+ switch (opt) {
+ case 'v':
+ printf("%s\n", VERSION);
+ exit(EXIT_SUCCESS);
+ break;
+ case 's':
+ fifo_path = optarg;
+ break;
+ }
+ }
running = true;
-
dpy = xcb_connect(NULL, &default_screen);
if (xcb_connection_has_error(dpy))
- err("can't open display\n");
+ err("Can't open the default display.\n");
setup();
sock_fd = socket(AF_UNIX, SOCK_STREAM, 0);
if (sock_fd == -1)
- err("couldn't create socket\n");
+ err("Couldn't create the socket.\n");
- bind(sock_fd, (struct sockaddr *) &sock_address, sizeof(sock_address));
- listen(sock_fd, SOMAXCONN);
+ if (bind(sock_fd, (struct sockaddr *) &sock_address, sizeof(sock_address)) == -1)
+ err("Couldn't bind a name to the socket.\n");
+
+ if (listen(sock_fd, SOMAXCONN) == -1)
+ err("Couldn't listen to the socket.\n");
sel = MAX(sock_fd, dpy_fd) + 1;
+ if (fifo_path != NULL) {
+ int fifo_fd = open(fifo_path, O_RDWR | O_NONBLOCK);
+ if (fifo_fd != -1)
+ status_fifo = fdopen(fifo_fd, "w");
+ else
+ warn("Couldn't open status fifo.\n");
+ }
+
load_settings();
run_autostart();
- grab_buttons();
ewmh_update_wm_name();
while (running) {
FD_SET(sock_fd, &descriptors);
FD_SET(dpy_fd, &descriptors);
- if (select(sel, &descriptors, NULL, NULL, NULL)) {
+ if (select(sel, &descriptors, NULL, NULL, NULL) > 0) {
if (FD_ISSET(sock_fd, &descriptors)) {
ret_fd = accept(sock_fd, NULL, 0);
}
- if (xcb_connection_has_error(dpy)) {
- err("connection has errors\n");
- }
+ if (xcb_connection_has_error(dpy))
+ err("The server has closed the connection.\n");
}
+ cleanup();
close(sock_fd);
+ if (status_fifo != NULL)
+ fclose(status_fifo);
xcb_ewmh_connection_wipe(ewmh);
free(ewmh);
xcb_flush(dpy);
xcb_disconnect(dpy);
- return 0;
+ return exit_status;
}
projects / bspwm.git / blobdiff