wmii

commit f02ebd6d4ff67033a2635e92d59919c9a1103c3b
parent 615381d5bdb3d29f26bf42bec5a31e869ddfbf53
Author: Kris Maglione <jg@suckless.org>
Date:   Sun, 25 Feb 2007 14:17:56 -0500

Replaced rc.wmii.var with splitting rc.wmii.local at /^# Overrides/

Diffstat:
rc/rc.wmii
 | 
21
+++++++++++----------

1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/rc/rc.wmii b/rc/rc.wmii
@@ -23,9 +23,15 @@ fn wmiimenu {
 		-sf $WMII_FOCUSCOLORS(1) -sb $WMII_FOCUSCOLORS(2)
 }
 
-local = `{config_whatis rc.wmii.var}
+fn config_whatis {
+	confpath=`{echo $WMII_CONFPATH | sed 'y/:/ /'}
+	prog=$1; shift
+	echo `{{path=$confpath whatis $prog} | grep -v '=|^fn '} $*
+}
+
+local = `{config_whatis rc.wmii.local}
 if(! ~ $#local 0)
-	. $local
+	. <{awk '// /^# Overrides/ { exit }' $local}
 
 # Column Rules
 wmiir write /colrules <<!
@@ -99,6 +105,8 @@ fn Action-quit {
 	wmiir xwrite /ctl quit
 }
 fn Action-status {
+	flag x -
+	flag r -
 	if(wmiir remove /rbar/status >[2]/dev/null)
 		sleep 2
 	echo $WMII_NORMCOLORS | wmiir create /rbar/status
@@ -201,21 +209,14 @@ fn read_tags {
 	wmiir ls /tag | sed 's,/,,; /^sel$/d'
 }
 
-fn config_whatis {
-	confpath=`{echo $WMII_CONFPATH | sed 'y/:/ /'}
-	prog=$1; shift
-	echo `{{path=$confpath whatis $prog} | grep -v '=|^fn '} $*
-}
-
 fn run_command {
 	rfork ens
 	path=$oldpath \
 	eval exec $* </dev/null
 }
 
-local = `{config_whatis rc.wmii.local}
 if(! ~ $#local 0)
-	. $local
+	. <{awk '/^# Overrides/, 0' $local}
 
 # WM Configuration
 wmiir write /ctl <<!