fixed issue pointed out by Jukka

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 8df93ef..bb32235 100644 (file)
--- a/view.c
+++ b/view.c
@@ -3,25 +3,23 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
-#include <stdio.h>
 
 /* 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;
@@ -38,13 +36,18 @@ reorder()
        clients = newclients;
 }
 
+static Client *
+nexttiled(Client *c) {
+       for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
+       return c;
+}
+
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
 
 void
-detach(Client *c)
-{
+detach(Client *c) {
        if(c->prev)
                c->prev->next = c->next;
        if(c->next)
@@ -55,12 +58,9 @@ detach(Client *c)
 }
 
 void
-dofloat(Arg *arg)
-{
+dofloat(Arg *arg) {
        Client *c;
 
-       maximized = False;
-
        for(c = clients; c; c = c->next) {
                if(isvisible(c)) {
                        resize(c, True, TopLeft);
@@ -68,22 +68,21 @@ 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;
 
-       maximized = False;
-
        w = sw - mw;
-       for(n = 0, c = clients; c && !c->isfloat; c = c->next)
-               if(isvisible(c))
+       for(n = 0, c = clients; c; c = c->next)
+               if(isvisible(c) && !c->isfloat)
                        n++;
 
        if(n > 1)
@@ -130,14 +129,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)
@@ -152,8 +152,7 @@ focusnext(Arg *arg)
 }
 
 void
-focusprev(Arg *arg)
-{
+focusprev(Arg *arg) {
        Client *c;
 
        if(!sel)
@@ -170,8 +169,7 @@ focusprev(Arg *arg)
 }
 
 Bool
-isvisible(Client *c)
-{
+isvisible(Client *c) {
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
@@ -181,15 +179,14 @@ isvisible(Client *c)
 }
 
 void
-resizecol(Arg *arg)
-{
+resizecol(Arg *arg) {
        unsigned int n;
        Client *c;
 
-       for(n = 0, c = clients; c && !c->isfloat; c = c->next)
-               if(isvisible(c))
+       for(n = 0, c = clients; c; c = c->next)
+               if(isvisible(c) && !c->isfloat)
                        n++;
-       if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
+       if(!sel || sel->isfloat || n < 2 || (arrange != dotile))
                return;
 
        if(sel == getnext(clients)) {
@@ -206,62 +203,30 @@ resizecol(Arg *arg)
 }
 
 void
-restack()
-{
-       static unsigned int nwins = 0;
-       static Window *wins = NULL;
-       unsigned int f, fi, m, mi, n;
+restack() {
        Client *c;
        XEvent ev;
-
-       for(f = 0, m = 0, c = clients; c; c = c->next)
-               if(isvisible(c)) {
-                       if(c->isfloat || arrange == dofloat)
-                               f++;
-                       else
-                               m++;
-               }
-       if(!(n = 2 * (f + m))) {
+       
+       if(!sel) {
                drawstatus();
                return;
        }
-       if(nwins < n) {
-               nwins = n;
-               wins = erealloc(wins, nwins * sizeof(Window));
+       if(sel->isfloat || arrange == dofloat) {
+               XRaiseWindow(dpy, sel->win);
+               XRaiseWindow(dpy, sel->twin);
        }
-
-       fi = 0;
-       mi = 2 * f;
-       if(sel) {
-               if(sel->isfloat || arrange == dofloat) {
-                       wins[fi++] = sel->twin;
-                       wins[fi++] = sel->win;
-               }
-               else {
-                       wins[mi++] = sel->twin;
-                       wins[mi++] = sel->win;
+       if(arrange != dofloat)
+               for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+                       XLowerWindow(dpy, c->twin);
+                       XLowerWindow(dpy, c->win);
                }
-       }
-       for(c = clients; c; c = c->next)
-               if(isvisible(c) && c != sel) {
-                       if(c->isfloat || arrange == dofloat) {
-                               wins[fi++] = c->twin;
-                               wins[fi++] = c->win;
-                       }
-                       else {
-                               wins[mi++] = c->twin;
-                               wins[mi++] = c->win;
-                       }
-               }
-       XRestackWindows(dpy, wins, n);
        drawall();
        XSync(dpy, False);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
-togglemode(Arg *arg)
-{
+togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;
        if(sel)
                arrange(NULL);
@@ -270,8 +235,7 @@ togglemode(Arg *arg)
 }
 
 void
-toggleview(Arg *arg)
-{
+toggleview(Arg *arg) {
        unsigned int i;
 
        seltag[arg->i] = !seltag[arg->i];
@@ -283,8 +247,7 @@ toggleview(Arg *arg)
 }
 
 void
-view(Arg *arg)
-{
+view(Arg *arg) {
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
@@ -295,8 +258,7 @@ view(Arg *arg)
 }
 
 void
-viewall(Arg *arg)
-{
+viewall(Arg *arg) {
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
@@ -306,23 +268,38 @@ viewall(Arg *arg)
 }
 
 void
-zoom(Arg *arg)
-{
+zoom(Arg *arg) {
+       int tmp;
        unsigned int n;
        Client *c;
+       XEvent ev;
+
+       if(!sel)
+               return;
+
+       if(sel->isfloat || (arrange == dofloat)) {
+               sel->x = sx;
+               sel->y = bh;
+               sel->w = sw;
+               sel->h = sh - bh;
+               resize(sel, True, TopLeft);
+               while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+               return;
+       }
 
-       for(n = 0, c = clients; c && !c->isfloat; c = c->next)
-               if(isvisible(c))
+       for(n = 0, c = clients; c; c = c->next)
+               if(isvisible(c) && !c->isfloat)
                        n++;
-       if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
+       if(n < 2 || (arrange != dotile))
                return;
 
-       if((c = sel) == getnext(clients))
-               if(!(c = getnext(c->next)) || c->isfloat)
+       if((c = sel) == nexttiled(clients))
+               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);