Merge remote branch 'origin/master' into obsd

Conflicts:
	xinit.c
	xinitrc.cpp

10 files changed, 73 insertions, 125 deletions

diff --git a/Makefile.am b/Makefile.am
index 76ee2c3..3b76f88 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,8 @@ XINITDIR = $(datadir)/X11/xinit
 bin_PROGRAMS = xinit
 bin_SCRIPTS = startx
 
-AM_CFLAGS = $(XINIT_CFLAGS) -DXINITDIR=\"$(XINITDIR)\" -DBINDIR=\"$(bindir)\"
+AM_CFLAGS = $(CWARNFLAGS) $(XINIT_CFLAGS)
+AM_CPPFLAGS = -DXINITDIR=\"$(XINITDIR)\" -DBINDIR=\"$(bindir)\"
 xinit_LDADD = $(XINIT_LIBS)
 
 xinit_SOURCES =	\
diff --git a/configure.ac b/configure.ac
index 20ddb10..f7ef5cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,9 +25,9 @@ AC_INIT(xinit,[1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
 
 AM_CONFIG_HEADER(config.h)
 
@@ -45,7 +45,7 @@ AC_CHECK_FUNCS([killpg])
 
 m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
 
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
 
 # Build options
 DEFAULT_XRDB=xrdb
@@ -155,7 +155,6 @@ case $host_os in
         ;;
 esac
 
-XINIT_CFLAGS="$CWARNFLAGS $XINIT_CFLAGS"
 AC_SUBST(XINIT_CFLAGS)
 AC_SUBST(XINIT_LIBS)
 
@@ -205,13 +204,5 @@ AC_SUBST(XINIT)
 AC_SUBST(WM)
 AC_SUBST(XCONSOLE)
 
-# Defines which X servers are listed in help output in xinit.c
-# Cheat, lie, and assume all the world is Xorg for now
-AC_DEFINE(XORG, 1, [Define if you have Xorg X server])
-
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
 AC_OUTPUT([Makefile])
 AC_OUTPUT([privileged_startx/Makefile])
diff --git a/cpprules.in b/cpprules.in
index f32eafc..c04855b 100644
--- a/cpprules.in
+++ b/cpprules.in
@@ -31,7 +31,7 @@ MANDEFS =  \
 SUFFIXES = .$(APP_MAN_SUFFIX) .man .cpp
 
 .cpp:
-	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
 
 .man.$(APP_MAN_SUFFIX):
-	$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
diff --git a/startx.cmd b/startx.cmd
index cd37ecb..950ab9d 100644
--- a/startx.cmd
+++ b/startx.cmd
@@ -1,6 +1,5 @@
 /* OS/2 REXX */
-/* $XFree86: xc/programs/xinit/startx.cmd,v 3.3 1996/10/17 15:23:47 dawes Exp $
- * 
+/*
  * This is just a sample implementation of a slightly less primitive 
  * interface than xinit.  It looks for user xinitrc.cmd and xservrc.cmd
  * files, then system xinitrc.cmd and xservrc.cmd files, else lets xinit choose
diff --git a/startx.cpp b/startx.cpp
index 664f120..443d63b 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -1,6 +1,5 @@
 XCOMM!SHELL_CMD
 
-XCOMM $Xorg: startx.cpp,v 1.3 2000/08/17 19:54:29 cpqbld Exp $
 XCOMM
 XCOMM This is just a sample implementation of a slightly less primitive
 XCOMM interface than xinit.  It looks for user .xinitrc and .xserverrc
@@ -11,7 +10,6 @@ XCOMM and pop a clock and serveral xterms.
 XCOMM
 XCOMM Site administrators are STRONGLY urged to write nicer versions.
 XCOMM
-XCOMM $XFree86: xc/programs/xinit/startx.cpp,v 3.16tsi Exp $
 
 unset DBUS_SESSION_BUS_ADDRESS
 unset SESSION_MANAGER
diff --git a/startx.man b/startx.man
index 33e731c..e730272 100644
--- a/startx.man
+++ b/startx.man
@@ -1,5 +1,4 @@
-.\" $Xorg: startx.man,v 1.4 2001/02/09 02:05:49 xorgcvs Exp $
-.\" $XdotOrg$
+.\"
 .\" Copyright 1993, 1998  The Open Group
 .\" 
 .\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -24,9 +23,8 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xinit/startx.man,v 1.7 2001/04/19 15:08:32 dawes Exp $
 .\"
-.TH STARTX 1 __xorgversion__
+.TH STARTX __appmansuffix__ __xorgversion__
 .SH NAME
 startx \- initialize an X session
 .SH SYNOPSIS
@@ -45,14 +43,16 @@ startx \- initialize an X session
 .I options
 \&.\|.\|. ]
 .SH DESCRIPTION
-The \fIstartx\fP script is a front end to \fIxinit\fP that provides a
+The \fBstartx\fP script is a front end to
+.BR xinit (__appmansuffix__)
+that provides a
 somewhat nicer user interface for running a single session of the X
 Window System.  It is often run with no arguments.
 .PP
 Arguments immediately following the
 .I startx
 command are used to start a client in the same manner as
-.IR xinit (1).
+.BR xinit (__appmansuffix__).
 The special argument
 .RB '--'
 marks the end of client arguments and the beginning of server options.
@@ -61,9 +61,9 @@ per-session basis the
 default color depth, the server's notion of the number of dots-per-inch the
 display device presents, or take advantage of a different server layout, as
 permitted by the
-.IR __XSERVERNAME__ (1)
+.BR __XSERVERNAME__ (__appmansuffix__)
 server and specified in the
-.IR __XCONFIGFILE__ (__filemansuffix__)
+.BR __XCONFIGFILE__ (__filemansuffix__)
 file.  Some examples of specifying server arguments follow; consult the
 manual page for your X server to determine which arguments are legal.
 .RS
@@ -77,7 +77,7 @@ startx -- -layout Multihead
 #ifdef __SCOMAN__
 .PP
 To determine the client to run,
-.I startx
+.B startx
 looks for the following files, in order:
 .RS
 .PP
@@ -93,7 +93,7 @@ looks for the following files, in order:
 #else
 .PP
 To determine the client to run,
-.I startx
+.B startx
 first looks for a file called
 .I .xinitrc
 in the user's home directory.  If that is not found, it uses
@@ -105,10 +105,10 @@ library directory.
 #endif
 If command line client options are given, they override this
 behavior and revert to the
-.IR xinit (1)
+.BR xinit (__appmansuffix__)
 behavior.
 To determine the server to run,
-.I startx
+.B startx
 first looks for a file called
 .I .xserverrc
 in the user's home directory.  If that is not found, it uses
@@ -119,12 +119,12 @@ in the
 library directory.
 If command line server options are given, they override this
 behavior and revert to the
-.IR xinit (1)
+.BR xinit (__appmansuffix__)
 behavior.  Users rarely need to provide a
 .I .xserverrc
 file.
 See the
-.IR xinit (1)
+.BR xinit (__appmansuffix__)
 manual page for more details on the arguments.
 .PP
 The system-wide
@@ -139,7 +139,7 @@ The
 .I .xinitrc
 is typically a shell script which starts many clients according to the
 user's preference.  When this shell script exits,
-.I startx
+.B startx
 kills the server and performs any other session shutdown needed.
 Most of the clients started by
 .I .xinitrc
@@ -181,7 +181,7 @@ This is to prevent the X server, if not given the
 .I \-auth
 argument, from automatically setting up insecure host-based authentication
 for the local host.  See the
-.IR Xserver (1)
+.BR Xserver (__appmansuffix__)
 and
 .IR Xsecurity (__miscmansuffix__)
 manual pages for more information on X client/server authentication.
@@ -216,6 +216,6 @@ Server to run if the user has no
 .I .xserverrc
 file.
 .SH "SEE ALSO"
-.IR xinit (1),
-.IR Xserver (1),
-.IR __XSERVERNAME__ (1)
+.BR xinit (__appmansuffix__),
+.BR Xserver (__appmansuffix__),
+.BR __XSERVERNAME__ (__appmansuffix__)
diff --git a/xinit.c b/xinit.c
index bc4d734..6d354eb 100644
--- a/xinit.c
+++ b/xinit.c
@@ -1,7 +1,3 @@
-/* $Xorg: xinit.c,v 1.5 2001/02/09 02:05:49 xorgcvs Exp $ */
-/* $XdotOrg: xc/programs/xinit/xinit.c,v 1.4 2005/10/04 01:27:34 ajax Exp $ */
-/* $OpenBSD: xinit.c,v 1.5 2008/04/20 13:46:02 matthieu Exp $ */
-
 /*
 
 Copyright 1986, 1998  The Open Group
@@ -27,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/programs/xinit/xinit.c,v 3.32 2002/05/31 18:46:13 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -103,12 +98,6 @@ char **newenvironlast = NULL;
 # endif
 #endif
 
-/* A/UX setpgid incorrectly removes the controlling terminal.
-   Per Posix, only setsid should do that. */
-#ifdef macII
-#define setpgid setpgrp
-#endif
-
 #ifdef __UNIXOS2__
 #define HAS_EXECVPE
 #endif
@@ -121,36 +110,21 @@ char **newenvironlast = NULL;
 
 const char *bindir = BINDIR;
 const char * const server_names[] = {
-#if defined(ultrix) && defined(mips)
-    "Xdec        Digital color display on DECstation",
-#endif
-#if defined(sun) && !defined(XORG)	/* Sun */
-    "Xsun        Sun BW2, CG2, CG3, CG4, or CG6 on Sun 2, 3, 4, or 386i",
-    "Xsunmono    Sun BW2 on Sun 2, 3, 4, or 386i ",
-    "Xsun24      Sun BW2, CG2, CG3, CG4, CG6, or CG8 on Sun 4",
-#endif
-#ifdef hpux				/* HP */
-    "Xhp         HP monochrome and colors displays on 9000/300 series",
-#endif
-#ifdef ibm				/* IBM */
-    "Xibm        IBM AED, APA, 8514a, megapel, VGA displays on PC/RT",
-#endif
-#ifdef macII				/* MacII */
-    "XmacII      Apple monochrome display on Macintosh II",
-#endif
-#ifdef XFREE86
-    "XFree86     XFree86 displays",
-#endif
-#ifdef XORG
-    "Xorg        Common X server for most displays",
-#endif
 #ifdef __APPLE__
     "Xquartz     Mac OSX Quartz displays.",
+#else
+# ifdef __CYGWIN__
+    "XWin        X Server for the Cygwin environment on Microsoft Windows",
+# else
+    "Xorg        Common X server for most displays",
+# endif
 #endif
     "Xvfb        Virtual frame buffer",
     "Xfake       kdrive-based virtual frame buffer",
     "Xnest       X server nested in a window on another X server",
     "Xephyr      kdrive-based nested X server",
+    "Xvnc        X server accessed over VNC's RFB protocol",
+    "Xdmx        Distributed Multi-head X server",
     NULL};
 
 #ifndef XINITRC
@@ -299,15 +273,6 @@ main(int argc, char *argv[], char *envp[])
 #endif
 		for (ptr = default_client; *ptr; )
 			*cptr++ = *ptr++;
-#ifdef sun
-		/* 
-		 * If running on a sun, and if WINDOW_PARENT isn't defined, 
-		 * that means SunWindows isn't running, so we should pass 
-		 * the -C flag to xterm so that it sets up a console.
-		 */
-		if ( getenv("WINDOW_PARENT") == NULL )
-		    *cptr++ = "-C";
-#endif /* sun */
 	} else {
 		client_given = 1;
 	}
diff --git a/xinit.man b/xinit.man
index a60187a..538f926 100644
--- a/xinit.man
+++ b/xinit.man
@@ -1,15 +1,15 @@
-.\" $Xorg: xinit.man,v 1.4 2001/02/09 02:05:49 xorgcvs Exp $
+.\"
 .\" Copyright 1988, 1998  The Open Group
-.\" 
+.\"
 .\" Permission to use, copy, modify, distribute, and sell this software and its
 .\" documentation for any purpose is hereby granted without fee, provided that
 .\" the above copyright notice appear in all copies and that both that
 .\" copyright notice and this permission notice appear in supporting
 .\" documentation.
-.\" 
+.\"
 .\" The above copyright notice and this permission notice shall be included
 .\" in all copies or substantial portions of the Software.
-.\" 
+.\"
 .\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 .\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 .\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -17,15 +17,13 @@
 .\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 .\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 .\" OTHER DEALINGS IN THE SOFTWARE.
-.\" 
+.\"
 .\" Except as contained in this notice, the name of The Open Group shall
 .\" not be used in advertising or otherwise to promote the sale, use or
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
-.\" 
-.\" $XFree86: xc/programs/xinit/xinit.man,v 3.9 2001/02/07 23:25:56 dawes Exp $
-.\" 
-.TH XINIT 1 __xorgversion__
+.\"
+.TH XINIT __appmansuffix__ __xorgversion__
 .SH NAME
 xinit \- X Window System initializer
 .SH SYNOPSIS
@@ -44,33 +42,32 @@ xinit \- X Window System initializer
 .I options
 \&.\|.\|. ]
 .SH DESCRIPTION
