X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=input-setup;h=ba390dad1adf5e2ca5747bf430c5c53c6ba16bfd;hp=2f595f3e7cecbfca81570ead2f51bbe2b3ca1845;hb=79b274fcd8bfa556133ab13270e84b40aebe8468;hpb=e893484a0470843582699dc41fe9d69388c63c02

diff --git a/input-setup b/input-setup
index 2f595f3..ba390da 100755
--- a/input-setup
+++ b/input-setup
@@ -1,4 +1,5 @@
 #!/bin/bash -l
+set -x
 # Copyright (C) 2016 Ian Kelling
 
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,127 +14,83 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# set to oppsite if the order is flipped.
+k2flip=true
+if $k2flip; then
+  k2inorder=false
+else
+  k2inorder=true
+fi
+
+type=model01
+
+case $1 in
+  l) type=laptop ;;
+  k) type=kinesis ;;
+  m) type=model01 ;;
+esac
+
 #set -x
 mi() {
-    xinput --get-feedbacks "$1" | grep "threshold"
-    xinput --get-feedbacks "$1" | grep "accelNum\|accelDenom"
-    xinput --list-props "$1" | grep "Device Accel Profile\|Device Accel Constant Deceleration\|Device Accel Velocity Scaling"
+  xinput --get-feedbacks "$1" | grep "threshold"
+  xinput --get-feedbacks "$1" | grep "accelNum\|accelDenom"
+  xinput --list-props "$1" | grep "Device Accel Profile\|Device Accel Constant Deceleration\|Device Accel Velocity Scaling"
 }
 ms() {
-    xinput --set-ptr-feedback "$1" $2 ${3%/*} ${3#*/}
-    xinput --set-prop "$1" 'Device Accel Profile'  $4
-    xinput --set-prop "$1" 'Device Accel Constant Deceleration' $5
-    xinput --set-prop "$1" 'Device Accel Velocity Scaling' $6
-    mi "$1"
+  xinput --set-ptr-feedback "$1" $2 ${3%/*} ${3#*/}
+  xinput --set-prop "$1" 'Device Accel Profile'  $4
+  xinput --set-prop "$1" 'Device Accel Constant Deceleration' $5
+  xinput --set-prop "$1" 'Device Accel Velocity Scaling' $6
+  mi "$1"
 }
 set_device_id() {
-    if device_id=$(xinput --list | grep -m 1 "$1"); then
-        device_id=${device_id##*id=}
-        device_id=${device_id%%[[:space:]]*}
-    else
-        return 1
-    fi
+  if [[ $2 ]] && $2; then
+    cmd="tail -n1"
+  else
+    cmd="head -n1"
+  fi
+  if device_id=$(xinput --list | grep "$1" | $cmd); then
+    device_id=${device_id##*id=}
+    device_id=${device_id%%[[:space:]]*}
+    echo "2:$2 device_id=$device_id"
+  else
+    return 1
+  fi
 }
 
-case $HOSTNAME in
-	tp|x2)
-		# original saved with: xkbcomp $DISPLAY /a/c/stretch-11-2016.xkb
-		xkbcomp /a/c/x2.xkb $DISPLAY
-		;;
-    treetowl*|iank-dev|frodo)
-        # todo, differentiate for work pc
-	#/a/bin/radl
-        if [[ -z $DISPLAY ]]; then
-            echo "error. empty DISPLAY var" >> /a/gdm-keyboard-error.log
-        else
-            xkbcomp /a/c/.Xkeymap $DISPLAY
-
-            xkbset m # setup mouse keys, which I have altered
-
-            xkbset exp =m  # stop mousekeys expiring after a timeout
-
-            xset r rate 200 13 # decrease rate delay
-            cd / # so xbindkeys does not hold open mountpoints
-            xbindkeys # configured to grab left and right scroll button presses
-        fi
-
-
-        #right scroll wheel, change from button 4 & 5 to 13 and 14.
-        # also changes the middle click to 12, even though I'm not using it anymore
-        if set_device_id "04d9:048e"; then
-            xinput --set-button-map "$device_id" 1 12 3 13 14 6 7
-        fi
-
-        ms 'Kensington Kensington Slimblade Trackball' 100 4000/1 7 6.5 1.5
-        xinput --set-button-map 'Kensington Kensington Slimblade Trackball' 0 0 0 4 5 6 7 0 9 10 11 12
-
-        # razer naga middle mouse stopped working. it's settings were:
-        #ms "$device_id" 100 1000/1 7 4 1
-
-        if set_device_id "SteelSeries World of Warcraft MMO Gaming Mouse"; then
-            ms "$device_id" 100 1000/1 7 4 1
-            #ms "$device_id" 1 7/2 2 2.5 2
-
-            # makes it compatible with what windows sends using synergy
-            xinput --set-button-map "$device_id" 1 2 3 4 5 6 7 6 7 10 11 12 13 14 15
-
-            # under the new "improved" libinput, the mouse speed/accel has
-            # changed all around and is much more limited.
-            # Other xinput commands will fail and this will succeed.
-            xinput --set-prop "$device_id" "libinput Accel Speed" '.8'
-        fi
-
-
-        # disable the mouse movements of my mouse-wheel only mouse
-        if set_device_id "USB Optical Mouse"; then
-            xinput --set-prop "$device_id" 'Device Accel Constant Deceleration' 10000
-            # 12 is to effectively disable the middle click button
-            xinput --set-button-map "$device_id" 1 12 3 10 11 6 7
-        fi
-        . /a/bin/bash_unpublished/duplicity-gpg-agent-setup
-        ;;
-    frodo*)
-        ;;
+# default via xset q is 660 25. (delay for autorepeat, repeat rate)
+# was at 200 13, but while learning to use keyboardio, i hold keys a bit longer sometimes.
+xset r rate 400 13 # decrease rate delay
+
+if set_device_id "SteelSeries World of Warcraft MMO Gaming Mouse"; then
+  ms "$device_id" 100 1000/1 7 4 1
+
+  # under the new "improved" libinput, the mouse speed/accel has
+  # changed all around and is much more limited.
+  # Other xinput commands will fail and this will succeed.
+  xinput --set-prop "$device_id" "libinput Accel Speed" '.8'
+fi
+
+# todo, differentiate for work pc
+#/a/bin/radl
+
+case $type in
+  model01)
+    # original saved with: xkbcomp $DISPLAY /a/c/flidas-2017-12.xkb
+    xkbcomp /a/c/model01.xkb $DISPLAY
+    . /a/bin/bash_unpublished/duplicity-gpg-agent-setup
+    ;;
+  laptop)
+    xkbcomp /a/c/x2.xkb $DISPLAY
+
+    ;;
 esac
 
 # for desktop and htpc
