diff options
| author | Eric Anholt <eric@anholt.net> | 2006-11-27 15:43:15 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-11-27 15:43:15 -0800 |
| commit | b4b0d901d98371a8aa7b17d195e18e83e2a6a618 (patch) | |
| tree | ee12953f0708194e3d77c0831fd0fe0e336bceb0 /dix/events.c | |
| parent | 64de3baf85f6df274f71f736016f0848567cd9f6 (diff) | |
| parent | d6cd0313c7f23f32c9c7dda00ff739e772bf7db3 (diff) | |
Merge branch 'randr-1.2'
Conflicts:
dix/events.c
dix/getevents.c
hw/xfree86/common/xf86Mode.c
hw/xfree86/dri/Makefile.am
hw/xfree86/os-support/drm/xf86drm.c
hw/xfree86/os-support/xf86drm.h
Diffstat (limited to 'dix/events.c')
| -rw-r--r-- | dix/events.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dix/events.c b/dix/events.c index e5701eec2..c8da7d62c 100644 --- a/dix/events.c +++ b/dix/events.c @@ -330,8 +330,7 @@ static void ConfineToShape(RegionPtr shape, int *px, int *py); static void PostNewCursor(void); #define SyntheticMotion(x, y) \ - PostSyntheticMotion(x, y, noPanoramiXExtension ? 0 : \ - sprite.screen->myNum, \ + PostSyntheticMotion(x, y, sprite.screen, \ syncEvents.playingEvents ? \ syncEvents.time.milliseconds : \ currentTime.milliseconds); |