Browse Source

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

config
Anselm R. Garbe 17 years ago
parent
commit
f6e41b0bc3
5 changed files with 15 additions and 16 deletions
  1. +3
    -3
      config.arg.h
  2. +3
    -3
      config.default.h
  3. +2
    -2
      config.mk
  4. +6
    -7
      tile.c
  5. +1
    -1
      tile.h

+ 3
- 3
config.arg.h View File

@ -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 }, \


+ 3
- 3
config.default.h View File

@ -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 }, \


+ 2
- 2
config.mk View File

@ -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}\"


+ 6
- 7
tile.c View File

@ -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
- 1
tile.h View File

@ -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 */

Loading…
Cancel
Save