Changelog:
- the UseXShm key was still present but not used anymore
--
Lionel Ulmer - http://www.bbrox.org/
Index: dlls/x11drv/x11drv_main.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/x11drv_main.c,v
retrieving revision 1.70
diff -u -r1.70 x11drv_main.c
--- dlls/x11drv/x11drv_main.c 23 Jun 2003 23:02:03 -0000 1.70
+++ dlls/x11drv/x11drv_main.c 10 Aug 2003 19:53:47 -0000
@@ -61,7 +61,7 @@
unsigned int screen_depth;
Window root_window;
DWORD desktop_tid = 0;
-int dxgrab, usedga, usexvidmode;
+int dxgrab, usedga, usexvidmode, usexshm;
int use_xkb = 1;
int use_take_focus = 1;
int managed_mode = 1;
@@ -248,6 +248,9 @@
if (!get_config_key( hkey, appkey, "UseDGA", buffer, sizeof(buffer) ))
usedga = IS_OPTION_TRUE( buffer[0] );
+
+ if (!get_config_key( hkey, appkey, "UseXShm", buffer, sizeof(buffer) ))
+ usexshm = IS_OPTION_TRUE( buffer[0] );
if (!get_config_key( hkey, appkey, "UseXVidMode", buffer, sizeof(buffer) ))
usexvidmode = IS_OPTION_TRUE( buffer[0] );
Index: graphics/x11drv/dib.c
===================================================================
RCS file: /home/wine/wine/graphics/x11drv/dib.c,v
retrieving revision 1.109
diff -u -r1.109 dib.c
--- graphics/x11drv/dib.c 13 May 2003 23:56:12 -0000 1.109
+++ graphics/x11drv/dib.c 10 Aug 2003 19:53:49 -0000
@@ -44,6 +44,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(bitmap);
WINE_DECLARE_DEBUG_CHANNEL(x11drv);
+extern int usexshm;
+
static int ximageDepthTable[32];
/* This structure holds the arguments for DIB_SetImageBits() */
@@ -5657,6 +5659,8 @@
{
XImage *image;
+ if (!usexshm) return NULL;
+
image = XShmCreateImage(gdi_display, visual, bpp, ZPixmap, NULL, shminfo, width, height);
if (image)
{
