diff options
| author | Philip Langdale <philipl@fido2.homeip.net> | 2006-10-11 11:32:18 -0700 |
|---|---|---|
| committer | Philip Langdale <philipl@fido2.homeip.net> | 2006-10-11 11:32:18 -0700 |
| commit | 7631f4d8db2b83878bd886204aaa978dac9c47b5 (patch) | |
| tree | 199ea4eb107ad78234941e4998dbfdd432ded279 | |
| parent | 79de175986817cac2fedb267cc9a04438b3694d4 (diff) | |
Document the 'Xinerama' option and tweak the default to reflect
the capabilites of the underlying hardware.
| -rw-r--r-- | man/vmware.man | 5 | ||||
| -rw-r--r-- | src/vmware.c | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/man/vmware.man b/man/vmware.man index 40677f4..2379134 100644 --- a/man/vmware.man +++ b/man/vmware.man @@ -30,7 +30,10 @@ Enable or disable the HW cursor. Default: off. .TP .BI "Option \*qNoAccel\*q \*q" boolean \*q Disable or enable acceleration. Default: acceleration is enabled. +.TP +.BI "Option \*qXinerama\*q \*q" boolean \*q +Disable or enable Xinerama support. Default: xinerama is enabled if the hardware supports it. .SH "SEE ALSO" __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) .SH AUTHORS -Copyright (c) 1999-2005 VMware, Inc. +Copyright (c) 1999-2006 VMware, Inc. diff --git a/src/vmware.c b/src/vmware.c index 7f93120..c630d68 100644 --- a/src/vmware.c +++ b/src/vmware.c @@ -752,11 +752,12 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags) /* * Init xinerama preferences. */ - useXinerama = xf86ReturnOptValBool(options, OPTION_XINERAMA, TRUE); + useXinerama = xf86ReturnOptValBool(options, OPTION_XINERAMA, + pVMWARE->vmwareCapability & SVGA_CAP_MULTIMON); if (useXinerama && !(pVMWARE->vmwareCapability & SVGA_CAP_MULTIMON)) { - useXinerama = FALSE; - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Xinerama is not not supported by " - "the current virtual hardware\n"); + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "Xinerama is not safely supported by the current virtual hardware. " + "Do not request resolutions that require > 16MB of framebuffer.\n"); } pVMWARE->xineramaStatic = xf86ReturnOptValBool(options, OPTION_STATIC_XINERAMA, FALSE); |