add openbox-session for gdm, which will run ~/.config/openbox/autostart

diff --git a/Makefile.am b/Makefile.am
index dbf0407f436b278f672e6ecb32f22295aee89951..6cbf0cc0c9501c96ba1014689db43296f547caad 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,6 +32,7 @@ bin_PROGRAMS = \
        tools/gnome-panel-control/gnome-panel-control
 
 bin_SCRIPTS = \
+       data/xsession/openbox-session \
        data/xsession/openbox-gnome-session \
        data/xsession/openbox-kde-session
 
@@ -383,6 +384,14 @@ data/xsession/openbox-kde-session: \
        @$(edit) $< >$@
        @chmod a+x $@
 
+data/xsession/openbox-session: \
+               $(srcdir)/data/xsession/openbox-session.in
+       @echo make: creating $@
+       @mkdir data 2>/dev/null || true
+       @mkdir data/xsession 2>/dev/null || true
+       @$(edit) $< >$@
+       @chmod a+x $@
+
 doc/openbox.1.in: $(srcdir)/doc/openbox.1.sgml
        @echo make: creating $@
        @mkdir doc 2>/dev/null || true
@@ -425,6 +434,7 @@ dist_noinst_DATA = \
        data/rc.xsd \
        data/menu.xsd \
        data/themerc.xsd \
+       data/xsession/openbox-session.in \
        data/xsession/openbox-gnome-session.in \
        data/xsession/openbox-kde-session.in \
        render/obrender-3.0.pc.in \

diff --git a/data/xsession/openbox-session.in b/data/xsession/openbox-session.in
new file mode 100644 (file)
index 0000000..e76d320
--- /dev/null
+++ b/data/xsession/openbox-session.in
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+AUTOSTART="$HOME/.config/openbox/autostart"
+
+if test -e $AUTOSTART; then
+    # sleep for 1 second so Openbox is there before anything else
+    (sleep 1 && . $AUTOSTART) &
+fi
+
+exec @bindir@/openbox "$@"

diff --git a/data/xsession/openbox.desktop b/data/xsession/openbox.desktop
index 77de117a9d4d85bd2a8e5655186861404f369033..b162f09eef43bb5d0e9869aa3ac9e9dcae53e50b 100644 (file)
--- a/data/xsession/openbox.desktop
+++ b/data/xsession/openbox.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Openbox
 Comment=Log in using the Openbox window manager (without a session manager)
-Exec=openbox
-TryExec=openbox
+Exec=openbox-session
+TryExec=openbox-session
 Icon=openbox.png
 Type=XSession

diff --git a/doc/openbox.1.in b/doc/openbox.1.in
index ebf256bd015ec20942aae2776e8fe54de4cc097c..1e6f2feb1f1558ec2b5ed9ff8a1f1cb2f909139f 100644 (file)
--- a/doc/openbox.1.in
+++ b/doc/openbox.1.in
@@ -45,16 +45,9 @@ is possible by editing the configuration files by hand. Please note that
 for you. 
 .PP 
 The default configuration files are installed in 
-@configdir@/openbox/, and the user configuration is placed in 
-~/.config/openbox/. You can copy the default configuration 
+@configdir@/openbox/rc.xml, and the user configuration is placed in 
+~/.config/openbox/rc.xml. You can copy the default configuration 
 to ~/.config/openbox and edit it to your liking. 
-.PP 
-There are 3 default configuration files, \fBrc.xml\fP, 
-\fBrc-gnome.xml\fP, and \fBrc-kde.xml\fP. The 
-rc-gnome.xml is used when you run 
-\fBopenbox-gnome-session\fR and the rc-kde.xml is used when 
-you run \fBopenbox-kde-session\fR. The configuration 
-files should be named the same in ~/.config/openbox/. 
 .SH "OPTIONS" 
 .PP 
 These are the possible options that \fBopenbox\fR accepts: 
@@ -89,4 +82,4 @@ The program's full documentation is available on the website:
 .PP 
 Please report bugs to: \fBhttp://bugzilla.icculus.org/ 
 \fP 
-.\" created by instant / docbook-to-man, Sun 13 May 2007, 20:34 
+.\" created by instant / docbook-to-man, Mon 14 May 2007, 17:39