wmii

commit 97032c01a8974c9996cd61869374f0851d811532
parent 8b20e63cd8675ef920511c6c2a3e45b3af16602f
Author: Anselm R. Garbe <garbeam@wmii.de>
Date:   Thu, 19 Jan 2006 19:55:08 +0200

prepared new snap


Diffstat:
cmd/wm/layout.c
 | 
2
++
cmd/wm/page.c
 | 
11
+++--------
cmd/wm/wm.h
 | 
1
+
rc/wmiirc
 | 
2
+-

4 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/cmd/wm/layout.c b/cmd/wm/layout.c
@@ -24,6 +24,8 @@ alloc_layout(Page * p, char *layout)
         name = "float";
     snprintf(buf, MAX_BUF, "/%s/layout/%s", p->file[P_PREFIX]->name, name);
     l->file[L_PREFIX] = ixp_create(ixps, buf);
+    snprintf(buf, MAX_BUF, "/%s/layout/%s/name", p->file[P_PREFIX]->name, name);
+    l->file[L_NAME] = wmii_create_ixpfile(ixps, buf, layout);
     snprintf(buf, MAX_BUF, "/%s/layout/%s/frame", p->file[P_PREFIX]->name, name);
     l->file[L_FRAME_PREFIX] = ixp_create(ixps, buf);
     snprintf(buf, MAX_BUF, "/%s/layout/%s/frame/sel",
diff --git a/cmd/wm/page.c b/cmd/wm/page.c
@@ -238,15 +238,10 @@ toggle_layout(void *obj, char *arg)
 {
     Page *p = obj;
 
-    if(p->sel == p->managed)
-        p->sel = p->floating;
+    if(!p->managed->def || (p->sel == p->managed))
+    	focus_layout(p->floating);
     else
-        p->sel = p->managed;
-
-	if(!p->sel->def)
-		p->sel = p->floating;
-
-    focus_layout(p->sel);
+    	focus_layout(p->managed);
 }
 
 Page *
diff --git a/cmd/wm/wm.h b/cmd/wm/wm.h
@@ -24,6 +24,7 @@ enum {
     L_PREFIX,
     L_FRAME_PREFIX,
     L_SEL_FRAME,
+    L_NAME,
     L_CTL,
     L_LAST
 };
diff --git a/rc/wmiirc b/rc/wmiirc
@@ -113,7 +113,7 @@ wmiir write /wm/event/clientupdate \
 wmiir write /wm/event/pageupdate \
 'wmiir write /bar/'^$plab^'/data `{wmiir read /wm/sel/name} &&' ^\
 'wmiir write /bar/'^$klab^'/data `{wmiir read /keys/lookup|sed ''s|/mode/||''} && ' ^\
-'wmiir write /bar/'^$llab^'/data `{wmiir read /wm/sel/layoutname}'
+'wmiir write /bar/'^$llab^'/data `{wmiir read /wm/sel/layout/sel/name}'
 
 for(page in `{wmiir read /wm | grep '^[0-9]'}) {
 	framesconf /wm/$page/layout/float/frame