diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:59 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:59 +0000 |
| commit | a6dbf328e124511ea2b4dc796f6b67dd919bf839 (patch) | |
| tree | 513474734457bff05d4bd284f442c7d392105c86 /src/ct_cursor.c | |
| parent | 3c5e383a433be77572808336ce06a6da5990ee61 (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branchXEVIE-BASE
Diffstat (limited to 'src/ct_cursor.c')
| -rw-r--r-- | src/ct_cursor.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/ct_cursor.c b/src/ct_cursor.c index 44a7e8a..55b56a3 100644 --- a/src/ct_cursor.c +++ b/src/ct_cursor.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_cursor.c,v 1.27 2002/11/25 14:04:58 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_cursor.c,v 1.28 2003/07/17 08:19:34 eich Exp $ */ /* * Copyright 1994 The XFree86 Project @@ -156,10 +156,7 @@ CHIPSSetCursorPosition(ScrnInfoPtr pScrn, int x, int y) CHIPSPtr cPtr = CHIPSPTR(pScrn); CURSOR_SYNC(pScrn); - - if (pScrn->currentMode->Flags & V_DBLSCAN) - y *= 2; - + if (x < 0) x = ~(x-1) | 0x8000; if (y < 0) @@ -429,10 +426,13 @@ CHIPSLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src) } static Bool -CHIPSUseHWCursor(ScreenPtr pScr, CursorPtr pCurs) +CHIPSUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs) { - CHIPSPtr cPtr = CHIPSPTR(xf86Screens[pScr->myNum]); - return ((cPtr->Flags & ChipsHWCursor) != 0); + ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + CHIPSPtr cPtr = CHIPSPTR(pScrn); + + return (((cPtr->Flags & ChipsHWCursor) != 0) + && !(pScrn->currentMode->Flags & V_DBLSCAN)); } Bool |