diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2006-11-23 17:15:14 +1030 |
|---|---|---|
| committer | Peter Hutterer <whot@hyena.localdomain> | 2006-11-23 17:15:14 +1030 |
| commit | 1c7568b8a1417257fa67c7fca69aa253099b9461 (patch) | |
| tree | 9e2079d6e643d1b332e62f5806cdc5f5e2030fb9 /hw/xfree86/dri/dri.c | |
| parent | f52d53e060d0468b658a565688d1f92c156405c7 (diff) | |
mi: closing memory leak, miPointer is freed in miPointerCloseScreen
bugfix: uninitialized pPointer in miPointerGetPosition ifndef MPX
adding DeviceIntPtr parameter to ScreenRec's cursor functions.
cleanup of miPointer code to use same scheme in each function
dix: MPHasCursor() function determines checking whether to invoke
cursor rendering.
animcur: adding DeviceIntPtr parameter to cursor functions but animcur relies
on the core pointer right now.
xfixes: adding DeviceIntPtr parameter to cursor functions but xfixes relies on
the core pointer right now.
rac: adding DeviceIntPtr parameter to cursor functions but RAC relies on
the core pointer right now.
ramdac: adding DeviceIntPtr parameter to cursor functions but ramdac relies on
the core pointer right now.
Diffstat (limited to 'hw/xfree86/dri/dri.c')
| -rw-r--r-- | hw/xfree86/dri/dri.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index a49c63212..76f0b702a 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -70,6 +70,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "mi.h" #include "mipointer.h" #include "xf86_OSproc.h" +#include "inputstr.h" #if !defined(PANORAMIX) extern Bool noPanoramiXExtension; @@ -2013,7 +2014,7 @@ DRIAdjustFrame(int scrnIndex, int x, int y, int flags) if (px > pScrn->frameX1) px = pScrn->frameX1; if (py < pScrn->frameY0) py = pScrn->frameY0; if (py > pScrn->frameY1) py = pScrn->frameY1; - pScreen->SetCursorPosition(pScreen, px, py, TRUE); + pScreen->SetCursorPosition(inputInfo.pointer, pScreen, px, py, TRUE); return; } |