wmii

commit 01c5643f9fe6419744abcb447dbcf2ff4f7ced17
parent 05597b0a36a7ca6666fa0b4b576df61dd94a1056
Author: Kris Maglione <jg@suckless.org>
Date:   Sun, 16 Nov 2008 02:50:55 -0500

Fix /tag/*/index, again (thanks Suraj)

Diffstat:
cmd/wmii/column.c
 | 
3
++-
cmd/wmii/view.c
 | 
3
+++
mk/wmii.mk
 | 
6
+++---

3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/cmd/wmii/column.c b/cmd/wmii/column.c
@@ -225,7 +225,8 @@ find(Area **ap, Frame **fp, int dir, bool wrap, bool stack) {
 		*fp = stack_find(a, f, dir, stack);
 		if(*fp)
 			return true;
-		*ap = area_find(a->view, r, dir, wrap);
+		if (!a->floating)
+			*ap = area_find(a->view, r, dir, wrap);
 		if(!*ap)
 			return false;
 		*fp = stack_find(*ap, *fp, dir, stack);
diff --git a/cmd/wmii/view.c b/cmd/wmii/view.c
@@ -364,6 +364,8 @@ view_attach(View *v, Frame *f) {
 		else if(starting || c->sel && c->sel->area && !c->sel->area->floating)
 			a = v->firstarea;
 	}
+	if(!a->floating && view_fullscreen_p(v, a->screen))
+		a = v->floating;
 
 	area_attach(a, f);
 	/* TODO: Decide whether to focus this frame */
@@ -594,6 +596,7 @@ view_index(View *v) {
 	bufclear();
 	i = 0;
 	foreach_area(v, s, a) {
+		i++;
 		if(a->floating)
 			bufprint("# ~ %d %d\n", Dx(a->r), Dy(a->r));
 		else
diff --git a/mk/wmii.mk b/mk/wmii.mk
@@ -1,7 +1,7 @@
 VERS = hg$$(hg identify -n)
-VERS = hg$$(hg log -r $$(hg id | awk -F'[+ ]' '{print $$1}') --template '{rev}')
+VERS = hg$$(hg log -r $$(hg id 2>/dev/null | awk -F'[+ ]' '{print $$1}') --template '{rev}' 2>/dev/null)
 VERSION = $(VERS)
-VERSION := $(shell echo $(VERS) 2>/dev/null)
-VERSION != echo $(VERS) 2>/dev/null
+VERSION := $(shell echo $(VERS))
+VERSION != echo $(VERS)
 CONFVERSION = hg