Remove from docs / config tool useless / obsoleted options.
diff --git a/documentation/configuring.sgml b/documentation/configuring.sgml
index 5a5ea41..af4d8a8 100644
--- a/documentation/configuring.sgml
+++ b/documentation/configuring.sgml
@@ -2699,21 +2699,6 @@
</listitem>
</varlistentry>
<varlistentry>
- <term>UseXShm</term>
- <listitem>
- <para>
- If you don't want DirectX to use DGA, you can at least
- use X Shared Memory extensions (XShm). It is much
- slower than DGA, since the app doesn't have direct
- access to the physical frame buffer, but using shared
- memory to draw the frame is at least faster than
- sending the data through the standard X11 socket, even
- though Wine's XShm support is still known to crash
- sometimes.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
<term>DesktopDoubleBuffered</term>
<listitem>
<para>
diff --git a/documentation/installation-und-konfiguration.german b/documentation/installation-und-konfiguration.german
index 143aac4..db3bf5c 100644
--- a/documentation/installation-und-konfiguration.german
+++ b/documentation/installation-und-konfiguration.german
@@ -1033,11 +1033,6 @@
unterstützt, ist es oft erforderlich, den X-Server in der
benötigten Farbtiefe zu starten, bevor WINE gestartet wird.
- UseXShm
- Hierbei handelt es sich um eine andere Erweiterung des X
- Window Systems, die schnellere Graphikoperationen
- ermöglicht. Beispiel: "UseXShm" = "true".
-
DXGrab
Diese Option bewirkt, dass der Mauszeiger - bei der
Verwendung von DirectDraw (DirectX) - das von DirectDraw
diff --git a/documentation/samples/config b/documentation/samples/config
index 84c13bf..d19e30a 100644
--- a/documentation/samples/config
+++ b/documentation/samples/config
@@ -124,8 +124,6 @@
; Use XFree86 DGA extension if present
; (make sure /dev/mem is accessible by you !)
"UseDGA" = "Y"
-; Use XShm extension if present
-"UseXShm" = "Y"
; Use XVidMode extension if present
"UseXVidMode" = "Y"
; Use the take focus protocol
@@ -135,9 +133,6 @@
; Create the desktop window with a double-buffered visual
; (useful to play OpenGL games)
"DesktopDoubleBuffered" = "N"
-; Use this if you have more than one port for video on your setup
-; (Wine uses for now the first 'input image' it finds).
-;; "XVideoPort" = "43"
; Run in synchronous mode (useful for debugging X11 problems)
;;"Synchronous" = "Y"
;
diff --git a/programs/winecfg/properties.h b/programs/winecfg/properties.h
index e7df431..01bd78d 100644
--- a/programs/winecfg/properties.h
+++ b/programs/winecfg/properties.h
@@ -63,12 +63,10 @@
int nDesktopSizeX;
int nDesktopSizeY;
int nDGA;
- int nXShm;
int nXVidMode;
int nTakeFocus;
int nDXGrab;
int nDoubleBuffered;
- int nXVideoPort;
int nSynchronous;
} X11DRV_DESC;
diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c
index b5d7fa6..feab865 100644
--- a/programs/winecfg/winecfg.c
+++ b/programs/winecfg/winecfg.c
@@ -209,12 +209,10 @@
pCfg->sX11Drv.nDesktopSizeX = 640;
pCfg->sX11Drv.nDesktopSizeY = 480;
pCfg->sX11Drv.nDGA = 1;
- pCfg->sX11Drv.nXShm = 1;
pCfg->sX11Drv.nXVidMode = 1;
pCfg->sX11Drv.nTakeFocus = 1;
pCfg->sX11Drv.nDXGrab = 0;
pCfg->sX11Drv.nDoubleBuffered = 0;
- pCfg->sX11Drv.nXVideoPort = 43;
pCfg->sX11Drv.nSynchronous = 1;
RegCloseKey( hSession );
