Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small fixes

Browse source 
svn path=/trunk/; revision=1940
This commit is contained in:
Jason Filby 2001-06-03 10:48:41 +00:00
parent b6af1f6bab
commit 3d24d1f443
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
reactos/drivers/dd/vga/display/objects/pointer.c
View file

@ -61,7 +61,7 @@ ULONG VGADDISetPointerShape(PSURFOBJ pso, PSURFOBJ psoMask, PSURFOBJ psoColor, P
PCHAR DFBTmp;
ULONG DFBAllocSize;
// Hide the cursor (if it's there -- FIXME?)
// Hide the cursor
if(ppdev->pPointerAttributes->Enable != 0) vgaHideCursor(ppdev);
// Copy the mask and color bitmaps into the PPDEV
@ -95,9 +95,6 @@ void vgaHideCursor(PPDEV ppdev)
{
ULONG i, j, cx, cy, bitpos;
// Clip so as not to hide where we are just going to be repainting (if called from vgaShowCursor)
// Display what was behind cursor
DFB_BltToVGA(oldx, oldy,
ppdev->pPointerAttributes->Width,
@ -105,9 +102,6 @@ void vgaHideCursor(PPDEV ppdev)
behindCursor,
ppdev->pPointerAttributes->WidthInBytes);
oldx = ppdev->xyCursor.x;
oldy = ppdev->xyCursor.y;
ppdev->pPointerAttributes->Enable = 0;
}
@ -121,7 +115,7 @@ void vgaShowCursor(PPDEV ppdev)
cx = ppdev->xyCursor.x;
cy = ppdev->xyCursor.y;
// repaint background
// Used to repaint background
DFB_BltFromVGA(ppdev->xyCursor.x, ppdev->xyCursor.y,
ppdev->pPointerAttributes->Width, ppdev->pPointerAttributes->Height,
behindCursor, ppdev->pPointerAttributes->WidthInBytes);
@ -133,5 +127,8 @@ void vgaShowCursor(PPDEV ppdev)
ppdev->pPointerAttributes->Pixels,
ppdev->pPointerAttributes->WidthInBytes, 5);
oldx = ppdev->xyCursor.x;
oldy = ppdev->xyCursor.y;
ppdev->pPointerAttributes->Enable = 1;
}

7
reactos/drivers/dd/vga/display/vgavideo/vgavideo.c
View file

@ -398,7 +398,6 @@ void DIB_BltFromVGA(int x, int y, int w, int h, void *b, int Dest_lDelta)
opb += Dest_lDelta; // new test code
pb = opb; // new test code
}
}
@ -565,6 +564,12 @@ void DFB_BltFromVGA(int x, int y, int w, int h, void *b, int bw)
vpY += byte_per_line;
}
}
// We don't need this if the next call is a DFB blt to VGA (as in the case of moving the mouse pointer)
WRITE_PORT_UCHAR((PUCHAR)GRA_I, 0x05); // write mode 2
WRITE_PORT_UCHAR((PUCHAR)GRA_D, 0x02);
WRITE_PORT_UCHAR((PUCHAR)GRA_I, 0x03); // replace
WRITE_PORT_UCHAR((PUCHAR)GRA_D, 0x00);
}
void DFB_BltToVGA(int x, int y, int w, int h, void *b, int bw)