fixed issue pointed out by Jukka

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 3e78661..bb32235 100644 (file)
--- a/view.c
+++ b/view.c
@@ -3,13 +3,11 @@
  * 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)
@@ -21,8 +19,7 @@ minclient()
 }
 
 static void
-reorder()
-{
+reorder() {
        Client *c, *newclients, *tail;
 
        newclients = tail = NULL;
@@ -40,8 +37,7 @@ reorder()
 }
 
 static Client *
-nexttiled(Client *c)
-{
+nexttiled(Client *c) {
        for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
        return c;
 }
@@ -51,8 +47,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)
@@ -63,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);
@@ -84,13 +76,10 @@ dofloat(Arg *arg)
 }
 
 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 = c->next)
                if(isvisible(c) && !c->isfloat)
@@ -148,8 +137,7 @@ dotile(Arg *arg)
 }
 
 void
-focusnext(Arg *arg)
-{
+focusnext(Arg *arg) {
        Client *c;
    
        if(!sel)
@@ -164,8 +152,7 @@ focusnext(Arg *arg)
 }
 
 void
-focusprev(Arg *arg)
-{
+focusprev(Arg *arg) {
        Client *c;
 
        if(!sel)
@@ -182,8 +169,7 @@ focusprev(Arg *arg)
 }
 
 Bool
-isvisible(Client *c)
-{
+isvisible(Client *c) {
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
@@ -193,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 = 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)) {
@@ -218,8 +203,7 @@ resizecol(Arg *arg)
 }
 
 void
-restack()
-{
+restack() {
        Client *c;
        XEvent ev;
        
@@ -242,8 +226,7 @@ restack()
 }
 
 void
-togglemode(Arg *arg)
-{
+togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;
        if(sel)
                arrange(NULL);
@@ -252,8 +235,7 @@ togglemode(Arg *arg)
 }
 
 void
-toggleview(Arg *arg)
-{
+toggleview(Arg *arg) {
        unsigned int i;
 
        seltag[arg->i] = !seltag[arg->i];
@@ -265,8 +247,7 @@ toggleview(Arg *arg)
 }
 
 void
-view(Arg *arg)
-{
+view(Arg *arg) {
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
@@ -277,8 +258,7 @@ view(Arg *arg)
 }
 
 void
-viewall(Arg *arg)
-{
+viewall(Arg *arg) {
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
@@ -288,15 +268,29 @@ 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 = 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) == nexttiled(clients))