[hackers] [wmii] Fix /tag/*/index, again (thanks Suraj) || Kris Maglione

changeset: 2406:5cbaacd4c640
tag: tip
user: Kris Maglione <jg_AT_suckless.org>
date: Sun Nov 16 02:50:55 2008 -0500
files: cmd/wmii/column.c cmd/wmii/view.c mk/wmii.mk
description:
Fix /tag/*/index, again (thanks Suraj)

diff -r 4baa76634d92 -r 5cbaacd4c640 cmd/wmii/column.c
--- a/cmd/wmii/column.c Wed Oct 29 20:14:41 2008 -0400
+++ b/cmd/wmii/column.c Sun Nov 16 02:50:55 2008 -0500
@@ -225,7 +225,8 @@
                 *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 -r 4baa76634d92 -r 5cbaacd4c640 cmd/wmii/view.c
--- a/cmd/wmii/view.c Wed Oct 29 20:14:41 2008 -0400
+++ b/cmd/wmii/view.c Sun Nov 16 02:50:55 2008 -0500
@@ -364,6 +364,8 @@
                 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 @@
         bufclear();
         i = 0;
         foreach_area(v, s, a) {
+ i++;
                 if(a->floating)
                         bufprint("# ~ %d %d\n", Dx(a->r), Dy(a->r));
                 else
diff -r 4baa76634d92 -r 5cbaacd4c640 mk/wmii.mk
--- a/mk/wmii.mk Wed Oct 29 20:14:41 2008 -0400
+++ b/mk/wmii.mk Sun Nov 16 02:50:55 2008 -0500
@@ -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
 
Received on Sun Nov 16 2008 - 07:50:58 UTC