wmii

commit ae5f40b906c6e045ff8ad1dcb911c6a1ae6c2192
parent cb1510d07709ab75571f2052c57e3093122080bf
Author: garbeam <garbeam@localhost.localdomain>
Date:   Thu,  8 Dec 2005 23:31:19 +0200

added several other stuff


Diffstat:
rc/wmirc
 | 
14
+++++++-------
test/test_container.c
 | 
16
++++++++--------

2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/rc/wmirc b/rc/wmirc
@@ -70,7 +70,7 @@ fn framesconf {
 
 fn barsucks {
     wmir write /bar/$1/b1press 'wmir write /wm/ctl ''select prev'''
-    wmir write /bar/$1/b3press 'wmir write /wm/ctl ''select next'''
+	wmir write /bar/$1/b3press 'wmir write /wm/ctl ''select next'''
     wmir write /bar/$1/b4press 'wmir write /wm/ctl ''select prev'''
     wmir write /bar/$1/b5press 'wmir write /wm/ctl ''select next'''
 }
@@ -84,13 +84,16 @@ wmir write /bar/bordercolor $NORM_BORDER_COLOR
 plab=`{wmir read /bar/new}
 wmir write /bar/$plab/b1press 'wmir write /wm/ctl pager'
 
+llab=`{wmir read /bar/new}
+wmir write /bar/$llab/b1press 'wmir write /wm/ctl pager'
+
 clab=`{wmir read /bar/new}
 wmir write /bar/$clab/fgcolor $SEL_FG_COLOR
 wmir write /bar/$clab/bgcolor $SEL_BG_COLOR
 wmir write /bar/$clab/bordercolor $SEL_BG_COLOR
 barsucks $clab
 
-wmir write /bar/expandable 1
+wmir write /bar/expandable $clab
 wmir write /bar/geometry 0,south,east,$BAR_HEIGHT
 wmir write /bar/ctl 'display 1'
 
@@ -109,10 +112,8 @@ wmir write /wm/event/clientupdate \
 'text=`{wmir read /wm/sel/layout/sel/frame/sel/client/sel/name} \
 wmir write /bar/'^$clab^'/data $"text'
 wmir write /wm/event/pageupdate \
-'text=`{wmir read /wm/sel/name} ^ \
-`{wmir read /wm/sel/layout/sel/layout|awk ''{print substr($0,0,1)}''} ^ \
-`{wmir read /keys/lookup|awk ''{print substr($0,7,1)}''} \
-wmir write /bar/'^$plab^'/data $"text'
+'wmir write /bar/'^$plab^'/data `{wmir read /wm/sel/name} &&' ^ \
+'wmir write /bar/'^$llab^'/data `{wmir read /wm/sel/layout/sel/name |awk ''{print substr($0,0,1)}''}'
 
 for(frame in `{wmir read /wm/sel/layout/sel | grep '^[0-9]'})
     framesconf /wm/sel/layout/sel/$frame refresh
@@ -189,4 +190,3 @@ selstyle /menu/sstyle >[2]/dev/null
 feh --bg-scale $HOME/wallpaper/bg.png
 status &
 #mpc && status-mpd &
-urxvt '+sb' -bg '#000000' -fg '#ffffff' -cr '#ffffff' -sl 4000 -fn -artwiz-smoothansi-*-*-*-*-*-*-*-*-*-*-*-*&
diff --git a/test/test_container.c b/test/test_container.c
@@ -40,7 +40,7 @@ int main(int argc, char *argv[])
 
 	printf("--------------------------------\n");
 	for (i = 0; i < 10; i++) {
-		int *e = cext_get_item(&c, i);
+		int *e = cext_list_get_item(&c, i);
 		printf("%d\n", *e);
 	}
 	printf("--------------------------------\n");
@@ -55,13 +55,13 @@ int main(int argc, char *argv[])
 
 	printf("--------------------------------\n");
 	{
-		int *e = cext_get_item(&c, 5);
-		cext_top_item(&c, e);
-		e = cext_get_top_item(&c);
+		int *e = cext_list_get_item(&c, 5);
+		cext_stack_top_item(&c, e);
+		e = cext_stack_get_top_item(&c);
 		printf("%d (5)\n", *e);
-		e = cext_get_up_item(&c, cext_get_top_item(&c));
+		e = cext_stack_get_up_item(&c, cext_stack_get_top_item(&c));
 		printf("%d (0)\n", *e);
-		e = cext_get_down_item(&c, cext_get_top_item(&c));
+		e = cext_stack_get_down_item(&c, cext_stack_get_top_item(&c));
 		printf("%d (9)\n", *e);
 	}
 	printf("--------------------------------\n");
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
 
 	printf("--------------------------------\n");
 	{
-		int *e = cext_get_item(&c, 5);
+		int *e = cext_list_get_item(&c, 5);
 		cext_detach_item(&c, e);	
 		cext_iterate(&c, nil, iter_print_container);
 	}
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
 
 	printf("--------------------------------\n");
 	{
-		int *e = cext_get_item(&c, 4);
+		int *e = cext_list_get_item(&c, 4);
 		cext_detach_item(&c, e);	
 		cext_iterate(&c, nil, iter_print_container);
 	}