diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-12-03 10:41:16 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-12-17 15:03:12 +1000 |
| commit | 21a15f9a04ec0a6c8f654eef943561e98db2475d (patch) | |
| tree | b4e799b2138d5b2b1a5f4a8a62ed794bb52c1c6c /mi | |
| parent | 707b4dc61f18960611409ef5ad8947be189f7296 (diff) | |
Pass the event list through to the pointer barrier code to return it
Instead of having the pointer barrier code enqueue events separately from
GetPointerEvents, pass the event list through and let it add to it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/mipointer.c | 6 | ||||
| -rw-r--r-- | mi/mipointer.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mi/mipointer.c b/mi/mipointer.c index d1708249f..f4fbd2912 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -565,7 +565,8 @@ miPointerMoveNoEvent(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) */ ScreenPtr miPointerSetPosition(DeviceIntPtr pDev, int mode, double *screenx, - double *screeny) + double *screeny, + int *nevents, InternalEvent* events) { miPointerScreenPtr pScreenPriv; ScreenPtr pScreen; @@ -598,7 +599,8 @@ miPointerSetPosition(DeviceIntPtr pDev, int mode, double *screenx, input_constrain_cursor(pDev, pScreen, current_x, current_y, x, y, - &constrained_x, &constrained_y); + &constrained_x, &constrained_y, + nevents, events); x = constrained_x; y = constrained_y; diff --git a/mi/mipointer.h b/mi/mipointer.h index 1500e216a..f89dff31e 100644 --- a/mi/mipointer.h +++ b/mi/mipointer.h @@ -115,7 +115,8 @@ miPointerGetPosition(DeviceIntPtr pDev, int *x, int *y); /* Moves the cursor to the specified position. May clip the co-ordinates: * x and y are modified in-place. */ extern _X_EXPORT ScreenPtr -miPointerSetPosition(DeviceIntPtr pDev, int mode, double *x, double *y); +miPointerSetPosition(DeviceIntPtr pDev, int mode, double *x, double *y, + int *nevents, InternalEvent *events); extern _X_EXPORT void miPointerUpdateSprite(DeviceIntPtr pDev); |