frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ironing some glitches caused by the merge

This commit is contained in:
Peter Hutterer 2006-12-05 18:50:19 +10:30 committed by Peter Hutterer
parent 3c8f166022
commit eb1d9f51af
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Changelog
View File

@ -24,6 +24,15 @@ ____________________________________________________________
Merging from master Merging from master
____________________________________________________________
Ironing some glitches caused by the merge
Files:
Xi/exevents.c
randr/rrpointer.c
dix/events.c
== 01.12.06 == == 01.12.06 ==

3
Xi/exevents.c
View File

@ -266,7 +266,8 @@ ProcessOtherEvent(xEventPtr xE, register DeviceIntPtr other, int count)
} else if (xE->u.u.type == DeviceButtonRelease } else if (xE->u.u.type == DeviceButtonRelease
#ifdef MPX #ifdef MPX
|| xE->u.u.type == MPXButtonRelease || xE->u.u.type == MPXButtonRelease
#endif) { #endif
) {
if (!b) if (!b)
return; return;

2
dix/events.c
View File

@ -360,7 +360,7 @@ static void ConfineToShape(DeviceIntPtr pDev, RegionPtr shape, int *px, int *py)
static void PostNewCursor(DeviceIntPtr pDev); static void PostNewCursor(DeviceIntPtr pDev);
#define SyntheticMotion(x, y) \ #define SyntheticMotion(x, y) \
PostSyntheticMotion(x, y, sprite.screen, \ PostSyntheticMotion(x, y, sprite->screen, \
syncEvents.playingEvents ? \ syncEvents.playingEvents ? \
syncEvents.time.milliseconds : \ syncEvents.time.milliseconds : \
currentTime.milliseconds); currentTime.milliseconds);

5
randr/rrpointer.c
View File

@ -21,6 +21,7 @@
*/ */
#include "randrstr.h" #include "randrstr.h"
#include "inputstr.h"
/* /*
* When the pointer moves, check to see if the specified position is outside * 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) 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; pScrPriv->pointerCrtc = nearest;
} }
@ -132,6 +133,6 @@ RRPointerScreenConfigured (ScreenPtr pScreen)
if (pScreen != pCurrentScreen) if (pScreen != pCurrentScreen)
return; return;
GetSpritePosition (&x, &y); GetSpritePosition(inputInfo.pointer, &x, &y);
RRPointerToNearestCrtc (pScreen, x, y, NULL); RRPointerToNearestCrtc (pScreen, x, y, NULL);
} }