From b76f9af5f933bb960210336a2b3b81cd6a1e63f5 Mon Sep 17 00:00:00 2001
From: Ryan Kavanagh <rak@debian.org>
Date: Sat, 30 Dec 2017 11:33:00 -0500
Subject: Fix pgup/pgdn on sunt6 keyboard

---
 .xkb/keycodes/sunt6fix | 4 ++++
 bin/icd                | 9 +++------
 2 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 .xkb/keycodes/sunt6fix

diff --git a/.xkb/keycodes/sunt6fix b/.xkb/keycodes/sunt6fix
new file mode 100644
index 0000000..e599b3c
--- /dev/null
+++ b/.xkb/keycodes/sunt6fix
@@ -0,0 +1,4 @@
+xkb_keycodes {
+    <PGUP> = 86;
+    <PGDN> = 104;
+};
diff --git a/bin/icd b/bin/icd
index 1b9a011..93e96ca 100755
--- a/bin/icd
+++ b/bin/icd
@@ -24,7 +24,7 @@ KIN_OPTIONS="\
 
 SUN_OPTIONS="\
     ${GLOBAL_OPTIONS} \
-    -geometry sun(type6) \
+    -geometry sun(type6unix) \
     -option caps:escape \
     -option myswap:switch_lalt_lsuper"
 
@@ -61,20 +61,17 @@ fi
 if [ "x${SUN_USB_ID}" != "x" ]; then
     echo "Setting up Sun Type 6"
     SUN_XINPUT_ID=$(xinput | grep ${SUN_USB_ID} | sed -e 's/.*id=\([0-9]\+\).*/\1/g')
-    echo ${SUN_XINPUT_ID}
+    echo "ID: ${SUN_XINPUT_ID}"
     for XID in $SUN_XINPUT_ID; do
         echo $XID
         setxkbmap \
             -I${XKB_DIR} \
             -device ${XID} \
             ${SUN_OPTIONS} \
-            -print > ${HOME}/.xkb/keymap/icd.sun
-            #-print | sed -e 's@\(pc+icd.*\)"@\1+myswap(switch_lalt_lsuper)"@g' > ${HOME}/.xkb/keymap/icd.sun
+            -print | sed -e '/xkb_keycodes/s/"[[:space:]]/+sunt6fix&/' > ${HOME}/.xkb/keymap/icd.sun
         xkbcomp -I${HOME}/.xkb -i ${XID} -synch \
             ${HOME}/.xkb/keymap/icd.sun ${DISPLAY} # 2> /dev/null
     done
-    xkbcomp -I${HOME}/.xkb -synch \
-        ${HOME}/.xkb/keymap/icd.sun ${DISPLAY} # 2> /dev/null
 fi
 
 
-- 
cgit v1.2.3