Merge branch 'master' of ustrat:git/staging/profile

[profile] / dot / xinitrc

diff --git a/dot/xinitrc b/dot/xinitrc
index 4f69187..9875cad 100755 (executable)
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -99,7 +99,10 @@ initialize () {
   run init xset m 2 1
 
   ## Key mappings.
-  xmodmap -e 'keysym BackSpace = BackSpace BackSpace'
+  xmodmap $HOME/.xmodmap
+  if [ -r $HOME/.xmodmap-local ]; then
+    xmodmap $HOME/.xmodmap-local
+  fi
 }
 
 ###--------------------------------------------------------------------------
@@ -151,8 +154,18 @@ start-window-manager () {
 start-clients-local () { :; }
 
 start-clients () {
+
   ## Gnome session.
-  case $vnc in no) run bginit gnome-session ;; esac
+  case "$vnc,$(gnome-session --version 2>&1)" in
+    no,gnome-session\ 2.3[2-9].* | \
+    no,gnome-session\ 2.4[0-9].* | \
+    no,gnome-session\ 2.[1-9][0-9][0-9]*)
+      run bginit gnome-session --session mdw
+      ;;
+    no,*)
+      run bginit gnome-session
+      ;;
+  esac
 
   ## Local clients.
   start-clients-local