wmii

commit 9e0ac2f4fbf64d9ca3844ad7cdd3fd7b28d13a21
parent 236f54e69c8220472f376d774538c81c268a370b
Author: Kris Maglione <jg@suckless.org>
Date:   Fri, 23 May 2008 13:57:24 -0400

Fix grow and nudge in columns.

Diffstat:
cmd/wmii/column.c
 | 
51
+++++++++++++++++++++++++++------------------------
cmd/wmii/layout.c
 | 
6
+++---
cmd/wmii/message.c
 | 
6
++----

3 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/cmd/wmii/column.c b/cmd/wmii/column.c
@@ -244,31 +244,35 @@ static void
 column_settle(Area *a) {
 	Frame *f;
 	uint yoff, yoffcr;
-	int i, surplus, nuncol, n;
+	int surplus, nuncol, n;
 
 	nuncol = 0;
 	surplus = column_surplus(a);
 	for(f=a->frame; f; f=f->anext)
 		if(!f->collapsed) nuncol++;
 
+	if(nuncol == 0) {
+		fprint(2, "%s: Badness: No uncollapsed frames, column %d, view %q\n",
+				argv0, area_idx(a), a->view->name);
+		return;
+	}
+	if(surplus < 0)
+		fprint(2, "%s: Badness: surplus = %d in column_settle, column %d, view %q\n",
+				argv0, surplus, area_idx(a), a->view->name);
+
 	yoff = a->r.min.y;
 	yoffcr = yoff;
-	i = nuncol;
-	n = 0;
-	if(surplus / nuncol == 0)
-		n = surplus;
+	n = surplus % nuncol;
+	surplus /= nuncol;
 	for(f=a->frame; f; f=f->anext) {
 		f->r = rectsetorigin(f->r, Pt(a->r.min.x, yoff));
 		f->colr = rectsetorigin(f->colr, Pt(a->r.min.x, yoffcr));
 		f->r.min.x = a->r.min.x;
 		f->r.max.x = a->r.max.x;
 		if(!f->collapsed) {
-			if(n == 0)
-				f->r.max.y += surplus / nuncol;
-			else if(n-- > 0)
+			f->r.max.y += surplus;
+			if(n-- > 0)
 				f->r.max.y++;
-			if(--i == 0)
-				f->r.max.y = a->r.max.y;
 		}
 		yoff = f->r.max.y;
 		yoffcr = f->colr.max.y;
@@ -319,15 +323,13 @@ column_squeeze(Area *a) {
 	int surplus, osurplus, dy;
 
 	fvec.n = 0;
-	for(f=a->frame; f; f=f->anext) {
-		h = frame_gethints(f);
-		f->r = sizehint(&h, f->r);
-		vector_ppush(&fvec, f);
-	}
+	for(f=a->frame; f; f=f->anext)
+		if(!f->collapsed) {
+			h = frame_gethints(f);
+			f->r = sizehint(&h, f->r);
+			vector_ppush(&fvec, f);
+		}
 	fp = (Frame**)fvec.ary;
-	/* I would prefer an unstable sort. Unfortunately, the GNU people
-	 * provide a stable one, so, this works better on BSD.
-	 */
 	qsort(fp, fvec.n, sizeof *fp, comp_frame);
 
 	surplus = column_surplus(a);
@@ -479,24 +481,25 @@ column_resizeframe_h(Frame *f, Rectangle r) {
 	fp = f->aprev;
 
 	if(fp)
-		r.min.y = max(r.min.y, fp->r.min.y + minh);
+		r.min.y = max(r.min.y, fp->colr.min.y + minh);
 	else /* XXX. */
 		r.min.y = max(r.min.y, a->r.min.y);
 
 	if(fn)
-		r.max.y = min(r.max.y, fn->r.max.y - minh);
+		r.max.y = min(r.max.y, fn->colr.max.y - minh);
 	else
 		r.max.y = min(r.max.y, a->r.max.y);
 
 	if(fp) {
-		fp->r.max.y = r.min.y;
-		frame_resize(fp, fp->r);
+		fp->colr.max.y = r.min.y;
+		frame_resize(fp, fp->colr);
 	}
 	if(fn) {
-		fn->r.min.y = r.max.y;
-		frame_resize(fn, fn->r);
+		fn->colr.min.y = r.max.y;
+		frame_resize(fn, fn->colr);
 	}
 
+	f->colr = r;
 	frame_resize(f, r);
 }
 
diff --git a/cmd/wmii/layout.c b/cmd/wmii/layout.c
@@ -312,7 +312,7 @@ _openstack_up(Frame *f, int h) {
 	return ret + dy;
 }
 
-static int
+static void
 column_openstack(Area *a, Frame *f, int h) {
 
 	if(f == nil)
@@ -320,9 +320,8 @@ column_openstack(Area *a, Frame *f, int h) {
 	else {
 		h -= _openstack_down(f->anext, h);
 		if(h)
-			return _openstack_up(f->aprev, h);
+			_openstack_up(f->aprev, h);
 	}
-	return 0;
 }
 
 static void
@@ -334,6 +333,7 @@ column_drop(Area *a, Frame *f, int y) {
 		assert(ff != f);
 
 	if(a->frame == nil || y <= a->frame->r.min.y) {
+		f->collapsed = true;
 		column_openstack(a, nil, labelh(def.font));
 		column_insert(a, f, nil);
 		return;
diff --git a/cmd/wmii/message.c b/cmd/wmii/message.c
@@ -652,8 +652,7 @@ msg_grow(View *v, IxpMsg *m) {
 	if(!getamt(m, &amount))
 		return Ebadvalue;
 
-	/* COLR */
-	r = f->r;
+	r = f->colr;
 	switch(dir) {
 	case LLEFT:	r.min.x -= amount.x; break;
 	case LRIGHT:	r.max.x += amount.x; break;
@@ -690,8 +689,7 @@ msg_nudge(View *v, IxpMsg *m) {
 	if(!getamt(m, &amount))
 		return Ebadvalue;
 
-	/* COLR */
-	r = f->r;
+	r = f->colr;
 	switch(dir) {
 	case LLEFT:	r = rectaddpt(r, Pt(-amount.x, 0)); break;
 	case LRIGHT:	r = rectaddpt(r, Pt( amount.x, 0)); break;