dix/events: take screen number, not pointer, in PostSyntheticMotion
Since we were using PostSyntheticMotion incorrectly anyway, update the declared API to match.
This commit is contained in:
parent
c1674660a7
commit
05f915050c
|
@ -761,7 +761,7 @@ SwitchCorePointer(DeviceIntPtr pDev)
|
||||||
* to shift the pointer to get it inside the new bounds.
|
* to shift the pointer to get it inside the new bounds.
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
PostSyntheticMotion(int x, int y, ScreenPtr pScreen, unsigned long time)
|
PostSyntheticMotion(int x, int y, int screen, unsigned long time)
|
||||||
{
|
{
|
||||||
xEvent xE;
|
xEvent xE;
|
||||||
|
|
||||||
|
@ -770,8 +770,8 @@ PostSyntheticMotion(int x, int y, ScreenPtr pScreen, unsigned long time)
|
||||||
will translate from sprite screen to screen 0 upon reentry
|
will translate from sprite screen to screen 0 upon reentry
|
||||||
to the DIX layer. */
|
to the DIX layer. */
|
||||||
if (!noPanoramiXExtension) {
|
if (!noPanoramiXExtension) {
|
||||||
x += panoramiXdataPtr[0].x - panoramiXdataPtr[pScreen->myNum].x;
|
x += panoramiXdataPtr[0].x - panoramiXdataPtr[screen].x;
|
||||||
y += panoramiXdataPtr[0].y - panoramiXdataPtr[pScreen->myNum].y;
|
y += panoramiXdataPtr[0].y - panoramiXdataPtr[screen].y;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -103,7 +103,7 @@ extern int ProcUngrabButton(ClientPtr /* client */);
|
||||||
extern int ProcRecolorCursor(ClientPtr /* client */);
|
extern int ProcRecolorCursor(ClientPtr /* client */);
|
||||||
|
|
||||||
#ifdef PANORAMIX
|
#ifdef PANORAMIX
|
||||||
extern void PostSyntheticMotion(int x, int y, ScreenPtr pScreen, unsigned long time);
|
extern void PostSyntheticMotion(int x, int y, int screen, unsigned long time);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* DIXEVENTS_H */
|
#endif /* DIXEVENTS_H */
|
||||||
|
|
|
@ -421,7 +421,7 @@ extern int GetProximityEvents(
|
||||||
extern void PostSyntheticMotion(
|
extern void PostSyntheticMotion(
|
||||||
int x,
|
int x,
|
||||||
int y,
|
int y,
|
||||||
ScreenPtr pScreen,
|
int screen,
|
||||||
unsigned long time);
|
unsigned long time);
|
||||||
|
|
||||||
extern int GetMotionHistorySize(
|
extern int GetMotionHistorySize(
|
||||||
|
|
Loading…
Reference in New Issue