-The \fIxinit\fP program is used to start the X Window System server and a first
-client program on systems that
-cannot start X directly from \fI/etc/init\fP or in environments
-that use multiple window systems.  When this first client exits, 
-\fIxinit\fP will kill the X server and then terminate.
+The \fBxinit\fP program is used to start the X Window System server and a first
+client program on systems that are not using a display manager such as
+.BR xdm (__appmansuffix__)
+or in environments
+that use multiple window systems.  When this first client exits,
+\fBxinit\fP will kill the X server and then terminate.
 .PP
 If no specific client program is given on the command line,
-\fIxinit\fP will look for a file in the user's home directory
+\fBxinit\fP will look for a file in the user's home directory
 called \fI.xinitrc\fP to run as a shell script to start up client programs.
-If no such file exists, \fIxinit\fP will use the following as a default:
+If no such file exists, \fBxinit\fP will use the following as a default:
 .sp
 	xterm  \-geometry  +1+1  \-n  login  \-display  :0
 .sp
 .PP
 If no specific server program is given on the command line,
-\fIxinit\fP will look for a file in the user's home directory
+\fBxinit\fP will look for a file in the user's home directory
 called \fI.xserverrc\fP to run as a shell script to start up the server.
 If no such file exists, \fIxinit\fP will use the following as a default:
 .sp
 	X  :0
 .sp
 Note that this assumes that there is a program named \fIX\fP in the current
