Deprecate -noshadowfb command line flagdmx-0-1-20020419-beta

Add -shadowfb command line flag for legacy shadow framebuffer support

2 files changed, 14 insertions, 7 deletions

diff --git a/xc/programs/Xserver/hw/dmx/Xdmx.man b/xc/programs/Xserver/hw/dmx/Xdmx.man
index 987edbe6a..3504f33f2 100644
--- a/xc/programs/Xserver/hw/dmx/Xdmx.man
+++ b/xc/programs/Xserver/hw/dmx/Xdmx.man
@@ -92,8 +92,14 @@ will switch to another VC in local (raw) mode.
 .RE
 .sp
 .TP 8
+.BI "-shadowfb"
+This option turns on (legacy) support for the shadow frame buffer.
+.sp
+.TP 8
 .BI "-noshadowfb"
 This option turns off (legacy) support for the shadow frame buffer.
+Note that this option has been deprecated and will be removed in the
+next release.
 .sp
 .TP 8
 .BI "-configfile " filename
@@ -254,11 +260,6 @@ to another VC (possibly back to another X session running on the local
 machine).  Using Ctrl-Alt-Backspace on the blank VC will terminate the
 Xdmx session and return to the original VC.
 .PP
-In all cases, include
-.B -noshadowfb
-to use the new output system that does not make use of the shadow
-buffer.
-.PP
 This example uses the configuration file shown in the previous section:
 .RS
 Xdmx :1 -inputfrom :0 +xinerama -configfile filename -config example2
diff --git a/xc/programs/Xserver/hw/dmx/dmxinit.c b/xc/programs/Xserver/hw/dmx/dmxinit.c
index f59e2dbac..dbaf80647 100644
--- a/xc/programs/Xserver/hw/dmx/dmxinit.c
+++ b/xc/programs/Xserver/hw/dmx/dmxinit.c
@@ -56,7 +56,7 @@ DMXScreenInfo  *dmxScreens;
 int             dmxNumInputs;
 DMXInputInfo   *dmxInputs;
 
-int             dmxShadowFB = TRUE;
+int             dmxShadowFB = FALSE;
 
 XErrorEvent     dmxLastErrorEvent;
 Bool            dmxErrorOccurred = FALSE;
@@ -461,8 +461,14 @@ int ddxProcessArgument(int argc, char *argv[], int i)
         return 2;
 #endif
     } else if (!strcmp(argv[i], "-noshadowfb")) {
+        dmxLog(dmxWarning,
+               "-noshadowfb has been deprecated "
+	       "since it is now the default\n");
 	dmxShadowFB = FALSE;
 	return 1;
+    } else if (!strcmp(argv[i], "-shadowfb")) {
+	dmxShadowFB = TRUE;
+	return 1;
     } else if (!strcmp(argv[i], "-configfile")) {
         if (++i < argc) dmxConfigReadFile(argv[i], 0);
         return 2;
@@ -478,7 +484,7 @@ void ddxUseMsg(void)
     ErrorF("\n\nDevice Dependent Usage:\n");
     ErrorF("-display string      Specify the back-end display(s)\n");
     ErrorF("-inputfrom string    Specify input source\n");
-    ErrorF("-noshadowfb          Disable shadow frame buffer\n");
+    ErrorF("-shadowfb            Enable shadow frame buffer\n");
     ErrorF("-configfile file     Read from a configuration file\n");
     ErrorF("-config config       Select a specific configuration\n");
     ErrorF("\n");