Add better focus code that deals with prev a little better.

[spectrwm.git] / scrotwm.c

diff --git a/scrotwm.c b/scrotwm.c
index 9bb5f78..dff3997 100644 (file)
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -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"
@@ -318,6 +319,8 @@ void        horizontal_config(struct workspace *, int);
 void   horizontal_stack(struct workspace *, struct swm_geometry *);
 void   max_stack(struct workspace *, struct swm_geometry *);
 
+struct ws_win *find_window(Window);
+
 void   grabbuttons(struct ws_win *, int);
 void   new_region(struct swm_screen *, int, int, int, int);
 void   unmanage_window(struct ws_win *);
@@ -335,7 +338,7 @@ struct layout {
        { vertical_stack,       vertical_config,        0,      "[|]" },
        { horizontal_stack,     horizontal_config,      0,      "[-]" },
        { max_stack,            NULL,
-         SWM_L_FOCUSPREV | SWM_L_MAPONFOCUS,                   "[ ]"},
+         SWM_L_MAPONFOCUS | SWM_L_FOCUSPREV,                   "[ ]"},
        { NULL,                 NULL,                   0,      NULL },
 };
 
@@ -417,8 +420,9 @@ union arg {
 };
 
 void   focus(struct swm_region *, union arg *);
-void   focus_magic(struct ws_win *);
-
+void   focus_magic(struct ws_win *, int);
+#define SWM_F_GENERIC          (0)
+#define SWM_F_TRANSIENT                (1)
 /* quirks */
 struct quirk {
        char                    *class;
@@ -1630,11 +1634,69 @@ 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, *winlostfocus;
-       struct ws_win_list      *wl;
-       struct ws_win           *cur_focus;
+       struct ws_win           *winfocus = NULL, *winlostfocus = NULL;
+       struct ws_win           *cur_focus = NULL;
+       struct ws_win_list      *wl = NULL;
+       struct workspace        *ws = NULL;
 
        if (!(r && r->ws))
                return;
@@ -1650,20 +1712,19 @@ focus(struct swm_region *r, union arg *args)
                else
                        winfocus = TAILQ_FIRST(&r->ws->winlist);
                        
-               focus_magic(winfocus);
+               focus_magic(winfocus, SWM_F_GENERIC);
                return;
        }
 
-       cur_focus = r->ws->focus;
-       if (cur_focus == NULL)
+       if ((cur_focus = r->ws->focus) == NULL)
                return;
-
-       wl = &cur_focus->ws->winlist;
+       ws = r->ws;
+       wl = &ws->winlist;
 
        winlostfocus = cur_focus;
 
        switch (args->id) {
-       case SWM_ARG_ID_FOCUSPREV:
+       case SWM_ARG_ID_FOCUSPREV:
                winfocus = TAILQ_PREV(cur_focus, ws_win_list, entry);
                if (winfocus == NULL)
                        winfocus = TAILQ_LAST(wl, ws_win_list);
@@ -1679,8 +1740,6 @@ focus(struct swm_region *r, union arg *args)
                winfocus = TAILQ_FIRST(wl);
                if (winfocus == cur_focus)
                        winfocus = cur_focus->ws->focus_prev;
-               if (winfocus == NULL)
-                       return;
                break;
 
        default:
@@ -1690,7 +1749,7 @@ focus(struct swm_region *r, union arg *args)
        if (winfocus == winlostfocus || winfocus == NULL)
                return;
 
-       focus_magic(winfocus);
+       focus_magic(winfocus, SWM_F_GENERIC);
 }
 
 void
@@ -1711,6 +1770,7 @@ cycle_layout(struct swm_region *r, union arg *args)
        stack();
        a.id = SWM_ARG_ID_FOCUSCUR;
        focus(r, &a);
+       bar_update();
 }
 
 void