-search path.  However, servers are usually named \fIXdisplaytype\fP where 
-\fIdisplaytype\fP is the type of graphics display which is driven by this
-server.  The site administrator should, therefore, make a link to the 
+search path.  The site administrator should, therefore, make a link to the
 appropriate type of server on the machine, or create a shell script that
-runs \fIxinit\fP with the appropriate server.
+runs \fBxinit\fP with the appropriate server.
 .PP
 Note, when using a \fI.xserverrc\fP script be sure to ``exec'' the real X server.
 Failing to do this can make the X server slow to start and exit.  For example:
@@ -78,49 +75,49 @@ Failing to do this can make the X server slow to start and exit.  For example:
 	exec Xdisplaytype
 .PP
 An important point is that programs which are run by \fI\.xinitrc\fP
-should be run in the background if they do 
+should be run in the background if they do
 not exit right away, so that they don't prevent other programs from
 starting up.
 However, the last long-lived program started (usually
 a window manager or terminal emulator) should be
 left in the foreground so that the script won't exit (which
-indicates that the user is done and that \fIxinit\fP should exit).
+indicates that the user is done and that \fBxinit\fP should exit).
 .PP
 An alternate client and/or server may be specified on the
 command line.  The desired client program and its arguments should be given
-as the first command line arguments to \fIxinit\fP.  To specify a particular
-server command line, append a double dash (\-\^\-) to the \fIxinit\fP command
+as the first command line arguments to \fBxinit\fP.  To specify a particular
+server command line, append a double dash (\-\^\-) to the \fBxinit\fP command
 line (after any client and arguments) followed by the desired server command.
 .PP
 Both the client program name and the server program name must begin with a
 slash (/) or a period (.).  Otherwise, they are treated as an arguments to be
