X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xinitrc;h=480fbc65943c0b04bb7172edbea25030f4aef35b;hb=d0c74d35e6fc5c9e22592bf0b2ab6ab8337d3aa1;hp=a464b6ca2254519ca9cd8213e866274d6dec9754;hpb=5ac32da4374a1af1d9cae41a220f4286a820025f;p=config%2Fdotfiles.git

diff --git a/xinitrc b/xinitrc
index a464b6c..480fbc6 100755
--- a/xinitrc
+++ b/xinitrc
@@ -54,12 +54,11 @@ background_pids=
 #
 # Default to use a background image.
 set_background=yes
-# Default to display a warning if `xautolock` is not available.
+# Default to display a warning if no screen locker is not available.
 screen_lock_force=yes
-# Lock screen after x minutes of inactivity, requires `xautolock` to be
-# installed.
+# Lock screen after x minutes of inactivity.
 screen_lock_time=3
-# Locker program to lock the screen, used below with `xautolock`.
+# Locker program to lock the screen (with xautolock).
 screen_locker=xtrlock
 
 # Load settings for the local system.
@@ -81,7 +80,7 @@ xsetroot -solid black
 
 # Force English keyboard layout.
 if installed setxkbmap; then
-    setxkbmap us
+    setxkbmap -option compose:menu us
 fi
 
 # Use the Caps lock as Ctrl because it's easier to reach and very useful for
@@ -97,6 +96,15 @@ fi
 # necessary because of my German keyboard which I use with an English layout.
 xmodmap -e 'keycode 94 = grave asciitilde'
 
+# Enable scrolling with trackpoint and middle mouse on Thinkpads, also disable
+# touchpad. Thanks to DerRoteBaron.
+if xinput 2>/dev/null | grep 'TPPS/2 IBM TrackPoint' >/dev/null; then
+    xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 8 1
+    xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 8 2
+    xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Axes" 8 6 7 4 5
+    xinput --disable "SynPS/2 Synaptics TouchPad"
+fi
+
 # Disable annoying audio bell. Thanks to Sebastian Rachuj.
 xset b off
 
@@ -127,18 +135,11 @@ if installed redshift; then
     redshift -l 49.9:10.9 -t 5500:4500 >/dev/null &
 fi
 
-# Automatically lock the screen after x minutes of inactivity if
-# `xscreensaver` or `xautolock` is available. Warn if no locker was found.
-if installed xscreensaver; then
-    xscreensaver &
-elif installed xautolock; then
-    if installed "$screen_locker"; then
-        xautolock -secure -time "$screen_lock_time" -locker "$screen_locker" &
-    else
-        error "Locker '$screen_locker' not installed. Auto lock won't work!"
-    fi
-elif test -n "$screen_lock_force"; then
-    error "'xautolock' not found. Auto lock won't work!"
+
+# Start best available screen locker.
+xlockscreen=`"$HOME/.xlockscreen" start "$screen_lock_time" "$screen_locker"`
+if test $? -ne 0 && test -n "$screen_lock_force"; then
+    error "$xlockscreen"
 fi