summaryrefslogtreecommitdiffstats
path: root/desktop/echinus/xinitrc.echinus
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/echinus/xinitrc.echinus')
-rw-r--r--desktop/echinus/xinitrc.echinus30
1 files changed, 30 insertions, 0 deletions
diff --git a/desktop/echinus/xinitrc.echinus b/desktop/echinus/xinitrc.echinus
new file mode 100644
index 0000000000..7827671dbb
--- /dev/null
+++ b/desktop/echinus/xinitrc.echinus
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+if [ -f $sysresources ]; then
+ xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+ xmodmap $sysmodmap
+fi
+
+if [ -f $userresources ]; then
+ xrdb -merge $userresources
+fi
+
+if [ -f $usermodmap ]; then
+ xmodmap $usermodmap
+fi
+
+# Start the window manager:
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+ exec ck-launch-session dbus-launch --exit-with-session /usr/bin/echinus
+else
+ exec dbus-launch --exit-with-session /usr/bin/echinus
+fi