Zhiyi Zhang : winex11.drv: Add set_screen_size() helper.
Alexandre Julliard
julliard at winehq.org
Fri Jul 24 17:05:10 CDT 2020
Module: wine
Branch: master
Commit: 45d991d54138523e5278db5618eb458100982294
URL: https://source.winehq.org/git/wine.git/?a=commit;h=45d991d54138523e5278db5618eb458100982294
Author: Zhiyi Zhang <zzhang at codeweavers.com>
Date: Fri Jul 24 17:23:08 2020 +0800
winex11.drv: Add set_screen_size() helper.
Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winex11.drv/xrandr.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c
index cc88188943..4bbba15a25 100644
--- a/dlls/winex11.drv/xrandr.c
+++ b/dlls/winex11.drv/xrandr.c
@@ -466,6 +466,16 @@ static void get_screen_size( XRRScreenResources *resources, unsigned int *width,
}
}
+static void set_screen_size( int width, int height )
+{
+ int screen = default_visual.screen;
+ int mm_width, mm_height;
+
+ mm_width = width * DisplayWidthMM( gdi_display, screen ) / DisplayWidth( gdi_display, screen );
+ mm_height = height * DisplayHeightMM( gdi_display, screen ) / DisplayHeight( gdi_display, screen );
+ pXRRSetScreenSize( gdi_display, root_window, width, height, mm_width, mm_height );
+}
+
static LONG xrandr12_set_current_mode( int mode )
{
unsigned int screen_width, screen_height;
@@ -515,12 +525,7 @@ static LONG xrandr12_set_current_mode( int mode )
get_screen_size( resources, &screen_width, &screen_height );
screen_width = max( screen_width, crtc_info->x + dd_modes[mode].width );
screen_height = max( screen_height, crtc_info->y + dd_modes[mode].height );
-
- pXRRSetScreenSize( gdi_display, root_window, screen_width, screen_height,
- screen_width * DisplayWidthMM( gdi_display, default_visual.screen )
- / DisplayWidth( gdi_display, default_visual.screen ),
- screen_height * DisplayHeightMM( gdi_display, default_visual.screen )
- / DisplayHeight( gdi_display, default_visual.screen ));
+ set_screen_size( screen_width, screen_height );
status = pXRRSetCrtcConfig( gdi_display, resources, resources->crtcs[primary_crtc],
CurrentTime, crtc_info->x, crtc_info->y, xrandr12_modes[mode],
More information about the wine-cvs
mailing list