-appended to their respective startup lines.  This makes it possible to 
-add arguments (for example, foreground and background colors) without 
+appended to their respective startup lines.  This makes it possible to
+add arguments (for example, foreground and background colors) without
 having to retype the whole command line.
 .PP
 If an explicit server name is not given and the first argument following the
-double dash (\-\^\-) is a colon followed by a digit, \fIxinit\fP will use that 
-number as the display 
-number instead of zero.  All remaining arguments are appended to the server 
+double dash (\-\^\-) is a colon followed by a digit, \fBxinit\fP will use that
+number as the display
+number instead of zero.  All remaining arguments are appended to the server
 command line.
 .PP
 .SH EXAMPLES
-Below are several examples of how command line arguments in \fIxinit\fP are
+Below are several examples of how command line arguments in \fBxinit\fP are
 used.
 .TP 8
 .B "xinit"
 This will start up a server named \fIX\fP and run the user's \fI\.xinitrc\fP,
 if it exists, or else start an \fIxterm\fP.
 .TP 8
-.B "xinit \-\^\- /usr/local/bin/Xqdss  :1"
+.B "xinit \-\^\- /usr/local/bin/Xvnc  :1"
 This is how one could start a specific type of server on an alternate display.
 .TP 8
 .B "xinit \-geometry =80x65+10+10 \-fn 8x13 \-j \-fg white \-bg navy"
 This will start up a server named \fIX\fP, and will append the given
 arguments to the default \fIxterm\fP command.  It will ignore \fI\.xinitrc\fP.
 .TP 8
