summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 19:54:49 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 19:54:49 +0000
commit4118bc8579ac75620ea6cda2b16d3ebbe4f5b6af (patch)
tree4f7d27d3b1ab0b3357039a83a707a9ceaf6c670e
parent52279458e75907cb4d004e8be0c87f1c7b714159 (diff)
-rw-r--r--startx.cmd4
-rw-r--r--startx.cpp2
-rw-r--r--startx.man9
-rw-r--r--xinit.c5
-rw-r--r--xinit.def2
-rw-r--r--xinit.man2
-rw-r--r--xinitrc.cmd4
7 files changed, 16 insertions, 12 deletions
diff --git a/startx.cmd b/startx.cmd
index 4b4e712..cd37ecb 100644
--- a/startx.cmd
+++ b/startx.cmd
@@ -1,5 +1,5 @@
/* OS/2 REXX */
-/* $XFree86: xc/programs/xinit/startx.cmd,v 3.4 2003/11/12 00:10:31 dawes Exp $
+/* $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
@@ -15,7 +15,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
diff --git a/startx.cpp b/startx.cpp
index 6d9ef3a..5684cc0 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -11,7 +11,7 @@ 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.18 2003/08/22 19:27:33 eich Exp $
+XCOMM $XFree86: xc/programs/xinit/startx.cpp,v 3.16tsi Exp $
#ifdef SCO
diff --git a/startx.man b/startx.man
index 4b14a05..559c6d0 100644
--- a/startx.man
+++ b/startx.man
@@ -1,4 +1,5 @@
.\" $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
@@ -23,7 +24,7 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: xc/programs/xinit/startx.man,v 1.8 2001/12/14 20:01:56 dawes Exp $
+.\" $XFree86: xc/programs/xinit/startx.man,v 1.7 2001/04/19 15:08:32 dawes Exp $
.\"
.TH STARTX 1 __xorgversion__
.SH NAME
@@ -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)
diff --git a/xinit.c b/xinit.c
index 62cf248..fea283e 100644
--- a/xinit.c
+++ b/xinit.c
@@ -25,7 +25,7 @@ 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.33 2003/06/10 17:03:56 dawes Exp $ */
+/* $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>
@@ -123,6 +123,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/xinit.def b/xinit.def
index 0de8dd3..92c4176 100644
--- a/xinit.def
+++ b/xinit.def
@@ -1,4 +1,4 @@
NAME xinit NOTWINDOWCOMPAT
-DESCRIPTION "@#XFREE86:4.4.0#@ $XFree86: xc/programs/xinit/xinit.def,v 3.3 2004/01/14 17:32:40 dawes Exp $"
+DESCRIPTION "@#XFREE86:4.4.0#@ $XFree86: xc/programs/xinit/xinit.def,v 3.2 2002/05/31 18:46:13 dawes Exp $"
PROTMODE
EXETYPE OS2
diff --git a/xinit.man b/xinit.man
index ecf7353..2ff692c 100644
--- a/xinit.man
+++ b/xinit.man
@@ -23,7 +23,7 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: xc/programs/xinit/xinit.man,v 3.10 2001/12/14 20:01:56 dawes Exp $
+.\" $XFree86: xc/programs/xinit/xinit.man,v 3.9 2001/02/07 23:25:56 dawes Exp $
.\"
.TH XINIT 1 __xorgversion__
.SH NAME
diff --git a/xinitrc.cmd b/xinitrc.cmd
index 5a3a991..f40a7b7 100644
--- a/xinitrc.cmd
+++ b/xinitrc.cmd
@@ -1,10 +1,10 @@
/* OS/2 REXX */
-/* $XFree86: xc/programs/xinit/xinitrc.cmd,v 3.6 2003/11/12 00:10:31 dawes Exp $ */
+/* $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)
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)