diff options
| author | Anselm R. Garbe <garbeam@gmail.com> | 2007-08-12 12:46:08 +0200 |
|---|---|---|
| committer | Anselm R. Garbe <garbeam@gmail.com> | 2007-08-12 12:46:08 +0200 |
| commit | f6e41b0bc3a00a2c48a996e2da4ad84be9a719f7 (patch) | |
| tree | 70f814444afc641cf00d0c56032b154e2b0f480e | |
| parent | 2c6087e3d20b506e63d12c9f4e638ecd024e859c (diff) | |
renamed MASTER into MWFACT, master into mwfact, and incmaster into addtomwfact
| -rw-r--r-- | config.arg.h | 6 | ||||
| -rw-r--r-- | config.default.h | 6 | ||||
| -rw-r--r-- | config.mk | 4 | ||||
| -rw-r--r-- | tile.c | 13 | ||||
| -rw-r--r-- | tile.h | 2 |
5 files changed, 15 insertions, 16 deletions
diff --git a/config.arg.h b/config.arg.h index 6fd42186..9a5bdc61 100644 --- a/config.arg.h +++ b/config.arg.h @@ -32,7 +32,7 @@ static Layout layout[] = { \ { "[]=", 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 */ @@ -49,8 +49,8 @@ static Key key[] = { \ { 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 }, \ diff --git a/config.default.h b/config.default.h index 1f0fe8cb..83d244df 100644 --- a/config.default.h +++ b/config.default.h @@ -33,7 +33,7 @@ static Layout layout[] = { \ { "[]=", 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 */ @@ -47,8 +47,8 @@ static Key key[] = { \ { 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 }, \ @@ -20,8 +20,8 @@ LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 # 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}\" @@ -4,23 +4,22 @@ /* static */ -static double master = MASTER; +static double mwfact = MWFACT; /* extern */ void -incmaster(const char *arg) { +addtomwfact(const char *arg) { double delta; if(lt->arrange != tile) return; - /* arg handling, manipulate master */ + /* arg handling, manipulate mwfact */ 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(); } @@ -33,7 +32,7 @@ tile(void) { 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; @@ -1,6 +1,6 @@ /* 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 */ |