diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2015-11-02 19:37:40 +0000 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2016-03-09 16:12:33 +0000 |
| commit | 98238ece5756801a8a67b9235e42cb9ab2318633 (patch) | |
| tree | 8f57074fc0aa4caf4e4f096625341cc3b274de98 | |
| parent | cdeaebad9889d81d2698b8a10fec5e55d8dec7a1 (diff) | |
hw/xwin: Ignore the obsolete, undocumented -internalwm option
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
| -rw-r--r-- | hw/xwin/InitOutput.c | 4 | ||||
| -rw-r--r-- | hw/xwin/man/XWin.man | 3 | ||||
| -rw-r--r-- | hw/xwin/winprocarg.c | 7 |
3 files changed, 2 insertions, 12 deletions
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 57e514faf..119012405 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -745,10 +745,6 @@ winUseMsg(void) ErrorF("-ignoreinput\n" "\tIgnore keyboard and mouse input.\n"); -#ifdef XWIN_MULTIWINDOWEXTWM - ErrorF("-internalwm\n" "\tRun the internal window manager.\n"); -#endif - #ifdef XWIN_XF86CONFIG ErrorF("-keyboard\n" "\tSpecify a keyboard device from the configuration file.\n"); diff --git a/hw/xwin/man/XWin.man b/hw/xwin/man/XWin.man index 50fdba2e0..7ffdd6c23 100644 --- a/hw/xwin/man/XWin.man +++ b/hw/xwin/man/XWin.man @@ -346,9 +346,6 @@ Color map manipulation is not supported, so the PseudoColor visual will not have the correct colors. This option is intended to allow applications which only work with a depth 8 visual to operate in TrueColor modes. -.TP 8 -.B \-internalwm -Run the internal window manager. .SH LOG FILE As it runs \fIXWin\fP writes messages indicating the most relevant events diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c index 2bf656064..bf70cf1ed 100644 --- a/hw/xwin/winprocarg.c +++ b/hw/xwin/winprocarg.c @@ -577,11 +577,8 @@ ddxProcessArgument(int argc, char *argv[], int i) * Look for the '-internalwm' argument */ if (IS_OPTION("-internalwm")) { - if (!screenInfoPtr->fMultiMonitorOverride) - screenInfoPtr->fMultipleMonitors = TRUE; - screenInfoPtr->fMWExtWM = TRUE; - screenInfoPtr->fInternalWM = TRUE; - + 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; } |