diff options
| -rw-r--r-- | startx.cmd | 3 | ||||
| -rw-r--r-- | startx.man | 7 | ||||
| -rw-r--r-- | xinit.c | 4 | ||||
| -rw-r--r-- | xinitrc.cmd | 3 |
4 files changed, 11 insertions, 6 deletions
@@ -1,5 +1,6 @@ /* OS/2 REXX */ /* $XFree86: xc/programs/xinit/startx.cmd,v 3.3 1996/10/17 15:23:47 dawes Exp $ + * $XdotOrg: xc/programs/xinit/startx.cmd,v 1.1.4.1.6.2 2004/04/02 21:47:36 eich Exp $ * * This is just a sample implementation of a slightly less primitive * interface than xinit. It looks for user xinitrc.cmd and xservrc.cmd @@ -15,7 +16,7 @@ ADDRESS CMD env = 'OS2ENVIRONMENT' x11root = VALUE('X11ROOT',,env) IF x11root = '' THEN DO - SAY "The environment variable X11ROOT is not set. XFree86/OS2 won't run without it." + SAY "The environment variable X11ROOT is not set. X/OS2 won't run without it." EXIT END @@ -1,4 +1,5 @@ .\" $Xorg: startx.man,v 1.4 2001/02/09 02:05:49 xorgcvs Exp $ +.\" $XdotOrg: xc/programs/xinit/startx.man,v 1.1.4.1.6.2 2004/04/02 21:47:36 eich Exp $ .\" Copyright 1993, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -58,9 +59,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 XFree86 (1) +.IR __XSERVERNAME__ (1) server and specified in the -.IR XF86Config (__filemansuffix__) +.IR __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 @@ -186,4 +187,4 @@ file. .SH "SEE ALSO" .IR xinit (1), .IR Xserver (1), -.IR XFree86 (1) +.IR __XSERVERNAME__ (1) @@ -26,7 +26,6 @@ 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 $ */ - #include <X11/Xlib.h> #include <X11/Xos.h> #include <stdio.h> @@ -123,6 +122,9 @@ char *server_names[] = { #ifdef XFREE86 "XFree86 XFree86 displays", #endif +#ifdef XORG + "Xorg X.Org displays", +#endif #ifdef __DARWIN__ "XDarwin Darwin/Mac OS X IOKit displays", "XDarwinQuartz Mac OS X Quartz displays", diff --git a/xinitrc.cmd b/xinitrc.cmd index a4502b8..50ddd39 100644 --- a/xinitrc.cmd +++ b/xinitrc.cmd @@ -1,10 +1,11 @@ /* OS/2 REXX */ /* $XFree86: xc/programs/xinit/xinitrc.cmd,v 3.5 1997/01/27 08:26:14 dawes Exp $ */ +/* $XdotOrg: xc/programs/xinit/xinitrc.cmd,v 1.1.4.1.6.2 2004/04/02 21:47:36 eich Exp $ */ '@echo off' env = 'OS2ENVIRONMENT' x11root = VALUE('X11ROOT',,env) IF x11root = '' THEN DO - SAY "The environment variable X11ROOT is not set. XFree86/OS2 won't run without it." + SAY "The environment variable X11ROOT is not set. X/OS2 won't run without it." EXIT END home = VALUE('HOME',,env) |