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

winex11.drv: Handle display device changes.

Browse Source 
Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zhiyi Zhang 2019-06-10 22:07:46 +08:00 committed by Alexandre Julliard
parent 31445c3264
commit 7f57cda707
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/winex11.drv/desktop.c
View File

@ -154,6 +154,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height )
max_width = primary_rect.right - primary_rect.left; max_width = primary_rect.right - primary_rect.left;
max_height = primary_rect.bottom - primary_rect.top; max_height = primary_rect.bottom - primary_rect.top;
xinerama_init( width, height ); xinerama_init( width, height );
X11DRV_DisplayDevices_Init( TRUE );
/* initialize the available resolutions */ /* initialize the available resolutions */
dd_modes = X11DRV_Settings_SetHandlers("desktop", dd_modes = X11DRV_Settings_SetHandlers("desktop",

4
dlls/winex11.drv/display.c
View File

@ -339,7 +339,7 @@ static void cleanup_devices(void)
SetupDiDestroyDeviceInfoList(devinfo); SetupDiDestroyDeviceInfoList(devinfo);
} }
void X11DRV_DisplayDevices_Init(void) void X11DRV_DisplayDevices_Init(BOOL force)
{ {
static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0};
HANDLE mutex; HANDLE mutex;
@ -366,7 +366,7 @@ void X11DRV_DisplayDevices_Init(void)
} }
/* Avoid unnecessary reinit */ /* Avoid unnecessary reinit */
if (disposition != REG_CREATED_NEW_KEY) if (!force && disposition != REG_CREATED_NEW_KEY)
goto done; goto done;
TRACE("via %s\n", wine_dbgstr_a(handler.name)); TRACE("via %s\n", wine_dbgstr_a(handler.name));

2
dlls/winex11.drv/x11drv.h
View File

@ -736,7 +736,7 @@ struct x11drv_display_device_handler
}; };
extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN;
extern void X11DRV_DisplayDevices_Init(void) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_Init(BOOL force) DECLSPEC_HIDDEN;
/* XIM support */ /* XIM support */
extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN;

2
dlls/winex11.drv/x11drv_main.c
View File

@ -597,7 +597,7 @@ static BOOL process_attach(void)
X11DRV_InitKeyboard( gdi_display ); X11DRV_InitKeyboard( gdi_display );
if (use_xim) use_xim = X11DRV_InitXIM( input_style ); if (use_xim) use_xim = X11DRV_InitXIM( input_style );
X11DRV_DisplayDevices_Init(); X11DRV_DisplayDevices_Init(FALSE);
return TRUE; return TRUE;
} }