Module: wine Branch: master Commit: ed331cb0a5f3bee1b2075b877d3c2a19a668f9fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed331cb0a5f3bee1b2075b877d...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Sun Jul 15 15:44:59 2012 +0200
winex11: Properly calculate the virtual screen rect in xinerama_init().
---
dlls/winex11.drv/xinerama.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index b2014ed..84db8ba 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -177,6 +177,7 @@ void xinerama_init( unsigned int width, unsigned int height ) }
primary = get_primary(); + SetRectEmpty( &virtual_screen_rect );
/* coordinates (0,0) have to point to the primary monitor origin */ OffsetRect( &rect, -primary->rcMonitor.left, -primary->rcMonitor.top ); @@ -184,17 +185,17 @@ void xinerama_init( unsigned int width, unsigned int height ) { OffsetRect( &monitors[i].rcMonitor, rect.left, rect.top ); OffsetRect( &monitors[i].rcWork, rect.left, rect.top ); + UnionRect( &virtual_screen_rect, &virtual_screen_rect, &monitors[i].rcMonitor ); TRACE( "monitor %p: %s work %s%s\n", index_to_monitor(i), wine_dbgstr_rect(&monitors[i].rcMonitor), wine_dbgstr_rect(&monitors[i].rcWork), (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); }
- virtual_screen_rect = rect; screen_width = primary->rcMonitor.right - primary->rcMonitor.left; screen_height = primary->rcMonitor.bottom - primary->rcMonitor.top; TRACE( "virtual size: %s primary size: %dx%d\n", - wine_dbgstr_rect(&rect), screen_width, screen_height ); + wine_dbgstr_rect(&virtual_screen_rect), screen_width, screen_height );
wine_tsx11_unlock(); }