setmwfact and zoom check isarrange(floating) now, not !isarrange(tile) - this makes...

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 8762269..90ba67b 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -1398,7 +1398,7 @@ void
 setmwfact(const char *arg) {
        double delta;
 
 setmwfact(const char *arg) {
        double delta;
 

-       if(!isarrange(tile))
+       if(isarrange(floating))

                return;
        /* arg handling, manipulate mwfact */
        if(arg == NULL)
                return;
        /* arg handling, manipulate mwfact */
        if(arg == NULL)


@@ -1418,6 +1418,7 @@ setmwfact(const char *arg) {
 
 void
 setup(void) {
 
 void
 setup(void) {

+       int d;

        unsigned int i, j, mask;
        Window w;
        XModifierKeymap *modmap;
        unsigned int i, j, mask;
        Window w;
        XModifierKeymap *modmap;


@@ -1507,7 +1508,7 @@ setup(void) {
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);
 
        /* multihead support */
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);
 
        /* multihead support */

-       selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
+       selscreen = XQueryPointer(dpy, root, &w, &w, &d, &d, &d, &d, &mask);

 }
 
 void
 }
 
 void


@@ -1673,7 +1674,7 @@ toggleview(const char *arg) {
        seltags[i] = !seltags[i];
        for(j = 0; j < ntags && !seltags[j]; j++);
        if(j == ntags)
        seltags[i] = !seltags[i];
        for(j = 0; j < ntags && !seltags[j]; j++);
        if(j == ntags)

-               seltags[i] = True; /* cannot toggle last view */
+               seltags[i] = True; /* at least one tag must be viewed */

        arrange();
 }
 
        arrange();
 }
 


@@ -1849,7 +1850,7 @@ void
 zoom(const char *arg) {
        Client *c;
 
 zoom(const char *arg) {
        Client *c;
 

-       if(!sel || !isarrange(tile) || sel->isfloating)
+       if(!sel || isarrange(floating) || sel->isfloating)

                return;
        if((c = sel) == nexttiled(clients))
                if(!(c = nexttiled(c->next)))
                return;
        if((c = sel) == nexttiled(clients))
                if(!(c = nexttiled(c->next)))