@@ -2114,7 +2174,7 @@ max_stack(struct workspace *ws, struct swm_geometry *g)
 {
        XWindowChanges          wc;
        struct swm_geometry     gg = *g;
-       struct ws_win           *win, *wintrans = NULL;
+       struct ws_win           *win, *wintrans = NULL, *parent = NULL;
        unsigned int            mask;
        int                     winno;
 
@@ -2130,6 +2190,7 @@ max_stack(struct workspace *ws, struct swm_geometry *g)
        TAILQ_FOREACH(win, &ws->winlist, entry) {
                if (win->transient) {
                        wintrans = win;
+                       parent = find_window(win->transient);
                        continue;
                }
 
@@ -2154,8 +2215,10 @@ max_stack(struct workspace *ws, struct swm_geometry *g)
 
        /* put the last transient on top */
        if (wintrans) {
+               if (parent)
+                       XMapRaised(display, parent->id);
                stack_floater(wintrans, ws->r);
-               focus_magic(wintrans); /* override */
+               focus_magic(wintrans, SWM_F_TRANSIENT);
        }
 }
 
@@ -2175,6 +2238,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);
 
@@ -3456,12 +3521,22 @@ conf_load(char *filename)
        return (0);
 }
 
+void
+set_child_transient(struct ws_win *win)
+{
+       struct ws_win           *parent;
+
+       parent = find_window(win->transient);
+       if (parent)
+               parent->child_trans = win;
+}
+
 struct ws_win *
 manage_window(Window id)
 {
        Window                  trans = 0;
        struct workspace        *ws;
-       struct ws_win           *win, *ww, *parent;
+       struct ws_win           *win, *ww;
        int                     format, i, ws_idx, n, border_me = 0;
        unsigned long           nitems, bytes;
        Atom                    ws_idx_atom = 0, type;
@@ -3481,6 +3556,8 @@ manage_window(Window id)
                    "%lu\n", win->id);
                TAILQ_REMOVE(&win->ws->unmanagedlist, win, entry);
                TAILQ_INSERT_TAIL(&win->ws->winlist, win, entry);
+               if (win->transient)
+                       set_child_transient(win);
                return (win);
        }
 
@@ -3497,9 +3574,7 @@ manage_window(Window id)
        XGetTransientForHint(display, id, &trans);
        if (trans) {
                win->transient = trans;
-               parent = find_window(win->transient);
-               if (parent)
-                       parent->child_trans = win;
+               set_child_transient(win);
                DNPRINTF(SWM_D_MISC, "manage_window: win %lu transient %lu\n",
                    win->id, win->transient);
        }
@@ -3677,6 +3752,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);
 
@@ -3684,12 +3760,14 @@ unmanage_window(struct ws_win *win)
 }
 
 void
-focus_magic(struct ws_win *win)
+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 (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);
@@ -3755,7 +3833,7 @@ buttonpress(XEvent *e)
        if ((win = find_window(ev->window)) == NULL)
                return;
 
-       focus_magic(win);
+       focus_magic(win, SWM_F_TRANSIENT);
        action = client_click;
 
        for (i = 0; i < LENGTH(buttons); i++)
@@ -3829,7 +3907,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);
 
@@ -3840,11 +3917,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
@@ -3865,7 +3940,7 @@ enternotify(XEvent *e)
        if ((win = find_window(ev->window)) == NULL)
                return;
 
-       focus_magic(win);
+       focus_magic(win, SWM_F_TRANSIENT);
 }
 
 void
@@ -3928,7 +4003,7 @@ maprequest(XEvent *e)
        /* make new win focused */
        r = root_to_region(win->wa.root);
        if (win->ws == r->ws)
-               focus_magic(win);
+               focus_magic(win, SWM_F_GENERIC);
 }
 
 void
@@ -3970,7 +4045,6 @@ void
 unmapnotify(XEvent *e)
 {
        struct ws_win           *win;
-       union arg               a;
 
        DNPRINTF(SWM_D_EVENT, "unmapnotify: window: %lu\n", e->xunmap.window);
 
@@ -3979,10 +4053,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();
        }