diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2006-12-05 18:50:19 +1030 |
|---|---|---|
| committer | Peter Hutterer <whot@hyena.localdomain> | 2006-12-05 18:50:19 +1030 |
| commit | eb1d9f51af19dab20a95c2830ca1c508d8ee66bb (patch) | |
| tree | 59d6c7877d0a30b149fe3bc44f178f66fa107236 /randr/rrpointer.c | |
| parent | 3c8f166022a2d19af14eb670fa382503ba1451cd (diff) | |
Ironing some glitches caused by the merge
Diffstat (limited to 'randr/rrpointer.c')
| -rw-r--r-- | randr/rrpointer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/randr/rrpointer.c b/randr/rrpointer.c index c092e494b..b9ee3bce2 100644 --- a/randr/rrpointer.c +++ b/randr/rrpointer.c @@ -21,6 +21,7 @@ */ #include "randrstr.h" +#include "inputstr.h" /* * When the pointer moves, check to see if the specified position is outside @@ -87,7 +88,7 @@ RRPointerToNearestCrtc (ScreenPtr pScreen, int x, int y, RRCrtcPtr skip) } } if (best_dx || best_dy) - (*pScreen->SetCursorPosition) (pScreen, x + best_dx, y + best_dy, TRUE); + (*pScreen->SetCursorPosition) (inputInfo.pointer, pScreen, x + best_dx, y + best_dy, TRUE); pScrPriv->pointerCrtc = nearest; } @@ -132,6 +133,6 @@ RRPointerScreenConfigured (ScreenPtr pScreen) if (pScreen != pCurrentScreen) return; - GetSpritePosition (&x, &y); + GetSpritePosition(inputInfo.pointer, &x, &y); RRPointerToNearestCrtc (pScreen, x, y, NULL); } |