X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xinitrc;h=858cbaa1320ab6500fa184f000bbfa10b2a65738;hb=3e05c1d4dda93e05aad2ef37900754f77c026d82;hp=b286dbc9615534d7489f780d006ceac1fd53807f;hpb=472e40aeca23a58e20bcc0fc787c9d98e1f4224a;p=config%2Fdotfiles.git

diff --git a/xinitrc b/xinitrc
index b286dbc..858cbaa 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
@@ -144,12 +144,37 @@ elif test -n "$screen_lock_force"; then
     error "'xautolock' not found. Auto lock won't work!"
 fi
 
+# Use compton to get transparent windows. See ~/.Xdefaults 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.