user/xinit: pull in, take, bump, fix, rewrite rcs

1 files changed, 55 insertions, 0 deletions

diff --git a/user/xinit/Xsession b/user/xinit/Xsession
new file mode 100644
index 000000000..6b9403fd4
--- /dev/null
+++ b/user/xinit/Xsession
@@ -0,0 +1,55 @@
+#!/bin/sh
+#
+# X session wrapper
+
+echo "Running X session wrapper"
+
+# Load profile
+for file in /etc/profile "$HOME/.profile" /etc/xprofile "$HOME/.xprofile"; do
+	if [ -f "$file" ]; then
+		echo "Loading profile from $file";
+		. "$file"
+	fi
+done
+
+# Load resources
+for file in /etc/X11/Xresources "$HOME/.Xresources"; do
+	if [ -f "$file" ]; then
+		echo "Loading resource: $file"
+		xrdb -nocpp -merge "$file"
+	fi
+done
+
+# Load keymaps
+use_xkbmap=false
+for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
+	if [ -f "$file" ]; then
+		echo "Loading keymap: $file"
+		setxkbmap `cat "$file"` && use_xkbmap=true
+	fi
+done
+
+# Load xmodmap if not using XKB
+if ! $use_xkbmap; then
+	for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
+		if [ -f "$file" ]; then
+		   echo "Loading modmap: $file"
+		   xmodmap "$file"
+		fi
+	done
+fi
+
+# Run all system xinitrc shell scripts.
+xinitdir="/etc/X11/xinit/xinitrc.d"
+if [ -d "$xinitdir" ]; then
+	for script in $xinitdir/*; do
+		echo "Loading xinit script $script"
+		if [ -x "$script" -a ! -d "$script" ]; then
+			. "$script"
+		fi
+	done
+fi
+
+echo "X session wrapper complete, running session $@"
+
+exec $@