diff options
Diffstat (limited to 'xc/programs/Xserver/hw/sun/sunCursor.c')
| -rw-r--r-- | xc/programs/Xserver/hw/sun/sunCursor.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/xc/programs/Xserver/hw/sun/sunCursor.c b/xc/programs/Xserver/hw/sun/sunCursor.c index 510ed6c5c..6e1d46b9f 100644 --- a/xc/programs/Xserver/hw/sun/sunCursor.c +++ b/xc/programs/Xserver/hw/sun/sunCursor.c @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/sun/sunCursor.c,v 3.2 2001/01/17 22:36:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/sun/sunCursor.c,v 3.3 2001/08/17 22:08:11 tsi Exp $ */ /*- * sunCursor.c -- @@ -33,6 +33,8 @@ from The Open Group. #define NEED_EVENTS #include "sun.h" +#include "cfb.h" +#include "mfb.h" #ifdef FBIOGCURMAX /* has hardware cursor kernel support */ @@ -78,11 +80,6 @@ sunCursorRepad (pScreen, bits, src_bits, dst_bits, ptSrc, w, h) PixmapPtr src, dst; BoxRec box; RegionRec rgnDst; -#ifndef LOWMEMFTPT - extern int mfbDoBitblt(); -#else - extern int cfbDoBitblt(); -#endif /* ifndef LOWMEMFTPT */ if (!(src = GetScratchPixmapHeader(pScreen, bits->width, bits->height, /*bpp*/ 1, /*depth*/ 1, @@ -100,9 +97,10 @@ sunCursorRepad (pScreen, bits, src_bits, dst_bits, ptSrc, w, h) box.y2 = h; REGION_INIT(pScreen, &rgnDst, &box, 1); #ifndef LOWMEMFTPT - mfbDoBitblt(src, dst, GXcopy, &rgnDst, ptSrc); + mfbDoBitblt(&src->drawable, &dst->drawable, GXcopy, &rgnDst, ptSrc); #else - cfbDoBitblt(src, dst, GXcopy, &rgnDst, ptSrc, 0xFFFFFFFF); + cfbDoBitblt(&src->drawable, &dst->drawable, GXcopy, &rgnDst, ptSrc, + 0xFFFFFFFF); #endif /* ifndef LOWMEMFTPT */ REGION_UNINIT(pScreen, &rgnDst); FreeScratchPixmapHeader(src); |