wmii: refactor

7 files changed, 408 insertions, 315 deletions

diff --git a/.wmii/config.sh b/.wmii/config.sh
new file mode 100644
index 0000000..abe378f
--- /dev/null
+++ b/.wmii/config.sh
@@ -0,0 +1,242 @@
+#!/bin/bash
+
+MODKEY=Mod4 # "super"
+UP=p
+DOWN=n
+LEFT=b
+RIGHT=f
+
+# Colors tuples: "<text> <background> <border>"
+. `conffile theme-solarized-dark`
+
+Event() {
+	event=$1; shift;
+	case "$event" in
+		## Mouse event meanings:
+		##   MouseDown = mouse down
+		##   Click     = mouse up
+		##   DND       = hover, while dragging something (Drag 'n' Drop)
+		##               The associated mouse button is always "1"
+		##
+		## Mouse-button IDs:
+		##   1 = left
+		##   2 = middle
+		##   3 = right
+
+		## Custom (non-WMII-generated) events
+		WmiircStart) ## No args
+			echo ' ==> Starting wmiirc'
+			9umount "$WMII_DIR" &>/dev/null # just in case
+			mkdir -p "$WMII_DIR"
+			9mount -i "unix!$WMII_NAMESPACE/wmii" "$WMII_DIR"
+
+			# Configure wmii
+			< "`conffile tagrules`" expand_variables >> $WMII_DIR/tagrules
+			< "`conffile ctl-init`" expand_variables >> $WMII_DIR/ctl
+			scansection Key|cut -sf2                 >> $WMII_DIR/keys
+			# Configure X11
+			xsetroot -solid "$WMII_BACKGROUND"
+
+			# Generate dynamic files
+			path_ls $PATH > $progsfile
+
+			# Clear the LBar and RBar
+			find $WMII_DIR/{l,r}bar -type f -delete
+			# Populate the LBar by emulating [Create|Focus]Tag events
+			seltag=`sed 1q $WMII_DIR/tag/sel/ctl`
+			lstags | while read tag; do
+				Event CreateTag "$tag"
+				if [ "$tag" = "$seltag" ]; then
+					Event FocusTag "$tag"
+				fi
+			done
+
+			# Run the autostart action  
+			Action autostart 2>/dev/null &
+			;;
+		WmiircQuit) ## No args
+			Event Quit;;
+		## WMII-meta events
+		Quit) ## No args
+			echo ' ==> Stopping wmiirc'
+			echo "  -> unmounting WMII_DIR=$WMII_DIR..."
+			9umount "$WMII_DIR"
+			echo "  -> rmdir'ing WMII_DIR=$WMII_DIR..."
+			rmdir "$WMII_DIR"
+			exit;;
+		Warning) ## $@=string
+			notify-send "wmii warning: $*";;
+		Key) ## $1=keystroke
+			Key "$@";;
+
+		## WMII Window management events
+		FocusFloating) ## No args
+			;;
+		AreaFocus) ## $1=area
+			;;
+		DestroyArea) ## $1=area
+			;;
+		ColumnFocus) ## $1=column
+			;;
+		CreateColumn) ## $1=column
+			;;
+
+		## Client events
+		CreateClient) ## $1=client
+			;;
+		DestroyClient) ## $1=client
+			;;
+		Urgent) ## $1=client $2=[Manager|Client]
+			;;
+		NotUrgent) ## $1=client $2=[Manager|Client]
+			;;
+		ClientMouseDown) ## $1=client $2=button
+			client=$1
+			button=$2
+			case $button in
+				1) ;;
+				2) ;;
+				3)
+					{
+						case `wmii9menu Delete Fullscreen` in
+							Delete)
+								echo kill >> $WMII_DIR/client/$client/ctl;;
+							Fullscreen)
+								echo Fullscreen on >> $WMII_DIR/client/$1/ctl;;
+						esac
+					}& ;;
+			esac;;
+		ClientClick) ## $1=client $2=button
+			;;
+		Unresponsive) ## $1=client
+			client=$1
+			client_name=`cat $WMII_DIR/client/$client/label`
+			msg="The client \`${client_name}' is not responding."
+			msg+=" What would you like to do?"
+			{
+				resp=$(wihack -transient $client \
+					xmessage -nearmouse -buttons Kill,Wait -print "$msg")
+				if [ "$resp" = Kill ]; then
+					echo slay >> $WMII_DIR/client/$client/ctl
+				fi
+			}& ;;
+		Fullscreen) ## $1=client $2=[on|off]
+			# TODO: hide any clients with the 'panel' class
+			;;
+
+		## Tag events
+		CreateTag) ## $1=tag
+			echo "$WMII_NORMCOLORS"   $@ >> $WMII_DIR/lbar/$1;;
+		DestroyTag) ## $1=tag
+			rm $WMII_DIR/lbar/$1;;
+		FocusTag) ## $1=tag
+			echo "$WMII_FOCUSCOLORS"  $1 >> $WMII_DIR/lbar/$1;;
+		UnfocusTag) ## $1=tag
+			echo "$WMII_NORMCOLORS"   $1 >> $WMII_DIR/lbar/$1;;
+		UrgentTag) ## $1=tag $2=[Manager|Client]
+			echo "$WMII_URGENTCOLORS" $1 >> $WMII_DIR/lbar/$1;;
+		NotUrgentTag) ## $1=tag $2=[Manager|Client]
+			echo "$WMII_NORMCOLORS"   $1 >> $WMII_DIR/lbar/$1;;
+
+		## LeftBar events (usually tag buttons)
+		LeftBarMouseDown) ## $1=button $2=bar_item
+			;;
+		LeftBarClick) ## $1=button $2=bar_item
+			shift # ignore the button
+			echo view "$@" >> $WMII_DIR/ctl;;
+		LeftMouseDND) ## $1=button $2=bar_item
+			Event LeftBarClick "$@";;
+
+		## RightBar events
+		RightBarMouseDown) ## $1=button $2=bar_item
+			;;
+		RightBarClick) ## $1=button $2=bar_item
+			;;
+		RightMouseDND) ## $1=button $2=bar_item
+			Event RightBarClick "$@";;
+	esac
+} ## End Event
+
+# Key Bindings
+Key() {
+	key=$1
+	case "$key" in
+		## Moving around
+
+		$MODKEY-$LEFT) ## Select the client to the left
+			echo select left   >> $WMII_DIR/tag/sel/ctl;;
+		$MODKEY-$RIGHT) ## Select the client to the right
+			echo select right  >> $WMII_DIR/tag/sel/ctl;;
+		$MODKEY-$UP) ## Select the client above
+			echo select up     >> $WMII_DIR/tag/sel/ctl;;
+		$MODKEY-$DOWN) ## Select the client below
+			echo select down   >> $WMII_DIR/tag/sel/ctl;;
+
+		$MODKEY-space) ## Toggle between floating and managed layers
+			echo select toggle >> $WMII_DIR/tag/sel/ctl;;
+
+		## Moving clients around
+
+		$MODKEY-Shift-$LEFT) ## Move selected client to the left
+			echo send sel left   >> $WMII_DIR/tag/sel/ctl;;
+		$MODKEY-Shift-$RIGHT) ## Move selected client to the right
+			echo send sel right  >> $WMII_DIR/tag/sel/ctl;;
+		$MODKEY-Shift-$UP) ## Move selected client up
+			echo send sel up     >> $WMII_DIR/tag/sel/ctl;;
+		$MODKEY-Shift-$DOWN) ## Move selected client down
+			echo send sel down   >> $WMII_DIR/tag/sel/ctl;;
+		$MODKEY-Shift-space) ## Toggle selected client between floating and managed layers
+			echo send sel toggle >> $WMII_DIR/tag/sel/ctl;;
+
+		## Moving through stacks
+		$MODKEY-Control-$UP) ## Select the stack above
+			echo select up   stack >> $WMII_DIR/tag/sel/ctl;;
+		$MODKEY-Control-$DOWN) ## Select the stack below
+			echo select down stack >> $WMII_DIR/tag/sel/ctl;;
+
+		## Client actions
+		$MODKEY-shift-1) ## Toggle selected client's fullsceen state
+			echo Fullscreen toggle >> $WMII_DIR/client/sel/ctl;;
+		$MODKEY-shift-0) ## Close client
+			echo kill >> $WMII_DIR/client/sel/ctl;;
+
+		## Changing column modes
+		$MODKEY-d) ## Set column to default mode
+			echo colmode sel default-max >> $WMII_DIR/tag/sel/ctl;;
+		$MODKEY-s) ## Set column to stack mode
+			echo colmode sel stack-max   >> $WMII_DIR/tag/sel/ctl;;
+		$MODKEY-m) ## Set column to max mode
+			echo colmode sel stack+max   >> $WMII_DIR/tag/sel/ctl;;
+
+		## Running programs
+		$MODKEY-a) ## Open wmii actions menu
+			Action $(path_ls $WMII_CONFPATH | wimenu -h "${hist}.actions" -n 5000) & ;;
+		$MODKEY-x) ## Open program menu
+			setsid $(wimenu -h "${hist}.progs" -n 5000 <$progsfile) & ;;
+		$MODKEY-Return) ## Launch a terminal
+			setsid x-terminal-emulator & ;;
+
+		## Tag actions
+		$MODKEY-t) ## Change to another tag
+			{
+				tag=$(lstags | wimenu -h "${hist}.tags" -n 50) || return
+				echo  view $tag >> $WMII_DIR/ctl
+			}& ;;
+		$MODKEY-Shift-t) ## Retag the selected client
+			sel=$(sed 1q $WMII_DIR/client/sel/ctl)
+			{
+				tag=$(lstags | wimenu -h "${hist}.tags" -n 50) || return
+				echo "$tag" >> $WMII_DIR/client/$sel/tags
+			}& ;;
+	esac
+} ## End Key
+
+Action() {
+	prog=`path_which "$WMII_CONFPATH" $1`; shift
+	if [ -n "$prog" ]; then
+		"$prog" "$@"
+		return $?
+	else
+		return 1
+	fi
+} ## End Action
diff --git a/.wmii/ctl-init b/.wmii/ctl-init
new file mode 100644
index 0000000..026c0d5
--- /dev/null
+++ b/.wmii/ctl-init
@@ -0,0 +1,5 @@
+font        xft:Monospace-8
+focuscolors $WMII_FOCUSCOLORS
+normcolors  $WMII_NORMCOLORS
+grabmod     $MODKEY
+border      1
diff --git a/.wmii/fixes.sh b/.wmii/fixes.sh
new file mode 100644
index 0000000..6e1f38b
--- /dev/null
+++ b/.wmii/fixes.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+# Fix various deficiencies in either the shell or the filesystem
+
+##
+# Usage: ls DIRECTORY
+# Linux's 9p kernel module sometimes omits entries in directory listings
+##
+unalias ls 2>/dev/null
+ls() {
+	real_ls="`which ls` -1F"
+	[ $# = 0 ] && set -- "`pwd`"
+	f="${1/#${WMII_DIR}/}"
+	if [ "$f" = "$1" ]; then
+		$real_ls "$f"
+	else
+		wmiir ls "$f"
+	fi
+}
+
+##
+# Usage: setsid cmd [arguments...]
+# I like wmiir's setsid better than linux-utils'
+##
+setsid() { wmiir setsid "$@"; }
diff --git a/.wmii/include.sh b/.wmii/include.sh
index b1ec901..43855e6 100644
--- a/.wmii/include.sh
+++ b/.wmii/include.sh
@@ -1,76 +1,15 @@
 #!/bin/bash
 
 if [ -z "$WMII_NAMESPACE" ]; then
-    export WMII_NAMESPACE=`wmiir namespace`
+    export WMII_NAMESPACE="`wmiir namespace`"
 fi
 if [ -z "$WMII_DIR" ]; then
     export WMII_DIR="$HOME/n/wmii"
 fi
 
-# Linux's 9p kernel module sometimes omits entries in directory listings
-unalias ls 2>/dev/null
-ls() {
-	real_ls="`which ls` -1F"
-	[ $# = 0 ] && set -- "`pwd`"
-	case $# in
-		1)
-			f="${1/#${WMII_DIR}/}"
-			if [ "$f" = "$1" ]; then
-				$real_ls "$f"
-			else
-				wmiir ls "$f"
-			fi
-			;;
-		*) $real_ls "$f";;
-	esac
-}
+. "$HOME/.wmii/util.sh"
 
