applied sanders jukka patch

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 9ba8e0b..e799094 100644 (file)
--- a/view.c
+++ b/view.c
@@ -4,40 +4,70 @@
  */
 #include "dwm.h"
 
  */
 #include "dwm.h"
 

-/* extern */
+/* static */

 
 

-void (*arrange)(Arg *) = DEFMODE;
+static Client *
+minclient(void) {
+       Client *c, *min;

 
 

-void
-attach(Client *c)
-{
-       Client *first = getnext(clients);
+       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;
+}

 
 

-       if(!first) {
-               if(clients) {
-                       for(first = clients; first->next; first = first->next);
-                       first->next = c;
-                       c->prev = first;
+static Client *
+nexttiled(Client *c) {
+       for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
+       return c;
+}
+
+static void
+reorder(void) {
+       Client *c, *newclients, *tail;
+
+       newclients = tail = NULL;
+       while((c = minclient())) {
+               detach(c);
+               if(tail) {
+                       c->prev = tail;
+                       tail->next = c;
+                       tail = c;

                }
                else
                }
                else

-                       clients = c;
+                       tail = newclients = c;

        }
        }

-       else if(first == clients) {
-               c->next = clients;
-               clients->prev = c;
-               clients = c;
+       clients = newclients;
+}
+
+static void
+togglemax(Client *c)
+{
+       XEvent ev;
+       if((c->ismax = !c->ismax)) {
+               c->rx = c->x; c->x = sx;
+               c->ry = c->y; c->y = bh;
+               c->rw = c->w; c->w = sw;
+               c->rh = c->h; c->h = sh - bh - 2;

        }
        else {
        }
        else {

-               first->prev->next = c;
-               c->prev = first->prev;
-               first->prev = c;
-               c->next = first;
+               c->x = c->rx;
+               c->y = c->ry;
+               c->w = c->rw;
+               c->h = c->rh;

        }
        }

+       resize(c, True, TopLeft);
+       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));

 }
 
 }
 

+/* extern */
+
+void (*arrange)(Arg *) = DEFMODE;
+

 void
 void

-detach(Client *c)
-{
+detach(Client *c) {

        if(c->prev)
                c->prev->next = c->next;
        if(c->next)
        if(c->prev)
                c->prev->next = c->next;
        if(c->next)


@@ -48,37 +78,31 @@ detach(Client *c)
 }
 
 void
 }
 
 void

-dofloat(Arg *arg)
-{
+dofloat(Arg *arg) {

        Client *c;
 
        for(c = clients; c; c = c->next) {
        Client *c;
 
        for(c = clients; c; c = c->next) {

-               c->ismax = False;

                if(isvisible(c)) {
                        resize(c, True, TopLeft);
                }
                else
                        ban(c);
        }
                if(isvisible(c)) {
                        resize(c, True, TopLeft);
                }
                else
                        ban(c);
        }

-       if(!sel || !isvisible(sel))
-               sel = getnext(clients);
-       if(sel)
-               focus(sel);
-       else
-               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+       if(!sel || !isvisible(sel)) {
+               for(c = stack; c && !isvisible(c); c = c->snext);
+               focus(c);
+       }

        restack();
 }
 
 void
        restack();
 }
 
 void

-dotile(Arg *arg)
-{
+dotile(Arg *arg) {

        int h, i, n, w;
        Client *c;
 
        w = sw - mw;
        int h, i, n, w;
        Client *c;
 
        w = sw - mw;

-       for(n = 0, c = clients; c; c = c->next)
-               if(isvisible(c) && !c->isfloat)
-                       n++;
+       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+               n++;

 
        if(n > 1)
                h = (sh - bh) / (n - 1);
 
        if(n > 1)
                h = (sh - bh) / (n - 1);


@@ -86,12 +110,12 @@ dotile(Arg *arg)
                h = sh - bh;
 
        for(i = 0, c = clients; c; c = c->next) {
                h = sh - bh;
 
        for(i = 0, c = clients; c; c = c->next) {

-               c->ismax = False;

                if(isvisible(c)) {
                        if(c->isfloat) {
                                resize(c, True, TopLeft);
                                continue;
                        }
                if(isvisible(c)) {
                        if(c->isfloat) {
                                resize(c, True, TopLeft);
                                continue;
                        }

+                       c->ismax = False;

                        if(n == 1) {
                                c->x = sx;
                                c->y = sy + bh;
                        if(n == 1) {
                                c->x = sx;
                                c->y = sy + bh;


@@ -125,18 +149,15 @@ dotile(Arg *arg)
                else
                        ban(c);
        }
                else
                        ban(c);
        }

-       if(!sel || !isvisible(sel))
-               sel = getnext(clients);
-       if(sel)
-               focus(sel);
-       else
-               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+       if(!sel || !isvisible(sel)) {
+               for(c = stack; c && !isvisible(c); c = c->snext);
+               focus(c);
+       }

        restack();
 }
 
 void
        restack();
 }
 
 void

-focusnext(Arg *arg)
-{
+focusnext(Arg *arg) {

        Client *c;
    
        if(!sel)
        Client *c;
    
        if(!sel)


@@ -151,8 +172,7 @@ focusnext(Arg *arg)
 }
 
 void
 }
 
 void

-focusprev(Arg *arg)
-{
+focusprev(Arg *arg) {

        Client *c;
 
        if(!sel)
        Client *c;
 
        if(!sel)


@@ -169,8 +189,7 @@ focusprev(Arg *arg)
 }
 
 Bool
 }
 
 Bool

-isvisible(Client *c)
-{
+isvisible(Client *c) {

        unsigned int i;
 
        for(i = 0; i < ntags; i++)
        unsigned int i;
 
        for(i = 0; i < ntags; i++)


@@ -180,60 +199,54 @@ isvisible(Client *c)
 }
 
 void
 }
 
 void

-restack()
-{
-       static unsigned int nwins = 0;
-       static Window *wins = NULL;
-       unsigned int f, fi, m, mi, n;
+resizecol(Arg *arg) {
+       unsigned int n;

        Client *c;
        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))) {
-               drawstatus();
+       for(n = 0, c = clients; c; c = c->next)
+               if(isvisible(c) && !c->isfloat)
+                       n++;
+       if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))

                return;
                return;

+
+       if(sel == getnext(clients)) {
+               if(mw + arg->i > sw - 100 || mw + arg->i < 100)
+                       return;
+               mw += arg->i;

        }
        }

-       if(nwins < n) {
-               nwins = n;
-               wins = erealloc(wins, nwins * sizeof(Window));
+       else {
+               if(mw - arg->i > sw - 100 || mw - arg->i < 100)
+                       return;
+               mw -= arg->i;

        }
        }

+       arrange(NULL);
+}

 
 

