X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=input-setup;h=2b7a6ba4a78da10541dc323bff710331df936fd0;hp=1a762e9f9e1f6cb4ceea75b549ee8289f22b2026;hb=65351382939fa95fb1e05d7d83eb58d27c3c6133;hpb=b5152768e90016afe8ff2d55cc9f38d08396b0fc

diff --git a/input-setup b/input-setup
index 1a762e9..2b7a6ba 100755
--- a/input-setup
+++ b/input-setup
@@ -69,11 +69,6 @@ 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
-    #ms "$device_id" 1 7/2 2 2.5 2
-
-    # makes it compatible with what windows sends using synergy
-    # commented out because i never expect to use windows again
-    #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.
@@ -81,71 +76,18 @@ if set_device_id "SteelSeries World of Warcraft MMO Gaming Mouse"; then
     xinput --set-prop "$device_id" "libinput Accel Speed" '.8'
 fi
 
+# todo, differentiate for work pc
+#/a/bin/radl
+
 case $type in
     model01)
         xkbcomp /a/c/model01.xkb $DISPLAY
+        . /a/bin/bash_unpublished/duplicity-gpg-agent-setup
         ;;
     laptop)
 	# original saved with: xkbcomp $DISPLAY /a/c/stretch-11-2016.xkb
 	xkbcomp /a/c/x2.xkb $DISPLAY
-        xkbset -m # remove mouse keys
-
-	;;
-    kinesis)
-        # 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
-
-            cd / # so xbindkeys does not hold open mountpoints
-            killall xbindkeys # having some lag, thinking this might help.
-            xbindkeys # configured to grab left and right scroll button presses
-        fi
-
-        kinesis2=false
-        #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
-        else
-            kinesis2=true # if we are using the 2nd kinesis which has different device ids
-        fi
-        if $kinesis2 && set_device_id "USB OPTICAL MOUSE" $k2flip; then
-            xinput --set-button-map "$device_id" 1 12 3 14 13 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
-
-
-
-        # disable the mouse movements mouse wheel
-        if $kinesis2; then
-            if set_device_id "USB OPTICAL MOUSE" $k2inorder; 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 11 10 6 7
-            fi
-        else
-            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
-        fi
 
-        . /a/bin/bash_unpublished/duplicity-gpg-agent-setup
         ;;
 esac
 
@@ -154,40 +96,6 @@ if set_device_id "Logitech Unifying Device"; then
 xinput --set-prop "$device_id" 'Evdev Middle Button Emulation' 1
 fi
 
-#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
+
+set +x
 exit 0