X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xinitrc;h=d242454b22d14415e0492b9013a73021ab88a542;hb=ea1ac11f5006206de7fd25ec3c196285c03d776e;hp=8a634ff61779c4efb1168ea2ab96662cbf4b3a81;hpb=3f98331da3bc878b7a26cdd6273a584429bca078;p=config%2Fdotfiles.git

diff --git a/xinitrc b/xinitrc
index 8a634ff..d242454 100755
--- a/xinitrc
+++ b/xinitrc
@@ -21,15 +21,42 @@
 # Some systems don't set the LANG environment variable when starting xinitrc,
 # this causes problems for rxvt-unicode-256color which fails to display UTF-8
 # characters correctly when LANG is missing and for notify.py which also needs
-# LANG set (for Python's decode() function). Therefore set it here, might be
-# overwritten by shell setup scripts.
-LANG=en_US.UTF-8
-export LANG
+# LANG set (for Python's decode() function). Therefore load my general shell
+# environment which also includes $LANG.
+if test -f "$HOME/.shell/env"; then
+    # Debug function used in ~/.shell/env.
+    source_debug() {
+        # Do nothing.
+        :
+    }
+
+    . "$HOME/.shell/env"
+fi
 
 
 installed() {
     type "$1" >/dev/null 2>&1
 }
+# Save PID of the most recently started background process. Used to terminate
+# them when logging out to prevent unused background processes. On some
+# systems this is only necessary for some programs (like ssh-agent), haven't
+# yet figured out why.
+save_background_pid() {
+    background_pids="$background_pids $!"
+}
+background_pids=
+
+
+# Options, can be modified in ~/.xinitrc.local. To disable a boolean option
+# set it to an empty value.
+#
+# Default to use a background image.
+set_background=yes
+
+# Load settings for the local system.
+if test -f "$HOME/.xinitrc.local"; then
+    . "$HOME/.xinitrc.local"
+fi
 
 
 # Start ssh-agent if we have private keys, thanks to
@@ -51,14 +78,6 @@ fi
 # Use my X11 key bindings.
 xmodmap "$HOME/.xmodmaprc"
 
-# Default to use a background image. Can be disabled in .xinitrc.local.
-set_background=yes
-
-# Load settings for the local system.
-if test -f "$HOME/.xinitrc.local"; then
-    . "$HOME/.xinitrc.local"
-fi
-
 # Change the background if available.
 if test -f "$HOME/.background" && test -n "$set_background"; then
     if installed hsetroot; then
@@ -75,6 +94,7 @@ fi
 # Display timed reminders and recheck the file for changes every minute (-z1).
 if installed remind && test -f "$HOME/.reminders"; then
     remind -z1 -k'.shell/bin/notify.py %s &' "$HOME/.reminders" &
+    save_background_pid
 fi
 
 # Set color temperature of display according to time of day.
@@ -88,3 +108,13 @@ fi
 
 # Start window manager.
 xmonad
+
+# Cleanup.
+#
+# Kill ssh-agent to prevent unused background processes.
+if test -x /usr/bin/ssh-agent; then
+    /usr/bin/ssh-agent -k >/dev/null
+    # No `eval` necessary, we terminate anyway.
+fi
+# Kill remaining background processes.
+kill $background_pids