diff options
| -rw-r--r-- | config.mk | 4 | ||||
| -rw-r--r-- | view.c | 23 |
2 files changed, 14 insertions, 13 deletions
diff --git a/config.mk b/config.mk index 1d73f2b..f65e6fc 100644 --- a/config.mk +++ b/config.mk @@ -17,8 +17,8 @@ LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 # flags CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" LDFLAGS = ${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}\" diff --git a/view.c b/view.c index 793151d..9bd7584 100644 --- a/view.c +++ b/view.c @@ -32,17 +32,17 @@ pop(Client *c) { static void swap(Client *c1, Client *c2) { Client tmp = *c1; - Client *cp = c1->prev; - Client *cn = c1->next; + Client *c1p = c1->prev; + Client *c1n = c1->next; + Client *c2p = c2->prev; + Client *c2n = c2->next; *c1 = *c2; - c1->prev = cp; - c1->next = cn; - cp = c2->prev; - cn = c2->next; *c2 = tmp; - c2->prev = cp; - c2->next = cn; + c1->prev = c1p; + c1->next = c1n; + c2->prev = c2p; + c2->next = c2n; } static void @@ -192,10 +192,9 @@ focusprev(Arg *arg) { void incnmaster(Arg *arg) { - if(nmaster + arg->i < 1 || (wah / (nmaster + arg->i) < bh)) + if((nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh)) return; nmaster += arg->i; - arrange(); } @@ -305,7 +304,9 @@ zoom(Arg *arg) { n++; c = sel; - if(n <= nmaster || (arrange == dofloat)) + if(arrange == dofloat) + return; + else if(n <= nmaster) pop(c); else if(ismaster(sel)) { if(!(c = topofstack())) |