-# I like wmiir's setsid better than linux-utils'
-setsid() { wmiir setsid "$@"; }
+hist="`conffile history`"
+progsfile=$WMII_NAMESPACE/.proglist
 
-path_ls() {
-	find -L `echo "$@"|sed 'y/:/ /'` -maxdepth 1 -type f -executable -printf '%f\n' 2>/dev/null| sort -u
-}
-
-path_which() {
-	mypath=$1
-	prog=$2
-	which=`which which`
-	PATH="$mypath" "$which" -- "$prog" 2>/dev/null
-}
-
-lstags() {
-	ls $WMII_DIR/tag | sed -e 's@/@@' -e '/^sel$/d'
-}
-
-scansection() {
-	file=`path_which "$WMII_CONFPATH" wmiirc`
-	sec=$1
-	tmp=`mktemp`
-	if [ -n "$sec" ]; then
-		< "$file" sed -n "/^\s*$sec\s*()/,/##\s*End $sec/p" | sed '1d;$d'> $tmp
-	else
-		< "$file" sed "/\s*}\s*##\s*End\s/d" > $tmp
-	fi
-	< $tmp sed -n '/##/p'|sed -r 's/^\s*(.*)\)\s*## ?/\t\1\t/;s/\s*## ?//'
-	rm $tmp
-}
-
-conffile() {
-	echo "$HOME/.wmii/$@"
-}
-
-Action() {
-	prog=`path_which "$WMII_CONFPATH" $1`; shift
-	if [ -n "$prog" ]; then
-		"$prog" "$@"
-		return $?
-	else
-		return 1
-	fi
-}
-
-connected_to_x_server() {
-	xdpyinfo &>/dev/null
-	return $?
-}
+. "$HOME/.wmii/config.sh"
diff --git a/.wmii/tagrules b/.wmii/tagrules
new file mode 100644
index 0000000..990151f
--- /dev/null
+++ b/.wmii/tagrules
@@ -0,0 +1,3 @@
+/Emacs|Navigator/ -> +sel
+/Eclipse/ -> +sel
+/panel/ -> /.*/
diff --git a/.wmii/util.sh b/.wmii/util.sh
new file mode 100644
index 0000000..3234783
--- /dev/null
+++ b/.wmii/util.sh
@@ -0,0 +1,121 @@
+#!/bin/bash
+
+# I moved "fixes" into a separate file because it isn't so much configuration...
+. "$HOME/.wmii/fixes.sh"
+
+################################################################################
+# Added shell features                                                         #
+################################################################################
+
+##
+# Usage: dquote STRING
+# Safely double-quotes a string.
+# It escapes ways to execute code, but not variables.
+##
+dquote() {
+	str=$1
+	str="${str//\\/\\\\}" # backslash
+	str="${str//\"/\\\"}" # dquote
+	str="${str//\$(/\\\$(}" # $(...)
+	str="${str//\`/\\\`}" # backtick
+	printf '"%s"\n' "$str"
+}
+
+##
+# Usage: expand_variables
+# Expands variables read from /dev/stdin
+##
+expand_variables() {
+	while read; do
+		eval printf "'%s\n'" "$(dquote "$REPLY")"
+	done
+}
+
+################################################################################
+# PATH manipulation                                                            #
+################################################################################
+
+##
+# Usage: path_ls PATH
+# List executables in PATH (PATH is delimited by `:')
+##
+path_ls() {
+	dirs="`echo "$@"|sed 'y/:/ /'`"
+	find -L $dirs -maxdepth 1 -type f -executable -printf '%f\n' 2>/dev/null | sort -u
+}
+
+##
+# Usage: path_which PATH PROGRAM
+# Find the full path of PROGRAM by searching PATH
+##
+path_which() {
+	mypath=$1
+	prog=$2
+	which=`which which`
+	PATH="$mypath" "$which" -- "$prog" 2>/dev/null
+}
+
+################################################################################
+# wmii convenience functions                                                   #
+################################################################################
+
+##
+# Usage: lstags
+# Lists wmii tags
+##
+lstags() {
+	ls $WMII_DIR/tag | sed -e 's@/@@' -e '/^sel$/d'
+}
+
+################################################################################
+# X11 functions                                                                #
+################################################################################
+
+##
+# Usage: connected_to_x_server
+# Return status indicates whether there is an X server at $DISPLAY
+##
+connected_to_x_server() {
+	xdpyinfo &>/dev/null
+	return $?
+}
+
+################################################################################
+# My wmii configuration                                                        #
+################################################################################
+
+##
+# Usage: scansection [SECTION]
+# Reads the doc comments from a section of wmiirc.
+# If SECTION is not given, it reads all doc comments.
+##
+scansection() {
+	file=`conffile config.sh`
+	sec=$1
+	tmp=`mktemp`
+	# Isolate the sections we want.
+	if [ -n "$sec" ]; then
+		# Find the section
+		< "$file" sed -n "/^\s*$sec\s*()/,/##\s*End $sec/p" | sed '1d;$d'> $tmp
+	else
+		# Remove extra lines that mark the end of a section
+		< "$file" sed "/\s*}\s*##\s*End\s/d" > $tmp
+	fi
+	< $tmp sed -n '/##/p' | while read; do
+		var="$(echo "$REPLY" | sed -nr 's/^\s*(.*)\)\s*##.*/\1/p')"
+		comment="$(echo "$REPLY" | sed -r 's/.*## ?//')"
+		if [ -z "$var" ]; then
+			printf '%s\n' "$comment"
+		else
+			printf '\t%s\t%s\n' "$(echo "$var"|expand_variables)" "$comment"
+		fi
+	done
+	rm $tmp
+}
+
+##
+# Usage: conffile FILE
+##
+conffile() {
+	echo "$HOME/.wmii/$@"
+}
diff --git a/.wmii/wmiirc b/.wmii/wmiirc
index 1e88128..c513cd1 100755
--- a/.wmii/wmiirc
+++ b/.wmii/wmiirc
@@ -1,258 +1,17 @@
 #!/bin/bash