-set_device_id "Logitech Unifying Device"
-xinput --set-prop "$device_id" 'Evdev Middle Button Emulation' 1
-
-
-#ms 'Kensington Kensington Slimblade Trackball' 1 7/2 2 4 5 = 2.01
-# ms 9 10 20/1 6 4 .2
-#ms 9 10 35/1 6 5 .2 = 1.82
-#ms 9 10 1200/1 7 5 .2   = 1.82 after a practice round
-#
-#ms 9 10 140/1 6 7 .1  = 2.0 after a practice round.
-#feels like the slow is finally too slow, and fast too fast
-# ms 9 10 50/1 6 6 .2 = 1.83 after
-# ms 9 10 90/1 6 6 .1 = 1.86
-#ms 9 10 3000/1 7 6 .1 = 1.81
-#ms 9 1 15/1 3 6 3 = 2.0
-#ms 9 1 10/1 3 4 2 = 1.91
-#ms 9 1 8/1 3 5 4 =  1.98
-#ms 9 1 10/2 2 5 2.5 = 1.99
-#ms 9 100 3000/1 7 5 1 = 1.86
-#ms 9 100 1500/1 7 5 1.5 = 1.87
-#ms 9 100 2200/1 7 6 1.5 = 1.81
-#ms 9 100 2200/1 7 5 1.5 = 1.83
-#ms 9 100 3000/1 7 6 1.5 = 1.88
-#ms 9 1 100/1 4 6 15 = 1.85
-#ms 9 100 3000/1 7 7 1.5 = 1.85, but had a 1.76 on first try...
-# ms 9 100 3500/1 7 7 1.5 = 1.73, 1.68 a1 1.74, 1.83, 1.75, 1.78, 1.76
-# ms 9 100 4000/1 7 7 1.5 = 1.80
-# ms 9 100 4000/1 7 8 1.5 = 1.78
-# ms 9 100 4000/1 7 8 1.8 = 1.88
-# ms 9 100 4800/1 7 8 1.5 = 1.85
-# ms 9 100 4000/1 7 6.5 1.5 = 1.83. stickig with this, upped speeds a bit to make it more practical for normal windows
-# new day
-# ms 9 100 3500/1 7 7 1.5 = 1.92
-# ms 9 1 7/2 2 5 5 = 1.9
-# ms 9 100 3500/1 7 7 1.5 = 1.62
-# felt like having it a bit faster for a while, but switched back
-#ms 'Kensington Kensington Slimblade Trackball' 100 3500/1 7 5 1.5
-
-
-#set +x
+if set_device_id "Logitech Unifying Device"; then
+  xinput --set-prop "$device_id" 'Evdev Middle Button Emulation' 1
+fi
+
+
+set +x
+exit 0