renamed MASTER into MWFACT, master into mwfact, and incmaster into addtomwfact

diff --git a/config.arg.h b/config.arg.h
index 6fd4218..9a5bdc6 100644 (file)
--- a/config.arg.h
+++ b/config.arg.h
@@ -32,7 +32,7 @@ static Layout layout[] = { \
        { "[]=",                tile }, /* first entry is default */ \
        { "><>",                floating }, \
 };
        { "[]=",                tile }, /* first entry is default */ \
        { "><>",                floating }, \
 };

-#define MASTER                 0.6     /* 0.1 .. 0.9 */
+#define MWFACT                 0.6     /* master width factor [0.1 .. 0.9] */

 #define SNAP                   32      /* snap pixel */
 
 /* key definitions */
 #define SNAP                   32      /* snap pixel */
 
 /* key definitions */


@@ -49,8 +49,8 @@ static Key key[] = { \
        { MODKEY,                       XK_b,           togglebar,      NULL }, \
        { MODKEY,                       XK_j,           focusclient,    "1" }, \
        { MODKEY,                       XK_k,           focusclient,    "-1" }, \
        { MODKEY,                       XK_b,           togglebar,      NULL }, \
        { MODKEY,                       XK_j,           focusclient,    "1" }, \
        { MODKEY,                       XK_k,           focusclient,    "-1" }, \

-       { MODKEY,                       XK_h,           incmaster,      "-0.05" }, \
-       { MODKEY,                       XK_l,           incmaster,      "0.05" }, \
+       { MODKEY,                       XK_h,           addtomwfact,    "-0.05" }, \
+       { MODKEY,                       XK_l,           addtomwfact,    "0.05" }, \

        { MODKEY,                       XK_m,           togglemax,      NULL }, \
        { MODKEY,                       XK_Return,      zoom,           NULL }, \
        { MODKEY|ShiftMask,             XK_space,       togglefloating, NULL }, \
        { MODKEY,                       XK_m,           togglemax,      NULL }, \
        { MODKEY,                       XK_Return,      zoom,           NULL }, \
        { MODKEY|ShiftMask,             XK_space,       togglefloating, NULL }, \

diff --git a/config.default.h b/config.default.h
index 1f0fe8c..83d244d 100644 (file)
--- a/config.default.h
+++ b/config.default.h
@@ -33,7 +33,7 @@ static Layout layout[] = { \
        { "[]=",                tile }, /* first entry is default */ \
        { "><>",                floating }, \
 };
        { "[]=",                tile }, /* first entry is default */ \
        { "><>",                floating }, \
 };

-#define MASTER                 0.6     /* 0.1 .. 0.9 */
+#define MWFACT                 0.6     /* master width factor [0.1 .. 0.9] */

 #define SNAP                   32      /* snap pixel */
 
 /* key definitions */
 #define SNAP                   32      /* snap pixel */
 
 /* key definitions */


@@ -47,8 +47,8 @@ static Key key[] = { \
        { MODKEY,                       XK_b,           togglebar,      NULL }, \
        { MODKEY,                       XK_j,           focusclient,    "1" }, \
        { MODKEY,                       XK_k,           focusclient,    "-1" }, \
        { MODKEY,                       XK_b,           togglebar,      NULL }, \
        { MODKEY,                       XK_j,           focusclient,    "1" }, \
        { MODKEY,                       XK_k,           focusclient,    "-1" }, \

-       { MODKEY,                       XK_h,           incmaster,      "-0.05" }, \
-       { MODKEY,                       XK_l,           incmaster,      "0.05" }, \
+       { MODKEY,                       XK_h,           addtomwfact,    "-0.05" }, \
+       { MODKEY,                       XK_l,           addtomwfact,    "0.05" }, \

        { MODKEY,                       XK_m,           togglemax,      NULL }, \
        { MODKEY,                       XK_Return,      zoom,           NULL }, \
        { MODKEY|ShiftMask,             XK_space,       togglefloating, NULL }, \
        { MODKEY,                       XK_m,           togglemax,      NULL }, \
        { MODKEY,                       XK_Return,      zoom,           NULL }, \
        { MODKEY|ShiftMask,             XK_space,       togglefloating, NULL }, \

diff --git a/config.mk b/config.mk
index a0fad48..6d8f1e8 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -20,8 +20,8 @@ LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
 # flags
 CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
 LDFLAGS = -s ${LIBS}
 # flags
 CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
 LDFLAGS = -s ${LIBS}

-#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
-#LDFLAGS = -g ${LIBS}
+CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
+LDFLAGS = -g ${LIBS}

 
 # Solaris
 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
 
 # Solaris
 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"

diff --git a/tile.c b/tile.c
index 40e40e2..2481eb3 100644 (file)
--- a/tile.c
+++ b/tile.c
@@ -4,23 +4,22 @@
 
 /* static */
 
 
 /* static */
 

-static double master = MASTER;
+static double mwfact = MWFACT;

 
 /* extern */
 
 void
 
 /* extern */
 
 void

-incmaster(const char *arg) {
+addtomwfact(const char *arg) {

        double delta;
 
        if(lt->arrange != tile)
                return;
 
        double delta;
 
        if(lt->arrange != tile)
                return;
 

-       /* arg handling, manipulate master */
+       /* arg handling, manipulate mwfact */

        if(arg && (1 == sscanf(arg, "%lf", &delta))) {
        if(arg && (1 == sscanf(arg, "%lf", &delta))) {

-               if(delta + master > 0.1 && delta + master < 0.9)
-                       master += delta;
+               if(delta + mwfact > 0.1 && delta + mwfact < 0.9)
+                       mwfact += delta;

        }
        }

-

        lt->arrange();
 }
 
        lt->arrange();
 }
 


@@ -33,7 +32,7 @@ tile(void) {
                n++;
 
        /* window geoms */
                n++;
 
        /* window geoms */

-       mw = (n == 1) ? waw : master * waw;
+       mw = (n == 1) ? waw : mwfact * waw;

        th = (n > 1) ? wah / (n - 1) : 0;
        if(n > 1 && th < bh)
                th = wah;
        th = (n > 1) ? wah / (n - 1) : 0;
        if(n > 1 && th < bh)
                th = wah;

diff --git a/tile.h b/tile.h
index 67483c8..cd4e394 100644 (file)
--- a/tile.h
+++ b/tile.h
@@ -1,6 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 
 /* tile.c */
 /* See LICENSE file for copyright and license details. */
 
 /* tile.c */

-void incmaster(const char *arg);       /* inc/decreases the master width */
+void addtomwfact(const char *arg);     /* adds arg value [0.1 .. 0.9] to master width factor */

 void tile(void);                       /* arranges all windows tiled */
 void zoom(const char *arg);            /* zooms the focused client to master area, arg is ignored */
 void tile(void);                       /* arranges all windows tiled */
 void zoom(const char *arg);            /* zooms the focused client to master area, arg is ignored */