-       fi = 0;
-       mi = 2 * f;
-       if(sel->isfloat || arrange == dofloat) {
-               wins[fi++] = sel->twin;
-               wins[fi++] = sel->win;
+void
+restack(void) {
+       Client *c;
+       XEvent ev;
+
+       if(!sel) {
+               drawstatus();
+               return;

        }
        }

-       else {
-               wins[mi++] = sel->twin;
-               wins[mi++] = sel->win;
+       if(sel->isfloat || arrange == dofloat) {
+               XRaiseWindow(dpy, sel->win);
+               XRaiseWindow(dpy, sel->twin);

        }
        }

-       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;
-                       }
+       if(arrange != dofloat)
+               for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+                       XLowerWindow(dpy, c->twin);
+                       XLowerWindow(dpy, c->win);

                }
                }

-       XRestackWindows(dpy, wins, n);

        drawall();
        XSync(dpy, False);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
        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);
        arrange = (arrange == dofloat) ? dotile : dofloat;
        if(sel)
                arrange(NULL);


@@ -242,41 +255,65 @@ togglemode(Arg *arg)
 }
 
 void
 }
 
 void

-toggleview(Arg *arg)
-{
+toggleview(Arg *arg) {

        unsigned int i;
 
        seltag[arg->i] = !seltag[arg->i];
        for(i = 0; i < ntags && !seltag[i]; i++);
        if(i == ntags)
                seltag[arg->i] = True; /* cannot toggle last view */
        unsigned int i;
 
        seltag[arg->i] = !seltag[arg->i];
        for(i = 0; i < ntags && !seltag[i]; i++);
        if(i == ntags)
                seltag[arg->i] = True; /* cannot toggle last view */

+       reorder();

        arrange(NULL);
 }
 
 void
        arrange(NULL);
 }
 
 void

-view(Arg *arg)
-{
+view(Arg *arg) {

        unsigned int i;
 
        for(i = 0; i < ntags; i++)
                seltag[i] = False;
        seltag[arg->i] = True;
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
                seltag[i] = False;
        seltag[arg->i] = True;

+       reorder();

        arrange(NULL);
 }
 
 void
        arrange(NULL);
 }
 
 void

-zoom(Arg *arg)
-{
-       Client *c = sel;
+viewall(Arg *arg) {
+       unsigned int i;
+
+       for(i = 0; i < ntags; i++)
+               seltag[i] = True;
+       reorder();
+       arrange(NULL);
+}
+
+void
+zoom(Arg *arg) {
+       unsigned int n;
+       Client *c;

 
 

-       if(!c || (arrange != dotile) || c->isfloat || c->ismax)
+       if(!sel)
+               return;
+
+       if(sel->isfloat || (arrange == dofloat)) {
+               togglemax(sel);
+               return;
+       }
+
+       for(n = 0, c = clients; c; c = c->next)
+               if(isvisible(c) && !c->isfloat)
+                       n++;
+       if(n < 2 || (arrange == dofloat))

                return;
 
                return;
 

-       if(c == getnext(clients))
-               if(!(c = getnext(c->next)))
+       if((c = sel) == nexttiled(clients))
+               if(!(c = nexttiled(c->next)))

                        return;
        detach(c);
                        return;
        detach(c);

-       attach(c);
+       if(clients)
+               clients->prev = c;
+       c->next = clients;
+       clients = c;

        focus(c);
        arrange(NULL);
 }
        focus(c);
        arrange(NULL);
 }