more focus cleanz

[spectrwm.git] / scrotwm.c

diff --git a/scrotwm.c b/scrotwm.c
index 9bb5f78..b0793f3 100644 (file)
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -318,6 +318,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 +337,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,7 +419,7 @@ union arg {
 };
 
 void   focus(struct swm_region *, union arg *);
-void   focus_magic(struct ws_win *);
+void   focus_magic(struct ws_win *, int);
 
 /* quirks */
 struct quirk {
@@ -1632,9 +1634,10 @@ swapwin(struct swm_region *r, union arg *args)
 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,25 +1653,46 @@ focus(struct swm_region *r, union arg *args)
                else
                        winfocus = TAILQ_FIRST(&r->ws->winlist);
                        
-               focus_magic(winfocus);
+               focus_magic(winfocus, 0);
                return;
        }
 
-       cur_focus = r->ws->focus;
-       if (cur_focus == NULL)
+       if (r->ws->focus == NULL)
                return;
 
-       wl = &cur_focus->ws->winlist;
+       cur_focus = r->ws->focus;
+       ws = r->ws;
+       wl = &ws->winlist;
 
        winlostfocus = cur_focus;
 
        switch (args->id) {
        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;
+               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);
+                               }
+                       }
+               }
+               break;
        case SWM_ARG_ID_FOCUSNEXT:
                winfocus = TAILQ_NEXT(cur_focus, entry);
                if (winfocus == NULL)
@@ -1690,7 +1714,7 @@ focus(struct swm_region *r, union arg *args)
        if (winfocus == winlostfocus || winfocus == NULL)
                return;
 
-       focus_magic(winfocus);
+       focus_magic(winfocus, 0);
 }
 
 void
@@ -2114,7 +2138,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 +2154,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 +2179,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, 1);
        }
 }
 
@@ -3456,12 +3483,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 +3518,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 +3536,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);
        }
@@ -3684,12 +3721,12 @@ unmanage_window(struct ws_win *win)
 }
 
 void
-focus_magic(struct ws_win *win)
+focus_magic(struct ws_win *win, int do_trans)
 {
        if (win == NULL)
                return;
 
-       if (win->child_trans) {
+       if (do_trans && win->child_trans) {
                /* win = parent & has a transient so focus on that */
                if (win->java) {
                        focus_win(win->child_trans);
@@ -3755,7 +3792,7 @@ buttonpress(XEvent *e)
        if ((win = find_window(ev->window)) == NULL)
                return;
 
-       focus_magic(win);
+       focus_magic(win, 1);
        action = client_click;
 
        for (i = 0; i < LENGTH(buttons); i++)
@@ -3865,7 +3902,7 @@ enternotify(XEvent *e)
        if ((win = find_window(ev->window)) == NULL)
                return;
 
-       focus_magic(win);
+       focus_magic(win, 1);
 }
 
 void
@@ -3928,7 +3965,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, 0);
 }
 
 void