introduced ISTILE, which can be easily extended with other layout functions to allow...

diff --git a/config.h b/config.h
index 10e228b..006a622 100644 (file)
--- a/config.h
+++ b/config.h
@@ -22,14 +22,15 @@ Rule rules[] = {
 };
 
 /* layout(s) */
 };
 
 /* layout(s) */

+#define ISTILE                 isarrange(tile)
+#define MWFACT                 0.6     /* master width factor [0.1 .. 0.9] */
+#define RESIZEHINTS            True    /* False - respect size hints in tiled resizals */
+#define SNAP                   32      /* snap pixel */

 Layout layouts[] = {
        /* symbol               function */
        { "[]=",                tile }, /* first entry is default */
        { "><>",                floating },
 };
 Layout layouts[] = {
        /* symbol               function */
        { "[]=",                tile }, /* first entry is default */
        { "><>",                floating },
 };

-#define RESIZEHINTS            True    /* False - respect size hints in tiled resizals */
-#define MWFACT                 0.6     /* master width factor [0.1 .. 0.9] */
-#define SNAP                   32      /* snap pixel */

 
 /* key definitions */
 #define MODKEY                 Mod1Mask
 
 /* key definitions */
 #define MODKEY                 Mod1Mask

diff --git a/dwm.c b/dwm.c
index 90ba67b..ca57f8e 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -341,7 +341,7 @@ buttonpress(XEvent *e) {
                        movemouse(c);
                }
                else if(ev->button == Button2) {
                        movemouse(c);
                }
                else if(ev->button == Button2) {

-                       if(isarrange(tile) && !c->isfixed && c->isfloating)
+                       if(ISTILE && !c->isfixed && c->isfloating)

                                togglefloating(NULL);
                        else
                                zoom(NULL);
                                togglefloating(NULL);
                        else
                                zoom(NULL);


@@ -1398,7 +1398,7 @@ void
 setmwfact(const char *arg) {
        double delta;
 
 setmwfact(const char *arg) {
        double delta;
 

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

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


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

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

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