-.B "xinit \-e widgets \-\^\- ./Xsun \-l \-c"
-This will use the command \fI\.\/Xsun \-l \-c\fP to start the server and will
+.B "xinit \-e widgets \-\^\- ./Xorg \-l \-c"
+This will use the command \fI\.\/Xorg \-l \-c\fP to start the server and will
 append the arguments \fI\-e widgets\fP to the default \fIxterm\fP command.
 .TP 8
 .B "xinit /usr/ucb/rsh fasthost cpupig \-display ws:1 \-\^\-  :1 \-a 2 \-t 5"
@@ -156,7 +153,7 @@ a default \fI\.xinitrc\fP that references a site-wide startup file:
 .fi
 .in -8
 .sp
-Another approach is to write a script that starts \fIxinit\fP with a specific
+Another approach is to write a script that starts \fBxinit\fP with a specific
 shell script.  Such scripts are usually named \fIx11\fP, \fIxstart\fP, or
 \fIstartx\fP and are a convenient way to provide a simple interface for
 novice users:
@@ -176,7 +173,7 @@ connect.
 .TP 15
 .B XINITRC
 This variable specifies an init file containing shell commands to start up the
-initial windows.  By default, \fI\.xinitrc\fP in the home directory will be 
+initial windows.  By default, \fI\.xinitrc\fP in the home directory will be
 used.
 .SH FILES
 .TP 15
@@ -192,9 +189,9 @@ default server script
 .I X
 server to run if \fI.xserverrc\fP does not exist
 .SH "SEE ALSO"
-.IR X (__miscmansuffix__),
-.IR startx (1),
-.IR Xserver (1),
-.IR xterm (1)
+.BR X (__miscmansuffix__),
+.BR startx (__appmansuffix__),
+.BR Xserver (__appmansuffix__),
+.BR xterm (__appmansuffix__)
 .SH AUTHOR
 Bob Scheifler, MIT Laboratory for Computer Science
diff --git a/xinitrc.cmd b/xinitrc.cmd
index f40a7b7..623a159 100644
--- a/xinitrc.cmd
+++ b/xinitrc.cmd
@@ -1,5 +1,4 @@
 /* OS/2 REXX */
-/* $XFree86: xc/programs/xinit/xinitrc.cmd,v 3.5 1997/01/27 08:26:14 dawes Exp $ */
 '@echo off'
 env = 'OS2ENVIRONMENT'
 x11root = VALUE('X11ROOT',,env)
diff --git a/xinitrc.cpp b/xinitrc.cpp
index d446f3c..0440518 100644
--- a/xinitrc.cpp
+++ b/xinitrc.cpp
@@ -1,6 +1,4 @@
 XCOMM!SHELL_CMD
-XCOMM $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
-XCOMM $OpenBSD: xinitrc.cpp,v 1.3 2008/04/20 13:46:02 matthieu Exp $
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap