#include <stdio.h>
#include <string.h>
#include <unistd.h>
-#include <signal.h>
#include <fcntl.h>
+#include <ctype.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <sys/select.h>
-#include <xcb/xcb.h>
-#include <xcb/xcb_event.h>
-#include <xcb/xcb_ewmh.h>
-#include <xcb/randr.h>
#include "types.h"
+#include "desktop.h"
+#include "monitor.h"
#include "settings.h"
#include "messages.h"
-#include "rules.h"
#include "events.h"
#include "common.h"
-#include "helpers.h"
-#include "window.h"
#include "bspwm.h"
#include "tree.h"
+#include "window.h"
+#include "history.h"
+#include "stack.h"
+#include "rule.h"
#include "ewmh.h"
int main(int argc, char *argv[])
while ((opt = getopt(argc, argv, "hvc:s:p:")) != -1) {
switch (opt) {
case 'h':
- printf("bspwm [-h|-v|-c CONFIG_PATH|-s PANEL_FIFO|-p PANEL_PREFIX]\n");
+ printf(WM_NAME " [-h|-v|-c CONFIG_PATH|-s PANEL_FIFO|-p PANEL_PREFIX]\n");
exit(EXIT_SUCCESS);
break;
case 'v':
exit(EXIT_SUCCESS);
break;
case 'c':
- strncpy(config_path, optarg, sizeof(config_path));
+ snprintf(config_path, sizeof(config_path), "%s", optarg);
break;
case 's':
fifo_path = optarg;
snprintf(config_path, sizeof(config_path), "%s/%s/%s/%s", getenv("HOME"), ".config", WM_NAME, CONFIG_NAME);
}
- running = true;
dpy = xcb_connect(NULL, &default_screen);
if (xcb_connection_has_error(dpy))
dpy_fd = xcb_get_file_descriptor(dpy);
char *sp = getenv(SOCKET_ENV_VAR);
- strncpy(socket_path, (sp == NULL ? DEFAULT_SOCKET_PATH : sp), sizeof(socket_path));
+ snprintf(socket_path, sizeof(socket_path), "%s", (sp == NULL ? DEFAULT_SOCKET_PATH : sp));
sock_address.sun_family = AF_UNIX;
- strncpy(sock_address.sun_path, socket_path, sizeof(sock_address.sun_path));
+ snprintf(sock_address.sun_path, sizeof(sock_address.sun_path), "%s", socket_path);
unlink(socket_path);
sock_fd = socket(AF_UNIX, SOCK_STREAM, 0);
load_settings();
run_config();
- ewmh_update_wm_name();
+ running = true;
while (running) {
{
num_monitors = num_desktops = num_clients = 0;
monitor_uid = desktop_uid = rule_uid = 0;
- mon = last_mon = mon_head = mon_tail = NULL;
+ mon = mon_head = mon_tail = pri_mon = NULL;
rule_head = rule_tail = NULL;
+ history_head = history_tail = NULL;
+ stack_head = stack_tail = NULL;
status_fifo = NULL;
last_motion_time = last_motion_x = last_motion_y = 0;
randr_base = 0;
- visible = auto_raise = true;
+ visible = auto_raise = sticky_still = true;
exit_status = 0;
}
xcb_create_window(dpy, XCB_COPY_FROM_PARENT, motion_recorder, root, 0, 0, screen_width, screen_height, 0, XCB_WINDOW_CLASS_INPUT_ONLY, XCB_COPY_FROM_PARENT, mask, values);
xcb_atom_t net_atoms[] = {ewmh->_NET_SUPPORTED,
+ ewmh->_NET_SUPPORTING_WM_CHECK,
ewmh->_NET_DESKTOP_NAMES,
ewmh->_NET_NUMBER_OF_DESKTOPS,
ewmh->_NET_CURRENT_DESKTOP,
ewmh->_NET_WM_STATE_DEMANDS_ATTENTION,
ewmh->_NET_WM_WINDOW_TYPE,
ewmh->_NET_WM_WINDOW_TYPE_DOCK,
+ ewmh->_NET_WM_WINDOW_TYPE_DESKTOP,
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);
+ ewmh_set_supporting(motion_recorder);
- xcb_intern_atom_reply_t *iar = xcb_intern_atom_reply(dpy, xcb_intern_atom(dpy, 0, strlen("_COMPTON_SHADOW"), "_COMPTON_SHADOW"), NULL);
-
- if (iar != NULL) {
- compton_shadow = iar->atom;
- free(iar);
- }
+#define GETATOM(a) \
+ get_atom(#a, &a);
+ GETATOM(WM_DELETE_WINDOW)
+ GETATOM(WM_TAKE_FOCUS)
+ GETATOM(_BSPWM_FLOATING_WINDOW)
+#undef GETATOM
const xcb_query_extension_reply_t *qep = xcb_get_extension_data(dpy, &xcb_randr_id);
if (qep->present && import_monitors()) {
randr = false;
warn("Couldn't retrieve monitors via RandR.\n");
xcb_rectangle_t rect = (xcb_rectangle_t) {0, 0, screen_width, screen_height};
- monitor_t *m = add_monitor(&rect);
+ monitor_t *m = add_monitor(rect);
add_desktop(m, make_desktop(NULL));
}
ewmh_update_desktop_names();
ewmh_update_current_desktop();
frozen_pointer = make_pointer_state();
+ xcb_get_input_focus_reply_t *ifo = xcb_get_input_focus_reply(dpy, xcb_get_input_focus(dpy), NULL);
+ if (ifo != NULL && (ifo->focus == XCB_INPUT_FOCUS_POINTER_ROOT || ifo->focus == XCB_NONE))
+ clear_input_focus();
+ free(ifo);
}
void register_events(void)
}
}
-bool import_monitors(void)
-{
- PUTS("import monitors");
- xcb_randr_get_screen_resources_current_reply_t *sres = xcb_randr_get_screen_resources_current_reply(dpy, xcb_randr_get_screen_resources_current(dpy, root), NULL);
- if (sres == NULL)
- return false;
-
- int len = xcb_randr_get_screen_resources_current_outputs_length(sres);
- xcb_randr_output_t *outputs = xcb_randr_get_screen_resources_current_outputs(sres);
-
- xcb_randr_get_output_info_cookie_t cookies[len];
- for (int i = 0; i < len; i++)
- cookies[i] = xcb_randr_get_output_info(dpy, outputs[i], XCB_CURRENT_TIME);
-
- for (monitor_t *m = mon_head; m != NULL; m = m->next)
- m->wired = false;
-
- monitor_t *mm = NULL;
- unsigned int num = 0;
-
- for (int i = 0; i < len; i++) {
- xcb_randr_get_output_info_reply_t *info = xcb_randr_get_output_info_reply(dpy, cookies[i], NULL);
- if (info != NULL && info->crtc != XCB_NONE) {
-
- xcb_randr_get_crtc_info_reply_t *cir = xcb_randr_get_crtc_info_reply(dpy, xcb_randr_get_crtc_info(dpy, info->crtc, XCB_CURRENT_TIME), NULL);
- if (cir != NULL) {
- xcb_rectangle_t rect = (xcb_rectangle_t) {cir->x, cir->y, cir->width, cir->height};
- mm = get_monitor_by_id(outputs[i]);
- if (mm != NULL) {
- mm->rectangle = rect;
- for (desktop_t *d = mm->desk_head; d != NULL; d = d->next)
- for (node_t *n = first_extrema(d->root); n != NULL; n = next_leaf(n, d->root))
- fit_monitor(mm, n->client);
- arrange(mm, mm->desk);
- mm->wired = true;
- PRINTF("update monitor %s (0x%X)\n", mm->name, mm->id);
- } else {
- mm = add_monitor(&rect);
- char *name = (char *)xcb_randr_get_output_info_name(info);
- size_t name_len = MIN(sizeof(mm->name), (size_t)xcb_randr_get_output_info_name_length(info));
- strncpy(mm->name, name, name_len);
- mm->name[name_len] = '\0';
- mm->id = outputs[i];
- add_desktop(mm, make_desktop(NULL));
- PRINTF("add monitor %s (0x%X)\n", mm->name, mm->id);
- }
- num++;
- }
- free(cir);
- }
- free(info);
- }
-
- monitor_t *m = mon_head;
- while (m != NULL) {
- monitor_t *next = m->next;
- if (!m->wired) {
- PRINTF("remove monitor %s (0x%X)\n", m->name, m->id);
- merge_monitors(m, mm);
- remove_monitor(m);
- }
- m = next;
- }
-
- free(sres);
- update_motion_recorder();
- return (num_monitors > 0);
-}
-
void quit(void)
{
running = false;
remove_monitor(mon_head);
while (rule_head != NULL)
remove_rule(rule_head);
+ while (stack_head != NULL)
+ remove_stack(stack_head);
+ empty_history();
free(frozen_pointer);
}
for (desktop_t *d = m->desk_head; d != NULL; d = d->next, urgent = false) {
for (node_t *n = first_extrema(d->root); n != NULL && !urgent; n = next_leaf(n, d->root))
urgent |= n->client->urgent;
- fprintf(status_fifo, "%c%s:", m->desk == d ? (urgent ? 'U' : 'D') : (d->root == NULL ? 'E' : (urgent ? 'u' : 'd')), d->name);
+ char c = (urgent ? 'u' : (d->root == NULL ? 'f' : 'o'));
+ if (m->desk == d)
+ c = toupper(c);
+ fprintf(status_fifo, "%c%s:", c, d->name);
}
}
if (mon != NULL && mon->desk != NULL)
projects / bspwm.git / blobdiff