[Xorg-commit] xc/programs/Xserver/hw/xwin InitOutput.c,1.1.4.1.2.3,1.1.4.1.2.4 XWin.man,1.1.4.1,1.1.4.1.2.1 XWin.rc,1.1.4.1,1.1.4.1.2.1 winshaddd.c,1.1.4.1.2.2,1.1.4.1.2.3 wintrayicon.c,1.1,1.1.6.1 winvideo.c,1.1.6.1,1.1.6.2 winwindow.h,1.1.4.1.2.1,1.1.4.1.2.2

[Harold L Hunt II]

Committed by: harold

Update of /cvs/xorg/xc/programs/Xserver/hw/xwin
In directory pdx:/tmp/cvs-serv23016

Modified Files:
      Tag: CYGWIN
	InitOutput.c XWin.man XWin.rc winshaddd.c wintrayicon.c 
	winvideo.c winwindow.h 
Log Message:
Rebrand Cygwin/XFree86 as Cygwin/X

Index: InitOutput.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/InitOutput.c,v
retrieving revision 1.1.4.1.2.3
retrieving revision 1.1.4.1.2.4
diff -u -d -r1.1.4.1.2.3 -r1.1.4.1.2.4
--- InitOutput.c	15 Dec 2003 22:54:14 -0000	1.1.4.1.2.3
+++ InitOutput.c	23 Dec 2003 06:32:43 -0000	1.1.4.1.2.4
@@ -315,7 +315,7 @@
 
   ErrorF ("-lesspointer\n"
 	  "\tHide the windows mouse pointer when it is over an inactive\n"
-          "\tXFree86 window.  This prevents ghost cursors appearing where\n"
+          "\tCygwin/X window.  This prevents ghost cursors appearing where\n"
 	  "\tthe Windows cursor is drawn overtop of the X cursor\n");
 
   ErrorF ("-nodecoration\n"

Index: XWin.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/XWin.man,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.1.2.1
diff -u -d -r1.1.4.1 -r1.1.4.1.2.1
--- XWin.man	26 Nov 2003 22:49:05 -0000	1.1.4.1
+++ XWin.man	23 Dec 2003 06:32:43 -0000	1.1.4.1.2.1
@@ -48,13 +48,13 @@
 .I screen_number.
 .TP 8
 .B \-nodecoration
-Draw the Cygwin/XFree86 window without a border or title bar.
+Draw the Cygwin/X window without a border or title bar.
 .TP 8
 .B \-rootless
-EXPERIMENTAL: Run Cygwin/XFree86 in pseduo-rootless mode.
+EXPERIMENTAL: Run Cygwin/X in pseduo-rootless mode.
 .TP 8
 .B \-lesspointer
-Hide the Windows mouse pointer when over an inactive XFree86 window
+Hide the Windows mouse pointer when over an inactive Cygwin/X window
 .TP 8
 .B \-scrollbars
 In windowed mode, allow screens bigger than the Windows desktop.
@@ -96,14 +96,14 @@
 - The display mode can not be changed once the X server has started.
 .PP
 .SH AUTHORS
-XFree86 was originally ported to Cygwin by Dakshinamurthy Karra,
+The X Window System was originally ported to Cygwin by Dakshinamurthy Karra,
 Dr. Peter Busch, John Fortin, and Suhaib Siddiqi.
 .I XWin
-is maintained by the Cygwin/XFree86 project, with hosting services
+is maintained by the Cygwin/X project, with hosting services
 provided by RedHat.
 .PP
 The following members, in alphabetical order by last name, of the
-Cygwin/XFree86 Team contributed to the XFree86 4.1.0 release:
+Cygwin/X Team contributed to the 4.1.0 release:
 .PP
 Robert Collins - Cygwin developer, miscellaneous
 .br

Index: XWin.rc
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/XWin.rc,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.1.2.1
diff -u -d -r1.1.4.1 -r1.1.4.1.2.1
--- XWin.rc	26 Nov 2003 22:49:05 -0000	1.1.4.1
+++ XWin.rc	23 Dec 2003 06:32:43 -0000	1.1.4.1.2.1
@@ -41,12 +41,12 @@
 DEPTH_CHANGE_BOX DIALOG DISCARDABLE	32, 32, 180, 100
 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER
 FONT 8, "MS Sans Serif"
-CAPTION "Cygwin/XFree86"
+CAPTION "Cygwin/X"
 BEGIN
   DEFPUSHBUTTON		"Dismiss", IDOK, 66, 80, 50, 14
-  CTEXT			"Cygwin/XFree86", IDC_STATIC, 40, 12, 100, 8
+  CTEXT			"Cygwin/X", IDC_STATIC, 40, 12, 100, 8
   CTEXT			"Disruptive screen configuration change.", IDC_STATIC, 7, 40, 166, 8
-  CTEXT			"Restore previous resolution to use Cygwin/XFree86.", IDC_STATIC, 7, 52, 166, 8
+  CTEXT			"Restore previous resolution to use Cygwin/X.", IDC_STATIC, 7, 52, 166, 8
 END
 
 
@@ -55,7 +55,7 @@
 EXIT_DIALOG DIALOG DISCARDABLE	32, 32, 180, 70
 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTER
 FONT 8, "MS Sans Serif"
-CAPTION "Cygwin/XFree86 - Exit?"
+CAPTION "Cygwin/X - Exit?"
 BEGIN
   PUSHBUTTON "E&xit", IDOK, 55, 48, 30, 14
   DEFPUSHBUTTON "&Cancel", IDCANCEL, 95, 48, 30, 14

Index: winshaddd.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winshaddd.c,v
retrieving revision 1.1.4.1.2.2
retrieving revision 1.1.4.1.2.3
diff -u -d -r1.1.4.1.2.2 -r1.1.4.1.2.3
--- winshaddd.c	9 Dec 2003 01:37:16 -0000	1.1.4.1.2.2
+++ winshaddd.c	23 Dec 2003 06:32:43 -0000	1.1.4.1.2.3
@@ -573,7 +573,7 @@
       ErrorF ("winShadowUpdateProcDD - Memory location of the shadow "
 	      "surface has changed, trying to update the root window "
 	      "pixmap header to point to the new address.  If you get "
-	      "this message and Cygwin/XFree86 freezes or crashes "
+	      "this message and Cygwin/X freezes or crashes "
 	      "after this message then send a problem report and your "
 	      "/tmp/XWin.log file to cygwin-xfree at cygwin.com\n");
 

Index: wintrayicon.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/wintrayicon.c,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -d -r1.1 -r1.1.6.1
--- wintrayicon.c	25 Nov 2003 19:28:56 -0000	1.1
+++ wintrayicon.c	23 Dec 2003 06:32:43 -0000	1.1.6.1
@@ -62,7 +62,7 @@
   /* Set display and screen-specific tooltip text */
   snprintf (nid.szTip,
 	    sizeof (nid.szTip),
-	    "Cygwin/XFree86 Server - %s:%d",
+	    "Cygwin/X Server - %s:%d",
 	    display, 
 	    (int) pScreenInfo->dwScreen);
 

Index: winvideo.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winvideo.c,v
retrieving revision 1.1.6.1
retrieving revision 1.1.6.2
diff -u -d -r1.1.6.1 -r1.1.6.2
--- winvideo.c	9 Dec 2003 01:37:16 -0000	1.1.6.1
+++ winvideo.c	23 Dec 2003 06:32:43 -0000	1.1.6.2
@@ -146,7 +146,7 @@
 
     adapt->type = XvWindowMask | XvInputMask | XvImageMask;
     adapt->flags = VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT;
-    adapt->name = "Cygwin/XFree86 Video Overlay";
+    adapt->name = "Cygwin/X Video Overlay";
     adapt->nEncodings = 1;
     adapt->pEncodings = DummyEncoding;
     adapt->nFormats = NUM_FORMATS;

Index: winwindow.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winwindow.h,v
retrieving revision 1.1.4.1.2.1
retrieving revision 1.1.4.1.2.2
diff -u -d -r1.1.4.1.2.1 -r1.1.4.1.2.2
--- winwindow.h	9 Dec 2003 01:37:16 -0000	1.1.4.1.2.1
+++ winwindow.h	23 Dec 2003 06:32:43 -0000	1.1.4.1.2.2
@@ -41,12 +41,12 @@
 #endif
 
 /* Constant strings */
-#define WINDOW_CLASS		"cygwin/xfree86"
-#define WINDOW_TITLE		"Cygwin/XFree86 - %s:%d"
-#define WINDOW_TITLE_XDMCP	"Cygwin/XFree86 - %s"
+#define WINDOW_CLASS		"cygwin/x"
+#define WINDOW_TITLE		"Cygwin/X - %s:%d"
+#define WINDOW_TITLE_XDMCP	"Cygwin/X - %s"
 #define WIN_SCR_PROP		"cyg_screen_prop rl"
-#define WINDOW_CLASS_X		"cygwin/xfree86 X rl"
-#define WINDOW_TITLE_X		"Cygwin/XFree86 X"
+#define WINDOW_CLASS_X		"cygwin/x X rl"
+#define WINDOW_TITLE_X		"Cygwin/X X"
 #define WIN_WINDOW_PROP		"cyg_window_prop_rl"
 #define WIN_MSG_QUEUE_FNAME	"/dev/windows"
 #define WIN_LOG_FNAME		"/tmp/XWin.log"