Merge branch 'cygwin-patches-for-1.18' into cygwin-release-1.18xserver-cygwin-1.18.2-1

5 files changed, 5 insertions, 37 deletions

diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am
index c9ac35e9d..f0f9fee47 100644
--- a/hw/vfb/Makefile.am
+++ b/hw/vfb/Makefile.am
@@ -21,6 +21,7 @@ XVFB_LIBS = \
 
 Xvfb_LDADD = $(XVFB_LIBS) $(XVFB_SYS_LIBS) $(XSERVER_SYS_LIBS)
 Xvfb_DEPENDENCIES = $(XVFB_LIBS)
+Xvfb_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
 
 relink:
 	$(AM_V_at)rm -f Xvfb$(EXEEXT) && $(MAKE) Xvfb$(EXEEXT)
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index 360b3c61c..d8c8e8655 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -818,11 +818,6 @@ winUseMsg(void)
     ErrorF("-multiwindow\n" "\tRun the server in multi-window mode.\n");
 #endif
 
-#ifdef XWIN_MULTIWINDOWEXTWM
-    ErrorF("-mwextwm\n"
-           "\tRun the server in multi-window external window manager mode.\n");
-#endif
-
     ErrorF("-nodecoration\n"
            "\tDo not draw a window border, title bar, etc.  Windowed\n"
            "\tmode only.\n");
diff --git a/hw/xwin/man/XWin.man b/hw/xwin/man/XWin.man
index d28fb3dbc..b39ac39b1 100644
--- a/hw/xwin/man/XWin.man
+++ b/hw/xwin/man/XWin.man
@@ -51,11 +51,6 @@ Also start the integrated \fIWindows\fP-based window manager.
 Run the server in rootless mode.
 The X server works on a window covering the whole screen but the root window
 is hidden from view.
-.TP 8
-.B \-mwextwm
-Experimental.
-The mode combines \fB\-rootless\fP mode drawing with native \fIWindows\fP
-window frames managed by the experimental external window manager \fIxwinwm\fP.
 .PP
 \fBNOTE:\fP \fI-multiwindow\fP mode uses its own internal window manager.
 All other modes require an external window manager in order to move, resize, and perform other
diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c
index 4f6275be1..4e8e28361 100644
--- a/hw/xwin/winprocarg.c
+++ b/hw/xwin/winprocarg.c
@@ -564,29 +564,6 @@ ddxProcessArgument(int argc, char *argv[], int i)
         return 1;
     }
 
-#ifdef XWIN_MULTIWINDOWEXTWM
-    /*
-     * Look for the '-mwextwm' argument
-     */
-    if (IS_OPTION("-mwextwm")) {
-        if (!screenInfoPtr->fMultiMonitorOverride)
-            screenInfoPtr->fMultipleMonitors = TRUE;
-        screenInfoPtr->fMWExtWM = TRUE;
-
-        /* Indicate that we have processed this argument */
-        return 1;
-    }
-    /*
-     * Look for the '-internalwm' argument
-     */
-    if (IS_OPTION("-internalwm")) {
-        ErrorF("Ignoring obsolete -internalwm option\n");
-        /* Ignored, but we still accept the arg for backwards compatibility */
-        /* Indicate that we have processed this argument */
-        return 1;
-    }
-#endif
-
     /*
      * Look for the '-rootless' argument
      */
diff --git a/hw/xwin/winvalargs.c b/hw/xwin/winvalargs.c
index f93872419..c3359f45a 100644
--- a/hw/xwin/winvalargs.c
+++ b/hw/xwin/winvalargs.c
@@ -103,7 +103,7 @@ winValidateArgs(void)
 
             /* Fail if two or more conflicting options */
             if (iCount > 1) {
-                ErrorF("winValidateArgs - Only one of -multiwindow, -mwextwm, "
+                ErrorF("winValidateArgs - Only one of -multiwindow "
                        "and -rootless can be specific at a time.\n");
                 return FALSE;
             }
@@ -123,7 +123,7 @@ winValidateArgs(void)
             )
             ) {
             ErrorF("winValidateArgs - Xdmcp (-query, -broadcast, or -indirect) "
-                   "is invalid with -multiwindow or -mwextwm.\n");
+                   "is invalid with -multiwindow.\n");
             return FALSE;
         }
 
@@ -138,7 +138,7 @@ winValidateArgs(void)
                                             || g_ScreenInfo[i].fRootless)
             ) {
             ErrorF("winValidateArgs - -fullscreen is invalid with "
-                   "-multiwindow, -mwextwm, or -rootless.\n");
+                   "-multiwindow or -rootless.\n");
             return FALSE;
         }
 
@@ -153,7 +153,7 @@ winValidateArgs(void)
                                             || g_ScreenInfo[i].fRootless)
             ) {
             ErrorF("winValidateArgs - -nodecoration is invalid with "
-                   "-multiwindow, -mwextwm, or -rootless.\n");
+                   "-multiwindow or -rootless.\n");
             return FALSE;
         }