fixing some minor issues
51f6405b
2 file(s) · +14 −13
| 17 | 17 | # flags |
|
| 18 | 18 | CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" |
|
| 19 | 19 | LDFLAGS = ${LIBS} |
|
| 20 | - | #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" |
|
| 21 | - | #LDFLAGS = -g ${LIBS} |
|
| 20 | + | CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" |
|
| 21 | + | LDFLAGS = -g ${LIBS} |
|
| 22 | 22 | ||
| 23 | 23 | # Solaris |
|
| 24 | 24 | #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" |
| 32 | 32 | static void |
|
| 33 | 33 | swap(Client *c1, Client *c2) { |
|
| 34 | 34 | Client tmp = *c1; |
|
| 35 | - | Client *cp = c1->prev; |
|
| 36 | - | Client *cn = c1->next; |
|
| 35 | + | Client *c1p = c1->prev; |
|
| 36 | + | Client *c1n = c1->next; |
|
| 37 | + | Client *c2p = c2->prev; |
|
| 38 | + | Client *c2n = c2->next; |
|
| 37 | 39 | ||
| 38 | 40 | *c1 = *c2; |
|
| 39 | - | c1->prev = cp; |
|
| 40 | - | c1->next = cn; |
|
| 41 | - | cp = c2->prev; |
|
| 42 | - | cn = c2->next; |
|
| 43 | 41 | *c2 = tmp; |
|
| 44 | - | c2->prev = cp; |
|
| 45 | - | c2->next = cn; |
|
| 42 | + | c1->prev = c1p; |
|
| 43 | + | c1->next = c1n; |
|
| 44 | + | c2->prev = c2p; |
|
| 45 | + | c2->next = c2n; |
|
| 46 | 46 | } |
|
| 47 | 47 | ||
| 48 | 48 | static void |
|
| 192 | 192 | ||
| 193 | 193 | void |
|
| 194 | 194 | incnmaster(Arg *arg) { |
|
| 195 | - | if(nmaster + arg->i < 1 || (wah / (nmaster + arg->i) < bh)) |
|
| 195 | + | if((nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh)) |
|
| 196 | 196 | return; |
|
| 197 | 197 | nmaster += arg->i; |
|
| 198 | - | ||
| 199 | 198 | arrange(); |
|
| 200 | 199 | } |
|
| 201 | 200 | ||
| 305 | 304 | n++; |
|
| 306 | 305 | ||
| 307 | 306 | c = sel; |
|
| 308 | - | if(n <= nmaster || (arrange == dofloat)) |
|
| 307 | + | if(arrange == dofloat) |
|
| 308 | + | return; |
|
| 309 | + | else if(n <= nmaster) |
|
| 309 | 310 | pop(c); |
|
| 310 | 311 | else if(ismaster(sel)) { |
|
| 311 | 312 | if(!(c = topofstack())) |
|