Rewrite ScrollDC.
This commit is contained in:
parent
47e9ad4dce
commit
b330df5665
|
@ -41,66 +41,83 @@ WINE_DEFAULT_DEBUG_CHANNEL(scroll);
|
||||||
/*************************************************************************
|
/*************************************************************************
|
||||||
* ScrollDC (X11DRV.@)
|
* ScrollDC (X11DRV.@)
|
||||||
*
|
*
|
||||||
* Only the hrgnUpdate is returned in device coordinates.
|
* dx, dy, lprcScroll and lprcClip are all in logical coordinates (msdn is wrong)
|
||||||
* rcUpdate must be returned in logical coordinates to comply with win API.
|
* hrgnUpdate is returned in device coordinates with rcUpdate in logical coordinates.
|
||||||
* FIXME: the doc explicitly states the opposite, to be checked
|
*
|
||||||
*/
|
*/
|
||||||
BOOL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, const RECT *rc,
|
BOOL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, const RECT *lprcScroll,
|
||||||
const RECT *clipRect, HRGN hrgnUpdate, LPRECT rcUpdate )
|
const RECT *lprcClip, HRGN hrgnUpdate, LPRECT lprcUpdate )
|
||||||
{
|
{
|
||||||
RECT rect, rClip, rDst;
|
RECT rSrc, rClipped_src, rClip, rDst, offset;
|
||||||
|
|
||||||
TRACE( "%p %d,%d hrgnUpdate=%p rcUpdate = %p\n", hdc, dx, dy, hrgnUpdate, rcUpdate );
|
TRACE( "%p %d,%d hrgnUpdate=%p lprcUpdate = %p\n", hdc, dx, dy, hrgnUpdate, lprcUpdate );
|
||||||
if (clipRect) TRACE( "cliprc = (%ld,%ld,%ld,%ld)\n",
|
if (lprcClip) TRACE( "lprcClip = %s\n", wine_dbgstr_rect(lprcClip));
|
||||||
clipRect->left, clipRect->top, clipRect->right, clipRect->bottom );
|
if (lprcScroll) TRACE( "lprcScroll = %s\n", wine_dbgstr_rect(lprcScroll));
|
||||||
if (rc) TRACE( "rc = (%ld,%ld,%ld,%ld)\n", rc->left, rc->top, rc->right, rc->bottom );
|
|
||||||
|
|
||||||
/* compute device clipping region (in device coordinates) */
|
/* compute device clipping region (in device coordinates) */
|
||||||
|
|
||||||
if (rc) rect = *rc;
|
if (lprcScroll) rSrc = *lprcScroll;
|
||||||
else GetClipBox( hdc, &rect );
|
else GetClipBox( hdc, &rSrc );
|
||||||
|
LPtoDP(hdc, (LPPOINT)&rSrc, 2);
|
||||||
|
|
||||||
if (clipRect)
|
if (lprcClip) rClip = *lprcClip;
|
||||||
{
|
else GetClipBox( hdc, &rClip );
|
||||||
rClip = *clipRect;
|
LPtoDP(hdc, (LPPOINT)&rClip, 2);
|
||||||
IntersectRect( &rClip, &rect, &rClip );
|
|
||||||
}
|
|
||||||
else rClip = rect;
|
|
||||||
|
|
||||||
rDst = rClip;
|
IntersectRect( &rClipped_src, &rSrc, &rClip );
|
||||||
OffsetRect( &rDst, dx, dy );
|
TRACE("rSrc %s rClip %s clipped rSrc %s\n", wine_dbgstr_rect(&rSrc),
|
||||||
|
wine_dbgstr_rect(&rClip), wine_dbgstr_rect(&rClipped_src));
|
||||||
|
|
||||||
|
rDst = rClipped_src;
|
||||||
|
SetRect(&offset, 0, 0, dx, dy);
|
||||||
|
LPtoDP(hdc, (LPPOINT)&offset, 2);
|
||||||
|
OffsetRect( &rDst, offset.right - offset.left, offset.bottom - offset.top );
|
||||||
|
TRACE("rDst before clipping %s\n", wine_dbgstr_rect(&rDst));
|
||||||
IntersectRect( &rDst, &rDst, &rClip );
|
IntersectRect( &rDst, &rDst, &rClip );
|
||||||
|
TRACE("rDst after clipping %s\n", wine_dbgstr_rect(&rDst));
|
||||||
|
|
||||||
if (!IsRectEmpty(&rDst))
|
if (!IsRectEmpty(&rDst))
|
||||||
{
|
{
|
||||||
/* copy bits */
|
/* copy bits */
|
||||||
if (!BitBlt( hdc, rDst.left, rDst.top,
|
RECT rDst_lp = rDst, rSrc_lp = rDst;
|
||||||
rDst.right - rDst.left, rDst.bottom - rDst.top,
|
|
||||||
hdc, rDst.left - dx, rDst.top - dy, SRCCOPY))
|
OffsetRect( &rSrc_lp, offset.left - offset.right, offset.top - offset.bottom );
|
||||||
|
DPtoLP(hdc, (LPPOINT)&rDst_lp, 2);
|
||||||
|
DPtoLP(hdc, (LPPOINT)&rSrc_lp, 2);
|
||||||
|
|
||||||
|
if (!BitBlt( hdc, rDst_lp.left, rDst_lp.top,
|
||||||
|
rDst_lp.right - rDst_lp.left, rDst_lp.bottom - rDst_lp.top,
|
||||||
|
hdc, rSrc_lp.left, rSrc_lp.top, SRCCOPY))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* compute update areas */
|
/* compute update areas. This is the clipped source or'ed with the unclipped source translated minus the
|
||||||
|
clipped src translated (rDst) all clipped to rClip */
|
||||||
|
|
||||||
if (hrgnUpdate || rcUpdate)
|
if (hrgnUpdate || lprcUpdate)
|
||||||
{
|
{
|
||||||
HRGN hrgn = hrgnUpdate, hrgn2;
|
HRGN hrgn = hrgnUpdate, hrgn2;
|
||||||
|
|
||||||
/* map everything to device coordinates */
|
if (hrgn) SetRectRgn( hrgn, rClipped_src.left, rClipped_src.top, rClipped_src.right, rClipped_src.bottom );
|
||||||
LPtoDP( hdc, (LPPOINT)&rClip, 2 );
|
else hrgn = CreateRectRgn( rClipped_src.left, rClipped_src.top, rClipped_src.right, rClipped_src.bottom );
|
||||||
LPtoDP( hdc, (LPPOINT)&rDst, 2 );
|
|
||||||
|
|
||||||
hrgn2 = CreateRectRgnIndirect( &rDst );
|
hrgn2 = CreateRectRgnIndirect( &rSrc );
|
||||||
if (hrgn) SetRectRgn( hrgn, rClip.left, rClip.top, rClip.right, rClip.bottom );
|
OffsetRgn(hrgn2, offset.right - offset.left, offset.bottom - offset.top );
|
||||||
else hrgn = CreateRectRgn( rClip.left, rClip.top, rClip.right, rClip.bottom );
|
CombineRgn(hrgn, hrgn, hrgn2, RGN_OR);
|
||||||
|
|
||||||
|
SetRectRgn( hrgn2, rDst.left, rDst.top, rDst.right, rDst.bottom );
|
||||||
CombineRgn( hrgn, hrgn, hrgn2, RGN_DIFF );
|
CombineRgn( hrgn, hrgn, hrgn2, RGN_DIFF );
|
||||||
|
|
||||||
|
SetRectRgn( hrgn2, rClip.left, rClip.top, rClip.right, rClip.bottom );
|
||||||
|
CombineRgn( hrgn, hrgn, hrgn2, RGN_AND );
|
||||||
|
|
||||||
if( rcUpdate )
|
if( lprcUpdate )
|
||||||
{
|
{
|
||||||
GetRgnBox( hrgn, rcUpdate );
|
GetRgnBox( hrgn, lprcUpdate );
|
||||||
|
|
||||||
/* Put the rcUpdate in logical coordinate */
|
/* Put the lprcUpdate in logical coordinate */
|
||||||
DPtoLP( hdc, (LPPOINT)rcUpdate, 2 );
|
DPtoLP( hdc, (LPPOINT)lprcUpdate, 2 );
|
||||||
|
TRACE("returning lprcUpdate %s\n", wine_dbgstr_rect(lprcUpdate));
|
||||||
}
|
}
|
||||||
if (!hrgnUpdate) DeleteObject( hrgn );
|
if (!hrgnUpdate) DeleteObject( hrgn );
|
||||||
DeleteObject( hrgn2 );
|
DeleteObject( hrgn2 );
|
||||||
|
|
Loading…
Reference in New Issue