From d190145b94d00efe8a52c01c1675c308baa335cc Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Thu, 9 Jun 2022 11:21:17 +0200 Subject: stop unsetting DBUS_SESSION_BUS_ADDRESS variable It's not necessary as we no longer support running startx from an existing X session. Fixes #9. Signed-off-by: Dominik Mierzejewski --- startx.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'startx.cpp') diff --git a/startx.cpp b/startx.cpp index d7daea4..7ed38db 100644 --- a/startx.cpp +++ b/startx.cpp @@ -11,7 +11,6 @@ XCOMM XCOMM Site administrators are STRONGLY urged to write nicer versions. XCOMM -unset DBUS_SESSION_BUS_ADDRESS unset SESSION_MANAGER #ifdef __APPLE__ -- cgit v1.2.3 From 4e66c0bf2b5751e113ad3aba79891608f7e883e2 Mon Sep 17 00:00:00 2001 From: Tim Egenton Date: Tue, 7 Dec 2021 09:15:18 -0500 Subject: startx: Source XINITRC and XSERVERRC variables Fix issue #14 Check XINITRC and XSERVERRC, if those files do not exist then just use ~/.xinitrc and ~/.xserverc as normal. Signed-off-by: Tim Egenton --- startx.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'startx.cpp') diff --git a/startx.cpp b/startx.cpp index 7ed38db..dfbebe1 100644 --- a/startx.cpp +++ b/startx.cpp @@ -2,11 +2,12 @@ XCOMM!SHELL_CMD XCOMM XCOMM This is just a sample implementation of a slightly less primitive -XCOMM interface than xinit. It looks for user .xinitrc and .xserverrc -XCOMM files, then system xinitrc and xserverrc files, else lets xinit choose -XCOMM its default. The system xinitrc should probably do things like check -XCOMM for .Xresources files and merge them in, start up a window manager, -XCOMM and pop a clock and several xterms. +XCOMM interface than xinit. It looks for XINITRC and XSERVERRC environment +XCOMM variables, then user .xinitrc and .xserverrc files, and then system +XCOMM xinitrc and xserverrc files, else lets xinit choose its default. +XCOMM The system xinitrc should probably do things like check for +XCOMM .Xresources files and merge them in, start up a window manager, and +XCOMM pop a clock and several xterms. XCOMM XCOMM Site administrators are STRONGLY urged to write nicer versions. XCOMM @@ -47,9 +48,11 @@ export PATH #endif userclientrc=$HOME/.xinitrc +[ -f "${XINITRC}" ] && userclientrc="${XINITRC}" sysclientrc=XINITDIR/xinitrc userserverrc=$HOME/.xserverrc +[ -f "${XSERVERRC}" ] && userclientrc="${XSERVERRC}" sysserverrc=XINITDIR/xserverrc defaultclient=XTERM defaultserver=XSERVER -- cgit v1.2.3