removed a bunch of lines through making function signatures more consistent with...

[dwm.git] / view.c

diff --git a/view.c b/view.c
index e74d4bc..1226f0d 100644 (file)
--- a/view.c
+++ b/view.c
@@ -8,20 +8,19 @@
 /* static */
 
 static Client *
-minclient()
-{
+minclient() {
        Client *c, *min;
 
+       if((clients && clients->isfloat) || arrange == dofloat)
+               return clients; /* don't touch floating order */
        for(min = c = clients; c; c = c->next)
                if(c->weight < min->weight)
                        min = c;
        return min;
 }
 
-
 static void
-reorder()
-{
+reorder() {
        Client *c, *newclients, *tail;
 
        newclients = tail = NULL;
@@ -39,8 +38,7 @@ reorder()
 }
 
 static Client *
-nexttiled(Client *c)
-{
+nexttiled(Client *c) {
        for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
        return c;
 }
@@ -50,8 +48,7 @@ nexttiled(Client *c)
 void (*arrange)(Arg *) = DEFMODE;
 
 void
-detach(Client *c)
-{
+detach(Client *c) {
        if(c->prev)
                c->prev->next = c->next;
        if(c->next)
@@ -62,8 +59,7 @@ detach(Client *c)
 }
 
 void
-dofloat(Arg *arg)
-{
+dofloat(Arg *arg) {
        Client *c;
 
        maximized = False;
@@ -75,14 +71,15 @@ dofloat(Arg *arg)
                else
                        ban(c);
        }
-       if(!sel || !isvisible(sel))
-               focus(getnext(clients));
+       if(!sel || !isvisible(sel)) {
+               for(c = stack; c && !isvisible(c); c = c->snext);
+               focus(c);
+       }
        restack();
 }
 
 void
-dotile(Arg *arg)
-{
+dotile(Arg *arg) {
        int h, i, n, w;
        Client *c;
 
@@ -137,14 +134,15 @@ dotile(Arg *arg)
                else
                        ban(c);
        }
-       if(!sel || !isvisible(sel))
-               focus(getnext(clients));
+       if(!sel || !isvisible(sel)) {
+               for(c = stack; c && !isvisible(c); c = c->snext);
+               focus(c);
+       }
        restack();
 }
 
 void
-focusnext(Arg *arg)
-{
+focusnext(Arg *arg) {
        Client *c;
    
        if(!sel)
@@ -159,8 +157,7 @@ focusnext(Arg *arg)
 }
 
 void
-focusprev(Arg *arg)
-{
+focusprev(Arg *arg) {
        Client *c;
 
        if(!sel)
@@ -177,8 +174,7 @@ focusprev(Arg *arg)
 }
 
 Bool
-isvisible(Client *c)
-{
+isvisible(Client *c) {
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
@@ -188,8 +184,7 @@ isvisible(Client *c)
 }
 
 void
-resizecol(Arg *arg)
-{
+resizecol(Arg *arg) {
        unsigned int n;
        Client *c;
 
@@ -213,8 +208,7 @@ resizecol(Arg *arg)
 }
 
 void
-restack()
-{
+restack() {
        Client *c;
        XEvent ev;
        
@@ -226,7 +220,7 @@ restack()
                XRaiseWindow(dpy, sel->win);
                XRaiseWindow(dpy, sel->twin);
        }
-       if(arrange != dofloat) 
+       if(arrange != dofloat)
                for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
                        XLowerWindow(dpy, c->twin);
                        XLowerWindow(dpy, c->win);
@@ -237,8 +231,7 @@ restack()
 }
 
 void
-togglemode(Arg *arg)
-{
+togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;
        if(sel)
                arrange(NULL);
@@ -247,8 +240,7 @@ togglemode(Arg *arg)
 }
 
 void
-toggleview(Arg *arg)
-{
+toggleview(Arg *arg) {
        unsigned int i;
 
        seltag[arg->i] = !seltag[arg->i];
@@ -260,8 +252,7 @@ toggleview(Arg *arg)
 }
 
 void
-view(Arg *arg)
-{
+view(Arg *arg) {
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
@@ -272,8 +263,7 @@ view(Arg *arg)
 }
 
 void
-viewall(Arg *arg)
-{
+viewall(Arg *arg) {
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
@@ -283,8 +273,7 @@ viewall(Arg *arg)
 }
 
 void
-zoom(Arg *arg)
-{
+zoom(Arg *arg) {
        unsigned int n;
        Client *c;
 
@@ -298,8 +287,9 @@ zoom(Arg *arg)
                if(!(c = nexttiled(c->next)))
                        return;
        detach(c);
+       if(clients)
+               clients->prev = c;
        c->next = clients;
-       clients->prev = c;
        clients = c;
        focus(c);
        arrange(NULL);