X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=d63e6e8accdd43e107241600dd4c1d12ff1eb80c;hb=c6485fbba4e28bc85b4e16296a5bd8b0d6653404;hp=85345d6d85e0984fae71755d6020cd18670c79d5;hpb=f2da41ebd0faa4e3e4c80ee22d66aa3e1297a735;p=spectrwm.git diff --git a/spectrwm.c b/spectrwm.c index 85345d6..d63e6e8 100644 --- a/spectrwm.c +++ b/spectrwm.c @@ -91,6 +91,8 @@ #include #include #include +#include +#include #include #include #include @@ -201,15 +203,15 @@ u_int32_t swm_debug = 0 #endif char **start_argv; -Atom astate; -Atom aprot; -Atom adelete; -Atom takefocus; -Atom a_wmname; -Atom a_netwmname; -Atom a_utf8_string; -Atom a_string; -Atom a_swm_iconic; +xcb_atom_t astate; +xcb_atom_t aprot; +xcb_atom_t adelete; +xcb_atom_t takefocus; +xcb_atom_t a_wmname; +xcb_atom_t a_netwmname; +xcb_atom_t a_utf8_string; +xcb_atom_t a_string; +xcb_atom_t a_swm_iconic; volatile sig_atomic_t running = 1; volatile sig_atomic_t restart_wm = 0; int outputs = 0; @@ -242,7 +244,7 @@ struct search_window { int idx; struct ws_win *win; GC gc; - Window indicator; + xcb_window_t indicator; }; TAILQ_HEAD(search_winlist, search_window); struct search_winlist search_wl; @@ -354,8 +356,8 @@ TAILQ_HEAD(swm_region_list, swm_region); struct ws_win { TAILQ_ENTRY(ws_win) entry; - Window id; - Window transient; + xcb_window_t id; + xcb_window_t transient; struct ws_win *child_trans; /* transient child window */ struct swm_geometry g; /* current geometry */ struct swm_geometry g_float; /* region coordinates */ @@ -402,14 +404,14 @@ void max_stack(struct workspace *, struct swm_geometry *); void plain_stacker(struct workspace *); void fancy_stacker(struct workspace *); -struct ws_win *find_window(Window); +struct ws_win *find_window(xcb_window_t); -void grabbuttons(struct ws_win *, int); -void new_region(struct swm_screen *, int, int, int, int); -void unmanage_window(struct ws_win *); -long getstate(Window); +void grabbuttons(struct ws_win *, int); +void new_region(struct swm_screen *, int, int, int, int); +void unmanage_window(struct ws_win *); +uint16_t getstate(xcb_window_t); -int conf_load(char *, int); +int conf_load(char *, int); struct layout { void (*l_stack)(struct workspace *, struct swm_geometry *); @@ -479,12 +481,12 @@ struct swm_screen { int idx; /* screen index */ struct swm_region_list rl; /* list of regions on this screen */ struct swm_region_list orl; /* list of old regions */ - Window root; + xcb_window_t root; struct workspace ws[SWM_WS_MAX]; /* colors */ struct { - unsigned long color; + uint32_t color; char *name; } c[SWM_S_COLOR_MAX]; @@ -622,7 +624,39 @@ int floating_toggle_win(struct ws_win *); void constrain_window(struct ws_win *, struct swm_region *, int); void update_window(struct ws_win *); void spawn_select(struct swm_region *, union arg *, char *, int *); -unsigned char *get_win_name(Window); +unsigned char *get_win_name(xcb_window_t); +xcb_atom_t get_atom_from_string(const char *); +void map_window_raised(xcb_window_t); + +void +map_window_raised(xcb_window_t win) +{ + uint32_t val = XCB_STACK_MODE_ABOVE; + + xcb_configure_window(conn, win, + XCB_CONFIG_WINDOW_STACK_MODE, &val); + + xcb_map_window(conn, win); +} + +xcb_atom_t +get_atom_from_string(const char *str) +{ + xcb_intern_atom_cookie_t c; + xcb_intern_atom_reply_t *r; + xcb_atom_t atom; + + c = xcb_intern_atom(conn, False, strlen(str), str); + r = xcb_intern_atom_reply(conn, c, NULL); + if (r) { + atom = r->atom; + free(r); + + return (atom); + } + + return (XCB_ATOM_NONE); +} int get_property(Window id, Atom atom, long count, Atom type, unsigned long *nitems, @@ -652,17 +686,11 @@ update_iconic(struct ws_win *win, int newv) { int32_t v = newv; xcb_atom_t iprop; - xcb_intern_atom_cookie_t c; - xcb_intern_atom_reply_t *r; win->iconic = newv; - c = xcb_intern_atom(conn, False, strlen("_SWM_ICONIC"), "_SWM_ICONIC"); - r = xcb_intern_atom_reply(conn, c, NULL); - if (r) { - iprop = r->atom; - free(r); - } else + iprop = get_atom_from_string("_SWM_ICONIC"); + if (iprop == XCB_ATOM_NONE) return; if (newv) @@ -677,17 +705,11 @@ get_iconic(struct ws_win *win) { int32_t v = 0, *vtmp; xcb_atom_t iprop; - xcb_intern_atom_cookie_t c; - xcb_intern_atom_reply_t *r; xcb_get_property_cookie_t pc; xcb_get_property_reply_t *pr; - c = xcb_intern_atom(conn, False, strlen("_SWM_ICONIC"), "_SWM_ICONIC"); - r = xcb_intern_atom_reply(conn, c, NULL); - if (r) { - iprop = r->atom; - free(r); - } else + iprop = get_atom_from_string("_SWM_ICONIC"); + if (iprop == XCB_ATOM_NONE) goto out; pc = xcb_get_property(conn, False, win->id, iprop, XCB_ATOM_INTEGER, @@ -709,27 +731,12 @@ void setup_ewmh(void) { xcb_atom_t sup_list; - xcb_intern_atom_cookie_t c; - xcb_intern_atom_reply_t *r; int i, j, num_screens; - c = xcb_intern_atom(conn, False, strlen("_NET_SUPPORTED"), - "_NET_SUPPORTED"); - r = xcb_intern_atom_reply(conn, c, NULL); - if (r) { - sup_list = r->atom; - free(r); - } + sup_list = get_atom_from_string("_NET_SUPPORTED"); - for (i = 0; i < LENGTH(ewmh); i++) { - c = xcb_intern_atom(conn, False, strlen(ewmh[i].name), - ewmh[i].name); - r = xcb_intern_atom_reply(conn, c, NULL); - if (r) { - ewmh[i].atom = r->atom; - free(r); - } - } + for (i = 0; i < LENGTH(ewmh); i++) + ewmh[i].atom = get_atom_from_string(ewmh[i].name); num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); for (i = 0; i < num_screens; i++) { @@ -747,48 +754,52 @@ setup_ewmh(void) void teardown_ewmh(void) { - int i, success; - unsigned char *data = NULL; - unsigned long n; - Atom sup_check, sup_list; - Window id; - - sup_check = XInternAtom(display, "_NET_SUPPORTING_WM_CHECK", False); - sup_list = XInternAtom(display, "_NET_SUPPORTED", False); + int i, num_screens; + xcb_atom_t sup_check, sup_list; + xcb_window_t id; + xcb_get_property_cookie_t pc; + xcb_get_property_reply_t *pr; - for (i = 0; i < ScreenCount(display); i++) { + sup_check = get_atom_from_string("_NET_SUPPORTING_WM_CHECK"); + sup_list = get_atom_from_string("_NET_SUPPORTED"); + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + + for (i = 0; i < num_screens; i++) { /* Get the support check window and destroy it */ - success = get_property(screens[i].root, sup_check, 1, XA_WINDOW, - &n, NULL, &data); - - if (success) { - id = data[0]; - XDestroyWindow(display, id); - XDeleteProperty(display, screens[i].root, sup_check); - XDeleteProperty(display, screens[i].root, sup_list); + pc = xcb_get_property(conn, False, screens[i].root, sup_check, + XCB_ATOM_WINDOW, 0, 1); + pr = xcb_get_property_reply(conn, pc, NULL); + if (pr) { + id = *((xcb_window_t *)xcb_get_property_value(pr)); + + xcb_destroy_window(conn, id); + xcb_delete_property(conn, screens[i].root, sup_check); + xcb_delete_property(conn, screens[i].root, sup_list); + + free(pr); } - - XFree(data); } } void ewmh_autoquirk(struct ws_win *win) { - int success, i; - unsigned long *data = NULL, n; - Atom type; + int i; + unsigned long n; + xcb_atom_t type; - success = get_property(win->id, ewmh[_NET_WM_WINDOW_TYPE].atom, (~0L), - XA_ATOM, &n, NULL, (void *)&data); + xcb_get_property_cookie_t c; + xcb_get_property_reply_t *r; - if (!success) { - XFree(data); + c = xcb_get_property(conn, False, win->id, + ewmh[_NET_WM_WINDOW_TYPE].atom, XCB_ATOM_ATOM, 0, (~0L)); + r = xcb_get_property_reply(conn, c, NULL); + if (!r) return; - } + n = xcb_get_property_value_length(r); for (i = 0; i < n; i++) { - type = data[i]; + type = *((xcb_atom_t *)xcb_get_property_value(r)); if (type == ewmh[_NET_WM_WINDOW_TYPE_NORMAL].atom) break; if (type == ewmh[_NET_WM_WINDOW_TYPE_DOCK].atom || @@ -805,8 +816,7 @@ ewmh_autoquirk(struct ws_win *win) break; } } - - XFree(data); + free(r); } #define SWM_EWMH_ACTION_COUNT_MAX (6) @@ -923,36 +933,37 @@ ewmh_update_win_state(struct ws_win *win, long state, long action) win->ewmh_flags & EWMH_F_FULLSCREEN)) win->ewmh_flags = orig_flags; /* revert */ - XDeleteProperty(display, win->id, ewmh[_NET_WM_STATE].atom); + xcb_delete_property(conn, win->id, ewmh[_NET_WM_STATE].atom); if (win->ewmh_flags & EWMH_F_FULLSCREEN) - XChangeProperty(display, win->id, ewmh[_NET_WM_STATE].atom, - XA_ATOM, 32, PropModeAppend, - (unsigned char *)&ewmh[_NET_WM_STATE_FULLSCREEN].atom, 1); + xcb_change_property(conn, XCB_PROP_MODE_APPEND, win->id, + ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1, + &ewmh[_NET_WM_STATE_FULLSCREEN].atom); if (win->ewmh_flags & EWMH_F_SKIP_PAGER) - XChangeProperty(display, win->id, ewmh[_NET_WM_STATE].atom, - XA_ATOM, 32, PropModeAppend, - (unsigned char *)&ewmh[_NET_WM_STATE_SKIP_PAGER].atom, 1); + xcb_change_property(conn, XCB_PROP_MODE_APPEND, win->id, + ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1, + &ewmh[_NET_WM_STATE_SKIP_PAGER].atom); if (win->ewmh_flags & EWMH_F_SKIP_TASKBAR) - XChangeProperty(display, win->id, ewmh[_NET_WM_STATE].atom, - XA_ATOM, 32, PropModeAppend, - (unsigned char *)&ewmh[_NET_WM_STATE_SKIP_TASKBAR].atom, 1); + xcb_change_property(conn, XCB_PROP_MODE_APPEND, win->id, + ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1, + &ewmh[_NET_WM_STATE_SKIP_TASKBAR].atom); if (win->ewmh_flags & EWMH_F_ABOVE) - XChangeProperty(display, win->id, ewmh[_NET_WM_STATE].atom, - XA_ATOM, 32, PropModeAppend, - (unsigned char *)&ewmh[_NET_WM_STATE_ABOVE].atom, 1); + xcb_change_property(conn, XCB_PROP_MODE_APPEND, win->id, + ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1, + &ewmh[_NET_WM_STATE_ABOVE].atom); if (win->ewmh_flags & SWM_F_MANUAL) - XChangeProperty(display, win->id, ewmh[_NET_WM_STATE].atom, - XA_ATOM, 32, PropModeAppend, - (unsigned char *)&ewmh[_SWM_WM_STATE_MANUAL].atom, 1); + xcb_change_property(conn, XCB_PROP_MODE_APPEND, win->id, + ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1, + &ewmh[_SWM_WM_STATE_MANUAL].atom); } void ewmh_get_win_state(struct ws_win *win) { - int success, i; - unsigned long n; - Atom *states; + xcb_atom_t *states; + xcb_get_property_cookie_t c; + xcb_get_property_reply_t *r; + int i, n; if (win == NULL) return; @@ -963,16 +974,19 @@ ewmh_get_win_state(struct ws_win *win) if (win->manual) win->ewmh_flags |= SWM_F_MANUAL; - success = get_property(win->id, ewmh[_NET_WM_STATE].atom, - (~0L), XA_ATOM, &n, NULL, (void *)&states); - - if (!success) + c = xcb_get_property(conn, False, win->id, ewmh[_NET_WM_STATE].atom, + XCB_ATOM_ATOM, 0, (~0L)); + r = xcb_get_property_reply(conn, c, NULL); + if (!r) return; + + states = xcb_get_property_value(r); + n = xcb_get_property_value_length(r); + + free(r); for (i = 0; i < n; i++) ewmh_update_win_state(win, states[i], _NET_WM_STATE_ADD); - - XFree(states); } /* events */ @@ -1109,7 +1123,7 @@ void dumpwins(struct swm_region *r, union arg *args) { struct ws_win *win; - unsigned int state; + uint16_t state; XWindowAttributes wa; if (r->ws == NULL) { @@ -1124,7 +1138,7 @@ dumpwins(struct swm_region *r, union arg *args) if (!XGetWindowAttributes(display, win->id, &wa)) warnx("window: 0x%lx, failed XGetWindowAttributes", win->id); - warnx("window: 0x%lx, map_state: %d, state: %d, " + warnx("window: 0x%lx, map_state: %d, state: %u, " "transient: 0x%lx", win->id, wa.map_state, state, win->transient); } @@ -1135,7 +1149,7 @@ dumpwins(struct swm_region *r, union arg *args) if (!XGetWindowAttributes(display, win->id, &wa)) warnx("window: 0x%lx, failed XGetWindowAttributes", win->id); - warnx("window: 0x%lx, map_state: %d, state: %d, " + warnx("window: 0x%lx, map_state: %d, state: %u, " "transient: 0x%lx", win->id, wa.map_state, state, win->transient); } @@ -1250,26 +1264,34 @@ find_pid(long pid) return (NULL); } -unsigned long -name_to_color(char *colorname) +uint32_t +name_to_color(const char *colorname) { - Colormap cmap; - Status status; - XColor screen_def, exact_def; - unsigned long result = 0; - char cname[32] = "#"; + uint32_t result = 0; + char cname[32] = "#"; + xcb_screen_t *screen; + xcb_colormap_t cmap; + xcb_alloc_named_color_cookie_t c; + xcb_alloc_named_color_reply_t *r; - cmap = DefaultColormap(display, screens[0].idx); - status = XAllocNamedColor(display, cmap, colorname, - &screen_def, &exact_def); - if (!status) { + /* XXX - does not support rgb:/RR/GG/BB + * will need to use xcb_alloc_color + */ + screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data; + cmap = screen->default_colormap; + + c = xcb_alloc_named_color(conn, cmap, strlen(colorname), colorname); + r = xcb_alloc_named_color_reply(conn, c, NULL); + if (!r) { strlcat(cname, colorname + 2, sizeof cname - 1); - status = XAllocNamedColor(display, cmap, cname, &screen_def, - &exact_def); + c = xcb_alloc_named_color(conn, cmap, strlen(cname), + cname); + r = xcb_alloc_named_color_reply(conn, c, NULL); } - if (status) - result = screen_def.pixel; - else + if (r) { + result = r->pixel; + free(r); + } else warnx("color '%s' not found", colorname); return (result); @@ -1401,8 +1423,8 @@ bar_print(struct swm_region *r, const char *s) XSetForeground(display, r->s->bar_gc, r->s->c[SWM_S_COLOR_BAR_FONT].color); DRAWSTRING(display, r->bar->buffer, bar_fs, r->s->bar_gc, - x, (bar_fs_extents->max_logical_extent.height - lbox.height) / 2 - - lbox.y, s, len); + x, (bar_fs_extents->max_logical_extent.height - lbox.height) / 2 - + lbox.y, s, len); /* blt */ XCopyArea(display, r->bar->buffer, r->bar->id, r->s->bar_gc, 0, 0, @@ -1482,13 +1504,14 @@ bar_urgent(char *s, size_t sz) { XWMHints *wmh = NULL; struct ws_win *win; - int i, j; + int i, j, num_screens; char b[8]; for (i = 0; i < workspace_limit; i++) urgent[i] = 0; - for (i = 0; i < ScreenCount(display); i++) + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) for (j = 0; j < workspace_limit; j++) TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry) { wmh = XGetWMHints(display, win->id); @@ -1731,13 +1754,14 @@ bar_fmt_print(void) { char fmtexp[SWM_BAR_MAX], fmtnew[SWM_BAR_MAX]; char fmtrep[SWM_BAR_MAX]; - int i; + int i, num_screens; struct swm_region *r; /* expand the format by first passing it through strftime(3) */ bar_fmt_expand(fmtexp, sizeof fmtexp); - for (i = 0; i < ScreenCount(display); i++) { + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) { TAILQ_FOREACH(r, &screens[i].rl, entry) { if (r->bar == NULL) continue; @@ -1784,20 +1808,21 @@ void bar_toggle(struct swm_region *r, union arg *args) { struct swm_region *tmpr; - int i, sc = ScreenCount(display); + int i, num_screens; DNPRINTF(SWM_D_BAR, "bar_toggle\n"); + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); if (bar_enabled) { - for (i = 0; i < sc; i++) + for (i = 0; i < num_screens; i++) TAILQ_FOREACH(tmpr, &screens[i].rl, entry) if (tmpr->bar) - XUnmapWindow(display, tmpr->bar->id); + xcb_unmap_window(conn, tmpr->bar->id); } else { - for (i = 0; i < sc; i++) + for (i = 0; i < num_screens; i++) TAILQ_FOREACH(tmpr, &screens[i].rl, entry) if (tmpr->bar) - XMapRaised(display, tmpr->bar->id); + map_window_raised(tmpr->bar->id); } bar_enabled = !bar_enabled; @@ -1810,9 +1835,9 @@ bar_toggle(struct swm_region *r, union arg *args) void bar_refresh(void) { - XSetWindowAttributes wa; struct swm_region *r; - int i; + uint32_t wa[2]; + int i, num_screens; /* do this here because the conf file is in memory */ if (bar_extra && bar_extra_running == 0 && bar_argv[0]) { @@ -1843,17 +1868,15 @@ bar_refresh(void) } } - bzero(&wa, sizeof wa); - for (i = 0; i < ScreenCount(display); i++) + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) TAILQ_FOREACH(r, &screens[i].rl, entry) { if (r->bar == NULL) continue; - wa.border_pixel = - screens[i].c[SWM_S_COLOR_BAR_BORDER].color; - wa.background_pixel = - screens[i].c[SWM_S_COLOR_BAR].color; - XChangeWindowAttributes(display, r->bar->id, - CWBackPixel | CWBorderPixel, &wa); + wa[0] = screens[i].c[SWM_S_COLOR_BAR].color; + wa[1] = screens[i].c[SWM_S_COLOR_BAR_BORDER].color; + xcb_change_window_attributes(conn, r->bar->id, + XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL, wa); } bar_update(); } @@ -1918,10 +1941,11 @@ bar_setup(struct swm_region *r) r->bar->buffer = XCreatePixmap(display, r->bar->id, WIDTH(r->bar), HEIGHT(r->bar), DefaultDepth(display, r->s->idx)); - XSelectInput(display, r->bar->id, VisibilityChangeMask); - + xcb_randr_select_input(conn, r->bar->id, + XCB_RANDR_NOTIFY_MASK_OUTPUT_CHANGE); + if (bar_enabled) - XMapRaised(display, r->bar->id); + map_window_raised(r->bar->id); DNPRINTF(SWM_D_BAR, "bar_setup: window: 0x%lx, (x,y) w x h: (%d,%d) " "%d x %d\n", WINID(r->bar), X(r->bar), Y(r->bar), WIDTH(r->bar), @@ -1947,40 +1971,42 @@ void drain_enter_notify(void) { int i = 0; - XEvent cne; - while (XCheckMaskEvent(display, EnterWindowMask, &cne)) + while (xcb_poll_for_event(conn)) i++; DNPRINTF(SWM_D_EVENT, "drain_enter_notify: drained: %d\n", i); } void -set_win_state(struct ws_win *win, long state) +set_win_state(struct ws_win *win, uint16_t state) { - long data[] = {state, None}; + uint16_t data[2] = { state, XCB_ATOM_NONE }; - DNPRINTF(SWM_D_EVENT, "set_win_state: window: 0x%lx\n", win->id); + DNPRINTF(SWM_D_EVENT, "set_win_state: window: 0x%x\n", win->id); if (win == NULL) return; - XChangeProperty(display, win->id, astate, astate, 32, PropModeReplace, - (unsigned char *)data, 2); + xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id, astate, + astate, 32, 2, data); } -long -getstate(Window w) +uint16_t +getstate(xcb_window_t w) { - long result = -1; - unsigned char *p = NULL; - unsigned long n; + uint16_t result = 0; + xcb_get_property_cookie_t c; + xcb_get_property_reply_t *r; - if (!get_property(w, astate, 2L, astate, &n, NULL, &p)) - return (-1); - if (n != 0) - result = *((long *)p); - XFree(p); + c = xcb_get_property(conn, False, w, astate, astate, 0L, 2L); + r = xcb_get_property_reply(conn, c, NULL); + + if (r) { + result = *((uint16_t *)xcb_get_property_value(r)); + free(r); + } + return (result); } @@ -1997,21 +2023,23 @@ version(struct swm_region *r, union arg *args) } void -client_msg(struct ws_win *win, Atom a) +client_msg(struct ws_win *win, xcb_atom_t a) { - XClientMessageEvent cm; + xcb_client_message_event_t ev; if (win == NULL) return; - bzero(&cm, sizeof cm); - cm.type = ClientMessage; - cm.window = win->id; - cm.message_type = aprot; - cm.format = 32; - cm.data.l[0] = a; - cm.data.l[1] = CurrentTime; - XSendEvent(display, win->id, False, 0L, (XEvent *)&cm); + bzero(&ev, sizeof ev); + ev.response_type = XCB_CLIENT_MESSAGE; + ev.window = win->id; + ev.type = aprot; + ev.format = 32; + ev.data.data32[0] = a; + ev.data.data32[1] = XCB_CURRENT_TIME; + + xcb_send_event(conn, False, win->id, + XCB_EVENT_MASK_NO_EVENT, (const char *)&ev); } /* synthetic response to a ConfigureRequest when not making a change */ @@ -2128,23 +2156,23 @@ unmap_window(struct ws_win *win) return; /* don't unmap again */ - if (getstate(win->id) == IconicState) + if (getstate(win->id) == XCB_WM_STATE_ICONIC) return; - set_win_state(win, IconicState); + set_win_state(win, XCB_WM_STATE_ICONIC); - XUnmapWindow(display, win->id); - XSetWindowBorder(display, win->id, - win->s->c[SWM_S_COLOR_UNFOCUS].color); + xcb_unmap_window(conn, win->id); + xcb_change_window_attributes(conn, win->id, + XCB_CW_BORDER_PIXEL, &win->s->c[SWM_S_COLOR_UNFOCUS].color); } void unmap_all(void) { struct ws_win *win; - int i, j; + int i, j, num_screens; - for (i = 0; i < ScreenCount(display); i++) + for (i = 0; i < num_screens; i++) for (j = 0; j < workspace_limit; j++) TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry) unmap_window(win); @@ -2194,7 +2222,6 @@ restart(struct swm_region *r, union arg *args) bar_extra_stop(); bar_extra = 1; unmap_all(); - xcb_disconnect(conn); XCloseDisplay(display); execvp(start_argv[0], start_argv); warn("execvp failed"); @@ -2202,28 +2229,32 @@ restart(struct swm_region *r, union arg *args) } struct swm_region * -root_to_region(Window root) +root_to_region(xcb_window_t root) { struct swm_region *r = NULL; - Window rr, cr; - int i, x, y, wx, wy; - unsigned int mask; + int i, num_screens; + xcb_query_pointer_cookie_t qpc; + xcb_query_pointer_reply_t *qpr; - DNPRINTF(SWM_D_MISC, "root_to_region: window: 0x%lx\n", root); + DNPRINTF(SWM_D_MISC, "root_to_region: window: 0x%x\n", root); - for (i = 0; i < ScreenCount(display); i++) + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) if (screens[i].root == root) break; - if (XQueryPointer(display, screens[i].root, - &rr, &cr, &x, &y, &wx, &wy, &mask) != False) { + qpc = xcb_query_pointer(conn, screens[i].root); + qpr = xcb_query_pointer_reply(conn, qpc, NULL); + + if (qpr) { DNPRINTF(SWM_D_MISC, "root_to_region: pointer: (%d,%d)\n", - x, y); + qpr->root_x, qpr->root_y); /* choose a region based on pointer location */ TAILQ_FOREACH(r, &screens[i].rl, entry) - if (X(r) <= x && x < MAX_X(r) && - Y(r) <= y && y < MAX_Y(r)) + if (X(r) <= qpr->root_x && qpr->root_x < MAX_X(r) && + Y(r) <= qpr->root_y && qpr->root_y < MAX_Y(r)) break; + free(qpr); } if (r == NULL) @@ -2233,12 +2264,13 @@ root_to_region(Window root) } struct ws_win * -find_unmanaged_window(Window id) +find_unmanaged_window(xcb_window_t id) { struct ws_win *win; - int i, j; + int i, j, num_screens; - for (i = 0; i < ScreenCount(display); i++) + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) for (j = 0; j < workspace_limit; j++) TAILQ_FOREACH(win, &screens[i].ws[j].unmanagedlist, entry) @@ -2248,36 +2280,39 @@ find_unmanaged_window(Window id) } struct ws_win * -find_window(Window id) +find_window(xcb_window_t id) { struct ws_win *win; - Window wrr, wpr, *wcr = NULL; - int i, j; - unsigned int nc; + int i, j, num_screens; + xcb_query_tree_cookie_t c; + xcb_query_tree_reply_t *r; - for (i = 0; i < ScreenCount(display); i++) + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) for (j = 0; j < workspace_limit; j++) TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry) if (id == win->id) return (win); - /* if we were looking for the parent return that window instead */ - if (XQueryTree(display, id, &wrr, &wpr, &wcr, &nc) == 0) + c = xcb_query_tree(conn, id); + r = xcb_query_tree_reply(conn, c, NULL); + if (!r) return (NULL); - if (wcr) - XFree(wcr); - /* ignore not found and root */ - if (wpr == 0 || wrr == wpr) + /* if we were looking for the parent return that window instead */ + if (r->parent == 0 || r->root == r->parent) return (NULL); /* look for parent */ - for (i = 0; i < ScreenCount(display); i++) + for (i = 0; i < num_screens; i++) for (j = 0; j < workspace_limit; j++) TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry) - if (wpr == win->id) + if (r->parent == win->id) { + free(r); return (win); + } + free(r); return (NULL); } @@ -2290,7 +2325,7 @@ spawn(int ws_idx, union arg *args, int close_fd) DNPRINTF(SWM_D_MISC, "spawn: %s\n", args->argv[0]); if (display) - close(ConnectionNumber(display)); + close(xcb_get_file_descriptor(conn)); setenv("LD_PRELOAD", SWM_LIB, 1); @@ -2340,14 +2375,15 @@ spawn(int ws_idx, union arg *args, int close_fd) void kill_refs(struct ws_win *win) { - int i, x; + int i, x, num_screens; struct swm_region *r; struct workspace *ws; if (win == NULL) return; - for (i = 0; i < ScreenCount(display); i++) + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) TAILQ_FOREACH(r, &screens[i].rl, entry) for (x = 0; x < workspace_limit; x++) { ws = &r->s->ws[x]; @@ -2364,12 +2400,13 @@ validate_win(struct ws_win *testwin) struct ws_win *win; struct workspace *ws; struct swm_region *r; - int i, x; + int i, x, num_screens; if (testwin == NULL) return (0); - for (i = 0; i < ScreenCount(display); i++) + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) TAILQ_FOREACH(r, &screens[i].rl, entry) for (x = 0; x < workspace_limit; x++) { ws = &r->s->ws[x]; @@ -2385,10 +2422,11 @@ validate_ws(struct workspace *testws) { struct swm_region *r; struct workspace *ws; - int i, x; + int i, x, num_screens; /* validate all ws */ - for (i = 0; i < ScreenCount(display); i++) + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) TAILQ_FOREACH(r, &screens[i].rl, entry) for (x = 0; x < workspace_limit; x++) { ws = &r->s->ws[x]; @@ -2441,9 +2479,8 @@ unfocus_win(struct ws_win *win) ; grabbuttons(win, 0); - XSetWindowBorder(display, win->id, - win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color); - + xcb_change_window_attributes(conn, win->id, XCB_CW_BORDER_PIXEL, + &win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color); xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->s->root, ewmh[_NET_ACTIVE_WINDOW].atom, XCB_ATOM_WINDOW, 32, 1, &none); @@ -2453,11 +2490,12 @@ void unfocus_all(void) { struct ws_win *win; - int i, j; + int i, j, num_screens; DNPRINTF(SWM_D_FOCUS, "unfocus_all\n"); - for (i = 0; i < ScreenCount(display); i++) + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) for (j = 0; j < workspace_limit; j++) TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry) unfocus_win(win); @@ -2467,10 +2505,10 @@ void focus_win(struct ws_win *win) { XEvent cne; - Window cur_focus; - int rr; struct ws_win *cfw = NULL; - + xcb_get_input_focus_cookie_t c; + xcb_get_input_focus_reply_t *r; + xcb_window_t cur_focus = XCB_WINDOW_NONE; DNPRINTF(SWM_D_FOCUS, "focus_win: window: 0x%lx\n", WINID(win)); @@ -2492,15 +2530,21 @@ focus_win(struct ws_win *win) return; } - XGetInputFocus(display, &cur_focus, &rr); + c = xcb_get_input_focus(conn); + r = xcb_get_input_focus_reply(conn, c, NULL); + if (r) { + cur_focus = r->focus; + free(r); + } if ((cfw = find_window(cur_focus)) != NULL) unfocus_win(cfw); else { /* use larger hammer since the window was killed somehow */ TAILQ_FOREACH(cfw, &win->ws->winlist, entry) if (cfw->ws && cfw->ws->r && cfw->ws->r->s) - XSetWindowBorder(display, cfw->id, - cfw->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color); + xcb_change_window_attributes(conn, cfw->id, + XCB_CW_BORDER_PIXEL, + &cfw->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color); } win->ws->focus = win; @@ -2511,18 +2555,19 @@ focus_win(struct ws_win *win) ; if (win->java == 0) - XSetInputFocus(display, win->id, - RevertToParent, CurrentTime); + xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, + win->id, XCB_CURRENT_TIME); grabbuttons(win, 1); - XSetWindowBorder(display, win->id, - win->ws->r->s->c[SWM_S_COLOR_FOCUS].color); + xcb_change_window_attributes(conn, win->id, + XCB_CW_BORDER_PIXEL, + &win->ws->r->s->c[SWM_S_COLOR_FOCUS].color); if (win->ws->cur_layout->flags & SWM_L_MAPONFOCUS || win->ws->always_raise) - XMapRaised(display, win->id); + map_window_raised(win->id); - XChangeProperty(display, win->s->root, - ewmh[_NET_ACTIVE_WINDOW].atom, XA_WINDOW, 32, - PropModeReplace, (unsigned char *)&win->id, 1); + xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->s->root, + ewmh[_NET_ACTIVE_WINDOW].atom, XCB_ATOM_WINDOW, 32, 1, + &win->id); } bar_update(); @@ -2651,10 +2696,11 @@ cyclescr(struct swm_region *r, union arg *args) { struct swm_region *rr = NULL; union arg a; - int i, x, y; + int i, x, y, num_screens; + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); /* do nothing if we don't have more than one screen */ - if (!(ScreenCount(display) > 1 || outputs > 1)) + if (!(num_screens > 1 || outputs > 1)) return; i = r->s->idx; @@ -2678,7 +2724,8 @@ cyclescr(struct swm_region *r, union arg *args) /* move mouse to region */ x = X(rr) + 1; y = Y(rr) + 1 + (bar_enabled ? bar_height : 0); - XWarpPointer(display, None, rr->s[i].root, 0, 0, 0, 0, x, y); + xcb_warp_pointer(conn, XCB_WINDOW_NONE, rr->s[i].root, 0, 0, 0, 0, + x, y); a.id = SWM_ARG_ID_FOCUSCUR; focus(rr, &a); @@ -2687,7 +2734,8 @@ cyclescr(struct swm_region *r, union arg *args) /* move to focus window */ x = X(rr->ws->focus) + 1; y = Y(rr->ws->focus) + 1; - XWarpPointer(display, None, rr->s[i].root, 0, 0, 0, 0, x, y); + xcb_warp_pointer(conn, XCB_WINDOW_NONE, rr->s[i].root, 0, 0, 0, + 0, x, y); } } @@ -3014,14 +3062,15 @@ void stack(void) { struct swm_geometry g; struct swm_region *r; - int i; + int i, num_screens; #ifdef SWM_DEBUG int j; #endif DNPRINTF(SWM_D_STACK, "stack: begin\n"); - - for (i = 0; i < ScreenCount(display); i++) { + + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) { #ifdef SWM_DEBUG j = 0; #endif @@ -3347,7 +3396,7 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) if (XGetWindowAttributes(display, win->id, &wa)) if (wa.map_state == IsUnmapped) - XMapRaised(display, win->id); + map_window_raised(win->id); last_h = win_g.h; i++; @@ -3367,12 +3416,12 @@ notiles: } stack_floater(win, ws->r); - XMapRaised(display, win->id); + map_window_raised(win->id); } if (fs_win) { stack_floater(fs_win, ws->r); - XMapRaised(display, fs_win->id); + map_window_raised(fs_win->id); } } @@ -3483,7 +3532,7 @@ max_stack(struct workspace *ws, struct swm_geometry *g) { struct swm_geometry gg = *g; struct ws_win *win, *wintrans = NULL, *parent = NULL; - int winno; + int winno, num_screens; DNPRINTF(SWM_D_STACK, "max_stack: workspace: %d\n", ws->idx); @@ -3494,6 +3543,7 @@ max_stack(struct workspace *ws, struct swm_geometry *g) if (winno == 0 && count_win(ws, 1) == 0) return; + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); TAILQ_FOREACH(win, &ws->winlist, entry) { if (win->transient) { wintrans = win; @@ -3526,14 +3576,14 @@ max_stack(struct workspace *ws, struct swm_geometry *g) } /* unmap only if we don't have multi screen */ if (win != ws->focus) - if (!(ScreenCount(display) > 1 || outputs > 1)) + if (!(num_screens > 1 || outputs > 1)) unmap_window(win); } /* put the last transient on top */ if (wintrans) { if (parent) - XMapRaised(display, parent->id); + map_window_raised(parent->id); stack_floater(wintrans, ws->r); focus_magic(wintrans); } @@ -3545,8 +3595,8 @@ send_to_ws(struct swm_region *r, union arg *args) int wsid = args->id; struct ws_win *win = NULL, *parent; struct workspace *ws, *nws; - Atom ws_idx_atom = 0; - unsigned char ws_idx_str[SWM_PROPLEN]; + xcb_atom_t ws_idx_atom = XCB_ATOM_NONE; + char ws_idx_str[SWM_PROPLEN]; union arg a; if (wsid >= workspace_limit) @@ -3585,14 +3635,15 @@ send_to_ws(struct swm_region *r, union arg *args) win->ws = nws; /* Try to update the window's workspace property */ - ws_idx_atom = XInternAtom(display, "_SWM_WS", False); + ws_idx_atom = get_atom_from_string("_SWM_WS"); if (ws_idx_atom && - snprintf((char *)ws_idx_str, SWM_PROPLEN, "%d", nws->idx) < + snprintf(ws_idx_str, SWM_PROPLEN, "%d", nws->idx) < SWM_PROPLEN) { DNPRINTF(SWM_D_PROP, "send_to_ws: set property: _SWM_WS: %s\n", ws_idx_str); - XChangeProperty(display, win->id, ws_idx_atom, XA_STRING, 8, - PropModeReplace, ws_idx_str, strlen((char *)ws_idx_str)); + xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id, + ws_idx_atom, XCB_ATOM_STRING, 8, strlen(ws_idx_str), + ws_idx_str); } stack(); @@ -3637,7 +3688,7 @@ iconify(struct swm_region *r, union arg *args) } unsigned char * -get_win_name(Window win) +get_win_name(xcb_window_t win) { unsigned char *prop = NULL; unsigned long nbytes, nitems; @@ -3702,7 +3753,7 @@ uniconify(struct swm_region *r, union arg *args) name = get_win_name(win->id); if (name == NULL) continue; - fprintf(lfile, "%s.%lu\n", name, win->id); + fprintf(lfile, "%s.%u\n", name, win->id); XFree(name); } @@ -3768,7 +3819,7 @@ search_win_cleanup(void) struct search_window *sw = NULL; while ((sw = TAILQ_FIRST(&search_wl)) != NULL) { - XDestroyWindow(display, sw->indicator); + xcb_destroy_window(conn, sw->indicator); XFreeGC(display, sw->gc); TAILQ_REMOVE(&search_wl, sw, entry); free(sw); @@ -3780,8 +3831,8 @@ search_win(struct swm_region *r, union arg *args) { struct ws_win *win = NULL; struct search_window *sw = NULL; - Window w; - XGCValues gcv; + xcb_window_t w; + XGCValues gcv; int i; char s[8]; FILE *lfile; @@ -3830,9 +3881,9 @@ search_win(struct swm_region *r, union arg *args) TAILQ_INSERT_TAIL(&search_wl, sw, entry); sw->gc = XCreateGC(display, w, 0, &gcv); - XMapRaised(display, w); + map_window_raised(w); XSetForeground(display, sw->gc, r->s->c[SWM_S_COLOR_BAR].color); - + DRAWSTRING(display, w, bar_fs, sw->gc, 2, (bar_fs_extents->max_logical_extent.height - lbox.height) / 2 - lbox.y, s, len); @@ -3859,7 +3910,7 @@ search_resp_uniconify(char *resp, unsigned long len) name = get_win_name(win->id); if (name == NULL) continue; - if (asprintf(&s, "%s.%lu", name, win->id) == -1) { + if (asprintf(&s, "%s.%u", name, win->id) == -1) { XFree(name); continue; } @@ -4030,7 +4081,7 @@ wkill(struct swm_region *r, union arg *args) return; if (args->id == SWM_ARG_ID_KILLWINDOW) - XKillClient(display, r->ws->focus->id); + xcb_kill_client(conn, r->ws->focus->id); else if (r->ws->focus->can_delete) client_msg(r->ws->focus, adelete); @@ -4140,23 +4191,23 @@ constrain_window(struct ws_win *win, struct swm_region *r, int resizable) void update_window(struct ws_win *win) { - unsigned int mask; - XWindowChanges wc; - - bzero(&wc, sizeof wc); - mask = CWBorderWidth | CWWidth | CWHeight | CWX | CWY; + uint16_t mask; + uint32_t wc[5]; - wc.border_width = BORDER(win); - wc.x = X(win); - wc.y = Y(win); - wc.width = WIDTH(win); - wc.height = HEIGHT(win); + mask = XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y | + XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT | + XCB_CONFIG_WINDOW_BORDER_WIDTH; + wc[0] = X(win); + wc[1] = Y(win); + wc[2] = WIDTH(win); + wc[3] = HEIGHT(win); + wc[4] = BORDER(win); - DNPRINTF(SWM_D_EVENT, "update_window: window: 0x%lx, (x,y) w x h: " - "(%d,%d) %d x %d, bordered: %s\n", win->id, wc.x, wc.y, wc.width, - wc.height, YESNO(win->bordered)); + DNPRINTF(SWM_D_EVENT, "update_window: window: 0x%x, (x,y) w x h: " + "(%d,%d) %d x %d, bordered: %s\n", win->id, wc[0], wc[1], wc[2], + wc[3], YESNO(win->bordered)); - XConfigureWindow(display, win->id, mask, &wc); + xcb_configure_window(conn, win->id, mask, wc); } #define SWM_RESIZE_STEPS (50) @@ -4329,7 +4380,7 @@ resize(struct ws_win *win, union arg *args) } store_float_geom(win,r); - XUngrabPointer(display, CurrentTime); + xcb_ungrab_pointer(conn, XCB_CURRENT_TIME); XFreeCursor(display, cursor); /* drain events */ @@ -4454,7 +4505,7 @@ move(struct ws_win *win, union arg *args) update_window(win); } store_float_geom(win, r); - XUngrabPointer(display, CurrentTime); + xcb_ungrab_pointer(conn, XCB_CURRENT_TIME); /* drain events */ drain_enter_notify(); @@ -5366,6 +5417,7 @@ updatenumlockmask(void) void grabkeys(void) { + int num_screens; unsigned int j, k; KeyCode code; unsigned int modifiers[] = @@ -5375,10 +5427,12 @@ grabkeys(void) DNPRINTF(SWM_D_MISC, "grabkeys\n"); updatenumlockmask(); - for (k = 0; k < ScreenCount(display); k++) { + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (k = 0; k < num_screens; k++) { if (TAILQ_EMPTY(&screens[k].rl)) continue; - XUngrabKey(display, AnyKey, AnyModifier, screens[k].root); + xcb_ungrab_key(conn, XCB_GRAB_ANY, screens[k].root, + XCB_MOD_MASK_ANY); RB_FOREACH(kp, key_tree, &keys) { if ((code = XKeysymToKeycode(display, kp->keysym))) for (j = 0; j < LENGTH(modifiers); j++) @@ -5888,7 +5942,7 @@ int setlayout(char *selector, char *value, int flags) { int ws_id, i, x, mg, ma, si, raise, f = 0; - int st = SWM_V_STACK; + int st = SWM_V_STACK, num_screens; char s[1024]; struct workspace *ws; @@ -5922,7 +5976,8 @@ setlayout(char *selector, char *value, int flags) "::::" "'"); - for (i = 0; i < ScreenCount(display); i++) { + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) { ws = (struct workspace *)&screens[i].ws; ws[ws_id].cur_layout = &layouts[st]; @@ -6144,7 +6199,7 @@ set_child_transient(struct ws_win *win, Window *trans) " for 0x%lx trans 0x%lx\n", win->id, win->transient); if (win->hints == NULL) { - warnx("no hints for 0x%lx", win->id); + warnx("no hints for 0x%x", win->id); return; } @@ -6156,7 +6211,7 @@ set_child_transient(struct ws_win *win, Window *trans) XFree(wmh); if ((wmh = XGetWMHints(display, w->id)) == NULL) { - warnx("can't get hints for 0x%lx", w->id); + warnx("can't get hints for 0x%x", w->id); continue; } @@ -6167,7 +6222,7 @@ set_child_transient(struct ws_win *win, Window *trans) win->transient = w->id; *trans = w->id; DNPRINTF(SWM_D_MISC, "set_child_transient: asjusting " - "transient to 0x%lx\n", win->transient); + "transient to 0x%x\n", win->transient); break; } } @@ -6177,22 +6232,16 @@ set_child_transient(struct ws_win *win, Window *trans) } long -window_get_pid(Window win) +window_get_pid(xcb_window_t win) { long ret = 0; const char *errstr; xcb_atom_t apid; - xcb_intern_atom_cookie_t c; - xcb_intern_atom_reply_t *r; xcb_get_property_cookie_t pc; - xcb_get_property_reply_t *pr; + xcb_get_property_reply_t *pr; - c = xcb_intern_atom(conn, False, strlen("_NET_WM_PID"), "_NET_WM_PID"); - r = xcb_intern_atom_reply(conn, c, NULL); - if (r) { - apid = r->atom; - free(r); - } else + apid = get_atom_from_string("_NET_WM_PID"); + if (apid == XCB_ATOM_NONE) goto tryharder; pc = xcb_get_property(conn, False, win, apid, XCB_ATOM_CARDINAL, 0, 1); @@ -6208,12 +6257,7 @@ window_get_pid(Window win) return (ret); tryharder: - c = xcb_intern_atom(conn, False, strlen("_SWM_PID"), "_SWM_PID"); - r = xcb_intern_atom_reply(conn, c, NULL); - if (r) { - apid = r->atom; - free(r); - } + apid = get_atom_from_string("_SWM_PID"); pc = xcb_get_property(conn, False, win, apid, XCB_ATOM_STRING, 0, SWM_PROPLEN); pr = xcb_get_property_reply(conn, pc, NULL); @@ -6229,7 +6273,7 @@ tryharder: } struct ws_win * -manage_window(Window id) +manage_window(xcb_window_t id) { Window trans = 0; struct workspace *ws; @@ -6467,7 +6511,7 @@ manage_window(Window id) /* floaters need to be mapped if they are in the current workspace */ if ((win->floating || win->transient) && (ws->idx == r->ws->idx)) - XMapRaised(display, win->id); + map_window_raised(win->id); return (win); } @@ -6481,7 +6525,7 @@ free_window(struct ws_win *win) return; /* needed for restart wm */ - set_win_state(win, WithdrawnState); + set_win_state(win, XCB_WM_STATE_WITHDRAWN); TAILQ_REMOVE(&win->ws->unmanagedlist, win, entry); @@ -6502,6 +6546,7 @@ void unmanage_window(struct ws_win *win) { struct ws_win *parent; + xcb_screen_t *screen; if (win == NULL) return; @@ -6515,8 +6560,10 @@ unmanage_window(struct ws_win *win) } /* focus on root just in case */ - XSetInputFocus(display, PointerRoot, PointerRoot, CurrentTime); - + screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data; + xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, + screen->root, XCB_CURRENT_TIME); + focus_prev(win); if (win->hints) { @@ -6879,7 +6926,7 @@ mapnotify(XEvent *e) win = manage_window(ev->window); if (win) - set_win_state(win, NormalState); + set_win_state(win, XCB_WM_STATE_NORMAL); /* * focus_win can only set input focus on a mapped window. @@ -6946,7 +6993,7 @@ propertynotify(XEvent *e) if (ev->state == PropertyDelete && ev->atom == a_swm_iconic) { update_iconic(win, 0); - XMapRaised(display, win->id); + map_window_raised(win->id); stack(); focus_win(win); return; @@ -6987,7 +7034,7 @@ unmapnotify(XEvent *e) if (win == NULL) return; - if (getstate(e->xunmap.window) == NormalState) { + if (getstate(e->xunmap.window) == XCB_WM_STATE_NORMAL) { unmanage_window(win); stack(); @@ -7014,16 +7061,19 @@ unmapnotify(XEvent *e) void visibilitynotify(XEvent *e) { - int i; + int i, num_screens; struct swm_region *r; DNPRINTF(SWM_D_EVENT, "visibilitynotify: window: 0x%lx\n", e->xvisibility.window); - if (e->xvisibility.state == VisibilityUnobscured) - for (i = 0; i < ScreenCount(display); i++) + + if (e->xvisibility.state == VisibilityUnobscured) { + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) TAILQ_FOREACH(r, &screens[i].rl, entry) if (e->xvisibility.window == WINID(r->bar)) bar_update(); + } } void @@ -7057,7 +7107,7 @@ clientmessage(XEvent *e) if (win->can_delete) client_msg(win, adelete); else - XKillClient(display, win->id); + xcb_kill_client(conn, win->id); } if (ev->message_type == ewmh[_NET_MOVERESIZE_WINDOW].atom) { DNPRINTF(SWM_D_EVENT, @@ -7202,15 +7252,19 @@ void scan_xrandr(int i) { #ifdef SWM_XRR_HAS_CRTC - XRRCrtcInfo *ci; - XRRScreenResources *sr; int c; int ncrtc = 0; #endif /* SWM_XRR_HAS_CRTC */ struct swm_region *r; + int num_screens; + xcb_randr_get_screen_resources_cookie_t src; + xcb_randr_get_screen_resources_reply_t *srr; + xcb_randr_get_crtc_info_cookie_t cic; + xcb_randr_get_crtc_info_reply_t *cir; + xcb_randr_crtc_t *crtc; - - if (i >= ScreenCount(display)) + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + if (i >= num_screens) errx(1, "scan_xrandr: invalid screen"); /* remove any old regions */ @@ -7225,30 +7279,34 @@ scan_xrandr(int i) /* map virtual screens onto physical screens */ #ifdef SWM_XRR_HAS_CRTC if (xrandr_support) { - sr = XRRGetScreenResourcesCurrent(display, screens[i].root); - if (sr == NULL) + src = xcb_randr_get_screen_resources(conn, screens[i].root); + srr = xcb_randr_get_screen_resources_reply(conn, src, NULL); + if (srr == NULL) new_region(&screens[i], 0, 0, DisplayWidth(display, i), DisplayHeight(display, i)); else - ncrtc = sr->ncrtc; - - for (c = 0, ci = NULL; c < ncrtc; c++) { - ci = XRRGetCrtcInfo(display, sr, sr->crtcs[c]); - if (ci->noutput == 0) + ncrtc = srr->num_crtcs; + for (c = 0; c < ncrtc; c++) { + crtc = xcb_randr_get_screen_resources_crtcs(srr); + cic = xcb_randr_get_crtc_info(conn, crtc[c], + XCB_CURRENT_TIME); + cir = xcb_randr_get_crtc_info_reply(conn, cic, NULL); + if (cir && cir->num_outputs == 0) continue; - if (ci != NULL && ci->mode == None) + if (cir == NULL || cir->mode == 0) new_region(&screens[i], 0, 0, DisplayWidth(display, i), DisplayHeight(display, i)); else new_region(&screens[i], - ci->x, ci->y, ci->width, ci->height); + cir->x, cir->y, cir->width, cir->height); } - if (ci) - XRRFreeCrtcInfo(ci); - XRRFreeScreenResources(sr); + if (srr) + free(srr); + if (cir) + free(cir); } else #endif /* SWM_XRR_HAS_CRTC */ { @@ -7258,28 +7316,30 @@ scan_xrandr(int i) } void -screenchange(XEvent *e) { +screenchange(XEvent *e) +{ XRRScreenChangeNotifyEvent *xe = (XRRScreenChangeNotifyEvent *)e; struct swm_region *r; - int i; + int i, num_screens; DNPRINTF(SWM_D_EVENT, "screenchange: root: 0x%lx\n", xe->root); if (!XRRUpdateConfiguration(e)) return; + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); /* silly event doesn't include the screen index */ - for (i = 0; i < ScreenCount(display); i++) + for (i = 0; i < num_screens; i++) if (screens[i].root == xe->root) break; - if (i >= ScreenCount(display)) + if (i >= num_screens) errx(1, "screenchange: screen not found"); /* brute force for now, just re-enumerate the regions */ scan_xrandr(i); /* add bars to all regions */ - for (i = 0; i < ScreenCount(display); i++) + for (i = 0; i < num_screens; i++) TAILQ_FOREACH(r, &screens[i].rl, entry) bar_setup(r); stack(); @@ -7290,45 +7350,70 @@ screenchange(XEvent *e) { void grab_windows(void) { - Window d1, d2, *wins = NULL; - XWindowAttributes wa; - unsigned int no; - int i, j; - long state, manage; + xcb_window_t *wins = NULL; + int no; + int i, j, num_screens; + uint16_t state, manage; + + xcb_query_tree_cookie_t qtc; + xcb_query_tree_reply_t *qtr; + xcb_get_window_attributes_cookie_t c; + xcb_get_window_attributes_reply_t *r; + xcb_get_property_cookie_t pc; - for (i = 0; i < ScreenCount(display); i++) { - if (!XQueryTree(display, screens[i].root, &d1, &d2, &wins, &no)) + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) { + qtc = xcb_query_tree(conn, screens[i].root); + qtr = xcb_query_tree_reply(conn, qtc, NULL); + if (!qtr) continue; - + wins = xcb_query_tree_children(qtr); + no = xcb_query_tree_children_length(qtr); /* attach windows to a region */ - /* normal windows */ + /* normal windows */ for (j = 0; j < no; j++) { - if (!XGetWindowAttributes(display, wins[j], &wa) || - wa.override_redirect || - XGetTransientForHint(display, wins[j], &d1)) + c = xcb_get_window_attributes(conn, wins[j]); + r = xcb_get_window_attributes_reply(conn, c, NULL); + if (!r) + continue; + if (r->override_redirect) { + free(r); continue; + } + + pc = xcb_get_wm_transient_for(conn, wins[j]); + if (xcb_get_wm_transient_for_reply(conn, pc, &wins[j], + NULL)) { + free(r); + continue; + } state = getstate(wins[j]); - manage = state == IconicState; - if (wa.map_state == IsViewable || manage) + manage = state == XCB_WM_STATE_ICONIC; + if (r->map_state == XCB_MAP_STATE_VIEWABLE || manage) manage_window(wins[j]); + free(r); } /* transient windows */ for (j = 0; j < no; j++) { - if (!XGetWindowAttributes(display, wins[j], &wa) || - wa.override_redirect) + c = xcb_get_window_attributes(conn, wins[j]); + r = xcb_get_window_attributes_reply(conn, c, NULL); + if (!r) continue; - + if (r->override_redirect) { + free(r); + continue; + } + free(r); + state = getstate(wins[j]); - manage = state == IconicState; - if (XGetTransientForHint(display, wins[j], &d1) && - manage) + manage = state == XCB_WM_STATE_ICONIC; + pc = xcb_get_wm_transient_for(conn, wins[j]); + if (xcb_get_wm_transient_for_reply(conn, pc, &wins[j], + NULL) && manage) manage_window(wins[j]); } - if (wins) { - XFree(wins); - wins = NULL; - } + free(qtr); } } @@ -7336,10 +7421,13 @@ void setup_screens(void) { int i, j, k, num_screens; - int errorbase, major, minor; + int errorbase; struct workspace *ws; XGCValues gcv; + xcb_randr_query_version_cookie_t c; + xcb_randr_query_version_reply_t *r; + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); if ((screens = calloc(num_screens, sizeof(struct swm_screen))) == NULL) @@ -7349,9 +7437,16 @@ setup_screens(void) /* initial Xrandr setup */ xrandr_support = XRRQueryExtension(display, &xrandr_eventbase, &errorbase); - if (xrandr_support) - if (XRRQueryVersion(display, &major, &minor) && major < 1) + if (xrandr_support) { + c = xcb_randr_query_version(conn, True, False); + r = xcb_randr_query_version_reply(conn, c, NULL); + if (r) { + if (r->major_version < 1) + xrandr_support = 0; + free(r); + } else xrandr_support = 0; + } /* map physical screens */ for (i = 0; i < num_screens; i++) { @@ -7371,7 +7466,7 @@ setup_screens(void) /* create graphics context on screen */ gcv.graphics_exposures = 0; screens[i].bar_gc = XCreateGC(display, screens[i].root, - GCGraphicsExposures, &gcv); + GCGraphicsExposures, &gcv); /* set default cursor */ XDefineCursor(display, screens[i].root, @@ -7400,8 +7495,8 @@ setup_screens(void) scan_xrandr(i); if (xrandr_support) - XRRSelectInput(display, screens[i].root, - RRScreenChangeNotifyMask); + xcb_randr_select_input(conn, screens[i].root, + XCB_RANDR_NOTIFY_MASK_SCREEN_CHANGE); } } @@ -7418,26 +7513,28 @@ setup_globals(void) void workaround(void) { - int i; - Atom netwmcheck, netwmname, utf8_string; - Window root, win; + int i, num_screens; + xcb_atom_t netwmcheck, netwmname, utf8_string; + xcb_window_t root, win; /* work around sun jdk bugs, code from wmname */ - netwmcheck = XInternAtom(display, "_NET_SUPPORTING_WM_CHECK", False); - netwmname = XInternAtom(display, "_NET_WM_NAME", False); - utf8_string = XInternAtom(display, "UTF8_STRING", False); - for (i = 0; i < ScreenCount(display); i++) { + netwmcheck = get_atom_from_string("_NET_SUPPORTING_WM_CHECK"); + netwmname = get_atom_from_string("_NET_WM_NAME"); + utf8_string = get_atom_from_string("UTF8_STRING"); + + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) { root = screens[i].root; win = XCreateSimpleWindow(display,root, 0, 0, 1, 1, 0, screens[i].c[SWM_S_COLOR_UNFOCUS].color, screens[i].c[SWM_S_COLOR_UNFOCUS].color); - XChangeProperty(display, root, netwmcheck, XA_WINDOW, 32, - PropModeReplace, (unsigned char *)&win, 1); - XChangeProperty(display, win, netwmcheck, XA_WINDOW, 32, - PropModeReplace, (unsigned char *)&win, 1); - XChangeProperty(display, win, netwmname, utf8_string, 8, - PropModeReplace, (unsigned char*)"LG3D", strlen("LG3D")); + xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, + netwmcheck, XCB_ATOM_WINDOW, 32, 1, &win); + xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win, + netwmcheck, XCB_ATOM_WINDOW, 32, 1, &win); + xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win, + netwmcheck, utf8_string, 8, strlen("LG3D"), "LG3D"); } } @@ -7451,10 +7548,11 @@ main(int argc, char *argv[]) char conf[PATH_MAX], *cfile = NULL; struct stat sb; XEvent e; - int xfd, i; + int xfd, i, num_screens; fd_set rd; struct sigaction sact; - + xcb_generic_event_t *evt; + start_argv = argv; warnx("Welcome to spectrwm V%s Build: %s", SPECTRWM_VERSION, buildstr); if (!setlocale(LC_CTYPE, "") || !setlocale(LC_TIME, "") || @@ -7487,15 +7585,15 @@ main(int argc, char *argv[]) sact.sa_flags = SA_NOCLDSTOP; sigaction(SIGCHLD, &sact, NULL); - astate = XInternAtom(display, "WM_STATE", False); - aprot = XInternAtom(display, "WM_PROTOCOLS", False); - adelete = XInternAtom(display, "WM_DELETE_WINDOW", False); - takefocus = XInternAtom(display, "WM_TAKE_FOCUS", False); - a_wmname = XInternAtom(display, "WM_NAME", False); - a_netwmname = XInternAtom(display, "_NET_WM_NAME", False); - a_utf8_string = XInternAtom(display, "UTF8_STRING", False); - a_string = XInternAtom(display, "STRING", False); - a_swm_iconic = XInternAtom(display, "_SWM_ICONIC", False); + astate = get_atom_from_string("WM_STATE"); + aprot = get_atom_from_string("WM_PROTOCOLS"); + adelete = get_atom_from_string("WM_DELETE_WINDOW"); + takefocus = get_atom_from_string("WM_TAKE_FOCUS"); + a_wmname = get_atom_from_string("WM_NAME"); + a_netwmname = get_atom_from_string("_NET_WM_NAME"); + a_utf8_string = get_atom_from_string("UTF8_STRING"); + a_string = get_atom_from_string("STRING"); + a_swm_iconic = get_atom_from_string("_SWM_ICONIC"); /* look for local and global conf file */ pwd = getpwuid(getuid()); @@ -7558,7 +7656,8 @@ noconfig: setenv("SWM_STARTED", "YES", 1); /* setup all bars */ - for (i = 0; i < ScreenCount(display); i++) + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) TAILQ_FOREACH(r, &screens[i].rl, entry) { if (winfocus == NULL) winfocus = TAILQ_FIRST(&r->ws->winlist); @@ -7572,9 +7671,9 @@ noconfig: if (focus_mode == SWM_FOCUS_DEFAULT) drain_enter_notify(); - xfd = ConnectionNumber(display); + xfd = xcb_get_file_descriptor(conn); while (running) { - while (XPending(display)) { + while ((evt = xcb_poll_for_event(conn)) == 0) { XNextEvent(display, &e); if (running == 0) goto done; @@ -7611,10 +7710,10 @@ noconfig: continue; } /* move pointer to first screen if multi screen */ - if (ScreenCount(display) > 1 || outputs > 1) - XWarpPointer(display, None, rr->s[0].root, - 0, 0, 0, 0, X(rr), - Y(rr) + (bar_enabled ? bar_height : 0)); + if (num_screens > 1 || outputs > 1) + xcb_warp_pointer(conn, XCB_WINDOW_NONE, + rr->s[0].root, 0, 0, 0, 0, X(rr), + Y(rr) + (bar_enabled ? bar_height : 0)); a.id = SWM_ARG_ID_FOCUSCUR; focus(rr, &a); @@ -7644,10 +7743,9 @@ done: teardown_ewmh(); bar_extra_stop(); - for (i = 0; i < ScreenCount(display); ++i) + for (i = 0; i < num_screens; ++i) if (screens[i].bar_gc != NULL) XFreeGC(display, screens[i].bar_gc); - XFreeFontSet(display, bar_fs); xcb_disconnect(conn); XCloseDisplay(display);