all repos — dwm @ 51f6405b0d7a9ba34696cafbc08303b1e5b14cfa

my dwm build

fixing some minor issues
Anselm R. Garbe arg@suckless.org
Fri, 05 Jan 2007 16:35:45 +0100
commit

51f6405b0d7a9ba34696cafbc08303b1e5b14cfa

parent

6096f8a11312261f016d49b1cb2e4c2cdc7fdbc1

2 files changed, 14 insertions(+), 13 deletions(-)

jump to
M config.mkconfig.mk

@@ -17,8 +17,8 @@

# 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}\"
M view.cview.c

@@ -32,17 +32,17 @@

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

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 @@ for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))

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()))