mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evdev: reset accumulator inside evdev_flush_motion

Browse Source 
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
This commit is contained in:
Tiago Vignatti
2011-11-21 17:59:31 +02:00
parent a52b2e4b20
commit 80885e16b3
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/evdev.c
+14 -17
View File
@@ -207,13 +207,17 @@ is_motion_event(struct input_event *e)
static void static void
evdev_flush_motion(struct wl_input_device *device, uint32_t time, evdev_flush_motion(struct wl_input_device *device, uint32_t time,
struct evdev_motion_accumulator accum) struct evdev_motion_accumulator *accum)
{ {
if (accum.type == EVDEV_RELATIVE_MOTION) if (accum->type == EVDEV_RELATIVE_MOTION) {
notify_motion(device, time, accum.x + accum.dx, notify_motion(device, time, accum->x + accum->dx,
accum.y + accum.dy); accum->y + accum->dy);
if (accum.type == EVDEV_ABSOLUTE_MOTION) accum->dx = accum->dy = 0;
notify_motion(device, time, accum.x, accum.y); }
if (accum->type == EVDEV_ABSOLUTE_MOTION)
notify_motion(device, time, accum->x, accum->y);
accum->type = 0;
} }
static int static int
@@ -231,9 +235,7 @@ evdev_input_device_data(int fd, uint32_t mask, void *data)
if (!ec->focus) if (!ec->focus)
return 1; return 1;
accumulator.dx = 0; memset(&accumulator, 0, sizeof accumulator);
accumulator.dy = 0;
accumulator.type = 0;
accumulator.x = device->master->base.input_device.x; accumulator.x = device->master->base.input_device.x;
accumulator.y = device->master->base.input_device.y; accumulator.y = device->master->base.input_device.y;
@@ -251,14 +253,9 @@ evdev_input_device_data(int fd, uint32_t mask, void *data)
/* we try to minimize the amount of notifications to be /* we try to minimize the amount of notifications to be
* forwarded to the compositor, so we accumulate motion * forwarded to the compositor, so we accumulate motion
* events and send as a bunch */ * events and send as a bunch */
if (!is_motion_event(e)) { if (!is_motion_event(e))
evdev_flush_motion(&device->master->base.input_device, evdev_flush_motion(&device->master->base.input_device,
time, accumulator); time, &accumulator);
accumulator.dx = 0;
accumulator.dy = 0;
accumulator.type = 0;
}
switch (e->type) { switch (e->type) {
case EV_REL: case EV_REL:
evdev_process_relative_motion(e, &accumulator); evdev_process_relative_motion(e, &accumulator);
@@ -278,7 +275,7 @@ evdev_input_device_data(int fd, uint32_t mask, void *data)
} }
evdev_flush_motion(&device->master->base.input_device, time, evdev_flush_motion(&device->master->base.input_device, time,
accumulator); &accumulator);
return 1; return 1;
} }