small changes to dwm.1, rearranged order within main event loop

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index a718ebd..cdb0f52 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -47,12 +47,13 @@ dofloat(Arg *arg)
                else
                        ban(c);
        }
-       if((sel = getnext(clients))) {
+       if(!sel || !isvisible(sel))
+               sel = getnext(clients);
+       if(sel)
                focus(sel);
-               restack();
-       }
        else
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+       restack();
 }
 
 void
@@ -111,7 +112,9 @@ dotile(Arg *arg)
                else
                        ban(c);
        }
-       if((sel = getnext(clients)))
+       if(!sel || !isvisible(sel))
+               sel = getnext(clients);
+       if(sel)
                focus(sel);
        else
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
@@ -277,7 +280,10 @@ void
 togglemode(Arg *arg)
 {
        arrange = arrange == dofloat ? dotile : dofloat;
-       arrange(NULL);
+       if(sel)
+               arrange(NULL);
+       else
+               drawstatus();
 }
 
 void