-# Let any running instances of wmiirc know that we're starting
-wmiir xwrite /event Start
-
 . "$HOME/.wmii/include.sh"
 
-echo ' ==> Starting wmiirc'
-mkdir -p "$WMII_DIR"
-9mount -i "unix!$WMII_NAMESPACE/wmii" "$WMII_DIR"
-
-MODKEY=Mod4 # super
-UP=p
-DOWN=n
-LEFT=b
-RIGHT=f
-
-# Colors tuples: "<text> <background> <border>"
-. `conffile theme-solarized-dark`
-
-# Menu history
-hist="`conffile history`"
-
-# Tagging Rules
-echo '/Emacs|Navigator/ -> +sel' >> $WMII_DIR/tagrules
-echo '/Eclipse/ -> +sel' >> $WMII_DIR/tagrules
-echo '/panel/ -> /.*/' >> $WMII_DIR/tagrules
-
-Event() {
-	event=$1; shift;
-	case "$event" in
-		## Mouse event meanings:
-		##   MouseDown = mouse down
-		##   Click     = mouse up
-		##   DND       = hover, while dragging something (Drag 'n' Drop)
-		##               The associated mouse button is always "1"
-		##
-		## Mouse-button IDs:
-		##   1 = left
-		##   2 = middle
-		##   3 = right
-
-		## WMII-meta events
-		Quit) ## No args
-			echo ' ==> Stopping wmiirc'
-			echo "  -> unmounting WMII_DIR=$WMII_DIR..."
-			# might complain about /etc/mtab if the x server has already stopped
-			9umount "$WMII_DIR"
-			echo "  -> rmdir'ing WMII_DIR=$WMII_DIR..."
-			rmdir "$WMII_DIR"
-			exit;;
-		Warning) ## $@=string
-			notify-send "wmii warning: $*";;
-		Key) ## $1=keystroke
-			Key "$@";;
-
-		## WMII Window management events
-		FocusFloating) ## No args
-			;;
-		AreaFocus) ## $1=area
-			;;
-		DestroyArea) ## $1=area
-			;;
-		ColumnFocus) ## $1=column
-			;;
-		CreateColumn) ## $1=column
-			;;
-
-		## Client events
-		CreateClient) ## $1=client
-			;;
-		DestroyClient) ## $1=client
-			;;
-		Urgent) ## $1=client $2=[Manager|Client]
-			;;
-		NotUrgent) ## $1=client $2=[Manager|Client]
-			;;
-		ClientMouseDown) ## $1=client $2=button
-			client=$1
-			button=$2
-			case $button in
-				1) ;;
-				2) ;;
-				3)
-					{
-						case `wmii9menu Delete Fullscreen` in
-							Delete)
-								echo kill >> $WMII_DIR/client/$client/ctl;;
-							Fullscreen)
-								echo Fullscreen on >> $WMII_DIR/client/$1/ctl;;
-						esac
-					}& ;;
-			esac;;
-		ClientClick) ## $1=client $2=button
-			;;
-		Unresponsive) ## $1=client
-			client=$1
-			client_name=`cat $WMII_DIR/client/$client/label`
-			msg="The client \`${client_name}' is not responding."
-			msg+=" What would you like to do?"
-			{
-				resp=$(wihack -transient $client \
-					xmessage -nearmouse -buttons Kill,Wait -print "$msg")
-				if [ "$resp" = Kill ]; then
-					echo slay >> $WMII_DIR/client/$client/ctl
-				fi
-			}& ;;
-		Fullscreen) ## $1=client $2=[on|off]
-			# TODO: hide any clients with the 'panel' class
-			;;
-
-		## Tag events
-		CreateTag) ## $1=tag
-			echo "$WMII_NORMCOLORS"   $@ >> $WMII_DIR/lbar/$1;;
-		DestroyTag) ## $1=tag
-			rm $WMII_DIR/lbar/$1;;
-		FocusTag) ## $1=tag
-			echo "$WMII_FOCUSCOLORS"  $1 >> $WMII_DIR/lbar/$1;;
-		UnfocusTag) ## $1=tag
-			echo "$WMII_NORMCOLORS"   $1 >> $WMII_DIR/lbar/$1;;
-		UrgentTag) ## $1=tag $2=[Manager|Client]
-			echo "$WMII_URGENTCOLORS" $1 >> $WMII_DIR/lbar/$1;;
-		NotUrgentTag) ## $1=tag $2=[Manager|Client]
-			echo "$WMII_NORMCOLORS"   $1 >> $WMII_DIR/lbar/$1;;
-
-		## LeftBar events (usually tag buttons)
-		LeftBarMouseDown) ## $1=button $2=bar_item
-			;;
-		LeftBarClick) ## $1=button $2=bar_item
-			shift # ignore the button
-			echo view "$@" >> $WMII_DIR/ctl;;
-		LeftMouseDND) ## $1=button $2=bar_item
-			Event LeftBarClick "$@";;
-
-		## RightBar events
-		RightBarMouseDown) ## $1=button $2=bar_item
-			;;
-		RightBarClick) ## $1=button $2=bar_item
-			;;
-		RightMouseDND) ## $1=button $2=bar_item
-			Event RightBarClick "$@";;
-
-		## Custom (non-WMII-generated) events
-		Start) ## No args
-			Event Quit;; # get out of the way for a new event loop
-	esac
-} ## End Event
-
-# Key Bindings
-Key() {
-	key=$1
-	case "$key" in
-		## Moving around
-
-		$MODKEY-$LEFT) ## Select the client to the left
-			echo select left   >> $WMII_DIR/tag/sel/ctl;;
-		$MODKEY-$RIGHT) ## Select the client to the right
-			echo select right  >> $WMII_DIR/tag/sel/ctl;;
-		$MODKEY-$UP) ## Select the client above
-			echo select up     >> $WMII_DIR/tag/sel/ctl;;
-		$MODKEY-$DOWN) ## Select the client below
-			echo select down   >> $WMII_DIR/tag/sel/ctl;;
-
-		$MODKEY-space) ## Toggle between floating and managed layers
-			echo select toggle >> $WMII_DIR/tag/sel/ctl;;
-
-		## Moving clients around
-
-		$MODKEY-Shift-$LEFT) ## Move selected client to the left
-			echo send sel left   >> $WMII_DIR/tag/sel/ctl;;
-		$MODKEY-Shift-$RIGHT) ## Move selected client to the right
-			echo send sel right  >> $WMII_DIR/tag/sel/ctl;;
-		$MODKEY-Shift-$UP) ## Move selected client up
-			echo send sel up     >> $WMII_DIR/tag/sel/ctl;;
-		$MODKEY-Shift-$DOWN) ## Move selected client down
-			echo send sel down   >> $WMII_DIR/tag/sel/ctl;;
-		$MODKEY-Shift-space) ## Toggle selected client between floating and managed layers
-			echo send sel toggle >> $WMII_DIR/tag/sel/ctl;;
-
-		## Moving through stacks
-		$MODKEY-Control-$UP) ## Select the stack above
-			echo select up   stack >> $WMII_DIR/tag/sel/ctl;;
-		$MODKEY-Control-$DOWN) ## Select the stack below
-			echo select down stack >> $WMII_DIR/tag/sel/ctl;;
-
-		## Client actions
-		$MODKEY-shift-1) ## Toggle selected client's fullsceen state
-			echo Fullscreen toggle >> $WMII_DIR/client/sel/ctl;;
-		$MODKEY-shift-0) ## Close client
-			echo kill >> $WMII_DIR/client/sel/ctl;;
-
-		## Changing column modes
-		$MODKEY-d) ## Set column to default mode
-			echo colmode sel default-max >> $WMII_DIR/tag/sel/ctl;;
-		$MODKEY-s) ## Set column to stack mode
-			echo colmode sel stack-max   >> $WMII_DIR/tag/sel/ctl;;
-		$MODKEY-m) ## Set column to max mode
-			echo colmode sel stack+max   >> $WMII_DIR/tag/sel/ctl;;
-
-		## Running programs
-		$MODKEY-a) ## Open wmii actions menu
-			Action $(path_ls $WMII_CONFPATH | wimenu -h "${hist}.actions" -n 5000) & ;;
-		$MODKEY-x) ## Open program menu
-			setsid $(wimenu -h "${hist}.progs" -n 5000 <$progsfile) & ;;
-		$MODKEY-Return) ## Launch a terminal
-			setsid x-terminal-emulator & ;;
-
-		## Tag actions
-		$MODKEY-t) ## Change to another tag
-			{
-				tag=$(lstags | wimenu -h "${hist}.tags" -n 50) || return
-				echo  view $tag >> $WMII_DIR/ctl
-			}& ;;
-		$MODKEY-Shift-t) ## Retag the selected client
-			sel=$(sed 1q $WMII_DIR/client/sel/ctl)
-			{
-				tag=$(lstags | wimenu -h "${hist}.tags" -n 50) || return
-				echo "$tag" >> $WMII_DIR/client/$sel/tags
-			}& ;;
-	esac
-} ## End Key
-
-# WM Configuration
-echo font        xft:Monospace-8   >> $WMII_DIR/ctl
-echo focuscolors $WMII_FOCUSCOLORS >> $WMII_DIR/ctl
-echo normcolors  $WMII_NORMCOLORS  >> $WMII_DIR/ctl
-echo grabmod     $MODKEY           >> $WMII_DIR/ctl
-echo border      1                 >> $WMII_DIR/ctl
-xsetroot -solid "$WMII_BACKGROUND" &
-
-progsfile=$WMII_NAMESPACE/.proglist
-path_ls $PATH > $progsfile &
-
-eval arg `scansection Key|cut -sf2` >> $WMII_DIR/keys
-
-# Clear the LBar
-find $WMII_DIR/lbar -type f -delete
-
-# Emulate [Create|Focus]Tag events
-seltag=`sed 1q $WMII_DIR/tag/sel/ctl`
-lstags | while read tag; do
-	Event CreateTag "$tag"
-	if [ "$tag" = "$seltag" ]; then
-		Event FocusTag "$tag"
-	fi
-done
-
-Action autostart 2>/dev/null &
+# Let any running instances of wmiirc know that we're starting
+PIDFILE=$WMII_NAMESPACE/.wmii.pid
+echo $$ > $PIDFILE
 
-if [ -f "`conffile wmiirc_local`" ]; then
-	. "`conffile wmiirc_local`"
-fi
+Event WmiircStart
 
 trap "Event Quit" EXIT
 
 # use wmiir so it doesn't look like an open file
-wmiir read /event | while read event; do
-	Event $event
+wmiir read /event 2>/dev/null | while read event; do
+	[[ $$ = $(cat $PIDFILE) ]] && Event $event
 done
+
+Event WmiircQuit