Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-22 18:05:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Correctly translate output rect

Browse source 
- Don't call DIB routines for empty (clipped away) rectangles

svn path=/trunk/; revision=16018
This commit is contained in:
Gé van Geldorp 2005-06-17 20:54:24 +00:00
parent 5d7043ea5a
commit c37765923c
1 changed files with 56 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

54
reactos/subsys/win32k/eng/bitblt.c
View file

@ -290,7 +290,7 @@ EngBitBlt(SURFOBJ *DestObj,
return TRUE; return TRUE;
} }
if (NULL != SourcePoint) if (UsesSource && NULL != SourcePoint)
{ {
InputRect.left = SourcePoint->x; InputRect.left = SourcePoint->x;
InputRect.right = SourcePoint->x + (DestRect->right - DestRect->left); InputRect.right = SourcePoint->x + (DestRect->right - DestRect->left);
@ -362,10 +362,10 @@ EngBitBlt(SURFOBJ *DestObj,
return FALSE; return FALSE;
} }
OutputRect.left = DestRect->left + Translate.x; OutputRect.left += Translate.x;
OutputRect.right = DestRect->right + Translate.x; OutputRect.right += Translate.x;
OutputRect.top = DestRect->top + Translate.y; OutputRect.top += Translate.y;
OutputRect.bottom = DestRect->bottom + Translate.y; OutputRect.bottom += Translate.y;
if(BrushOrigin) if(BrushOrigin)
{ {
@ -412,11 +412,13 @@ EngBitBlt(SURFOBJ *DestObj,
ClipRect.right = ClipRegion->rclBounds.right + Translate.x; ClipRect.right = ClipRegion->rclBounds.right + Translate.x;
ClipRect.top = ClipRegion->rclBounds.top + Translate.y; ClipRect.top = ClipRegion->rclBounds.top + Translate.y;
ClipRect.bottom = ClipRegion->rclBounds.bottom + Translate.y; ClipRect.bottom = ClipRegion->rclBounds.bottom + Translate.y;
EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect); if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect))
{
Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left;
Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top;
Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ColorTranslation, Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ColorTranslation,
&CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, Rop4); &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, Rop4);
}
break; break;
case DC_COMPLEX: case DC_COMPLEX:
Ret = TRUE; Ret = TRUE;
@ -446,12 +448,15 @@ EngBitBlt(SURFOBJ *DestObj,
ClipRect.right = RectEnum.arcl[i].right + Translate.x; ClipRect.right = RectEnum.arcl[i].right + Translate.x;
ClipRect.top = RectEnum.arcl[i].top + Translate.y; ClipRect.top = RectEnum.arcl[i].top + Translate.y;
ClipRect.bottom = RectEnum.arcl[i].bottom + Translate.y; ClipRect.bottom = RectEnum.arcl[i].bottom + Translate.y;
EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect); if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect))
{
Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left;
Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top;
Ret = (*BltRectFunc)(OutputObj, InputObj, Mask, ColorTranslation, Ret = (*BltRectFunc)(OutputObj, InputObj, Mask,
&CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, Rop4) && ColorTranslation, &CombinedRect, &Pt,
Ret; MaskOrigin, Brush, &AdjustedBrushOrigin,
Rop4) && Ret;
}
} }
} }
while(EnumMore); while(EnumMore);
@ -1001,15 +1006,21 @@ EngMaskBitBlt(SURFOBJ *DestObj,
ClipRect.right = ClipRegion->rclBounds.right + Translate.x; ClipRect.right = ClipRegion->rclBounds.right + Translate.x;
ClipRect.top = ClipRegion->rclBounds.top + Translate.y; ClipRect.top = ClipRegion->rclBounds.top + Translate.y;
ClipRect.bottom = ClipRegion->rclBounds.bottom + Translate.y; ClipRect.bottom = ClipRegion->rclBounds.bottom + Translate.y;
EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect); if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect))
{
Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left;
Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top;
if(Mask->iBitmapFormat == BMF_8BPP) if(Mask->iBitmapFormat == BMF_8BPP)
{
Ret = AlphaBltMask(OutputObj, InputObj, Mask, DestColorTranslation, SourceColorTranslation, Ret = AlphaBltMask(OutputObj, InputObj, Mask, DestColorTranslation, SourceColorTranslation,
&CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin); &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin);
}
else else
{
Ret = BltMask(OutputObj, InputObj, Mask, DestColorTranslation, Ret = BltMask(OutputObj, InputObj, Mask, DestColorTranslation,
&CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, R4_MASK); &CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, R4_MASK);
}
}
break; break;
case DC_COMPLEX: case DC_COMPLEX:
Ret = TRUE; Ret = TRUE;
@ -1039,15 +1050,26 @@ EngMaskBitBlt(SURFOBJ *DestObj,
ClipRect.right = RectEnum.arcl[i].right + Translate.x; ClipRect.right = RectEnum.arcl[i].right + Translate.x;
ClipRect.top = RectEnum.arcl[i].top + Translate.y; ClipRect.top = RectEnum.arcl[i].top + Translate.y;
ClipRect.bottom = RectEnum.arcl[i].bottom + Translate.y; ClipRect.bottom = RectEnum.arcl[i].bottom + Translate.y;
EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect); if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect))
{
Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left; Pt.x = InputPoint.x + CombinedRect.left - OutputRect.left;
Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top; Pt.y = InputPoint.y + CombinedRect.top - OutputRect.top;
if(Mask->iBitmapFormat == BMF_8BPP) if(Mask->iBitmapFormat == BMF_8BPP)
Ret = AlphaBltMask(OutputObj, InputObj, Mask, DestColorTranslation, SourceColorTranslation, {
&CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin) && Ret; Ret = AlphaBltMask(OutputObj, InputObj, Mask,
DestColorTranslation,
SourceColorTranslation,
&CombinedRect, &Pt, MaskOrigin, Brush,
&AdjustedBrushOrigin) && Ret;
}
else else
Ret = BltMask(OutputObj, InputObj, Mask, DestColorTranslation, {
&CombinedRect, &Pt, MaskOrigin, Brush, &AdjustedBrushOrigin, R4_MASK) && Ret; Ret = BltMask(OutputObj, InputObj, Mask,
DestColorTranslation, &CombinedRect, &Pt,
MaskOrigin, Brush, &AdjustedBrushOrigin,
R4_MASK) && Ret;
}
}
} }
} }
while(EnumMore); while(EnumMore);