70. Merging in the TM branch (Egbert Eich).XORG-RELEASE-1-STSF-FORKXORG-CYGWIN-LAST-MERGE

11 files changed, 34 insertions, 29 deletions

diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index 13381ffa1..8a2241914 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -312,7 +312,7 @@ ddxUseMsg (void)
 
   ErrorF ("-lesspointer\n"
 	  "\tHide the windows mouse pointer when it is over an inactive\n"
-          "\tXFree86 window.  This prevents ghost cursors appearing where\n"
+          "\tX window.  This prevents ghost cursors appearing where\n"
 	  "\tthe Windows cursor is drawn overtop of the X cursor\n");
 
   ErrorF ("-nodecoration\n"
@@ -361,7 +361,7 @@ ddxUseMsg (void)
   ErrorF ("-[no]winkill\n"
           "\tAlt+F4 exits the X Server.\n");
 
-  ErrorF ("-xf86config\n"
+  ErrorF ("-config\n"
           "\tSpecify a configuration file.\n");
 
   ErrorF ("-keyboard\n"
@@ -1201,9 +1201,9 @@ ddxProcessArgument (int argc, char *argv[], int i)
     }
 
   /*
-   * Look for the '-xf86config' argument
+   * Look for the '-config' argument.  Accept -xf86config as an alias
    */
-  if (IS_OPTION ("-xf86config"))
+  if (IS_OPTION ("-config") || IS_OPTION ("-xf86config"))
     {
       CHECK_ARGS (1);
       g_cmdline.configFile = argv[++i];
@@ -1270,7 +1270,7 @@ InitOutput (ScreenInfo *screenInfo, int argc, char *argv[])
   ErrorF ("InitOutput\n");
 #endif
 
-  /* Try to read the XF86Config-style configuration file */
+  /* Try to read the xorg.conf-style configuration file */
   if (!winReadConfigfile ())
     ErrorF ("InitOutput - Error reading config file\n");
 
diff --git a/hw/xwin/XWin.man b/hw/xwin/XWin.man
index 8a185f1ca..3fb3f2814 100644
--- a/hw/xwin/XWin.man
+++ b/hw/xwin/XWin.man
@@ -48,13 +48,13 @@ Sets the display resolution for the X server to use on screen
 .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 X window
 .TP 8
 .B \-scrollbars
 In windowed mode, allow screens bigger than the Windows desktop.
@@ -96,14 +96,14 @@ ones are:
 - 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,
+X 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
-provided by RedHat.
+is maintained by the Cygwin/X project, with hosting services
+provided by freedesktop.org.
 .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 X.Org Foundation 6.7 release:
 .PP
 Robert Collins - Cygwin developer, miscellaneous
 .br
@@ -112,7 +112,7 @@ programming guru
 .br
 Alexander Gottwald - AltGr handling for non-U.S. keyboards
 .br
-Alan Hourihane - XFree86 developer, patch reviewer, general programming guru
+Alan Hourihane - X developer, patch reviewer, general programming guru
 .br
 Pierre A Humblet - Debugging of socket-related crashes, developer
 .br
diff --git a/hw/xwin/XWin.rc b/hw/xwin/XWin.rc
index c918304af..2e6cceb47 100644
--- a/hw/xwin/XWin.rc
+++ b/hw/xwin/XWin.rc
@@ -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 @@ END
 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
diff --git a/hw/xwin/ddraw.h b/hw/xwin/ddraw.h
index 2ca4f3462..f72ce1f09 100644
--- a/hw/xwin/ddraw.h
+++ b/hw/xwin/ddraw.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $Id$ */
 
 #ifndef __WINE_DDRAW_H
 #define __WINE_DDRAW_H
diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c
index db69005fd..d62fb18d9 100644
--- a/hw/xwin/winconfig.c
+++ b/hw/xwin/winconfig.c
@@ -126,6 +126,11 @@ winReadConfigfile ()
   /* Parse config file into data structure */
 
   filename = xf86openConfigFile (CONFIGPATH, xf86ConfigFile, PROJECTROOT);
+    
+  /* Hack for backward compatibility */
+  if (!filename && from == X_DEFAULT)
+    filename = xf86openConfigFile (CONFIGPATH, "XF86Config", PROJECTROOT);
+
   if (filename)
     {
       winMsg (from, "Using config file: \"%s\"\n", filename);
@@ -258,7 +263,7 @@ winConfigKeyboard (DeviceIntPtr pDevice)
   g_winInfo.xkb.variant = NULL;
   g_winInfo.xkb.options = NULL;
 # else
-  g_winInfo.xkb.rules = "xfree86";
+  g_winInfo.xkb.rules = "xorg";
   g_winInfo.xkb.model = "pc101";
   g_winInfo.xkb.layout = "us";
   g_winInfo.xkb.variant = NULL;
diff --git a/hw/xwin/winconfig.h b/hw/xwin/winconfig.h
index 22db4abee..80f7f7871 100644
--- a/hw/xwin/winconfig.h
+++ b/hw/xwin/winconfig.h
@@ -27,7 +27,7 @@
  *
  * Authors: Alexander Gottwald	
  */
-/* $XFree86$ */
+/* $Id$ */
 #ifndef __WIN_CONFIG_H__
 #define __WIN_CONFIG_H__
 
diff --git a/hw/xwin/winkeybd.h b/hw/xwin/winkeybd.h
index 9a4a3f68f..375245f80 100644
--- a/hw/xwin/winkeybd.h
+++ b/hw/xwin/winkeybd.h
@@ -36,7 +36,7 @@
 
 
 /*
- * Include the standard XFree86 ASCII keymap.
+ * Include the standard ASCII keymap.
  *
  * This header declares a static KeySym array called 'map'.
  */
diff --git a/hw/xwin/winshaddd.c b/hw/xwin/winshaddd.c
index 2c202a01c..239c0f5ab 100644
--- a/hw/xwin/winshaddd.c
+++ b/hw/xwin/winshaddd.c
@@ -573,7 +573,7 @@ winShadowUpdateDD (ScreenPtr pScreen,
       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@cygwin.com\n");
 
diff --git a/hw/xwin/wintrayicon.c b/hw/xwin/wintrayicon.c
index e7d611f81..9ba507ad2 100755
--- a/hw/xwin/wintrayicon.c
+++ b/hw/xwin/wintrayicon.c
@@ -62,7 +62,7 @@ winInitNotifyIcon (winPrivScreenPtr pScreenPriv)
   /* 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);
 
diff --git a/hw/xwin/winvideo.c b/hw/xwin/winvideo.c
index e2eb7abfb..d4a856fcf 100755
--- a/hw/xwin/winvideo.c
+++ b/hw/xwin/winvideo.c
@@ -144,7 +144,7 @@ winSetupImageVideo (ScreenPtr pScreen)
 
     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;
diff --git a/hw/xwin/winwindow.h b/hw/xwin/winwindow.h
index 963caafdf..b8e164c2b 100644
--- a/hw/xwin/winwindow.h
+++ b/hw/xwin/winwindow.h
@@ -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"