applied Jukkas patch

[dwm.git] / view.c

diff --git a/view.c b/view.c
index bb32235..44c0b30 100644 (file)
--- a/view.c
+++ b/view.c
@@ -7,7 +7,7 @@
 /* static */
 
 static Client *
-minclient() {
+minclient(void) {
        Client *c, *min;
 
        if((clients && clients->isfloat) || arrange == dofloat)
@@ -18,8 +18,14 @@ minclient() {
        return min;
 }
 
+static Client *
+nexttiled(Client *c) {
+       for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
+       return c;
+}
+
 static void
-reorder() {
+reorder(void) {
        Client *c, *newclients, *tail;
 
        newclients = tail = NULL;
@@ -36,10 +42,24 @@ reorder() {
        clients = newclients;
 }
 
-static Client *
-nexttiled(Client *c) {
-       for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
-       return c;
+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 {
+               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 */
@@ -96,6 +116,8 @@ dotile(Arg *arg) {
                                resize(c, True, TopLeft);
                                continue;
                        }
+                       if(c->ismax)
+                               togglemax(c);
                        if(n == 1) {
                                c->x = sx;
                                c->y = sy + bh;
@@ -186,7 +208,7 @@ resizecol(Arg *arg) {
        for(n = 0, c = clients; c; c = c->next)
                if(isvisible(c) && !c->isfloat)
                        n++;
-       if(!sel || sel->isfloat || n < 2 || (arrange != dotile))
+       if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
                return;
 
        if(sel == getnext(clients)) {
@@ -203,10 +225,10 @@ resizecol(Arg *arg) {
 }
 
 void
-restack() {
+restack(void) {
        Client *c;
        XEvent ev;
-       
+
        if(!sel) {
                drawstatus();
                return;
@@ -269,28 +291,21 @@ viewall(Arg *arg) {
 
 void
 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));
+               togglemax(sel);
                return;
        }
 
        for(n = 0, c = clients; c; c = c->next)
                if(isvisible(c) && !c->isfloat)
                        n++;
-       if(n < 2 || (arrange != dotile))
+       if(n < 2 || (arrange == dofloat))
                return;
 
        if((c = sel) == nexttiled(clients))