X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=be56d1b33b41a03819d596508f8e703d1c27b921;hb=314eb462495f1c4b8a58d6f75dc6c2727c995926;hp=1e205629f17ef33e09bc5ebed37c7e7abacfa722;hpb=cfe055c6fc663ae4f4ab2520ba076c2409552dac;p=spectrwm.git diff --git a/spectrwm.c b/spectrwm.c index 1e20562..be56d1b 100644 --- a/spectrwm.c +++ b/spectrwm.c @@ -141,6 +141,7 @@ static const char *buildstr = SPECTRWM_VERSION; #define xcb_icccm_get_wm_class_reply_t xcb_get_wm_class_reply_t #define xcb_icccm_get_wm_class_reply_wipe xcb_get_wm_class_reply_wipe #define xcb_icccm_get_wm_hints xcb_get_wm_hints +#define xcb_icccm_wm_hints_get_urgency xcb_wm_hints_get_urgency #define xcb_icccm_get_wm_hints_reply xcb_get_wm_hints_reply #define xcb_icccm_get_wm_name xcb_get_wm_name #define xcb_icccm_get_wm_name_reply xcb_get_wm_name_reply @@ -243,9 +244,20 @@ u_int32_t swm_debug = 0 #define SH_INC_W(w) (w)->sh.width_inc #define SH_INC_H(w) (w)->sh.height_inc #define SWM_MAX_FONT_STEPS (3) -#define WINID(w) ((w) ? (w)->id : 0) +#define WINID(w) ((w) ? (w)->id : XCB_WINDOW_NONE) +#define WS_FOCUSED(ws) ((ws)->r && (ws)->r->s->r_focus == (ws)->r) #define YESNO(x) ((x) ? "yes" : "no") +/* Constrain Window flags */ +#define SWM_CW_RESIZABLE (0x01) +#define SWM_CW_SOFTBOUNDARY (0x02) +#define SWM_CW_HARDBOUNDARY (0x04) +#define SWM_CW_RIGHT (0x10) +#define SWM_CW_LEFT (0x20) +#define SWM_CW_BOTTOM (0x40) +#define SWM_CW_TOP (0x80) +#define SWM_CW_ALLSIDES (0xf0) + #define SWM_FOCUS_DEFAULT (0) #define SWM_FOCUS_FOLLOW (1) #define SWM_FOCUS_MANUAL (2) @@ -269,10 +281,7 @@ xcb_atom_t a_state; xcb_atom_t a_prot; xcb_atom_t a_delete; xcb_atom_t a_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; xcb_atom_t a_swm_ws; volatile sig_atomic_t running = 1; @@ -288,6 +297,7 @@ Display *display; xcb_connection_t *conn; xcb_key_symbols_t *syms; +int boundary_width = 50; int cycle_empty = 0; int cycle_visible = 0; int term_width = 0; @@ -442,7 +452,6 @@ struct ws_win { unsigned long quirks; struct workspace *ws; /* always valid */ struct swm_screen *s; /* always valid, never changes */ - xcb_get_geometry_reply_t *wa; xcb_size_hints_t sh; xcb_icccm_get_wm_class_reply_t ch; xcb_icccm_wm_hints_t hints; @@ -560,6 +569,7 @@ union arg { #define SWM_ARG_ID_FOCUSNEXT (0) #define SWM_ARG_ID_FOCUSPREV (1) #define SWM_ARG_ID_FOCUSMAIN (2) +#define SWM_ARG_ID_FOCUSURGENT (3) #define SWM_ARG_ID_SWAPNEXT (10) #define SWM_ARG_ID_SWAPPREV (11) #define SWM_ARG_ID_SWAPMAIN (12) @@ -735,6 +745,7 @@ enum keyfuncid { KF_FOCUS_MAIN, KF_FOCUS_NEXT, KF_FOCUS_PREV, + KF_FOCUS_URGENT, KF_HEIGHT_GROW, KF_HEIGHT_SHRINK, KF_ICONIFY, @@ -883,7 +894,7 @@ int conf_load(const char *, int); void configurenotify(xcb_configure_notify_event_t *); void configurerequest(xcb_configure_request_event_t *); void config_win(struct ws_win *, xcb_configure_request_event_t *); -void constrain_window(struct ws_win *, struct swm_region *, int); +void constrain_window(struct ws_win *, struct swm_geometry *, int *); int count_win(struct workspace *, int); void cursors_cleanup(void); void cursors_load(void); @@ -936,6 +947,7 @@ struct ws_win *get_pointer_win(xcb_window_t); struct ws_win *get_region_focus(struct swm_region *); int get_region_index(struct swm_region *); xcb_screen_t *get_screen(int); +xcb_window_t get_sibling(struct ws_win *, int); int get_screen_count(void); #ifdef SWM_DEBUG char *get_stack_mode_name(uint8_t); @@ -961,9 +973,9 @@ void kill_refs(struct ws_win *); #ifdef SWM_DEBUG void leavenotify(xcb_leave_notify_event_t *); #endif -void load_float_geom(struct ws_win *, struct swm_region *); +void load_float_geom(struct ws_win *); struct ws_win *manage_window(xcb_window_t, uint16_t); -void map_window(struct ws_win *); +void map_window(struct ws_win *, xcb_window_t); void mapnotify(xcb_map_notify_event_t *); void mappingnotify(xcb_mapping_notify_event_t *); void maprequest(xcb_map_request_event_t *); @@ -988,6 +1000,9 @@ void quirk_replace(struct quirk *, const char *, const char *, unsigned long); void quit(struct swm_region *, union arg *); void raise_toggle(struct swm_region *, union arg *); +void region_containment(struct ws_win *, struct swm_region *, int); +struct swm_region *region_under(struct swm_screen *, int, int); +void regionize(struct ws_win *, int, int); void resize(struct ws_win *, union arg *); void resize_step(struct swm_region *, union arg *); void restart(struct swm_region *, union arg *); @@ -1036,13 +1051,14 @@ void spawn(int, union arg *, int); void spawn_custom(struct swm_region *, union arg *, const char *); int spawn_expand(struct swm_region *, union arg *, const char *, char ***); void spawn_insert(const char *, const char *, int); +struct spawn_prog *spawn_find(const char *); void spawn_remove(struct spawn_prog *); void spawn_replace(struct spawn_prog *, const char *, const char *, int); void spawn_select(struct swm_region *, union arg *, const char *, int *); void stack_config(struct swm_region *, union arg *); void stack_floater(struct ws_win *, struct swm_region *); void stack_master(struct workspace *, struct swm_geometry *, int, int); -void store_float_geom(struct ws_win *, struct swm_region *); +void store_float_geom(struct ws_win *); char *strdupsafe(const char *); void swapwin(struct swm_region *, union arg *); void switchws(struct swm_region *, union arg *); @@ -1061,6 +1077,7 @@ int validate_win(struct ws_win *); int validate_ws(struct workspace *); /*void visibilitynotify(xcb_visibility_notify_event_t *);*/ void version(struct swm_region *, union arg *); +void win_to_ws(struct ws_win *, int, int); pid_t window_get_pid(xcb_window_t); void wkill(struct swm_region *, union arg *); void workaround(void); @@ -1276,7 +1293,7 @@ get_swm_iconic(struct ws_win *win) pr = xcb_get_property_reply(conn, xcb_get_property(conn, 0, win->id, a_swm_iconic, XCB_ATOM_INTEGER, 0, 1), NULL); - if (!pr) + if (pr == NULL) goto out; if (pr->type != XCB_ATOM_INTEGER || pr->format != 32) goto out; @@ -1329,7 +1346,7 @@ teardown_ewmh(void) pc = xcb_get_property(conn, 0, screens[i].root, sup_check, XCB_ATOM_WINDOW, 0, 1); pr = xcb_get_property_reply(conn, pc, NULL); - if (!pr) + if (pr == NULL) continue; if (pr->format == sup_check) { id = *((xcb_window_t *)xcb_get_property_value(pr)); @@ -1353,7 +1370,7 @@ ewmh_autoquirk(struct ws_win *win) c = xcb_get_property(conn, 0, win->id, ewmh[_NET_WM_WINDOW_TYPE].atom, XCB_ATOM_ATOM, 0, UINT32_MAX); r = xcb_get_property_reply(conn, c, NULL); - if (!r) + if (r == NULL) return; n = xcb_get_property_value_length(r); @@ -1390,7 +1407,7 @@ ewmh_autoquirk(struct ws_win *win) int ewmh_set_win_fullscreen(struct ws_win *win, int fs) { - if (!win->ws->r) + if (win->ws->r == NULL) return (0); if (!win->floating) @@ -1401,12 +1418,12 @@ ewmh_set_win_fullscreen(struct ws_win *win, int fs) if (fs) { if (!win->g_floatvalid) - store_float_geom(win, win->ws->r); + store_float_geom(win); win->g = win->ws->r->g; win->bordered = 0; } else { - load_float_geom(win, win->ws->r); + load_float_geom(win); } return (1); @@ -1533,7 +1550,7 @@ ewmh_get_win_state(struct ws_win *win) c = xcb_get_property(conn, 0, win->id, ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 0, UINT32_MAX); r = xcb_get_property_reply(conn, c, NULL); - if (!r) + if (r == NULL) return; states = xcb_get_property_value(r); @@ -1702,7 +1719,7 @@ name_to_pixel(int sidx, const char *colorname) nr = xcb_alloc_named_color_reply(conn, xcb_alloc_named_color(conn, cmap, strlen(colorname), colorname), NULL); - if (!nr) { + if (nr == NULL) { strlcat(cname, colorname + 2, sizeof cname - 1); nr = xcb_alloc_named_color_reply(conn, xcb_alloc_named_color(conn, cmap, strlen(cname), @@ -1989,12 +2006,12 @@ bar_window_name(char *s, size_t sz, struct swm_region *r) free(title); } -int urgent[SWM_WS_MAX]; void bar_urgent(char *s, size_t sz) { struct ws_win *win; int i, j, num_screens; + int urgent[SWM_WS_MAX]; char b[8]; xcb_get_property_cookie_t c; xcb_icccm_wm_hints_t hints; @@ -2503,7 +2520,7 @@ xft_init(struct swm_region *r) font); } - if (!bar_font) { + if (bar_font == NULL) { warnx("unable to load font %s", font); continue; } else { @@ -2624,7 +2641,6 @@ getstate(xcb_window_t w) c = xcb_get_property(conn, 0, w, a_state, a_state, 0L, 2L); r = xcb_get_property_reply(conn, c, NULL); - if (r) { if (r->type == a_state && r->format == 32 && r->length == 2) result = *((uint32_t *)xcb_get_property_value(r)); @@ -2797,18 +2813,27 @@ quit(struct swm_region *r, union arg *args) } void -map_window(struct ws_win *win) +map_window(struct ws_win *win, xcb_window_t sibling) { - uint32_t val = XCB_STACK_MODE_ABOVE; + uint16_t mode = XCB_CONFIG_WINDOW_STACK_MODE; + uint32_t val[2]; + int i = 0; + + /* If sibling is specified, stack right above it. */ + if (sibling != XCB_WINDOW_NONE) { + mode |= XCB_CONFIG_WINDOW_SIBLING; + val[i++] = sibling; + } + + val[i] = XCB_STACK_MODE_ABOVE; if (win == NULL) return; - DNPRINTF(SWM_D_EVENT, "map_window: win 0x%x, mapped: %s\n", win->id, - YESNO(win->mapped)); + DNPRINTF(SWM_D_EVENT, "map_window: win 0x%x, mapped: %s, " + "sibling: 0x%x\n", win->id, YESNO(win->mapped), sibling); - xcb_configure_window(conn, win->id, - XCB_CONFIG_WINDOW_STACK_MODE, &val); + xcb_configure_window(conn, win->id, mode, val); if (win->mapped) return; @@ -2961,7 +2986,6 @@ root_to_region(xcb_window_t root, int check) /* No region with an active focus; try to use pointer. */ qpr = xcb_query_pointer_reply(conn, xcb_query_pointer(conn, screens[i].root), NULL); - if (qpr) { DNPRINTF(SWM_D_MISC, "root_to_region: pointer: " "(%d,%d)\n", qpr->root_x, qpr->root_y); @@ -3015,7 +3039,7 @@ find_window(xcb_window_t id) return (win); r = xcb_query_tree_reply(conn, xcb_query_tree(conn, id), NULL); - if (!r) + if (r == NULL) return (NULL); /* if we were looking for the parent return that window instead */ @@ -3156,6 +3180,42 @@ validate_ws(struct workspace *testws) return (1); } +xcb_window_t +get_sibling(struct ws_win *win, int mode) +{ + struct ws_win *w = win; + + switch (mode) { + case SWM_STACK_TOP: + TAILQ_FOREACH_REVERSE(w, &w->ws->winlist, ws_win_list, entry) + if (w != win && !w->floating && !w->iconic) + break; + break; + case SWM_STACK_ABOVE: + do { + w = TAILQ_NEXT(w, entry); + } while (w != NULL && (w == win || w->floating || w->iconic)); + break; + case SWM_STACK_BELOW: + do { + w = TAILQ_PREV(w, ws_win_list, entry); + } while (w != NULL && (w == win || w->floating || w->iconic)); + break; + case SWM_STACK_BOTTOM: + TAILQ_FOREACH(w, &w->ws->winlist, entry) + if (w != win && !w->floating && !w->iconic) + break; + break; + default: + w = NULL; + } + + if (w == NULL) + return (win->ws->r->id); + else + return (w->id); +} + void unfocus_win(struct ws_win *win) { @@ -3187,6 +3247,8 @@ unfocus_win(struct ws_win *win) } if (win->ws->focus == win) { + if (tile_gap < 0 && !win->floating) + map_window(win, get_sibling(win, SWM_STACK_BELOW)); win->ws->focus = NULL; win->ws->focus_prev = win; } @@ -3288,22 +3350,30 @@ focus_win(struct ws_win *win) ws->always_raise) { /* If a parent exists, map it first. */ if (parent) { - map_window(parent); + map_window(parent, XCB_WINDOW_NONE); /* Map siblings next. */ TAILQ_FOREACH(w, &ws->winlist, entry) if (w != win && !w->iconic && w->transient == parent->id) - map_window(w); + map_window(w, XCB_WINDOW_NONE); } /* Map focused window. */ - map_window(win); + map_window(win, XCB_WINDOW_NONE); /* Finally, map children of focus window. */ TAILQ_FOREACH(w, &ws->winlist, entry) if (w->transient == win->id && !w->iconic) - map_window(w); + map_window(w, XCB_WINDOW_NONE); + } else if (tile_gap < 0 && !win->floating) { + /* + * Windows overlap in the layout. + * Raise focused win above all tiled wins. + */ + if (tile_gap < 0 && !win->floating) + map_window(win, + get_sibling(win, SWM_STACK_TOP)); } set_region(ws->r); @@ -3425,10 +3495,11 @@ focus_region(struct swm_region *r) void switchws(struct swm_region *r, union arg *args) { - int wsid = args->id, unmap_old = 0; struct swm_region *this_r, *other_r; struct ws_win *win; struct workspace *new_ws, *old_ws; + xcb_window_t none = XCB_WINDOW_NONE; + int wsid = args->id, unmap_old = 0; if (!(r && r->s)) return; @@ -3448,7 +3519,14 @@ switchws(struct swm_region *r, union arg *args) if (new_ws == old_ws) return; - unfocus_win(old_ws->focus); + if ((win = old_ws->focus) != NULL) { + xcb_change_window_attributes(conn, win->id, XCB_CW_BORDER_PIXEL, + &win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].pixel); + + xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->s->root, + ewmh[_NET_ACTIVE_WINDOW].atom, XCB_ATOM_WINDOW, 32, 1, + &none); + } other_r = new_ws->r; if (other_r == NULL) { @@ -3467,8 +3545,11 @@ switchws(struct swm_region *r, union arg *args) /* Set focus_pending before stacking, if needed. */ if (focus_mode != SWM_FOCUS_FOLLOW && (!new_ws->focus_pending || - validate_win(new_ws->focus_pending))) + validate_win(new_ws->focus_pending))) { new_ws->focus_pending = get_region_focus(new_ws->r); + new_ws->focus = new_ws->focus_prev; + new_ws->focus_prev = NULL; + } stack(); @@ -3578,7 +3659,7 @@ focusrg(struct swm_region *r, union arg *args) DNPRINTF(SWM_D_FOCUS, "focusrg: id: %d\n", ridx); rr = TAILQ_FIRST(&r->s->rl); - for (i = 0; i < ridx; ++i) + for (i = 0; i < ridx && rr != NULL; ++i) rr = TAILQ_NEXT(rr, entry); if (rr == NULL) @@ -3864,86 +3945,107 @@ focus(struct swm_region *r, union arg *args) struct ws_win *head, *cur_focus = NULL, *winfocus = NULL; struct ws_win_list *wl = NULL; struct workspace *ws = NULL; - int all_iconics; + union arg a; + int i; + xcb_icccm_wm_hints_t hints; if (!(r && r->ws)) - return; + goto out; DNPRINTF(SWM_D_FOCUS, "focus: id: %d\n", args->id); - if ((cur_focus = r->ws->focus) == NULL) - return; + cur_focus = r->ws->focus; ws = r->ws; wl = &ws->winlist; - if (TAILQ_EMPTY(wl)) - return; - /* make sure there is at least one uniconified window */ - all_iconics = 1; - TAILQ_FOREACH(winfocus, wl, entry) - if (!winfocus->iconic) { - all_iconics = 0; - break; - } - if (all_iconics) - return; + + /* Make sure an uniconified window has focus, if one exists. */ + if (cur_focus == NULL) { + cur_focus = TAILQ_FIRST(wl); + while (cur_focus != NULL && cur_focus->iconic) + cur_focus = TAILQ_NEXT(cur_focus, entry); + } switch (args->id) { case SWM_ARG_ID_FOCUSPREV: - head = TAILQ_PREV(cur_focus, ws_win_list, entry); - if (head == NULL) - head = TAILQ_LAST(wl, ws_win_list); - winfocus = head; - if (WINID(winfocus) == cur_focus->transient) { - head = TAILQ_PREV(winfocus, ws_win_list, entry); - if (head == NULL) - head = TAILQ_LAST(wl, ws_win_list); - winfocus = head; - } + if (cur_focus == NULL) + goto out; - /* skip iconics */ - if (winfocus && winfocus->iconic) { - while (winfocus != cur_focus) { - if (winfocus == NULL) - winfocus = TAILQ_LAST(wl, ws_win_list); - if (!winfocus->iconic) - break; - winfocus = TAILQ_PREV(winfocus, ws_win_list, - entry); - } - } + winfocus = cur_focus; + do { + winfocus = TAILQ_PREV(winfocus, ws_win_list, entry); + if (winfocus == NULL) + winfocus = TAILQ_LAST(wl, ws_win_list); + if (winfocus == cur_focus) + break; + } while (winfocus != NULL && + (winfocus->iconic || winfocus->id == cur_focus->transient)); break; - case SWM_ARG_ID_FOCUSNEXT: - head = TAILQ_NEXT(cur_focus, entry); - if (head == NULL) - head = TAILQ_FIRST(wl); - winfocus = head; - - /* skip iconics */ - if (winfocus && winfocus->iconic) { - while (winfocus != cur_focus) { - if (winfocus == NULL) - winfocus = TAILQ_FIRST(wl); - if (!winfocus->iconic) - break; - winfocus = TAILQ_NEXT(winfocus, entry); - } - } - break; + if (cur_focus == NULL) + goto out; + winfocus = cur_focus; + do { + winfocus = TAILQ_NEXT(winfocus, entry); + if (winfocus == NULL) + winfocus = TAILQ_FIRST(wl); + if (winfocus == cur_focus) + break; + } while (winfocus != NULL && + (winfocus->iconic || winfocus->id == cur_focus->transient)); + break; case SWM_ARG_ID_FOCUSMAIN: + if (cur_focus == NULL) + goto out; + winfocus = TAILQ_FIRST(wl); if (winfocus == cur_focus) winfocus = cur_focus->ws->focus_prev; break; + case SWM_ARG_ID_FOCUSURGENT: + /* Search forward for the next urgent window. */ + winfocus = NULL; + head = cur_focus; + for (i = 0; i <= workspace_limit; ++i) { + if (head == NULL) + head = TAILQ_FIRST(&r->s->ws[(ws->idx + i) % + workspace_limit].winlist); + + while (head != NULL && + (head = TAILQ_NEXT(head, entry)) != NULL) { + if (head == cur_focus) { + winfocus = cur_focus; + break; + } + if (xcb_icccm_get_wm_hints_reply(conn, + xcb_icccm_get_wm_hints(conn, head->id), + &hints, NULL) != 0 && + xcb_icccm_wm_hints_get_urgency(&hints)) { + winfocus = head; + break; + } + } + + if (winfocus != NULL) + break; + } + + /* Switch ws if new focus is on a different ws. */ + if (winfocus != NULL && winfocus->ws != ws) { + a.id = winfocus->ws->idx; + switchws(r, &a); + } + break; default: - return; + goto out; } focus_win(get_focus_magic(winfocus)); - focus_flush(); + +out: + DNPRINTF(SWM_D_FOCUS, "focus: done\n"); } void @@ -4030,15 +4132,15 @@ stack(void) { } void -store_float_geom(struct ws_win *win, struct swm_region *r) +store_float_geom(struct ws_win *win) { - if (win == NULL || r == NULL) + if (win == NULL || win->ws->r == NULL) return; /* retain window geom and region geom */ win->g_float = win->g; - win->g_float.x -= X(r); - win->g_float.y -= Y(r); + win->g_float.x -= X(win->ws->r); + win->g_float.y -= Y(win->ws->r); win->g_floatvalid = 1; DNPRINTF(SWM_D_MISC, "store_float_geom: window: 0x%x, g: (%d,%d)" " %d x %d, g_float: (%d,%d) %d x %d\n", win->id, X(win), Y(win), @@ -4047,15 +4149,15 @@ store_float_geom(struct ws_win *win, struct swm_region *r) } void -load_float_geom(struct ws_win *win, struct swm_region *r) +load_float_geom(struct ws_win *win) { - if (win == NULL || r == NULL) + if (win == NULL || win->ws->r == NULL) return; if (win->g_floatvalid) { win->g = win->g_float; - X(win) += X(r); - Y(win) += Y(r); + X(win) += X(win->ws->r); + Y(win) += Y(win->ws->r); DNPRINTF(SWM_D_MISC, "load_float_geom: window: 0x%x, g: (%d,%d)" "%d x %d\n", win->id, X(win), Y(win), WIDTH(win), HEIGHT(win)); @@ -4080,7 +4182,7 @@ stack_floater(struct ws_win *win, struct swm_region *r) if (win->floatmaxed || (r != r->ws->old_r && !(win->ewmh_flags & EWMH_F_FULLSCREEN))) { /* update geometry for the new region */ - load_float_geom(win, r); + load_float_geom(win); } win->floatmaxed = 0; @@ -4090,7 +4192,7 @@ stack_floater(struct ws_win *win, struct swm_region *r) */ if (win->ewmh_flags & EWMH_F_FULLSCREEN) { if (!win->g_floatvalid) - store_float_geom(win, win->ws->r); + store_float_geom(win); win->g = r->g; } @@ -4127,11 +4229,11 @@ stack_floater(struct ws_win *win, struct swm_region *r) X(win) = X(r) + (WIDTH(r) - WIDTH(win)) / 2 - BORDER(win); Y(win) = Y(r) + (HEIGHT(r) - HEIGHT(win)) / 2 - BORDER(win); - store_float_geom(win, r); + store_float_geom(win); } - /* keep window within region bounds */ - constrain_window(win, r, 0); + /* Ensure at least 1 pixel of the window is in the region. */ + region_containment(win, r, SWM_CW_ALLSIDES); update_window(win); } @@ -4259,20 +4361,24 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) colno = (winno - mwin) / stacks; if (s <= (winno - mwin) % stacks) colno++; - split = split + colno; - hrh = (r_g.h / colno); + split += colno; + hrh = r_g.h / colno; extra = r_g.h - (colno * hrh); - if (flip) - win_g.x = r_g.x; - else + + if (!flip) win_g.x += win_g.w + 2 * border_width + tile_gap; + win_g.w = (r_g.w - msize - (stacks * (2 * border_width + tile_gap))) / stacks; if (s == 1) win_g.w += (r_g.w - msize - (stacks * (2 * border_width + tile_gap))) % stacks; + + if (flip) + win_g.x -= win_g.w + 2 * border_width + + tile_gap; s--; j = 0; } @@ -4347,13 +4453,17 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) update_window(win); } - map_window(win); + map_window(win, get_sibling(win, SWM_STACK_BELOW)); last_h = win_g.h; i++; j++; } + /* Map/raise focused tiled window to top if windows could overlap. */ + if (tile_gap < 0 && ws->focus != NULL && !ws->focus->floating) + map_window(ws->focus, get_sibling(ws->focus, SWM_STACK_TOP)); + notiles: /* now, stack all the floaters and transients */ TAILQ_FOREACH(win, &ws->winlist, entry) { @@ -4367,13 +4477,13 @@ notiles: } stack_floater(win, ws->r); - map_window(win); + map_window(win, XCB_WINDOW_NONE); } /* Make sure fs_win is stacked last so it's on top. */ if (fs_win) { stack_floater(fs_win, ws->r); - map_window(fs_win); + map_window(fs_win, XCB_WINDOW_NONE); } } @@ -4516,14 +4626,14 @@ max_stack(struct workspace *ws, struct swm_geometry *g) continue; if (!w->mapped && w != win) - map_window(w); + map_window(w, XCB_WINDOW_NONE); if (w->floating && !w->floatmaxed) { /* * retain geometry for retrieval on exit from * max_stack mode */ - store_float_geom(w, ws->r); + store_float_geom(w); w->floatmaxed = 1; } @@ -4545,25 +4655,25 @@ max_stack(struct workspace *ws, struct swm_geometry *g) /* If a parent exists, map/raise it first. */ if (parent) { - map_window(parent); + map_window(parent, XCB_WINDOW_NONE); /* Map siblings next. */ TAILQ_FOREACH(w, &ws->winlist, entry) if (w != win && !w->iconic && w->transient == parent->id) { stack_floater(w, ws->r); - map_window(w); + map_window(w, XCB_WINDOW_NONE); } } /* Map/raise focused window. */ - map_window(win); + map_window(win, XCB_WINDOW_NONE); /* Finally, map/raise children of focus window. */ TAILQ_FOREACH(w, &ws->winlist, entry) if (w->transient == win->id && !w->iconic) { stack_floater(w, ws->r); - map_window(w); + map_window(w, XCB_WINDOW_NONE); } } @@ -4582,7 +4692,7 @@ send_to_rg(struct swm_region *r, union arg *args) DNPRINTF(SWM_D_FOCUS, "send_to_rg: id: %d\n", ridx); rr = TAILQ_FIRST(&r->s->rl); - for (i = 0; i < ridx; ++i) + for (i = 0; i < ridx && rr != NULL; ++i) rr = TAILQ_NEXT(rr, entry); if (rr == NULL) @@ -4593,31 +4703,74 @@ send_to_rg(struct swm_region *r, union arg *args) send_to_ws(r, &a); } +struct swm_region * +region_under(struct swm_screen *s, int x, int y) +{ + struct swm_region *r = NULL; + + TAILQ_FOREACH(r, &s->rl, entry) { + DNPRINTF(SWM_D_MISC, "region_under: ws: %d, region g: (%d,%d) " + "%d x %d, coords: (%d,%d)\n", r->ws->idx, X(r), Y(r), + WIDTH(r), HEIGHT(r), x, y); + if (X(r) <= x && x < MAX_X(r)) + if (Y(r) <= y && y < MAX_Y(r)) + return (r); + } + + return (NULL); +} + void send_to_ws(struct swm_region *r, union arg *args) { int wsid = args->id; - struct ws_win *win = NULL, *parent; - struct workspace *ws, *nws, *pws; - char ws_idx_str[SWM_PROPLEN]; - - if (wsid >= workspace_limit) - return; + struct ws_win *win = NULL; if (r && r->ws && r->ws->focus) win = r->ws->focus; else return; - if (win->ws->idx == wsid) + DNPRINTF(SWM_D_MOVE, "send_to_ws: win 0x%x, ws %d\n", win->id, wsid); + + win_to_ws(win, wsid, 1); + + /* Restack and set new focus. */ + stack(); + + if (focus_mode != SWM_FOCUS_FOLLOW) { + if (r->ws->focus_pending) { + focus_win(r->ws->focus_pending); + r->ws->focus_pending = NULL; + } else { + xcb_set_input_focus(conn, + XCB_INPUT_FOCUS_PARENT, r->id, + XCB_CURRENT_TIME); + } + } + + focus_flush(); +} + +void +win_to_ws(struct ws_win *win, int wsid, int unfocus) +{ + struct ws_win *parent; + struct workspace *ws, *nws, *pws; + char ws_idx_str[SWM_PROPLEN]; + + if (wsid >= workspace_limit) return; - DNPRINTF(SWM_D_MOVE, "send_to_ws: win 0x%x, ws %d -> %d\n", win->id, - win->ws->idx, wsid); + if (win->ws->idx == wsid) + return; ws = win->ws; nws = &win->s->ws[wsid]; + DNPRINTF(SWM_D_MOVE, "win_to_ws: win 0x%x, ws %d -> %d\n", win->id, + ws->idx, wsid); + /* Update the window's workspace property: _SWM_WS */ if (snprintf(ws_idx_str, SWM_PROPLEN, "%d", nws->idx) < SWM_PROPLEN) { if (focus_mode != SWM_FOCUS_FOLLOW) @@ -4651,7 +4804,7 @@ send_to_ws(struct swm_region *r, union arg *args) TAILQ_INSERT_TAIL(&nws->winlist, parent, entry); parent->ws = nws; - DNPRINTF(SWM_D_PROP, "send_to_ws: set " + DNPRINTF(SWM_D_PROP, "win_to_ws: set " "property: _SWM_WS: %s\n", ws_idx_str); xcb_change_property(conn, XCB_PROP_MODE_REPLACE, parent->id, a_swm_ws, XCB_ATOM_STRING, 8, @@ -4659,7 +4812,8 @@ send_to_ws(struct swm_region *r, union arg *args) } } - unfocus_win(win); + if (unfocus) + unfocus_win(win); /* Don't unmap if new ws is visible */ if (nws->r == NULL) @@ -4674,30 +4828,14 @@ send_to_ws(struct swm_region *r, union arg *args) unfocus_win(nws->focus); nws->focus = win; - DNPRINTF(SWM_D_PROP, "send_to_ws: set property: _SWM_WS: %s\n", + DNPRINTF(SWM_D_PROP, "win_to_ws: set property: _SWM_WS: %s\n", ws_idx_str); xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id, a_swm_ws, XCB_ATOM_STRING, 8, strlen(ws_idx_str), ws_idx_str); - - /* Restack and set new focus. */ - stack(); - - if (focus_mode != SWM_FOCUS_FOLLOW) { - if (ws->focus_pending) { - focus_win(ws->focus_pending); - ws->focus_pending = NULL; - } else { - xcb_set_input_focus(conn, - XCB_INPUT_FOCUS_PARENT, r->id, - XCB_CURRENT_TIME); - } - } - - focus_flush(); } - DNPRINTF(SWM_D_MOVE, "send_to_ws: done.\n"); + DNPRINTF(SWM_D_MOVE, "win_to_ws: done.\n"); } void @@ -4752,10 +4890,9 @@ get_win_name(xcb_window_t win) xcb_get_property_reply_t *r; /* First try _NET_WM_NAME for UTF-8. */ - c = xcb_get_property(conn, 0, win, a_netwmname, + c = xcb_get_property(conn, 0, win, ewmh[_NET_WM_NAME].atom, XCB_GET_PROPERTY_TYPE_ANY, 0, UINT_MAX); r = xcb_get_property_reply(conn, c, NULL); - if (r) { if (r->type == XCB_NONE) { free(r); @@ -4763,8 +4900,7 @@ get_win_name(xcb_window_t win) c = xcb_get_property(conn, 0, win, XCB_ATOM_WM_NAME, XCB_GET_PROPERTY_TYPE_ANY, 0, UINT_MAX); r = xcb_get_property_reply(conn, c, NULL); - - if (!r) + if (r == NULL) return (NULL); if (r->type == XCB_NONE) { free(r); @@ -5069,7 +5205,7 @@ search_resp_search_workspace(const char *resp) DNPRINTF(SWM_D_MISC, "search_resp_search_workspace: resp: %s\n", resp); q = strdup(resp); - if (!q) { + if (q == NULL) { DNPRINTF(SWM_D_MISC, "search_resp_search_workspace: strdup: %s", strerror(errno)); return; @@ -5100,7 +5236,7 @@ search_resp_search_window(const char *resp) DNPRINTF(SWM_D_MISC, "search_resp_search_window: resp: %s\n", resp); s = strdup(resp); - if (!s) { + if (s == NULL) { DNPRINTF(SWM_D_MISC, "search_resp_search_window: strdup: %s", strerror(errno)); return; @@ -5201,16 +5337,12 @@ wkill(struct swm_region *r, union arg *args) int floating_toggle_win(struct ws_win *win) { - struct swm_region *r; - if (win == NULL) return (0); - if (!win->ws->r) + if (win->ws->r == NULL) return (0); - r = win->ws->r; - /* reject floating toggles in max stack mode */ if (win->ws->cur_layout == &layouts[SWM_MAX_STACK]) return (0); @@ -5218,11 +5350,11 @@ floating_toggle_win(struct ws_win *win) if (win->floating) { if (!win->floatmaxed) { /* retain position for refloat */ - store_float_geom(win, r); + store_float_geom(win); } win->floating = 0; } else { - load_float_geom(win, r); + load_float_geom(win); win->floating = 1; } @@ -5257,37 +5389,85 @@ floating_toggle(struct swm_region *r, union arg *args) } void -constrain_window(struct ws_win *win, struct swm_region *r, int resizable) +region_containment(struct ws_win *win, struct swm_region *r, int opts) +{ + struct swm_geometry g = r->g; + int rt, lt, tp, bm, bw; + + bw = (opts & SWM_CW_SOFTBOUNDARY) ? boundary_width : 0; + + /* + * Perpendicular distance of each side of the window to the respective + * side of the region boundary. Positive values indicate the side of + * the window has passed beyond the region boundary. + */ + rt = opts & SWM_CW_RIGHT ? MAX_X(win) + BORDER(win) - MAX_X(r) : bw; + lt = opts & SWM_CW_LEFT ? X(r) - X(win) + BORDER(win) : bw; + bm = opts & SWM_CW_BOTTOM ? MAX_Y(win) + BORDER(win) - MAX_Y(r) : bw; + tp = opts & SWM_CW_TOP ? Y(r) - Y(win) + BORDER(win) : bw; + + DNPRINTF(SWM_D_MISC, "region_containment: win 0x%x, rt: %d, lt: %d, " + "bm: %d, tp: %d, SOFTBOUNDARY: %s, HARDBOUNDARY: %s\n", win->id, rt, + lt, bm, tp, YESNO(opts & SWM_CW_SOFTBOUNDARY), + YESNO(opts & SWM_CW_HARDBOUNDARY)); + + /* + * Disable containment if any of the flagged sides went beyond the + * containment boundary, or if containment is disabled. + */ + if (!(opts & SWM_CW_HARDBOUNDARY || opts & SWM_CW_SOFTBOUNDARY) || + (bw != 0 && ((rt > bw) || (lt > bw) || (bm > bw) || (tp > bw)))) { + /* Make sure window has at least 1 pixel in the region */ + g.x += 1 - WIDTH(win); + g.y += 1 - HEIGHT(win); + g.w += 2 * WIDTH(win) - 2; + g.h += 2 * HEIGHT(win) - 2; + } + + constrain_window(win, &g, &opts); +} + +/* Move or resize a window so that flagged side(s) fit into the supplied box. */ +void +constrain_window(struct ws_win *win, struct swm_geometry *b, int *opts) { - if (MAX_X(win) + BORDER(win) > MAX_X(r)) { - if (resizable) - WIDTH(win) = MAX_X(r) - X(win) - BORDER(win); + DNPRINTF(SWM_D_MISC, "constrain_window: window: 0x%x, (x,y) w x h: " + "(%d,%d) %d x %d, box: (x,y) w x h: (%d,%d) %d x %d, rt: %s, " + "lt: %s, bt: %s, tp: %s, allow resize: %s\n", win->id, X(win), + Y(win), WIDTH(win), HEIGHT(win), b->x, b->y, b->w, b->h, + YESNO(*opts & SWM_CW_RIGHT), YESNO(*opts & SWM_CW_LEFT), + YESNO(*opts & SWM_CW_BOTTOM), YESNO(*opts & SWM_CW_TOP), + YESNO(*opts & SWM_CW_RESIZABLE)); + + if ((*opts & SWM_CW_RIGHT) && MAX_X(win) + BORDER(win) > b->x + b->w) { + if (*opts & SWM_CW_RESIZABLE) + WIDTH(win) = b->x + b->w - X(win) - BORDER(win); else - X(win) = MAX_X(r)- WIDTH(win) - BORDER(win); + X(win) = b->x + b->w - WIDTH(win) - BORDER(win); } - if (X(win) + BORDER(win) < X(r)) { - if (resizable) - WIDTH(win) -= X(r) - X(win) - BORDER(win); + if ((*opts & SWM_CW_LEFT) && X(win) + BORDER(win) < b->x) { + if (*opts & SWM_CW_RESIZABLE) + WIDTH(win) -= b->x - X(win) - BORDER(win); - X(win) = X(r) - BORDER(win); + X(win) = b->x - BORDER(win); } - if (MAX_Y(win) + BORDER(win) > MAX_Y(r)) { - if (resizable) - HEIGHT(win) = MAX_Y(r) - Y(win) - BORDER(win); + if ((*opts & SWM_CW_BOTTOM) && MAX_Y(win) + BORDER(win) > b->y + b->h) { + if (*opts & SWM_CW_RESIZABLE) + HEIGHT(win) = b->y + b->h - Y(win) - BORDER(win); else - Y(win) = MAX_Y(r) - HEIGHT(win) - BORDER(win); + Y(win) = b->y + b->h - HEIGHT(win) - BORDER(win); } - if (Y(win) + BORDER(win) < Y(r)) { - if (resizable) - HEIGHT(win) -= Y(r) - Y(win) - BORDER(win); + if ((*opts & SWM_CW_TOP) && Y(win) + BORDER(win) < b->y) { + if (*opts & SWM_CW_RESIZABLE) + HEIGHT(win) -= b->y - Y(win) - BORDER(win); - Y(win) = Y(r) - BORDER(win); + Y(win) = b->y - BORDER(win); } - if (resizable) { + if (*opts & SWM_CW_RESIZABLE) { if (WIDTH(win) < 1) WIDTH(win) = 1; if (HEIGHT(win) < 1) @@ -5361,7 +5541,7 @@ resize(struct ws_win *win, union arg *args) /* It's possible for win to have been freed during focus_flush(). */ if (validate_win(win)) { - DNPRINTF(SWM_D_EVENT, "move: invalid win.\n"); + DNPRINTF(SWM_D_EVENT, "resize: invalid win.\n"); goto out; } @@ -5386,16 +5566,21 @@ resize(struct ws_win *win, union arg *args) break; } if (resize_stp) { - constrain_window(win, r, 1); + region_containment(win, r, SWM_CW_ALLSIDES | SWM_CW_RESIZABLE | + SWM_CW_HARDBOUNDARY); update_window(win); - store_float_geom(win,r); + store_float_geom(win); return; } + region_containment(win, r, SWM_CW_ALLSIDES | SWM_CW_RESIZABLE | + SWM_CW_SOFTBOUNDARY); + update_window(win); + /* get cursor offset from window root */ xpr = xcb_query_pointer_reply(conn, xcb_query_pointer(conn, win->id), NULL); - if (!xpr) + if (xpr == NULL) return; g = win->g; @@ -5473,11 +5658,13 @@ resize(struct ws_win *win, union arg *args) WIDTH(win) = g.w + dx; } - constrain_window(win, r, 1); - /* not free, don't sync more than 120 times / second */ if ((mne->time - timestamp) > (1000 / 120) ) { timestamp = mne->time; + regionize(win, mne->root_x, mne->root_y); + region_containment(win, r, SWM_CW_ALLSIDES | + SWM_CW_RESIZABLE | SWM_CW_HARDBOUNDARY | + SWM_CW_SOFTBOUNDARY); update_window(win); xcb_flush(conn); } @@ -5487,7 +5674,7 @@ resize(struct ws_win *win, union arg *args) /* It's possible for win to have been freed above. */ if (validate_win(win)) { - DNPRINTF(SWM_D_EVENT, "move: invalid win.\n"); + DNPRINTF(SWM_D_EVENT, "resize: invalid win.\n"); goto out; } break; @@ -5495,10 +5682,12 @@ resize(struct ws_win *win, union arg *args) free(evt); } if (timestamp) { + region_containment(win, r, SWM_CW_ALLSIDES | SWM_CW_RESIZABLE | + SWM_CW_HARDBOUNDARY | SWM_CW_SOFTBOUNDARY); update_window(win); xcb_flush(conn); } - store_float_geom(win,r); + store_float_geom(win); out: xcb_ungrab_pointer(conn, XCB_CURRENT_TIME); free(xpr); @@ -5519,6 +5708,23 @@ resize_step(struct swm_region *r, union arg *args) focus_flush(); } +/* Try to set window region based on supplied coordinates or window center. */ +void +regionize(struct ws_win *win, int x, int y) +{ + struct swm_region *r = NULL; + + r = region_under(win->s, x, y); + if (r == NULL) + r = region_under(win->s, X(win) + WIDTH(win) / 2, + Y(win) + HEIGHT(win) / 2); + + if (r && r != win->ws->r) { + win_to_ws(win, r->ws->idx, 0); + set_region(r); + } +} + #define SWM_MOVE_STEPS (50) void @@ -5526,14 +5732,12 @@ move(struct ws_win *win, union arg *args) { xcb_timestamp_t timestamp = 0; int move_stp = 0, moving; - struct swm_region *r = NULL; xcb_query_pointer_reply_t *qpr = NULL; xcb_generic_event_t *evt; xcb_motion_notify_event_t *mne; if (win == NULL) return; - r = win->ws->r; if (win->ewmh_flags & EWMH_F_FULLSCREEN) return; @@ -5545,16 +5749,19 @@ move(struct ws_win *win, union arg *args) if (win->ws->cur_layout == &layouts[SWM_MAX_STACK] && !win->transient) return; - win->manual = 1; + if (!win->manual) { + win->manual = 1; + ewmh_update_win_state(win, ewmh[_SWM_WM_STATE_MANUAL].atom, + _NET_WM_STATE_ADD); + } + + /* When a stacked win is moved, float it and restack. */ if (!win->floating && !win->transient) { - store_float_geom(win, r); + store_float_geom(win); ewmh_update_win_state(win, ewmh[_NET_WM_STATE_ABOVE].atom, _NET_WM_STATE_ADD); + stack(); } - ewmh_update_win_state(win, ewmh[_SWM_WM_STATE_MANUAL].atom, - _NET_WM_STATE_ADD); - - stack(); focus_flush(); @@ -5586,9 +5793,10 @@ move(struct ws_win *win, union arg *args) break; } if (move_stp) { - constrain_window(win, r, 0); + regionize(win, -1, -1); + region_containment(win, win->ws->r, SWM_CW_ALLSIDES); update_window(win); - store_float_geom(win, r); + store_float_geom(win); return; } @@ -5599,11 +5807,15 @@ move(struct ws_win *win, union arg *args) /* get cursor offset from window root */ qpr = xcb_query_pointer_reply(conn, xcb_query_pointer(conn, win->id), NULL); - if (!qpr) { + if (qpr == NULL) { xcb_ungrab_pointer(conn, XCB_CURRENT_TIME); return; } + regionize(win, qpr->root_x, qpr->root_y); + region_containment(win, win->ws->r, SWM_CW_ALLSIDES | + SWM_CW_SOFTBOUNDARY); + update_window(win); xcb_flush(conn); moving = 1; while (moving && (evt = xcb_wait_for_event(conn))) { @@ -5614,14 +5826,16 @@ move(struct ws_win *win, union arg *args) break; case XCB_MOTION_NOTIFY: mne = (xcb_motion_notify_event_t *)evt; + DNPRINTF(SWM_D_EVENT, "motion: root: 0x%x\n", mne->root); X(win) = mne->root_x - qpr->win_x - border_width; Y(win) = mne->root_y - qpr->win_y - border_width; - constrain_window(win, r, 0); - /* not free, don't sync more than 120 times / second */ if ((mne->time - timestamp) > (1000 / 120) ) { timestamp = mne->time; + regionize(win, mne->root_x, mne->root_y); + region_containment(win, win->ws->r, + SWM_CW_ALLSIDES | SWM_CW_SOFTBOUNDARY); update_window(win); xcb_flush(conn); } @@ -5639,10 +5853,12 @@ move(struct ws_win *win, union arg *args) free(evt); } if (timestamp) { + region_containment(win, win->ws->r, SWM_CW_ALLSIDES | + SWM_CW_SOFTBOUNDARY); update_window(win); xcb_flush(conn); } - store_float_geom(win, r); + store_float_geom(win); out: free(qpr); xcb_ungrab_pointer(conn, XCB_CURRENT_TIME); @@ -5682,6 +5898,7 @@ struct keyfunc { { "focus_main", focus, {.id = SWM_ARG_ID_FOCUSMAIN} }, { "focus_next", focus, {.id = SWM_ARG_ID_FOCUSNEXT} }, { "focus_prev", focus, {.id = SWM_ARG_ID_FOCUSPREV} }, + { "focus_urgent", focus, {.id = SWM_ARG_ID_FOCUSURGENT} }, { "height_grow", resize_step, {.id = SWM_ARG_ID_HEIGHTGROW} }, { "height_shrink", resize_step, {.id = SWM_ARG_ID_HEIGHTSHRINK} }, { "iconify", iconify, {0} }, @@ -5847,7 +6064,7 @@ spawn_expand(struct swm_region *r, union arg *args, const char *spawn_name, char ***ret_args) { struct spawn_prog *prog = NULL; - int i; + int i, c; char *ap, **real_args; /* suppress unused warning since var is needed */ @@ -5857,7 +6074,7 @@ spawn_expand(struct swm_region *r, union arg *args, const char *spawn_name, /* find program */ TAILQ_FOREACH(prog, &spawns, entry) { - if (!strcasecmp(spawn_name, prog->name)) + if (strcasecmp(spawn_name, prog->name) == 0) break; } if (prog == NULL) { @@ -5870,62 +6087,68 @@ spawn_expand(struct swm_region *r, union arg *args, const char *spawn_name, err(1, "spawn_custom: calloc real_args"); /* expand spawn_args into real_args */ - for (i = 0; i < prog->argc; i++) { + for (i = c = 0; i < prog->argc; i++) { ap = prog->argv[i]; DNPRINTF(SWM_D_SPAWN, "spawn_custom: raw arg: %s\n", ap); - if (!strcasecmp(ap, "$bar_border")) { - if ((real_args[i] = + if (strcasecmp(ap, "$bar_border") == 0) { + if ((real_args[c] = strdup(r->s->c[SWM_S_COLOR_BAR_BORDER].name)) == NULL) err(1, "spawn_custom border color"); - } else if (!strcasecmp(ap, "$bar_color")) { - if ((real_args[i] = + } else if (strcasecmp(ap, "$bar_color") == 0) { + if ((real_args[c] = strdup(r->s->c[SWM_S_COLOR_BAR].name)) == NULL) err(1, "spawn_custom bar color"); - } else if (!strcasecmp(ap, "$bar_font")) { - if ((real_args[i] = strdup(bar_fonts)) + } else if (strcasecmp(ap, "$bar_font") == 0) { + if ((real_args[c] = strdup(bar_fonts)) == NULL) err(1, "spawn_custom bar fonts"); - } else if (!strcasecmp(ap, "$bar_font_color")) { - if ((real_args[i] = + } else if (strcasecmp(ap, "$bar_font_color") == 0) { + if ((real_args[c] = strdup(r->s->c[SWM_S_COLOR_BAR_FONT].name)) == NULL) err(1, "spawn_custom color font"); - } else if (!strcasecmp(ap, "$color_focus")) { - if ((real_args[i] = + } else if (strcasecmp(ap, "$color_focus") == 0) { + if ((real_args[c] = strdup(r->s->c[SWM_S_COLOR_FOCUS].name)) == NULL) err(1, "spawn_custom color focus"); - } else if (!strcasecmp(ap, "$color_unfocus")) { - if ((real_args[i] = + } else if (strcasecmp(ap, "$color_unfocus") == 0) { + if ((real_args[c] = strdup(r->s->c[SWM_S_COLOR_UNFOCUS].name)) == NULL) err(1, "spawn_custom color unfocus"); - } else if (!strcasecmp(ap, "$region_index")) { - if (asprintf(&real_args[i], "%d", + } else if (strcasecmp(ap, "$region_index") == 0) { + if (asprintf(&real_args[c], "%d", get_region_index(r) + 1) < 1) err(1, "spawn_custom region index"); - } else if (!strcasecmp(ap, "$workspace_index")) { - if (asprintf(&real_args[i], "%d", r->ws->idx + 1) < 1) + } else if (strcasecmp(ap, "$workspace_index") == 0) { + if (asprintf(&real_args[c], "%d", r->ws->idx + 1) < 1) + err(1, "spawn_custom workspace index"); + } else if (strcasecmp(ap, "$dmenu_bottom") == 0) { + if (!bar_at_bottom) + continue; + if ((real_args[c] = strdup("-b")) == NULL) err(1, "spawn_custom workspace index"); } else { /* no match --> copy as is */ - if ((real_args[i] = strdup(ap)) == NULL) + if ((real_args[c] = strdup(ap)) == NULL) err(1, "spawn_custom strdup(ap)"); } DNPRINTF(SWM_D_SPAWN, "spawn_custom: cooked arg: %s\n", - real_args[i]); + real_args[c]); + ++c; } #ifdef SWM_DEBUG DNPRINTF(SWM_D_SPAWN, "spawn_custom: result: "); - for (i = 0; i < prog->argc; i++) - DNPRINTF(SWM_D_SPAWN, "\"%s\" ", real_args[i]); - DNPRINTF(SWM_D_SPAWN, "\n"); + for (i = 0; i < c; ++i) + DPRINTF("\"%s\" ", real_args[i]); + DPRINTF("\n"); #endif *ret_args = real_args; - return (prog->argc); + return (c); } void @@ -6042,6 +6265,18 @@ spawn_remove(struct spawn_prog *sp) DNPRINTF(SWM_D_SPAWN, "spawn_remove: leave\n"); } +struct spawn_prog* +spawn_find(const char *name) +{ + struct spawn_prog *sp; + + TAILQ_FOREACH(sp, &spawns, entry) + if (strcasecmp(sp->name, name) == 0) + return sp; + + return NULL; +} + void setspawn(const char *name, const char *args, int flags) { @@ -6053,11 +6288,8 @@ setspawn(const char *name, const char *args, int flags) return; /* Remove any old spawn under the same name. */ - TAILQ_FOREACH(sp, &spawns, entry) - if (!strcmp(sp->name, name)) { - spawn_remove(sp); - break; - } + if ((sp = spawn_find(name)) != NULL) + spawn_remove(sp); if (*args != '\0') spawn_insert(name, args, flags); @@ -6097,11 +6329,7 @@ validate_spawns(void) continue; /* find program */ - TAILQ_FOREACH(sp, &spawns, entry) { - if (!strcasecmp(kp->spawn_name, sp->name)) - break; - } - + sp = spawn_find(kp->spawn_name); if (sp == NULL || sp->flags & SWM_SPAWN_OPTIONAL) continue; @@ -6129,6 +6357,7 @@ setup_spawn(void) setconfspawn("spawn_term", "xterm", 0); setconfspawn("menu", "dmenu_run" + " $dmenu_bottom" " -fn $bar_font" " -nb $bar_color" " -nf $bar_font_color" @@ -6136,6 +6365,7 @@ setup_spawn(void) " -sf $bar_color", 0); setconfspawn("search", "dmenu" + " $dmenu_bottom" " -i" " -fn $bar_font" " -nb $bar_color" @@ -6144,6 +6374,7 @@ setup_spawn(void) " -sf $bar_color", 0); setconfspawn("name_workspace", "dmenu" + " $dmenu_bottom" " -p Workspace" " -fn $bar_font" " -nb $bar_color" @@ -6183,13 +6414,13 @@ parsekeys(char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks) cp += (long)strspn(cp, SWM_KEY_WS); if (strncasecmp(name, "MOD", SWM_MODNAME_SIZE) == 0) *mod |= currmod; - else if (!strncasecmp(name, "Mod1", SWM_MODNAME_SIZE)) + else if (strncasecmp(name, "Mod1", SWM_MODNAME_SIZE) == 0) *mod |= XCB_MOD_MASK_1; - else if (!strncasecmp(name, "Mod2", SWM_MODNAME_SIZE)) + else if (strncasecmp(name, "Mod2", SWM_MODNAME_SIZE) == 0) *mod += XCB_MOD_MASK_2; - else if (!strncmp(name, "Mod3", SWM_MODNAME_SIZE)) + else if (strncmp(name, "Mod3", SWM_MODNAME_SIZE) == 0) *mod |= XCB_MOD_MASK_3; - else if (!strncmp(name, "Mod4", SWM_MODNAME_SIZE)) + else if (strncmp(name, "Mod4", SWM_MODNAME_SIZE) == 0) *mod |= XCB_MOD_MASK_4; else if (strncasecmp(name, "SHIFT", SWM_MODNAME_SIZE) == 0) *mod |= XCB_MOD_MASK_SHIFT; @@ -6338,17 +6569,15 @@ setconfbinding(char *selector, char *value, int flags) } } /* search by custom spawn name */ - TAILQ_FOREACH(sp, &spawns, entry) { - if (strcasecmp(selector, sp->name) == 0) { - DNPRINTF(SWM_D_KEY, "setconfbinding: %s: match " - "spawn\n", selector); - if (parsekeys(value, mod_key, &mod, &ks) == 0) { - setkeybinding(mod, ks, KF_SPAWN_CUSTOM, - sp->name); - return (0); - } else - return (1); - } + if ((sp = spawn_find(selector)) != NULL) { + DNPRINTF(SWM_D_KEY, "setconfbinding: %s: match " + "spawn\n", selector); + if (parsekeys(value, mod_key, &mod, &ks) == 0) { + setkeybinding(mod, ks, KF_SPAWN_CUSTOM, + sp->name); + return (0); + } else + return (1); } DNPRINTF(SWM_D_KEY, "setconfbinding: no match\n"); return (1); @@ -6369,6 +6598,7 @@ setup_keys(void) setkeybinding(MODKEY, XK_Tab, KF_FOCUS_NEXT, NULL); setkeybinding(MODKEY, XK_k, KF_FOCUS_PREV, NULL); setkeybinding(MODKEY_SHIFT, XK_Tab, KF_FOCUS_PREV, NULL); + setkeybinding(MODKEY, XK_u, KF_FOCUS_URGENT,NULL); setkeybinding(MODKEY_SHIFT, XK_equal, KF_HEIGHT_GROW,NULL); setkeybinding(MODKEY_SHIFT, XK_minus, KF_HEIGHT_SHRINK,NULL); setkeybinding(MODKEY, XK_w, KF_ICONIFY, NULL); @@ -6648,7 +6878,8 @@ parsequirks(char *qstr, unsigned long *quirk) if (cp) cp += (long)strspn(cp, SWM_Q_WS); for (i = 0; i < LENGTH(quirkname); i++) { - if (!strncasecmp(name, quirkname[i], SWM_QUIRK_LEN)) { + if (strncasecmp(name, quirkname[i], + SWM_QUIRK_LEN) == 0) { DNPRINTF(SWM_D_QUIRK, "parsequirks: %s\n", name); if (i == 0) { @@ -6726,8 +6957,9 @@ setquirk(const char *class, const char *name, unsigned long quirk) /* Remove/replace existing quirk. */ TAILQ_FOREACH(qp, &quirks, entry) { - if (!strcmp(qp->class, class) && !strcmp(qp->name, name)) { - if (!quirk) + if (strcmp(qp->class, class) == 0 && + strcmp(qp->name, name) == 0) { + if (quirk == 0) quirk_remove(qp); else quirk_replace(qp, class, name, quirk); @@ -6798,6 +7030,7 @@ enum { SWM_S_BAR_FORMAT, SWM_S_BAR_JUSTIFY, SWM_S_BORDER_WIDTH, + SWM_S_BOUNDARY_WIDTH, SWM_S_CLOCK_ENABLED, SWM_S_CLOCK_FORMAT, SWM_S_CYCLE_EMPTY, @@ -6893,11 +7126,11 @@ setconfvalue(char *selector, char *value, int flags) err(1, "setconfvalue: bar_format"); break; case SWM_S_BAR_JUSTIFY: - if (!strcmp(value, "left")) + if (strcmp(value, "left") == 0) bar_justify = SWM_BAR_JUSTIFY_LEFT; - else if (!strcmp(value, "center")) + else if (strcmp(value, "center") == 0) bar_justify = SWM_BAR_JUSTIFY_CENTER; - else if (!strcmp(value, "right")) + else if (strcmp(value, "right") == 0) bar_justify = SWM_BAR_JUSTIFY_RIGHT; else errx(1, "invalid bar_justify"); @@ -6907,6 +7140,11 @@ setconfvalue(char *selector, char *value, int flags) if (border_width < 0) border_width = 0; break; + case SWM_S_BOUNDARY_WIDTH: + boundary_width = atoi(value); + if (boundary_width < 0) + boundary_width = 0; + break; case SWM_S_CLOCK_ENABLED: clock_enabled = atoi(value); break; @@ -6932,13 +7170,13 @@ setconfvalue(char *selector, char *value, int flags) disable_border = atoi(value); break; case SWM_S_FOCUS_CLOSE: - if (!strcmp(value, "first")) + if (strcmp(value, "first") == 0) focus_close = SWM_STACK_BOTTOM; - else if (!strcmp(value, "last")) + else if (strcmp(value, "last") == 0) focus_close = SWM_STACK_TOP; - else if (!strcmp(value, "next")) + else if (strcmp(value, "next") == 0) focus_close = SWM_STACK_ABOVE; - else if (!strcmp(value, "previous")) + else if (strcmp(value, "previous") == 0) focus_close = SWM_STACK_BELOW; else errx(1, "focus_close"); @@ -6947,20 +7185,20 @@ setconfvalue(char *selector, char *value, int flags) focus_close_wrap = atoi(value); break; case SWM_S_FOCUS_DEFAULT: - if (!strcmp(value, "last")) + if (strcmp(value, "last") == 0) focus_default = SWM_STACK_TOP; - else if (!strcmp(value, "first")) + else if (strcmp(value, "first") == 0) focus_default = SWM_STACK_BOTTOM; else errx(1, "focus_default"); break; case SWM_S_FOCUS_MODE: - if (!strcmp(value, "default")) + if (strcmp(value, "default") == 0) focus_mode = SWM_FOCUS_DEFAULT; - else if (!strcmp(value, "follow") || - !strcmp(value, "follow_cursor")) + else if (strcmp(value, "follow") == 0 || + strcmp(value, "follow_cursor") == 0) focus_mode = SWM_FOCUS_FOLLOW; - else if (!strcmp(value, "manual")) + else if (strcmp(value, "manual") == 0) focus_mode = SWM_FOCUS_MANUAL; else errx(1, "focus_mode"); @@ -6971,13 +7209,13 @@ setconfvalue(char *selector, char *value, int flags) region_padding = 0; break; case SWM_S_SPAWN_ORDER: - if (!strcmp(value, "first")) + if (strcmp(value, "first") == 0) spawn_position = SWM_STACK_BOTTOM; - else if (!strcmp(value, "last")) + else if (strcmp(value, "last") == 0) spawn_position = SWM_STACK_TOP; - else if (!strcmp(value, "next")) + else if (strcmp(value, "next") == 0) spawn_position = SWM_STACK_ABOVE; - else if (!strcmp(value, "previous")) + else if (strcmp(value, "previous") == 0) spawn_position = SWM_STACK_BELOW; else errx(1, "spawn_position"); @@ -7002,8 +7240,6 @@ setconfvalue(char *selector, char *value, int flags) break; case SWM_S_TILE_GAP: tile_gap = atoi(value); - if (tile_gap < 0) - tile_gap = 0; break; case SWM_S_TITLE_CLASS_ENABLED: title_class_enabled = atoi(value); @@ -7046,13 +7282,13 @@ setconfmodkey(char *selector, char *value, int flags) (void)selector; (void)flags; - if (!strncasecmp(value, "Mod1", strlen("Mod1"))) + if (strncasecmp(value, "Mod1", strlen("Mod1")) == 0) update_modkey(XCB_MOD_MASK_1); - else if (!strncasecmp(value, "Mod2", strlen("Mod2"))) + else if (strncasecmp(value, "Mod2", strlen("Mod2")) == 0) update_modkey(XCB_MOD_MASK_2); - else if (!strncasecmp(value, "Mod3", strlen("Mod3"))) + else if (strncasecmp(value, "Mod3", strlen("Mod3")) == 0) update_modkey(XCB_MOD_MASK_3); - else if (!strncasecmp(value, "Mod4", strlen("Mod4"))) + else if (strncasecmp(value, "Mod4", strlen("Mod4")) == 0) update_modkey(XCB_MOD_MASK_4); else return (1); @@ -7174,17 +7410,17 @@ setlayout(char *selector, char *value, int flags) if (ws_id < 0 || ws_id >= workspace_limit) errx(1, "layout: invalid workspace %d", ws_id + 1); - if (!strcasecmp(s, "vertical")) + if (strcasecmp(s, "vertical") == 0) st = SWM_V_STACK; - else if (!strcasecmp(s, "vertical_flip")) { + else if (strcasecmp(s, "vertical_flip") == 0) { st = SWM_V_STACK; f = 1; - } else if (!strcasecmp(s, "horizontal")) + } else if (strcasecmp(s, "horizontal") == 0) st = SWM_H_STACK; - else if (!strcasecmp(s, "horizontal_flip")) { + else if (strcasecmp(s, "horizontal_flip") == 0) { st = SWM_H_STACK; f = 1; - } else if (!strcasecmp(s, "fullscreen")) + } else if (strcasecmp(s, "fullscreen") == 0) st = SWM_MAX_STACK; else errx(1, "invalid layout entry, should be 'ws[]:" @@ -7257,6 +7493,7 @@ struct config_option configopt[] = { { "bar_justify", setconfvalue, SWM_S_BAR_JUSTIFY }, { "bind", setconfbinding, 0 }, { "border_width", setconfvalue, SWM_S_BORDER_WIDTH }, + { "boundary_width", setconfvalue, SWM_S_BOUNDARY_WIDTH }, { "clock_enabled", setconfvalue, SWM_S_CLOCK_ENABLED }, { "clock_format", setconfvalue, SWM_S_CLOCK_FORMAT }, { "color_focus", setconfcolor, SWM_S_COLOR_FOCUS }, @@ -7366,7 +7603,7 @@ conf_load(const char *filename, int keymapping) optidx = -1; for (i = 0; i < LENGTH(configopt); i++) { opt = &configopt[i]; - if (!strncasecmp(cp, opt->optname, wordlen) && + if (strncasecmp(cp, opt->optname, wordlen) == 0 && (int)strlen(opt->optname) == wordlen) { optidx = i; break; @@ -7460,7 +7697,7 @@ set_child_transient(struct ws_win *win, xcb_window_t *trans) DNPRINTF(SWM_D_MISC, "set_child_transient: parent doesn't exist" " for 0x%x trans 0x%x\n", win->id, win->transient); - r = root_to_region(win->wa->root, SWM_CK_ALL); + r = root_to_region(win->s->root, SWM_CK_ALL); ws = r->ws; /* parent doen't exist in our window list */ TAILQ_FOREACH(w, &ws->winlist, entry) { @@ -7499,7 +7736,7 @@ window_get_pid(xcb_window_t win) pc = xcb_get_property(conn, 0, win, apid, XCB_ATOM_CARDINAL, 0, 1); pr = xcb_get_property_reply(conn, pc, NULL); - if (!pr) + if (pr == NULL) goto tryharder; if (pr->type != XCB_ATOM_CARDINAL) { free(pr); @@ -7517,7 +7754,7 @@ tryharder: pc = xcb_get_property(conn, 0, win, apid, XCB_ATOM_STRING, 0, SWM_PROPLEN); pr = xcb_get_property_reply(conn, pc, NULL); - if (!pr) + if (pr == NULL) return (0); if (pr->type != apid) { free(pr); @@ -7543,7 +7780,7 @@ get_ws_idx(xcb_window_t id) xcb_get_property(conn, 0, id, a_swm_ws, XCB_ATOM_STRING, 0, SWM_PROPLEN), NULL); - if (!gpr) + if (gpr == NULL) return (-1); if (gpr->type) { proplen = xcb_get_property_value_length(gpr); @@ -7583,6 +7820,7 @@ manage_window(xcb_window_t id, uint16_t mapped) struct pid_e *p; struct quirk *qp; uint32_t i, wa[2]; + xcb_get_geometry_reply_t *gr; xcb_icccm_get_wm_protocols_reply_t wpr; if ((win = find_window(id)) != NULL) { @@ -7605,6 +7843,13 @@ manage_window(xcb_window_t id, uint16_t mapped) DNPRINTF(SWM_D_MISC, "manage_window: win 0x%x is new.\n", id); } + /* Try to get initial window geometry. */ + gr = xcb_get_geometry_reply(conn, xcb_get_geometry(conn, id), NULL); + if (gr == NULL) { + DNPRINTF(SWM_D_MISC, "manage_window: get geometry failed.\n"); + return (NULL); + } + /* Create and initialize ws_win object. */ if ((win = calloc(1, sizeof(struct ws_win))) == NULL) err(1, "manage_window: calloc: failed to allocate memory for " @@ -7612,26 +7857,21 @@ manage_window(xcb_window_t id, uint16_t mapped) win->id = id; - /* Get window geometry. */ - win->wa = xcb_get_geometry_reply(conn, - xcb_get_geometry(conn, win->id), - NULL); - - /* Figure out which region the window belongs to. */ - r = root_to_region(win->wa->root, SWM_CK_ALL); + /* Figureout which region the window belongs to. */ + r = root_to_region(gr->root, SWM_CK_ALL); /* Ignore window border if there is one. */ - WIDTH(win) = win->wa->width; - HEIGHT(win) = win->wa->height; - X(win) = win->wa->x + win->wa->border_width - border_width; - Y(win) = win->wa->y + win->wa->border_width - border_width; + WIDTH(win) = gr->width; + HEIGHT(win) = gr->height; + X(win) = gr->x + gr->border_width - border_width; + Y(win) = gr->y + gr->border_width - border_width; win->bordered = 1; win->mapped = mapped; win->floatmaxed = 0; win->ewmh_flags = 0; win->s = r->s; /* this never changes */ - store_float_geom(win, r); + free(gr); /* Get WM_SIZE_HINTS. */ xcb_icccm_get_wm_normal_hints_reply(conn, @@ -7694,6 +7934,9 @@ manage_window(xcb_window_t id, uint16_t mapped) ws_idx_str); } + /* WS must already be set for this to work. */ + store_float_geom(win); + /* Handle EWMH */ ewmh_autoquirk(win); @@ -7712,8 +7955,8 @@ manage_window(xcb_window_t id, uint16_t mapped) } TAILQ_FOREACH(qp, &quirks, entry) { - if (!strcmp(win->ch.class_name, qp->class) && - !strcmp(win->ch.instance_name, qp->name)) { + if (strcmp(win->ch.class_name, qp->class) == 0 && + strcmp(win->ch.instance_name, qp->name) == 0) { DNPRINTF(SWM_D_CLASS, "manage_window: on quirks" "list; mask: 0x%lx\n", qp->quirk); if (qp->quirk & SWM_Q_FLOAT) @@ -7737,7 +7980,8 @@ manage_window(xcb_window_t id, uint16_t mapped) /* Make sure window is positioned inside its region, if its active. */ if (win->ws->r) { - constrain_window(win, win->ws->r, 0); + region_containment(win, r, SWM_CW_ALLSIDES | + SWM_CW_HARDBOUNDARY); update_window(win); } @@ -7797,9 +8041,6 @@ free_window(struct ws_win *win) TAILQ_REMOVE(&win->ws->unmanagedlist, win, entry); - if (win->wa) - free(win->wa); - xcb_icccm_get_wm_class_reply_wipe(&win->ch); kill_refs(win); @@ -7985,8 +8226,7 @@ print_win_geom(xcb_window_t w) xcb_get_geometry_reply_t *wa; wa = xcb_get_geometry_reply(conn, xcb_get_geometry(conn, w), NULL); - - if (!wa) { + if (wa == NULL) { DNPRINTF(SWM_D_MISC, "print_win_geom: window not found: 0x%x\n", w); return; @@ -8202,11 +8442,11 @@ destroynotify(xcb_destroy_notify_event_t *e) unmanage_window(win); stack(); - if (focus_mode != SWM_FOCUS_FOLLOW) { + if (focus_mode != SWM_FOCUS_FOLLOW && WS_FOCUSED(win->ws)) { if (win->ws->focus_pending) { focus_win(win->ws->focus_pending); win->ws->focus_pending = NULL; - } else if (win == win->ws->focus && win->ws->r) { + } else if (win == win->ws->focus) { xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, win->ws->r->id, XCB_CURRENT_TIME); } @@ -8349,13 +8589,13 @@ mapnotify(xcb_map_notify_event_t *e) DNPRINTF(SWM_D_EVENT, "mapnotify: window: 0x%x\n", e->window); - if ((win = find_window(e->window)) == NULL) - win = manage_window(e->window, 1); + if ((win = manage_window(e->window, 1)) == NULL) + return; win->mapped = 1; set_win_state(win, XCB_ICCCM_WM_STATE_NORMAL); - if (focus_mode != SWM_FOCUS_FOLLOW) { + if (focus_mode != SWM_FOCUS_FOLLOW && WS_FOCUSED(win->ws)) { if (win->ws->focus_pending == win) { focus_win(win); win->ws->focus_pending = NULL; @@ -8400,6 +8640,8 @@ maprequest(xcb_map_request_event_t *e) win = manage_window(e->window, (war->map_state == XCB_MAP_STATE_VIEWABLE)); + if (win == NULL) + goto out; /* The new window should get focus; prepare. */ if (focus_mode != SWM_FOCUS_FOLLOW && @@ -8410,10 +8652,14 @@ maprequest(xcb_map_request_event_t *e) if (w == win || !w->mapped) continue; - if (!strcmp(w->ch.class_name, - win->ch.class_name) && - !strcmp(w->ch.instance_name, - win->ch.instance_name)) + if (w->ch.class_name && + win->ch.class_name && + strcmp(w->ch.class_name, + win->ch.class_name) == 0 && + w->ch.instance_name && + win->ch.instance_name && + strcmp(w->ch.instance_name, + win->ch.instance_name) == 0) break; } } @@ -8533,7 +8779,8 @@ propertynotify(xcb_property_notify_event_t *e) if (ws->r) { stack(); - if (focus_mode != SWM_FOCUS_FOLLOW) { + if (focus_mode != SWM_FOCUS_FOLLOW && + WS_FOCUSED(ws)) { if (ws->focus_pending) { focus_win(ws->focus_pending); ws->focus_pending = NULL; @@ -8560,7 +8807,7 @@ propertynotify(xcb_property_notify_event_t *e) } else if (e->atom == a_state) { /* State just changed, make sure it gets focused if mapped. */ if (e->state == XCB_PROPERTY_NEW_VALUE) { - if (focus_mode != SWM_FOCUS_FOLLOW) { + if (focus_mode != SWM_FOCUS_FOLLOW && WS_FOCUSED(ws)) { if (win->mapped && ws->focus_pending == win) { focus_win(ws->focus_pending); @@ -8616,15 +8863,16 @@ unmapnotify(xcb_unmap_notify_event_t *e) if (ws->r) stack(); - if (focus_mode == SWM_FOCUS_FOLLOW) { - if (ws->r) + if (WS_FOCUSED(ws)) { + if (focus_mode == SWM_FOCUS_FOLLOW) { focus_win(get_pointer_win(ws->r->s->root)); - } else if (ws->focus_pending) { - focus_win(ws->focus_pending); - ws->focus_pending = NULL; - } else if (ws->focus == NULL && ws->r) { - xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, - ws->r->id, XCB_CURRENT_TIME); + } else if (ws->focus_pending) { + focus_win(ws->focus_pending); + ws->focus_pending = NULL; + } else if (ws->focus == NULL) { + xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, + ws->r->id, XCB_CURRENT_TIME); + } } } @@ -8671,7 +8919,10 @@ clientmessage(xcb_client_message_event_t *e) if (e->type == ewmh[_NET_ACTIVE_WINDOW].atom) { DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_ACTIVE_WINDOW\n"); - focus_win(win); + if (WS_FOCUSED(win->ws)) + focus_win(win); + else + win->ws->focus_pending = win; } if (e->type == ewmh[_NET_CLOSE_WINDOW].atom) { DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_CLOSE_WINDOW\n"); @@ -9026,7 +9277,7 @@ grab_windows(void) 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) + if (qtr == NULL) continue; wins = xcb_query_tree_children(qtr); no = xcb_query_tree_children_length(qtr); @@ -9048,7 +9299,7 @@ grab_windows(void) gac = xcb_get_window_attributes(conn, wins[j]); gar = xcb_get_window_attributes_reply(conn, gac, NULL); - if (!gar) { + if (gar == NULL) { DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; " "doesn't exist.\n", wins[j]); continue; @@ -9082,7 +9333,7 @@ grab_windows(void) for (j = 0; j < no; j++) { gac = xcb_get_window_attributes(conn, wins[j]); gar = xcb_get_window_attributes_reply(conn, gac, NULL); - if (!gar) { + if (gar == NULL) { DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; " "doesn't exist.\n", wins[j]); continue; @@ -9221,10 +9472,7 @@ setup_globals(void) a_prot = get_atom_from_string("WM_PROTOCOLS"); a_delete = get_atom_from_string("WM_DELETE_WINDOW"); a_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"); a_swm_ws = get_atom_from_string("_SWM_WS"); } @@ -9253,7 +9501,8 @@ workaround(void) 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, - a_netwmname, a_utf8_string, 8, strlen("LG3D"), "LG3D"); + ewmh[_NET_WM_NAME].atom, a_utf8_string, 8, strlen("LG3D"), + "LG3D"); } } @@ -9276,7 +9525,7 @@ shutdown_cleanup(void) num_screens = get_screen_count(); for (i = 0; i < num_screens; ++i) { - if (screens[i].bar_gc != 0) + if (screens[i].bar_gc != XCB_NONE) xcb_free_gc(conn, screens[i].bar_gc); if (!bar_font_legacy) XftColorFree(display, DefaultVisual(display, i), @@ -9383,7 +9632,7 @@ main(int argc, char *argv[]) start_argv = argv; warnx("Welcome to spectrwm V%s Build: %s", SPECTRWM_VERSION, buildstr); - if (!setlocale(LC_CTYPE, "") || !setlocale(LC_TIME, "")) + if (setlocale(LC_CTYPE, "") == NULL || setlocale(LC_TIME, "") == NULL) warnx("no locale support"); /* handle some signals */ @@ -9400,7 +9649,7 @@ main(int argc, char *argv[]) sact.sa_flags = SA_NOCLDSTOP; sigaction(SIGCHLD, &sact, NULL); - if (!(display = XOpenDisplay(0))) + if ((display = XOpenDisplay(0)) == NULL) errx(1, "can not open display"); conn = XGetXCBConnection(display); @@ -9427,7 +9676,7 @@ main(int argc, char *argv[]) free(evt); } - if (enable_wm() != 0) + if (enable_wm()) errx(1, "another window manager is currently running"); /* Load Xcursors and/or cursorfont glyph cursors. */