X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=067806b64da2581e332852f94cc28cad90517515;hb=803efec3fdf794b4c3e923738a655c896d39cc6c;hp=d8e5d0517b3f8276b65471793c869c3a00a1edd8;hpb=5861c15d647d027da81fd5af417d26a21d8ad011;p=spectrwm.git diff --git a/scrotwm.c b/scrotwm.c index d8e5d05..067806b 100644 --- a/scrotwm.c +++ b/scrotwm.c @@ -52,7 +52,7 @@ static const char *cvstag = "$scrotwm$"; -#define SWM_VERSION "0.9.17" +#define SWM_VERSION "0.9.18" #include #include @@ -148,6 +148,7 @@ u_int32_t swm_debug = 0 #define WIDTH(r) (r)->g.w #define HEIGHT(r) (r)->g.h #define SWM_MAX_FONT_STEPS (3) +#define WINID(w) (w ? w->id : 0) #ifndef SWM_LIB #define SWM_LIB "/usr/local/lib/libswmhack.so" @@ -420,7 +421,8 @@ union arg { void focus(struct swm_region *, union arg *); void focus_magic(struct ws_win *, int); - +#define SWM_F_GENERIC (0) +#define SWM_F_TRANSIENT (1) /* quirks */ struct quirk { char *class; @@ -1387,17 +1389,18 @@ unfocus_win(struct ws_win *win) } void -unfocus_all(void) +unfocus_all_except(struct ws_win *except) { struct ws_win *win; int i, j; - DNPRINTF(SWM_D_FOCUS, "unfocus_all:\n"); + DNPRINTF(SWM_D_FOCUS, "unfocus_all_except: id: %lu\n", except->id); for (i = 0; i < ScreenCount(display); i++) for (j = 0; j < SWM_WS_MAX; j++) TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry) - unfocus_win(win); + if (win != except) + unfocus_win(win); } void @@ -1418,7 +1421,7 @@ focus_win(struct ws_win *win) } /* use big hammer to make sure it works under all use cases */ - unfocus_all(); + unfocus_all_except(win); if (validate_win(win)) { kill_refs(win); @@ -1632,6 +1635,63 @@ swapwin(struct swm_region *r, union arg *args) } void +focus_prev(struct ws_win *win) +{ + struct ws_win *winfocus = NULL, *winlostfocus = NULL; + struct ws_win *cur_focus = NULL; + struct ws_win_list *wl = NULL; + struct workspace *ws = NULL; + + DNPRINTF(SWM_D_FOCUS, "focus_prev: id %lu\n", WINID(win)); + + if (!(win && win->ws)) + return; + + ws = win->ws; + wl = &ws->winlist; + cur_focus = ws->focus; + winlostfocus = cur_focus; + + /* pickle, just focus on whatever */ + if (cur_focus == NULL) { + /* use prev_focus if valid */ + if (ws->focus_prev && ws->focus_prev != cur_focus && + find_window(WINID(ws->focus_prev))) + winfocus = ws->focus_prev; + if (winfocus == NULL) + winfocus = TAILQ_FIRST(wl); + goto done; + } + + /* if transient focus on parent */ + if (cur_focus->transient) { + winfocus = find_window(cur_focus->transient); + goto done; + } + + /* if in max_stack try harder */ + /* XXX needs more love */ + if (ws->cur_layout->flags & SWM_L_FOCUSPREV) { + if (cur_focus != ws->focus_prev) + winfocus = ws->focus_prev; + else if (cur_focus != ws->focus) + winfocus = ws->focus; + goto done; + } + + if (cur_focus == win) + winfocus = TAILQ_PREV(win, ws_win_list, entry); + if (winfocus == NULL) + winfocus = TAILQ_FIRST(wl); + if (winfocus == NULL || winfocus == win) + winfocus = TAILQ_NEXT(cur_focus, entry); +done: + if (winfocus == winlostfocus || winfocus == NULL) + return; + focus_magic(winfocus, SWM_F_GENERIC); +} + +void focus(struct swm_region *r, union arg *args) { struct ws_win *winfocus = NULL, *winlostfocus = NULL; @@ -1653,69 +1713,34 @@ focus(struct swm_region *r, union arg *args) else winfocus = TAILQ_FIRST(&r->ws->winlist); - focus_magic(winfocus, 0); + focus_magic(winfocus, SWM_F_GENERIC); return; } - cur_focus = r->ws->focus; - if (cur_focus == NULL) { + if ((cur_focus = r->ws->focus) == NULL) return; - } - ws = r->ws; wl = &ws->winlist; winlostfocus = cur_focus; switch (args->id) { - case SWM_ARG_ID_FOCUSPREV: - if (cur_focus->transient) - winfocus = find_window(cur_focus->transient); - else if (ws->focus == cur_focus) { - /* if in max_stack try harder */ - if (ws->cur_layout->flags & SWM_L_FOCUSPREV) { - if (cur_focus != ws->focus_prev) - winfocus = ws->focus_prev; - else if (cur_focus != ws->focus) - winfocus = ws->focus; - } - - /* fallback and normal handling */ - if (winfocus == NULL) { - if (TAILQ_FIRST(wl) == cur_focus) - winfocus = TAILQ_NEXT(cur_focus, entry); - else { - winfocus = TAILQ_PREV(ws->focus, - ws_win_list, entry); - if (winfocus == NULL) - winfocus = TAILQ_LAST(wl, - ws_win_list); - } - } - } + case SWM_ARG_ID_FOCUSPREV: + winfocus = TAILQ_PREV(cur_focus, ws_win_list, entry); + if (winfocus == NULL) + winfocus = TAILQ_LAST(wl, ws_win_list); break; - case SWM_ARG_ID_FOCUSNEXT: - cur_focus = r->ws->focus; - if (cur_focus == NULL) - return; - wl = &cur_focus->ws->winlist; + case SWM_ARG_ID_FOCUSNEXT: winfocus = TAILQ_NEXT(cur_focus, entry); if (winfocus == NULL) winfocus = TAILQ_FIRST(wl); break; case SWM_ARG_ID_FOCUSMAIN: - cur_focus = r->ws->focus; - if (cur_focus == NULL) - return; - wl = &cur_focus->ws->winlist; - winfocus = TAILQ_FIRST(wl); if (winfocus == cur_focus) winfocus = cur_focus->ws->focus_prev; - if (winfocus == NULL) - return; break; default: @@ -1725,7 +1750,7 @@ focus(struct swm_region *r, union arg *args) if (winfocus == winlostfocus || winfocus == NULL) return; - focus_magic(winfocus, 0); + focus_magic(winfocus, SWM_F_GENERIC); } void @@ -1746,6 +1771,7 @@ cycle_layout(struct swm_region *r, union arg *args) stack(); a.id = SWM_ARG_ID_FOCUSCUR; focus(r, &a); + bar_update(); } void @@ -2193,7 +2219,7 @@ max_stack(struct workspace *ws, struct swm_geometry *g) if (parent) XMapRaised(display, parent->id); stack_floater(wintrans, ws->r); - focus_magic(wintrans, 1); + focus_magic(wintrans, SWM_F_TRANSIENT); } } @@ -2213,6 +2239,8 @@ send_to_ws(struct swm_region *r, union arg *args) return; if (win == NULL) return; + if (win->ws->idx == wsid) + return; DNPRINTF(SWM_D_MOVE, "send_to_ws: win: %lu\n", win->id); @@ -3725,6 +3753,7 @@ unmanage_window(struct ws_win *win) parent->child_trans = NULL; } + focus_prev(win); TAILQ_REMOVE(&win->ws->winlist, win, entry); TAILQ_INSERT_TAIL(&win->ws->unmanagedlist, win, entry); @@ -3734,10 +3763,12 @@ unmanage_window(struct ws_win *win) void focus_magic(struct ws_win *win, int do_trans) { + DNPRINTF(SWM_D_FOCUS, "focus_magic: %lu %d\n", WINID(win), do_trans); + if (win == NULL) return; - if (do_trans && win->child_trans) { + if (do_trans == SWM_F_TRANSIENT && win->child_trans) { /* win = parent & has a transient so focus on that */ if (win->java) { focus_win(win->child_trans); @@ -3803,7 +3834,7 @@ buttonpress(XEvent *e) if ((win = find_window(ev->window)) == NULL) return; - focus_magic(win, 1); + focus_magic(win, SWM_F_TRANSIENT); action = client_click; for (i = 0; i < LENGTH(buttons); i++) @@ -3877,7 +3908,6 @@ destroynotify(XEvent *e) { struct ws_win *win; XDestroyWindowEvent *ev = &e->xdestroywindow; - union arg a; DNPRINTF(SWM_D_EVENT, "destroynotify: window %lu\n", ev->window); @@ -3888,11 +3918,9 @@ destroynotify(XEvent *e) return; } - a.id = SWM_ARG_ID_FOCUSPREV; - focus(win->ws->r, &a); unmanage_window(win); - free_window(win); stack(); + free_window(win); } void @@ -3913,7 +3941,7 @@ enternotify(XEvent *e) if ((win = find_window(ev->window)) == NULL) return; - focus_magic(win, 1); + focus_magic(win, SWM_F_TRANSIENT); } void @@ -3976,7 +4004,7 @@ maprequest(XEvent *e) /* make new win focused */ r = root_to_region(win->wa.root); if (win->ws == r->ws) - focus_magic(win, 0); + focus_magic(win, SWM_F_GENERIC); } void @@ -4018,7 +4046,6 @@ void unmapnotify(XEvent *e) { struct ws_win *win; - union arg a; DNPRINTF(SWM_D_EVENT, "unmapnotify: window: %lu\n", e->xunmap.window); @@ -4027,10 +4054,14 @@ unmapnotify(XEvent *e) if (win == NULL) return; + /* + * XXX this is a work around for going fullscreen on mplayer + * remove this and find a better heuristic + */ + if (win->floating) + return; + if (getstate(e->xunmap.window) == NormalState) { - /* trash window and refocus */ - a.id = SWM_ARG_ID_FOCUSPREV; - focus(win->ws->r, &a); unmanage_window(win); stack(); }