diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-06-19 17:20:52 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-06-19 17:20:52 +0930 |
| commit | 1f97a7647606226cde61d6ad7a94f2b0b571a06c (patch) | |
| tree | 63959752648b4f3bcfe4ac271d0a714dfcd93280 /dix/events.c | |
| parent | 5dee64fc99f34e091abce65d47c4b6f026ab4849 (diff) | |
| parent | 2e7fef7d0837939e822c40b6ac77e7f0e66d57bd (diff) | |
Merge branch 'master' into mpx
Conflicts:
dix/devices.c
hw/xfree86/common/xf86Xinput.c
hw/xfree86/loader/xf86sym.c
mi/mieq.c
Diffstat (limited to 'dix/events.c')
| -rw-r--r-- | dix/events.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/dix/events.c b/dix/events.c index f6e90214d..58d9ed43a 100644 --- a/dix/events.c +++ b/dix/events.c @@ -745,6 +745,13 @@ XineramaChangeToCursor(DeviceIntPtr pDev, CursorPtr cursor) } } +#else +#define SyntheticMotion(x, y) \ + PostSyntheticMotion(x, y, \ + 0, \ + syncEvents.playingEvents ? \ + syncEvents.time.milliseconds : \ + currentTime.milliseconds); #endif /* PANORAMIX */ |