diff options
| author | Deron Johnson <deron.johnson@sun.com> | 2004-10-18 20:01:35 +0000 |
|---|---|---|
| committer | Deron Johnson <deron.johnson@sun.com> | 2004-10-18 20:01:35 +0000 |
| commit | 0787972b64b35614a7b09fa1b2197e446b237f98 (patch) | |
| tree | 368794fa757267c44fe70a9cc8d8d452e3506f42 | |
| parent | cc390e4ed5e0d1bc8f7c3eaf9de67be4e9792b7c (diff) | |
A cursor bug fix from Amir Bukhari.
| -rw-r--r-- | dix/events.c | 18 | ||||
| -rwxr-xr-x | xfixes/cursor.c | 9 |
2 files changed, 10 insertions, 17 deletions
diff --git a/dix/events.c b/dix/events.c index d75a1e062..d4a9b082e 100644 --- a/dix/events.c +++ b/dix/events.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/events.c,v 1.6 2004/08/09 02:08:35 kem Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/events.c,v 1.6.4.1 2004/09/16 23:37:22 deronj Exp $ */ /* $XFree86: xc/programs/Xserver/dix/events.c,v 3.51 2004/01/12 17:04:52 tsi Exp $ */ /************************************************************ @@ -678,14 +678,6 @@ XineramaConfineCursorToWindow(WindowPtr pWin, Bool generateEvents) static void XineramaChangeToCursor(CursorPtr cursor) { -#ifdef LG3D - if (plgeDisplayServerForceThisCursor != NULL) { - (*sprite.hotPhys.pScreen->DisplayCursor) (sprite.hotPhys.pScreen, - plgeDisplayServerForceThisCursor); - return; - } -#endif /* LG3D */ - if (cursor != sprite.current) { if ((sprite.current->bits->xhot != cursor->bits->xhot) || @@ -921,14 +913,6 @@ ChangeToCursor(CursorPtr cursor) } #endif -#ifdef LG3D - if (plgeDisplayServerForceThisCursor != NULL) { - (*sprite.hotPhys.pScreen->DisplayCursor) (sprite.hotPhys.pScreen, - plgeDisplayServerForceThisCursor); - return; - } -#endif /* LG3D */ - if (cursor != sprite.current) { if ((sprite.current->bits->xhot != cursor->bits->xhot) || diff --git a/xfixes/cursor.c b/xfixes/cursor.c index 2464f1abb..9baf38301 100755 --- a/xfixes/cursor.c +++ b/xfixes/cursor.c @@ -38,6 +38,9 @@ static RESTYPE CursorWindowType; static int CursorScreenPrivateIndex = -1; static int CursorGeneration; static CursorPtr CursorCurrent; +#ifdef LG3D +extern CursorPtr plgeDisplayServerForceThisCursor; +#endif /* LG3D */ #define VERIFY_CURSOR(pCursor, cursor, client, access) { \ pCursor = (CursorPtr)SecurityLookupIDByType((client), (cursor), \ @@ -87,6 +90,12 @@ CursorDisplayCursor (ScreenPtr pScreen, Bool ret; Unwrap (cs, pScreen, DisplayCursor); +#ifdef LG3D + if (plgeDisplayServerForceThisCursor != NULL) { + ret = (*pScreen->DisplayCursor) (pScreen, + plgeDisplayServerForceThisCursor); + } else +#endif ret = (*pScreen->DisplayCursor) (pScreen, pCursor); if (pCursor != CursorCurrent) { |