#!/bin/sh
-AUTOSTART="$HOME/.config/openbox/autostart.sh"
+if test -n "$1"; then
+ echo "Syntax: openbox-session"
+ echo
+ echo "See the openbox-session(1) manpage for help."
+ exit
+fi
+
+# Clean up after GDM
+xprop -root -remove _NET_NUMBER_OF_DESKTOPS \
+ -remove _NET_DESKTOP_NAMES \
+ -remove _NET_CURRENT_DESKTOP 2> /dev/null
+
+AUTOSTART="${XDG_CONFIG_HOME:-"$HOME/.config"}/openbox/autostart.sh"
GLOBALAUTOSTART="@configdir@/openbox/autostart.sh"
-if test -e $AUTOSTART; then
- # sleep for 1 second so Openbox is there before anything else
- (sleep 1 && . $AUTOSTART) &
+if test -r $AUTOSTART; then
+ . $AUTOSTART
else
- if test -e $GLOBALAUTOSTART; then
- # sleep for 1 second so Openbox is there before anything else
- (sleep 1 && . $GLOBALAUTOSTART) &
+ if test -r $GLOBALAUTOSTART; then
+ . $GLOBALAUTOSTART
fi
fi