X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xinitrc;h=c4dd1c207c902d4b8945f4440849e47fdde888e2;hb=6075dcef09a8871939dafbc29476bef2ed28c7a1;hp=d3b62b4cbd48d5d70ef8a54950fb3501818b659e;hpb=67bdeb0a3abdd2ebd51e68b5d157e26f90b84849;p=config%2Fdotfiles.git

diff --git a/xinitrc b/xinitrc
index d3b62b4..c4dd1c2 100755
--- a/xinitrc
+++ b/xinitrc
@@ -2,7 +2,7 @@
 
 # startx configuration file.
 
-# Copyright (C) 2011-2013  Simon Ruderich
+# Copyright (C) 2011-2014  Simon Ruderich
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -38,7 +38,12 @@ installed() {
     type "$1" >/dev/null 2>&1
 }
 error() {
-    xmessage "$@" &
+    if installed xmessage; then
+        xmessage "$@" &
+    else
+        # Log message to a file which is displayed by my Zsh setup on startup.
+        printf '%s\n' "$*" >>"$HOME/.xinitrc.errors"
+    fi
 }
 # Save PID of the most recently started background process. Used to terminate
 # them when logging out to prevent unused background processes. On some
@@ -55,6 +60,8 @@ background_pids=
 #
 # Default to use a background image.
 set_background=yes
+# Default to display a warning if `xautolock` is not available.
+screen_lock_force=yes
 # Lock screen after x minutes of inactivity, requires `xautolock` to be
 # installed.
 screen_lock_time=3
@@ -67,9 +74,11 @@ if test -f "$HOME/.xinitrc.local"; then
 fi
 
 
-# Start ssh-agent if we have private keys, thanks to
+# Start ssh-agent if no agent is running and we have private keys, thanks to
 # http://code.haskell.org/XMonadContrib/scripts/xinitrc (read on 2011-06-19).
-if test -x /usr/bin/ssh-agent && test -f "$HOME/.ssh/id_rsa"; then
+if test -z "$SSH_AGENT_PID" \
+        && test -x /usr/bin/ssh-agent \
+        && test -f "$HOME/.ssh/id_rsa"; then
     # -s to force bourne shell output. This file is a bourne shell script even
     # if the environment might suggest otherwise.
     eval `/usr/bin/ssh-agent -s` >/dev/null
@@ -83,8 +92,24 @@ if installed setxkbmap; then
     setxkbmap us
 fi
 
-# Use my X11 key bindings.
-xmodmap "$HOME/.xmodmaprc"
+# Use the Caps lock as Ctrl because it's easier to reach and very useful for
+# all programs. Caps lock is removed completely. Thanks to
+# http://snarfed.org/space/switch%20control%20and%20caps%20lock
+if xmodmap | grep -E '^lock.*Caps_Lock' >/dev/null; then
+    xmodmap -e 'remove Lock = Caps_Lock'
+    xmodmap -e 'remove Control = Control_L'
+    xmodmap -e 'keysym Caps_Lock = Control_L'
+    xmodmap -e 'add Control = Control_L'
+fi
+# Move grave and tilde next to left shift key. This setting may only be
+# necessary because of my German keyboard which I use with English settings.
+xmodmap -e 'keycode 94 = grave asciitilde'
+
+# Disable annoying audio bell. Thanks to Sebastian Rachuj.
+xset b off
+
+# Load settings for programs. Xdefaults is deprecated.
+xrdb ~/.Xresources
 
 # Change the background if available.
 if test -f "$HOME/.background" && test -n "$set_background"; then
@@ -118,14 +143,42 @@ if installed xautolock; then
     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!"
 fi
 
+# Use compton to get transparent windows. See ~/.Xresources for configuration
+# of urxvt.
+if installed compton; then
+    compton &
+fi
 
-# XMonad doesn't start a terminal emulator on its own, start one when I login.
+
+# My window managers doesn't start a terminal emulator on its own, start one
+# when I login.
 (urxvt || rxvt || xterm) &
 
 # Start window manager.
-xmonad
+failed=
+if installed herbstluftwm; then
+    herbstluftwm --locked >~/.config/herbstluftwm/log 2>&1 || failed=1
+elif installed xmonad; then
+    xmonad || failed=1
+elif installed stumpwm; then
+    stumpwm || failed=1
+else
+    failed='no window manager found'
+fi
+# Fallback in case my window manager failed to start. Otherwise X terminates
+# the session immediately (because xinitrc finishes).
+if test -n "$failed"; then
+    if test x"$failed" = x1; then
+        failed='failed to start window manager'
+    fi
+    error "$failed (spawning fallback terminal)"
+    urxvt || rxvt || xterm
+fi
+
 
 # Cleanup.
 #