bump version for release

[spectrwm.git] / scrotwm.c

diff --git a/scrotwm.c b/scrotwm.c
index 8bfd2f3..5e3ced2 100644 (file)
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -52,7 +52,7 @@
 
 static const char      *cvstag = "$scrotwm$";
 
-#define        SWM_VERSION     "0.9.18"
+#define        SWM_VERSION     "0.9.19"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -1678,24 +1678,27 @@ focus_prev(struct ws_win *win)
        }
 
        /* 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 != ws->focus_prev)
+                       winfocus = ws->focus_prev;
+               else if (cur_focus != ws->focus)
+                       winfocus = ws->focus;
+               else
+                       winfocus = TAILQ_PREV(win, ws_win_list, entry);
+               if (winfocus)
+                       goto done;
        }
 
        if (cur_focus == win)
                winfocus = TAILQ_PREV(win, ws_win_list, entry);
        if (winfocus == NULL)
-               winfocus = TAILQ_FIRST(wl);
+               winfocus = TAILQ_LAST(wl, ws_win_list);
        if (winfocus == NULL || winfocus == win)
                winfocus = TAILQ_NEXT(cur_focus, entry);
 done:
        if (winfocus == winlostfocus || winfocus == NULL)
                return;
+
        focus_magic(winfocus, SWM_F_GENERIC);
 }
 
@@ -1720,7 +1723,7 @@ focus(struct swm_region *r, union arg *args)
                        winfocus = r->ws->focus_prev;
                else
                        winfocus = TAILQ_FIRST(&r->ws->winlist);
-                       
+
                focus_magic(winfocus, SWM_F_GENERIC);
                return;
        }
@@ -3938,8 +3941,10 @@ enternotify(XEvent *e)
        XEvent                  cne;
        struct ws_win           *win;
 
-       DNPRINTF(SWM_D_EVENT, "enternotify: window: %lu mode %d detail %d\n",
-           ev->window, ev->mode, ev->detail);
+       DNPRINTF(SWM_D_FOCUS, "enternotify: window: %lu mode %d detail %d root "
+           "%lu subwindow %lu same_screen %d focus %d state %d\n",
+           ev->window, ev->mode, ev->detail, ev->root, ev->subwindow,
+           ev->same_screen, ev->focus, ev->state);
 
        /*
         * all these checks need to be in this order because the
@@ -3950,10 +3955,20 @@ enternotify(XEvent *e)
         */
 
        /*
+        * state is set when we are switching workspaces and focus is set when
+        * scrotwm launches via a restart
+        */
+       if (ev->state || ev->focus)
+               return;
+       /*
         * happens when a window is created or destroyed and the border
         * crosses the mouse pointer and when switching ws
+        *
+        * we need the subwindow test to see if we came from root in order
+        * to give focus to floaters
         */
-       if (ev->mode == NotifyNormal && ev->detail == NotifyVirtual)
+       if (ev->mode == NotifyNormal && ev->detail == NotifyVirtual &&
+           ev->subwindow == 0)
                return;
 
        /* this window already has focus */
@@ -3970,6 +3985,10 @@ enternotify(XEvent *e)
        if ((win = find_window(ev->window)) == NULL)
                return;
 
+       /* in fullstack kill all enters */
+       if (win->ws->cur_layout->flags & SWM_L_FOCUSPREV)
+               return;
+
        focus_magic(win, SWM_F_TRANSIENT);
 }