mirror of
https://github.com/reactos/reactos.git
synced 2025-08-06 06:53:37 +00:00
[FORMATTING]
Fix indentation, no code change. svn path=/branches/reactos-yarotows/; revision=49241
This commit is contained in:
parent
8af88571ea
commit
b0dd54e446
1 changed files with 89 additions and 86 deletions
|
@ -77,9 +77,9 @@ MouseSafetyOnDrawStart(
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pgp->Exclude.right >= HazardX1
|
if (pgp->Exclude.right >= HazardX1
|
||||||
&& pgp->Exclude.left <= HazardX2
|
&& pgp->Exclude.left <= HazardX2
|
||||||
&& pgp->Exclude.bottom >= HazardY1
|
&& pgp->Exclude.bottom >= HazardY1
|
||||||
&& pgp->Exclude.top <= HazardY2)
|
&& pgp->Exclude.top <= HazardY2)
|
||||||
{
|
{
|
||||||
ppdev->SafetyRemoveLevel = ppdev->SafetyRemoveCount;
|
ppdev->SafetyRemoveLevel = ppdev->SafetyRemoveCount;
|
||||||
ppdev->pfnMovePointer(&ppdev->pSurface->SurfObj, -1, -1, NULL);
|
ppdev->pfnMovePointer(&ppdev->pSurface->SurfObj, -1, -1, NULL);
|
||||||
|
@ -112,7 +112,10 @@ MouseSafetyOnDrawEnd(
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
ppdev->pfnMovePointer(&ppdev->pSurface->SurfObj, gpsi->ptCursor.x, gpsi->ptCursor.y, &pgp->Exclude);
|
ppdev->pfnMovePointer(&ppdev->pSurface->SurfObj,
|
||||||
|
gpsi->ptCursor.x,
|
||||||
|
gpsi->ptCursor.y,
|
||||||
|
&pgp->Exclude);
|
||||||
|
|
||||||
ppdev->SafetyRemoveLevel = 0;
|
ppdev->SafetyRemoveLevel = 0;
|
||||||
|
|
||||||
|
@ -163,16 +166,16 @@ IntHideMousePointer(
|
||||||
ptlSave.y = rclDest.top - pt.y;
|
ptlSave.y = rclDest.top - pt.y;
|
||||||
|
|
||||||
IntEngBitBlt(psoDest,
|
IntEngBitBlt(psoDest,
|
||||||
&pgp->psurfSave->SurfObj,
|
&pgp->psurfSave->SurfObj,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
&rclDest,
|
&rclDest,
|
||||||
&ptlSave,
|
&ptlSave,
|
||||||
&ptlSave,
|
&ptlSave,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
ROP3_TO_ROP4(SRCCOPY));
|
ROP3_TO_ROP4(SRCCOPY));
|
||||||
}
|
}
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
@ -216,71 +219,71 @@ IntShowMousePointer(PDEVOBJ *ppdev, SURFOBJ *psoDest)
|
||||||
|
|
||||||
/* Copy the pixels under the cursor to temporary surface. */
|
/* Copy the pixels under the cursor to temporary surface. */
|
||||||
IntEngBitBlt(&pgp->psurfSave->SurfObj,
|
IntEngBitBlt(&pgp->psurfSave->SurfObj,
|
||||||
psoDest,
|
psoDest,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
&rclPointer,
|
&rclPointer,
|
||||||
(POINTL*)&rclSurf,
|
(POINTL*)&rclSurf,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
ROP3_TO_ROP4(SRCCOPY));
|
ROP3_TO_ROP4(SRCCOPY));
|
||||||
|
|
||||||
/* Blt the pointer on the screen. */
|
/* Blt the pointer on the screen. */
|
||||||
if (pgp->psurfColor)
|
if (pgp->psurfColor)
|
||||||
{
|
{
|
||||||
IntEngBitBlt(psoDest,
|
IntEngBitBlt(psoDest,
|
||||||
&pgp->psurfMask->SurfObj,
|
&pgp->psurfMask->SurfObj,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
&rclSurf,
|
&rclSurf,
|
||||||
(POINTL*)&rclPointer,
|
(POINTL*)&rclPointer,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
ROP3_TO_ROP4(SRCAND));
|
ROP3_TO_ROP4(SRCAND));
|
||||||
|
|
||||||
IntEngBitBlt(psoDest,
|
IntEngBitBlt(psoDest,
|
||||||
&pgp->psurfColor->SurfObj,
|
&pgp->psurfColor->SurfObj,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
&rclSurf,
|
&rclSurf,
|
||||||
(POINTL*)&rclPointer,
|
(POINTL*)&rclPointer,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
ROP3_TO_ROP4(SRCINVERT));
|
ROP3_TO_ROP4(SRCINVERT));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
IntEngBitBlt(psoDest,
|
IntEngBitBlt(psoDest,
|
||||||
&pgp->psurfMask->SurfObj,
|
&pgp->psurfMask->SurfObj,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
&rclSurf,
|
&rclSurf,
|
||||||
(POINTL*)&rclPointer,
|
(POINTL*)&rclPointer,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
ROP3_TO_ROP4(SRCAND));
|
ROP3_TO_ROP4(SRCAND));
|
||||||
|
|
||||||
rclPointer.top += pgp->Size.cy;
|
rclPointer.top += pgp->Size.cy;
|
||||||
|
|
||||||
IntEngBitBlt(psoDest,
|
IntEngBitBlt(psoDest,
|
||||||
&pgp->psurfMask->SurfObj,
|
&pgp->psurfMask->SurfObj,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
&rclSurf,
|
&rclSurf,
|
||||||
(POINTL*)&rclPointer,
|
(POINTL*)&rclPointer,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
ROP3_TO_ROP4(SRCINVERT));
|
ROP3_TO_ROP4(SRCINVERT));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -317,16 +320,16 @@ EngSetPointerShape(
|
||||||
if (psoColor || psoMask)
|
if (psoColor || psoMask)
|
||||||
{
|
{
|
||||||
/* Get the size of the new pointer */
|
/* Get the size of the new pointer */
|
||||||
if (psoColor)
|
if (psoColor)
|
||||||
{
|
{
|
||||||
sizel.cx = psoColor->sizlBitmap.cx;
|
sizel.cx = psoColor->sizlBitmap.cx;
|
||||||
sizel.cy = psoColor->sizlBitmap.cy;
|
sizel.cy = psoColor->sizlBitmap.cy;
|
||||||
}
|
}
|
||||||
else// if (psoMask)
|
else// if (psoMask)
|
||||||
{
|
{
|
||||||
sizel.cx = psoMask->sizlBitmap.cx;
|
sizel.cx = psoMask->sizlBitmap.cx;
|
||||||
sizel.cy = psoMask->sizlBitmap.cy / 2;
|
sizel.cy = psoMask->sizlBitmap.cy / 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
rectl.left = 0;
|
rectl.left = 0;
|
||||||
rectl.top = 0;
|
rectl.top = 0;
|
||||||
|
@ -379,35 +382,35 @@ EngSetPointerShape(
|
||||||
|
|
||||||
/* Create a bitmap for the mask */
|
/* Create a bitmap for the mask */
|
||||||
hbmMask = EngCreateBitmap(psoMask->sizlBitmap,
|
hbmMask = EngCreateBitmap(psoMask->sizlBitmap,
|
||||||
lDelta,
|
lDelta,
|
||||||
pso->iBitmapFormat,
|
pso->iBitmapFormat,
|
||||||
BMF_TOPDOWN | BMF_NOZEROINIT,
|
BMF_TOPDOWN | BMF_NOZEROINIT,
|
||||||
NULL);
|
NULL);
|
||||||
psurfMask = SURFACE_ShareLockSurface(hbmMask);
|
psurfMask = SURFACE_ShareLockSurface(hbmMask);
|
||||||
if (!psurfMask) goto failure;
|
if (!psurfMask) goto failure;
|
||||||
|
|
||||||
/* Initialize an EXLATEOBJ */
|
/* Initialize an EXLATEOBJ */
|
||||||
ppal = PALETTE_LockPalette(ppdev->devinfo.hpalDefault);
|
ppal = PALETTE_LockPalette(ppdev->devinfo.hpalDefault);
|
||||||
EXLATEOBJ_vInitialize(&exlo,
|
EXLATEOBJ_vInitialize(&exlo,
|
||||||
&gpalMono,
|
&gpalMono,
|
||||||
ppal,
|
ppal,
|
||||||
0,
|
0,
|
||||||
RGB(0xff,0xff,0xff),
|
RGB(0xff,0xff,0xff),
|
||||||
RGB(0,0,0));
|
RGB(0,0,0));
|
||||||
|
|
||||||
/* Copy the mask bitmap */
|
/* Copy the mask bitmap */
|
||||||
rectl.bottom = psoMask->sizlBitmap.cy;
|
rectl.bottom = psoMask->sizlBitmap.cy;
|
||||||
IntEngCopyBits(&psurfMask->SurfObj,
|
IntEngCopyBits(&psurfMask->SurfObj,
|
||||||
psoMask,
|
psoMask,
|
||||||
NULL,
|
NULL,
|
||||||
&exlo.xlo,
|
&exlo.xlo,
|
||||||
&rectl,
|
&rectl,
|
||||||
(POINTL*)&rectl);
|
(POINTL*)&rectl);
|
||||||
|
|
||||||
/* Cleanup */
|
/* Cleanup */
|
||||||
EXLATEOBJ_vCleanup(&exlo);
|
EXLATEOBJ_vCleanup(&exlo);
|
||||||
if (ppal) PALETTE_UnlockPalette(ppal);
|
if (ppal) PALETTE_UnlockPalette(ppal);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Hide mouse pointer */
|
/* Hide mouse pointer */
|
||||||
IntHideMousePointer(ppdev, pso);
|
IntHideMousePointer(ppdev, pso);
|
||||||
|
@ -434,7 +437,7 @@ EngSetPointerShape(
|
||||||
EngDeleteSurface(pgp->psurfSave->BaseObject.hHmgr);
|
EngDeleteSurface(pgp->psurfSave->BaseObject.hHmgr);
|
||||||
SURFACE_ShareUnlockSurface(pgp->psurfSave);
|
SURFACE_ShareUnlockSurface(pgp->psurfSave);
|
||||||
pgp->psurfSave = NULL;
|
pgp->psurfSave = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* See if we are being asked to hide the pointer. */
|
/* See if we are being asked to hide the pointer. */
|
||||||
if (psoMask == NULL && psoColor == NULL)
|
if (psoMask == NULL && psoColor == NULL)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue