From 51f6405b0d7a9ba34696cafbc08303b1e5b14cfa Mon Sep 17 00:00:00 2001 From: "Anselm R. Garbe" Date: Fri, 5 Jan 2007 16:35:45 +0100 Subject: fixing some minor issues --- view.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'view.c') 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())) -- cgit v1.2.3