wmii

commit d7dc09cc8b5206f97a6f465f60611020c5386cbe
parent 9dc61b3f675d847ff59bd51d620f40167637cdcc
Author: Anselm R. Garbe <garbeam@wmii.de>
Date:   Wed, 12 Apr 2006 08:53:06 +0200

removed Alt, instead use Mod1 in any case, added UP/.. vars to wmiirc


Diffstat:
cmd/wm/kb.c
 | 
2
+-
rc/wmiirc
 | 
43
++++++++++++++++++++++++-------------------

2 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/cmd/wm/kb.c b/cmd/wm/kb.c
@@ -44,7 +44,7 @@ blitz_strtomod(char *val)
 		mod |= ShiftMask;
 	if (strstr(val, "Control"))
 		mod |= ControlMask;
-	if (strstr(val, "Mod1") || strstr(val, "Alt"))
+	if (strstr(val, "Mod1"))
 		mod |= Mod1Mask;
 	if (strstr(val, "Mod2"))
 		mod |= Mod2Mask;
diff --git a/rc/wmiirc b/rc/wmiirc
@@ -11,7 +11,12 @@ proglist() {
 	awk 'NF>2 && $1 ~ /^[^d].*x/ {print $NF}' | sort -u
 }
 
-MODKEY=Alt
+MODKEY=Mod1
+UP=k
+DOWN=j
+LEFT=h
+RIGHT=l
+
 WMII_FONT='fixed' export WMII_FONT
 WMII_NORMCOLORS='#222222 #eeeeee #666666' export WMII_NORMCOLORS
 WMII_SELCOLORS='#ffffff #285577 #4c7899' export WMII_SELCOLORS
@@ -45,10 +50,10 @@ proglist $OLD_PATH >/tmp/ns.$USER.$DISPLAY/progs &
 
 # SHORTCUTS
 wmiir write /def/keys <<EOF
-$MODKEY-h
-$MODKEY-l
-$MODKEY-j
-$MODKEY-k
+$MODKEY-$LEFT
+$MODKEY-$RIGHT
+$MODKEY-$DOWN
+$MODKEY-$UP
 $MODKEY-space
 $MODKEY-d
 $MODKEY-s
@@ -67,8 +72,8 @@ $MODKEY-7
 $MODKEY-8
 $MODKEY-9
 $MODKEY-Return
-$MODKEY-Shift-h
-$MODKEY-Shift-l
+$MODKEY-Shift-$LEFT
+$MODKEY-Shift-$RIGHT
 $MODKEY-Shift-space
 $MODKEY-Shift-c
 $MODKEY-Shift-t
@@ -82,10 +87,10 @@ $MODKEY-Shift-6
 $MODKEY-Shift-7
 $MODKEY-Shift-8
 $MODKEY-Shift-9
-$MODKEY-Control-h
-$MODKEY-Control-l
-$MODKEY-Control-j
-$MODKEY-Control-k
+$MODKEY-Control-$LEFT
+$MODKEY-Control-$RIGHT
+$MODKEY-Control-$DOWN
+$MODKEY-Control-$UP
 EOF
 
 # EVENT LOOP
@@ -104,13 +109,13 @@ do
 		xwrite /ctl view "$1";;
 	Key)
 		case "$1" in
-		$MODKEY-h)
+		$MODKEY-$LEFT)
 			xwrite /view/ctl select prev;;
-		$MODKEY-l)
+		$MODKEY-$RIGHT)
 			xwrite /view/ctl select next;;
-		$MODKEY-j)
+		$MODKEY-$DOWN)
 			xwrite /view/sel/ctl select next;;
-		$MODKEY-k)
+		$MODKEY-$UP)
 			xwrite /view/sel/ctl select prev;;
 		$MODKEY-space)
 			xwrite /view/ctl select toggle;;
@@ -142,13 +147,13 @@ do
 			xwrite /view/sel/sel/tags "`wmiir read /view/sel/sel/tags | wmiimenu`" &;;
 		$MODKEY-Shift-[0-9])
 			xwrite /view/sel/sel/tags `echo $1 | sed 's/.*-//'`;;
-		$MODKEY-Control-h)
+		$MODKEY-Control-$LEFT)
 			xwrite /view/sel/sel/ctl swap prev;;
-		$MODKEY-Control-l)
+		$MODKEY-Control-$RIGHT)
 			xwrite /view/sel/sel/ctl swap next;;
-		$MODKEY-Control-j)
+		$MODKEY-Control-$DOWN)
 			xwrite /view/sel/sel/ctl swap down;;
-		$MODKEY-Control-k)
+		$MODKEY-Control-$UP)
 			xwrite /view/sel/sel/ctl swap up;;
 		esac;;
 	esac