Merge remote-tracking branch 'origin/master' into obsd

5 files changed, 8 insertions, 45 deletions

diff --git a/Makefile.am b/Makefile.am
index 2a648bb..507630a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,7 +61,7 @@ CPP_FILES_FLAGS = \
 xinitrc_DATA = xinitrc
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = xinitrc startx $(launchagents_DATA)
+CLEANFILES = xinitrc startx
 
 EXTRA_DIST = xinitrc.cpp startx.cpp \
 		autogen.sh
diff --git a/configure.ac b/configure.ac
index 1da01d6..5dd8a51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure.
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([xinit], [1.3.3],
+AC_INIT([xinit], [1.3.4],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xinit])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
@@ -202,13 +202,8 @@ case $host_os in
     *solaris*)
 	SHELL_CMD="/bin/ksh"
 	;;
-    *sco*)
-	SHELL_CMD="/bin/ksh"
-	SCOMAN=1
-	;;
 esac
 AC_SUBST(SHELL_CMD)
-AC_SUBST(SCOMAN)
 AC_SUBST(XSERVERNAME)
 AC_SUBST(XCONFIGFILE)
 AC_SUBST(XCONFIGFILEMAN)
diff --git a/man/Makefile.am b/man/Makefile.am
index b24faca..9c6569f 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -13,7 +13,6 @@ MAN_SUBSTS+=	-e 's|__XSERVERNAME__|$(XSERVERNAME)|g' \
 		-e 's|__xinitdir__|$(XINITDIR)|g' \
 		-e 's|__bindir__|$(bindir)|g' \
 		-e 's|__libdir__|$(libdir)|g' \
-		-e 's|__SCOMAN__|$(SCOMAN)|g' \
 		-e 's|__configdir__|$(XINITDIR)|g'
 
 
diff --git a/man/startx.man b/man/startx.man
index 0405be0..4728a25 100644
--- a/man/startx.man
+++ b/man/startx.man
@@ -74,7 +74,6 @@ startx -- -dpi 100
 .PP
 startx -- -layout Multihead
 .RE
-.if '__SCOMAN__'' .ig
 .PP
 To determine the client to run,
 .B startx
@@ -90,20 +89,6 @@ looks for the following files, in order:
 .I __xinitdir__/xinitrc
 .RE
 .PP
-..
-.if !'x.__SCOMAN__'x.' .ig
-.PP
-To determine the client to run,
-.B startx
-first looks for a file called
-.I .xinitrc
-in the user's home directory.  If that is not found, it uses
-the file
-.I xinitrc
-in the
-.I xinit
-library directory.
-..
 If command line client options are given, they override this
 behavior and revert to the
 .BR xinit (__appmansuffix__)
@@ -187,17 +172,6 @@ and
 .IR Xsecurity (__miscmansuffix__)
 manual pages for more information on X client/server authentication.
 .SH FILES
-.if '__SCOMAN__'' .ig
-.TP 25
-.I $(HOME)/.startxrc
-Client to run.  Typically a shell script which runs many programs in
-the background.
-.TP 25
-.I __libdir__/sys.startxrc
-Client to use if the user has no
-.I .startxrc
-file.
-..
 .TP 25
 .I $(HOME)/.xinitrc
 Client to run.  Typically a shell script which runs many programs in
diff --git a/startx.cpp b/startx.cpp
index 1c6fce0..2a10283 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -56,7 +56,7 @@ defaultclient=XTERM
 defaultserver=XSERVER
 defaultclientargs=""
 defaultserverargs=""
-defaultdisplay=":0"
+defaultdisplay=""
 clientargs=""
 serverargs=""
 vtarg=""
@@ -120,7 +120,7 @@ enable_xauth=1
 XCOMM Automatically determine an unused $DISPLAY
 d=0
 while true ; do
-    [ -e /tmp/.X$d-lock ] || break
+    [ -e "/tmp/.X$d-lock" -o -S "/tmp/.X11-unix/X$d" ] || break
     d=$(($d + 1))
 done
 defaultdisplay=":$d"
@@ -193,9 +193,9 @@ if [ x"$server" = x ]; then
     XCOMM the startx session being seen as inactive:
     XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491"
     tty=$(tty)
-    if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then
+    if expr "$tty" : '/dev/tty[0-9][0-9]*$' > /dev/null; then
         tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
-        vtarg="vt$tty_num"
+        vtarg="vt$tty_num -keeptty"
     fi
 #endif
 
@@ -217,7 +217,7 @@ fi
 XCOMM if no vt is specified add vtarg (which may be empty)
 have_vtarg="no"
 for i in $serverargs; do
-    if expr match "$i" '^vt[0-9]\+$' > /dev/null; then
+    if expr "$i" : 'vt[0-9][0-9]*$' > /dev/null; then
         have_vtarg="yes"
     fi
 done
@@ -283,7 +283,7 @@ EOF
 
     XCOMM now add the same credentials to the client authority file
     XCOMM if '$displayname' already exists do not overwrite it as another
-    XCOMM server man need it. Add them to the '$xserverauthfile' instead.
+    XCOMM server may need it. Add them to the '$xserverauthfile' instead.
     for displayname in $authdisplay $hostname$authdisplay; do
         authcookie=`XAUTH list "$displayname" @@
         | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
@@ -326,11 +326,6 @@ if command -v deallocvt > /dev/null 2>&1; then
 fi
 #endif
 
-#ifdef macII
-Xrepair
-screenrestore
-#endif
-
 #if defined(sun)
 kbd_mode -a
 #endif