Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-01 00:58:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better looking mouse cursor

Browse source 
svn path=/trunk/; revision=1936
This commit is contained in:
Jason Filby 2001-06-02 08:43:48 +00:00
parent 7d15b82aa0
commit a9d9714a23
3 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/subsys/win32k/eng/lineto.c
View file

@ -22,7 +22,6 @@ BOOL EngLineTo(SURFOBJ *Surface, CLIPOBJ *Clip, BRUSHOBJ *Brush,
if(Surface->iType!=STYPE_BITMAP) if(Surface->iType!=STYPE_BITMAP)
{ {
// Call the driver's DrvLineTo // Call the driver's DrvLineTo
DbgPrint("calling surfgdi's lineto\n");
return SurfGDI->LineTo(Surface, Clip, Brush, x1, y1, x2, y2, RectBounds, mix); return SurfGDI->LineTo(Surface, Clip, Brush, x1, y1, x2, y2, RectBounds, mix);
} }

21
reactos/subsys/win32k/eng/mouse.c
View file

@ -92,6 +92,7 @@ void TestMouse()
PSURFOBJ SurfObj = AccessUserObject(dc->Surface); PSURFOBJ SurfObj = AccessUserObject(dc->Surface);
PSURFGDI SurfGDI = AccessInternalObject(dc->Surface); PSURFGDI SurfGDI = AccessInternalObject(dc->Surface);
BOOL txt; BOOL txt;
int i;
BRUSHOBJ Brush; BRUSHOBJ Brush;
HBITMAP hMouseSurf; HBITMAP hMouseSurf;
@ -101,14 +102,30 @@ void TestMouse()
RECTL MouseRect; RECTL MouseRect;
// Draw a test mouse cursor // Draw a test mouse cursor
Brush.iSolidColor = 1; /* Brush.iSolidColor = 1;
EngLineTo(SurfObj, NULL, &Brush, 0, 0, 15, 0, NULL, 0); EngLineTo(SurfObj, NULL, &Brush, 0, 0, 15, 0, NULL, 0);
EngLineTo(SurfObj, NULL, &Brush, 0, 0, 0, 15, NULL, 0); EngLineTo(SurfObj, NULL, &Brush, 0, 0, 0, 15, NULL, 0);
EngLineTo(SurfObj, NULL, &Brush, 0, 15, 15, 0, NULL, 0); EngLineTo(SurfObj, NULL, &Brush, 0, 15, 15, 0, NULL, 0);
Brush.iSolidColor = 15; Brush.iSolidColor = 15;
EngLineTo(SurfObj, NULL, &Brush, 1, 1, 13, 1, NULL, 0); EngLineTo(SurfObj, NULL, &Brush, 1, 1, 13, 1, NULL, 0);
EngLineTo(SurfObj, NULL, &Brush, 1, 1, 1, 13, NULL, 0); EngLineTo(SurfObj, NULL, &Brush, 1, 1, 1, 13, NULL, 0);
EngLineTo(SurfObj, NULL, &Brush, 1, 13, 13, 1, NULL, 0); EngLineTo(SurfObj, NULL, &Brush, 1, 13, 13, 1, NULL, 0); */
// Draw transparent colored rectangle
Brush.iSolidColor = 5;
for (i = 0; i < 17; i++)
EngLineTo(SurfObj, NULL, &Brush, 0, i, 17, i, NULL, 0);
// Draw white interior
Brush.iSolidColor = 15;
for (i = 1; i < 16; i++)
EngLineTo(SurfObj, NULL, &Brush, 0, i-1, 16-i, i-1, NULL, 0);
// Draw black outline
Brush.iSolidColor = 0;
EngLineTo(SurfObj, NULL, &Brush, 0, 0, 15, 0, NULL, 0);
EngLineTo(SurfObj, NULL, &Brush, 0, 16, 15, 0, NULL, 0);
EngLineTo(SurfObj, NULL, &Brush, 0, 15, 0, 0, NULL, 0);
// Create the bitmap for the mouse cursor data // Create the bitmap for the mouse cursor data
MouseSize.cx = 16; MouseSize.cx = 16;

5
reactos/subsys/win32k/objects/fillshap.c
View file

@ -88,10 +88,7 @@ W32kRectangle(HDC hDC,
if(PATH_IsPathOpen(dc->w.path)) { if(PATH_IsPathOpen(dc->w.path)) {
ret = PATH_Rectangle(hDC, LeftRect, TopRect, RightRect, BottomRect); ret = PATH_Rectangle(hDC, LeftRect, TopRect, RightRect, BottomRect);
} else { } else {
// Draw the rectangle with the current pen
DbgPrint("W32kRectangle pen: ");
DbgPrint("--- %08x\n", GDIOBJ_HandleToPtr(dc->w.hPen, GO_PEN_MAGIC));
BrushObj = PenToBrushObj(dc, GDIOBJ_HandleToPtr(dc->w.hPen, GO_PEN_MAGIC)); BrushObj = PenToBrushObj(dc, GDIOBJ_HandleToPtr(dc->w.hPen, GO_PEN_MAGIC));
ret = EngLineTo(SurfObj, ret = EngLineTo(SurfObj,