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

evdev: send old valuator inside event frame when the other is missing

Browse Source 
when a motion is being performed on ts device, only one axis can be sent
through the evdev bytestream whereas the other could be omitted. For instance:

   -------------- SYN_REPORT ------------
   type 3 (EV_ABS), code 53 (ABS_MT_POSITION_X), value 22208
   type 3 (EV_ABS), code 58 (ABS_MT_PRESSURE), value 631
   type 3 (EV_ABS), code 0 (ABS_X), value 22208
   -------------- SYN_REPORT ------------

on such case we'd have to send the compositor the old value of Y. Commit
f547bd36 introduced this bug cause it was sending zeroed coordinate and not
the old one.

Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
This commit is contained in:
Tiago Vignatti 2011-12-08 12:18:16 +02:00
parent d7c4551562
commit 1c2bcb182b
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
compositor/evdev.c
View File

@ -203,6 +203,20 @@ is_motion_event(struct input_event *e)
return 0; return 0;
} }
static void
evdev_reset_accum(struct wl_input_device *device,
struct evdev_motion_accumulator *accum)
{
memset(accum, 0, sizeof *accum);
/* There are cases where only one axis on ts devices can be sent
* through the bytestream whereas the other could be omitted. For
* this, we have to save the old value that will be forwarded without
* modifications to the compositor. */
accum->x = device->x;
accum->y = device->y;
}
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)
@ -213,7 +227,7 @@ evdev_flush_motion(struct wl_input_device *device, uint32_t time,
if (accum->type == EVDEV_ABSOLUTE_MOTION) if (accum->type == EVDEV_ABSOLUTE_MOTION)
notify_motion(device, time, accum->x, accum->y); notify_motion(device, time, accum->x, accum->y);
memset(accum, 0, sizeof *accum); evdev_reset_accum(device, accum);
} }
static int static int
@ -236,7 +250,7 @@ evdev_input_device_data(int fd, uint32_t mask, void *data)
return 1; return 1;
} }
memset(&accumulator, 0, sizeof accumulator); evdev_reset_accum(&device->master->base.input_device, &accumulator);
e = ev; e = ev;
end = (void *) ev + len; end = (void *) ev + len;