ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added an option to disable XVidMode support.

Browse Source
This commit is contained in:
Francois Gouget 2001-09-10 23:05:57 +00:00 committed by Alexandre Julliard
parent 38909c5900
commit 0fe854b7dd
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/x11drv/x11drv_main.c
View File

@ -55,7 +55,7 @@ unsigned int screen_width;
unsigned int screen_height; unsigned int screen_height;
unsigned int screen_depth; unsigned int screen_depth;
Window root_window; Window root_window;
int dxgrab, usedga; int dxgrab, usedga, usexvidmode;
unsigned int X11DRV_server_startticks; unsigned int X11DRV_server_startticks;
@ -219,6 +219,9 @@ static void setup_options(void)
if (!get_config_key( hkey, appkey, "UseDGA", buffer, sizeof(buffer) )) if (!get_config_key( hkey, appkey, "UseDGA", buffer, sizeof(buffer) ))
usedga = IS_OPTION_TRUE( buffer[0] ); usedga = IS_OPTION_TRUE( buffer[0] );
if (!get_config_key( hkey, appkey, "UseXVidMode", buffer, sizeof(buffer) ))
usexvidmode = IS_OPTION_TRUE( buffer[0] );
screen_depth = 0; screen_depth = 0;
if (!get_config_key( hkey, appkey, "ScreenDepth", buffer, sizeof(buffer) )) if (!get_config_key( hkey, appkey, "ScreenDepth", buffer, sizeof(buffer) ))
screen_depth = atoi(buffer); screen_depth = atoi(buffer);

10
dlls/x11drv/xvidmode.c
View File

@ -24,6 +24,8 @@ DEFAULT_DEBUG_CHANNEL(x11drv);
#ifdef HAVE_LIBXXF86VM #ifdef HAVE_LIBXXF86VM
extern int usexvidmode;
static int xf86vm_event, xf86vm_error, xf86vm_major, xf86vm_minor; static int xf86vm_event, xf86vm_error, xf86vm_major, xf86vm_minor;
LPDDHALMODEINFO xf86vm_modes; LPDDHALMODEINFO xf86vm_modes;
@ -62,13 +64,15 @@ void X11DRV_XF86VM_Init(void)
if (xf86vm_major) return; /* already initialized? */ if (xf86vm_major) return; /* already initialized? */
/* if in desktop mode, don't use XVidMode */
if (root_window != DefaultRootWindow(gdi_display)) return;
if (!usexvidmode) return;
/* see if XVidMode is available */ /* see if XVidMode is available */
if (!TSXF86VidModeQueryExtension(gdi_display, &xf86vm_event, &xf86vm_error)) return; if (!TSXF86VidModeQueryExtension(gdi_display, &xf86vm_event, &xf86vm_error)) return;
if (!TSXF86VidModeQueryVersion(gdi_display, &xf86vm_major, &xf86vm_minor)) return; if (!TSXF86VidModeQueryVersion(gdi_display, &xf86vm_major, &xf86vm_minor)) return;
/* if in desktop mode, don't use XVidMode */
if (root_window != DefaultRootWindow(gdi_display)) return;
/* retrieve modes */ /* retrieve modes */
if (!TSXF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &nmodes, if (!TSXF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &nmodes,
&modes)) &modes))

2
documentation/samples/config
View File

@ -124,6 +124,8 @@ WINE REGISTRY Version 2
"UseDGA" = "Y" "UseDGA" = "Y"
; Use XShm extension if present ; Use XShm extension if present
"UseXShm" = "Y" "UseXShm" = "Y"
; Use XVidMode extension if present
"UseXVidMode" = "Y"
; Enable DirectX mouse grab ; Enable DirectX mouse grab
"DXGrab" = "N" "DXGrab" = "N"
; Create the desktop window with a double-buffered visual ; Create the desktop window with a double-buffered visual