X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=db89878c3e6e3e58e5db6a9af7b52658d7fad662;hb=f986795d661821ec05039b405e2ce0ac71efc417;hp=4d2128a2d72dbe6cc4a51c60a02c118ca882ea53;hpb=b5b9fa338811092900560a226c282a2f6c1f9d8e;p=spectrwm.git diff --git a/spectrwm.c b/spectrwm.c index 4d2128a..db89878 100644 --- a/spectrwm.c +++ b/spectrwm.c @@ -83,6 +83,7 @@ #include #include #include +#include #include #include #include @@ -671,6 +672,8 @@ struct quirk { #define SWM_Q_NOFOCUSONMAP (1<<6) /* Don't focus on window when mapped. */ #define SWM_Q_FOCUSONMAP_SINGLE (1<<7) /* Only focus if single win of type. */ #define SWM_Q_OBEYAPPFOCUSREQ (1<<8) /* Focus when applications ask. */ +#define SWM_Q_IGNOREPID (1<<9) /* Ignore PID when determining ws. */ +#define SWM_Q_IGNORESPAWNWS (1<<10) /* Ignore _SWM_WS when managing win. */ }; TAILQ_HEAD(quirk_list, quirk); struct quirk_list quirks = TAILQ_HEAD_INITIALIZER(quirks); @@ -1037,7 +1040,7 @@ int32_t get_swm_ws(xcb_window_t); char *get_win_name(xcb_window_t); uint8_t get_win_state(xcb_window_t); void get_wm_protocols(struct ws_win *); -int get_ws_idx(xcb_window_t); +int get_ws_idx(struct ws_win *); void grabbuttons(struct ws_win *); void grabkeys(void); void grab_windows(void); @@ -1056,7 +1059,7 @@ void kill_refs(struct ws_win *); void leavenotify(xcb_leave_notify_event_t *); #endif void load_float_geom(struct ws_win *); -struct ws_win *manage_window(xcb_window_t, int); +struct ws_win *manage_window(xcb_window_t, int, bool); void map_window(struct ws_win *); void mapnotify(xcb_map_notify_event_t *); void mappingnotify(xcb_mapping_notify_event_t *); @@ -2769,6 +2772,13 @@ bar_setup(struct swm_region *r) XCB_COPY_FROM_PARENT, XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL | XCB_CW_EVENT_MASK, wa); + /* Stack bar window above region window to start. */ + wa[0] = r->id; + wa[1] = XCB_STACK_MODE_ABOVE; + + xcb_configure_window(conn, r->bar->id, XCB_CONFIG_WINDOW_SIBLING | + XCB_CONFIG_WINDOW_STACK_MODE, wa); + r->bar->buffer = xcb_generate_id(conn); xcb_create_pixmap(conn, screen->root_depth, r->bar->buffer, r->bar->id, WIDTH(r->bar), HEIGHT(r->bar)); @@ -3483,7 +3493,7 @@ unfocus_win(struct ws_win *win) void focus_win(struct ws_win *win) { - struct ws_win *cfw = NULL, *parent = NULL, *w; + struct ws_win *cfw = NULL, *parent = NULL, *w, *tmpw; struct workspace *ws; xcb_get_input_focus_reply_t *gifr; @@ -3566,20 +3576,25 @@ focus_win(struct ws_win *win) map_window(parent); /* Map siblings next. */ - TAILQ_FOREACH(w, &ws->winlist, entry) + TAILQ_FOREACH_SAFE(w, &ws->stack, stack_entry, + tmpw) if (w != win && !ICONIC(w) && - win->transient == parent->id) + w->transient == parent->id) { + raise_window(w); map_window(w); + } } /* Map focused window. */ raise_window(win); map_window(win); - /* Finally, map children of focus window. */ - TAILQ_FOREACH(w, &ws->winlist, entry) - if (w->transient == win->id && !ICONIC(w)) + /* Stack any children of focus window. */ + TAILQ_FOREACH_SAFE(w, &ws->stack, stack_entry, tmpw) + if (w->transient == win->id && !ICONIC(w)) { + raise_window(w); map_window(w); + } } else if (tile_gap < 0 && !ABOVE(win)) { /* * Windows overlap in the layout. @@ -4231,17 +4246,21 @@ focus(struct swm_region *r, union arg *args) if (!(r && r->ws)) goto out; - DNPRINTF(SWM_D_FOCUS, "focus: id: %d\n", args->id); - cur_focus = r->ws->focus; ws = r->ws; wl = &ws->winlist; + DNPRINTF(SWM_D_FOCUS, "focus: id: %d, cur_focus: %#x\n", args->id, + WINID(cur_focus)); + /* Make sure an uniconified window has focus, if one exists. */ if (cur_focus == NULL) { cur_focus = TAILQ_FIRST(wl); while (cur_focus != NULL && ICONIC(cur_focus)) cur_focus = TAILQ_NEXT(cur_focus, entry); + + DNPRINTF(SWM_D_FOCUS, "focus: new cur_focus: %#x\n", + WINID(cur_focus)); } switch (args->id) { @@ -4256,8 +4275,10 @@ focus(struct swm_region *r, union arg *args) winfocus = TAILQ_LAST(wl, ws_win_list); if (winfocus == cur_focus) break; - } while (winfocus != NULL && - (ICONIC(winfocus) || winfocus->id == cur_focus->transient)); + } while (winfocus && (ICONIC(winfocus) || + winfocus->id == cur_focus->transient || + (cur_focus->transient != XCB_WINDOW_NONE && + winfocus->transient == cur_focus->transient))); break; case SWM_ARG_ID_FOCUSNEXT: if (cur_focus == NULL) @@ -4270,8 +4291,10 @@ focus(struct swm_region *r, union arg *args) winfocus = TAILQ_FIRST(wl); if (winfocus == cur_focus) break; - } while (winfocus != NULL && - (ICONIC(winfocus) || winfocus->id == cur_focus->transient)); + } while (winfocus && (ICONIC(winfocus) || + winfocus->id == cur_focus->transient || + (cur_focus->transient != XCB_WINDOW_NONE && + winfocus->transient == cur_focus->transient))); break; case SWM_ARG_ID_FOCUSMAIN: if (cur_focus == NULL) @@ -4897,7 +4920,7 @@ void max_stack(struct workspace *ws, struct swm_geometry *g) { struct swm_geometry gg = *g; - struct ws_win *w, *win = NULL, *parent = NULL; + struct ws_win *w, *win = NULL, *parent = NULL, *tmpw; int winno; DNPRINTF(SWM_D_STACK, "max_stack: workspace: %d\n", ws->idx); @@ -4960,17 +4983,20 @@ max_stack(struct workspace *ws, struct swm_geometry *g) } } + /* If transient, stack parent and its children. */ if (TRANS(win) && (parent = find_window(win->transient))) { raise_window(parent); - TAILQ_FOREACH(w, &ws->stack, stack_entry) + TAILQ_FOREACH_SAFE(w, &ws->stack, stack_entry, tmpw) if (w->transient == parent->id) raise_window(w); } + /* Make sure focus window is on top. */ raise_window(win); - TAILQ_FOREACH(w, &ws->stack, stack_entry) + /* Stack any children of focus window. */ + TAILQ_FOREACH_SAFE(w, &ws->stack, stack_entry, tmpw) if (w->transient == win->id) raise_window(w); @@ -7527,6 +7553,8 @@ const char *quirkname[] = { "NOFOCUSONMAP", "FOCUSONMAP_SINGLE", "OBEYAPPFOCUSREQ", + "IGNOREPID", + "IGNORESPAWNWS", }; /* SWM_Q_WS: retain '|' for back compat for now (2009-08-11) */ @@ -8288,32 +8316,26 @@ setlayout(const char *selector, const char *value, int flags) ws[ws_id].cur_layout->l_config(&ws[ws_id], mg >= 0 ? SWM_ARG_ID_MASTERGROW : SWM_ARG_ID_MASTERSHRINK); - stack(); } /* master add */ for (x = 0; x < abs(ma); x++) { ws[ws_id].cur_layout->l_config(&ws[ws_id], ma >= 0 ? SWM_ARG_ID_MASTERADD : SWM_ARG_ID_MASTERDEL); - stack(); } /* stack inc */ for (x = 0; x < abs(si); x++) { ws[ws_id].cur_layout->l_config(&ws[ws_id], si >= 0 ? SWM_ARG_ID_STACKINC : SWM_ARG_ID_STACKDEC); - stack(); } /* Apply flip */ if (f) { ws[ws_id].cur_layout->l_config(&ws[ws_id], SWM_ARG_ID_FLIPLAYOUT); - stack(); } } - focus_flush(); - return (0); } @@ -8655,13 +8677,16 @@ get_swm_ws(xcb_window_t id) } int -get_ws_idx(xcb_window_t id) +get_ws_idx(struct ws_win *win) { xcb_get_property_reply_t *gpr; int ws_idx = -1; + if (win == NULL) + return -1; + gpr = xcb_get_property_reply(conn, - xcb_get_property(conn, 0, id, ewmh[_NET_WM_DESKTOP].atom, + xcb_get_property(conn, 0, win->id, ewmh[_NET_WM_DESKTOP].atom, XCB_ATOM_CARDINAL, 0, 1), NULL); if (gpr) { @@ -8670,20 +8695,20 @@ get_ws_idx(xcb_window_t id) free(gpr); } - if (ws_idx == -1) - if ((ws_idx = get_swm_ws(id)) != -1) - xcb_delete_property(conn, id, a_swm_ws); + if (ws_idx == -1 && !(win->quirks & SWM_Q_IGNORESPAWNWS)) + ws_idx = get_swm_ws(win->id); if (ws_idx > workspace_limit - 1 || ws_idx < -1) ws_idx = -1; - DNPRINTF(SWM_D_PROP, "get_ws_idx: win %#x, ws_idx: %d\n", id, ws_idx); + DNPRINTF(SWM_D_PROP, "get_ws_idx: win %#x, ws_idx: %d\n", win->id, + ws_idx); return ws_idx; } struct ws_win * -manage_window(xcb_window_t id, int mapped) +manage_window(xcb_window_t id, int spawn_pos, bool mapped) { struct ws_win *win, *ww; struct swm_region *r; @@ -8776,32 +8801,6 @@ manage_window(xcb_window_t id, int mapped) /* Get WM_PROTOCOLS. */ get_wm_protocols(win); - /* Figure out which workspace the window belongs to. */ - if ((p = find_pid(window_get_pid(win->id))) != NULL) { - win->ws = &r->s->ws[p->ws]; - TAILQ_REMOVE(&pidlist, p, entry); - free(p); - p = NULL; - } else if ((ws_idx = get_ws_idx(win->id)) != -1 && - !TRANS(win)) { - /* _SWM_WS is set; use that. */ - win->ws = &r->s->ws[ws_idx]; - } else if (trans && (ww = find_window(trans)) != NULL) { - /* Launch transients in the same ws as parent. */ - win->ws = ww->ws; - } else { - win->ws = r->ws; - } - - /* Set the _NET_WM_DESKTOP atom. */ - DNPRINTF(SWM_D_PROP, "manage_window: set _NET_WM_DESKTOP: %d\n", - win->ws->idx); - xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id, - ewmh[_NET_WM_DESKTOP].atom, XCB_ATOM_CARDINAL, 32, 1, &win->ws->idx); - - /* WS must already be set for this to work. */ - store_float_geom(win); - /* Set initial quirks based on EWMH. */ ewmh_autoquirk(win); @@ -8844,6 +8843,36 @@ manage_window(xcb_window_t id, int mapped) fake_keypress(win, XK_KP_Add, XCB_MOD_MASK_SHIFT); } + /* Figure out which workspace the window belongs to. */ + if (!(win->quirks & SWM_Q_IGNOREPID) && + (p = find_pid(window_get_pid(win->id))) != NULL) { + win->ws = &r->s->ws[p->ws]; + TAILQ_REMOVE(&pidlist, p, entry); + free(p); + p = NULL; + } else if ((ws_idx = get_ws_idx(win)) != -1 && + !TRANS(win)) { + /* _SWM_WS is set; use that. */ + win->ws = &r->s->ws[ws_idx]; + } else if (trans && (ww = find_window(trans)) != NULL) { + /* Launch transients in the same ws as parent. */ + win->ws = ww->ws; + } else { + win->ws = r->ws; + } + + /* Set the _NET_WM_DESKTOP atom. */ + DNPRINTF(SWM_D_PROP, "manage_window: set _NET_WM_DESKTOP: %d\n", + win->ws->idx); + xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id, + ewmh[_NET_WM_DESKTOP].atom, XCB_ATOM_CARDINAL, 32, 1, &win->ws->idx); + + /* Remove any _SWM_WS now that we set _NET_WM_DESKTOP. */ + xcb_delete_property(conn, win->id, a_swm_ws); + + /* WS must already be set for this to work. */ + store_float_geom(win); + /* Make sure window is positioned inside its region, if its active. */ if (win->ws->r) { region_containment(win, r, SWM_CW_ALLSIDES | @@ -8855,12 +8884,12 @@ out: /* Figure out where to stack the window in the workspace. */ if (trans && (ww = find_window(trans))) TAILQ_INSERT_AFTER(&win->ws->winlist, ww, win, entry); - else if (win->ws->focus && spawn_position == SWM_STACK_ABOVE) + else if (win->ws->focus && spawn_pos == SWM_STACK_ABOVE) TAILQ_INSERT_AFTER(&win->ws->winlist, win->ws->focus, win, entry); - else if (win->ws->focus && spawn_position == SWM_STACK_BELOW) + else if (win->ws->focus && spawn_pos == SWM_STACK_BELOW) TAILQ_INSERT_BEFORE(win->ws->focus, win, entry); - else switch (spawn_position) { + else switch (spawn_pos) { default: case SWM_STACK_TOP: case SWM_STACK_ABOVE: @@ -9476,7 +9505,7 @@ mapnotify(xcb_map_notify_event_t *e) DNPRINTF(SWM_D_EVENT, "mapnotify: win %#x\n", e->window); - if ((win = manage_window(e->window, 1)) == NULL) + if ((win = manage_window(e->window, spawn_position, true)) == NULL) return; ws = win->ws; @@ -9549,7 +9578,7 @@ maprequest(xcb_map_request_event_t *e) goto out; } - win = manage_window(e->window, + win = manage_window(e->window, spawn_position, (war->map_state == XCB_MAP_STATE_VIEWABLE)); if (win == NULL) goto out; @@ -10311,7 +10340,7 @@ grab_windows(void) manage = state != XCB_ICCCM_WM_STATE_WITHDRAWN; mapped = gar->map_state == XCB_MAP_STATE_VIEWABLE; if (mapped || manage) - manage_window(wins[j], mapped); + manage_window(wins[j], SWM_STACK_TOP, mapped); free(gar); } /* transient windows */ @@ -10338,7 +10367,7 @@ grab_windows(void) pc = xcb_icccm_get_wm_transient_for(conn, wins[j]); if (xcb_icccm_get_wm_transient_for_reply(conn, pc, &trans, NULL) && manage) - manage_window(wins[j], mapped); + manage_window(wins[j], SWM_STACK_TOP, mapped); free(gar); } free(qtr); @@ -10585,14 +10614,14 @@ main(int argc, char *argv[]) struct swm_region *r; char conf[PATH_MAX], *cfile = NULL; struct stat sb; - int xfd, i, num_screens, startup = 1; + int xfd, i, num_screens; struct sigaction sact; xcb_generic_event_t *evt; struct timeval tv; fd_set rd; int rd_max; - int stdin_ready = 0; int num_readable; + bool stdin_ready = false, startup = true; /* suppress unused warning since var is needed */ (void)argc; @@ -10738,7 +10767,7 @@ noconfig: /* If just (re)started, set default focus if needed. */ if (startup) { - startup = 0; + startup = false; if (focus_mode != SWM_FOCUS_FOLLOW) { r = TAILQ_FIRST(&screens[0].rl); @@ -10762,7 +10791,7 @@ noconfig: if (num_readable == -1 && errno != EINTR) { DNPRINTF(SWM_D_MISC, "select failed"); } else if (num_readable > 0 && FD_ISSET(STDIN_FILENO, &rd)) { - stdin_ready = 1; + stdin_ready = true; } if (restart_wm) @@ -10775,7 +10804,7 @@ noconfig: goto done; if (stdin_ready) { - stdin_ready = 0; + stdin_ready = false; bar_extra_update(); }