From 15be4bb0a5f0047bd2f1fac454363683b1f4d501 Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Sun, 14 Jun 2009 01:56:49 +0000
Subject: [PATCH] avoid changing down into super_l

---
 .xsession            | 13 +++++--------
 .xsession_archimedes |  9 +++++----
 .xsession_jax        |  3 +--
 .xsession_volo       |  3 +--
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/.xsession b/.xsession
index 505bfc2..7723cc4 100755
--- a/.xsession
+++ b/.xsession
@@ -15,16 +15,13 @@ if [ -d ~/tmp ]; then
    export TMPDIR=$(echo ~/tmp)
 fi;
 
-if [ "$HOSTNAME" == "archimedes" ]; then
-    xmodmap -e 'keycode 158 = XF86AudioRaiseVolume'
-    xmodmap -e 'keycode 146 = XF86AudioLowerVolume'
-    xset r rate 170 40
-fi;
-
 xmodmap -e 'keycode 115 = Multi_key'
-xmodmap -e 'keycode 116 = Super_L'
+# No clue why this has changed from Alt_R to Down, but we really want Down.
+if ! xmodmap -pk|grep -qe '116.*Down'; then
+    xmodmap -e 'keycode 116 = Super_L'
+fi;
 xmodmap -e 'clear mod4'
-xmodmap -e 'add mod4 = Super_L'
+xmodmap -e 'add mod4 = Super_L Super_R'
 
 if [ -e ~/.Xresources_$HOSTNAME ]; then
     xrdb -merge < ~/.Xresources_$HOSTNAME;
diff --git a/.xsession_archimedes b/.xsession_archimedes
index 3748c93..7ba5103 100644
--- a/.xsession_archimedes
+++ b/.xsession_archimedes
@@ -1,6 +1,4 @@
 #-*- mode: sh; -*-
-HOSTNAME=$(hostname)
-
 xrandr --output DVI0 --right-of VGA2
 
 xmodmap -e 'keycode 158 = XF86AudioRaiseVolume'
@@ -8,9 +6,12 @@ xmodmap -e 'keycode 146 = XF86AudioLowerVolume'
 xset r rate 170 40
 
 xmodmap -e 'keycode 115 = Multi_key'
-xmodmap -e 'keycode 116 = Super_L'
+# No clue why this has changed from Alt_R to Down, but we really want Down.
+if ! xmodmap -pk|grep -qe '116.*Down'; then
+    xmodmap -e 'keycode 116 = Super_L'
+fi;
 xmodmap -e 'clear mod4'
-xmodmap -e 'add mod4 = Super_L'
+xmodmap -e 'add mod4 = Super_L Super_R'
 
 #Red  1.300, Green  1.300, Blue  1.150
 xgamma -rgamma 1.3  -ggamma 1.3 -bgamma  1.15
diff --git a/.xsession_jax b/.xsession_jax
index 0ef531f..ec42b82 100644
--- a/.xsession_jax
+++ b/.xsession_jax
@@ -7,7 +7,6 @@ HOSTNAME=$(hostname)
 xmodmap - <<EOF
 clear lock
 keycode 66 = Multi_key
-keycode 115 = Super_L
 clear mod4
-add mod4 = Super_L
+add mod4 = Super_L Super_R
 EOF
diff --git a/.xsession_volo b/.xsession_volo
index 327646a..1f4a7d3 100644
--- a/.xsession_volo
+++ b/.xsession_volo
@@ -16,9 +16,8 @@ add mod1 = Alt_L Alt_R
 clear shift
 add shift = Shift_L
 keycode 115 = Multi_key
-keycode 116 = Super_L
 clear mod4
-add mod4 = Super_L
+add mod4 = Super_L Super_R
 EOF
 
 
-- 
2.39.2