From bcc31faf7ecd8b0ad3b66a75fc72145e93e6c35a Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Wed, 17 Feb 2010 16:11:36 -0500
Subject: revamp the autostart functionality, so autostart apps launch after
 openbox.

add /usr/libexec/openbox-autostart which runs the global/user scripts and
  launches /usr/libexec/openbox-xdg-autostart (which runs .desktop autostart
  stuff)

make openbox-session call openbox with --startup option, to make openbox launch
  /usr/libexec/openbox-autostart *after* it is initialized.

add /etc/xdg/openbox/environment and ~/.config/openbox/environment files to let
  user change environment variables (locale) for their Openbox session, which
  openbox-session loads before running openbox.
---
 data/xsession/openbox-session.in | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'data/xsession/openbox-session.in')

diff --git a/data/xsession/openbox-session.in b/data/xsession/openbox-session.in
index fa1bb996..3cf3571f 100644
--- a/data/xsession/openbox-session.in
+++ b/data/xsession/openbox-session.in
@@ -12,15 +12,11 @@ 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"
+# Set up the environment
+A="@configdir@/openbox/environment"
+test -r $A && . $A
+A="${XDG_CONFIG_HOME:-"$HOME/.config"}/openbox/environment"
+test -r $A && . $A
 
-if test -r $AUTOSTART; then
-    . $AUTOSTART
-else
-    if test -r $GLOBALAUTOSTART; then
-        . $GLOBALAUTOSTART
-    fi
-fi
-
-exec @bindir@/openbox "$@"
+# Run Openbox, and have it run the autostart stuff
+exec @bindir@/openbox --startup "@libexecdir@/openbox-autostart OPENBOX" "$@"
-- 
cgit v1.2.3