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

evdev: Don't transform device->abs.x/y in place

Browse Source 
We don't always get both an X and an Y event in a SYN report, so we end
up transforming the coordinate we don't get twice.  For example, if we
only receive an ABS_X event, we transform the already transformed
device->abs.y again in transform_absolute() when applying the calibration.
This commit is contained in:
Kristian Høgsberg
2013-08-28 22:12:24 -07:00
parent c4df4082c2
commit 6c7583de2a
1 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/evdev.c
+11 -13
View File
@@ -236,23 +236,21 @@ is_motion_event(struct input_event *e)
} }
static void static void
transform_absolute(struct evdev_device *device) transform_absolute(struct evdev_device *device, int32_t *x, int32_t *y)
{ {
int32_t x, y; if (!device->abs.apply_calibration) {
*x = device->abs.x;
if (!device->abs.apply_calibration) *y = device->abs.y;
return; return;
} else {
x = device->abs.x * device->abs.calibration[0] + *x = device->abs.x * device->abs.calibration[0] +
device->abs.y * device->abs.calibration[1] + device->abs.y * device->abs.calibration[1] +
device->abs.calibration[2]; device->abs.calibration[2];
y = device->abs.x * device->abs.calibration[3] + *y = device->abs.x * device->abs.calibration[3] +
device->abs.y * device->abs.calibration[4] + device->abs.y * device->abs.calibration[4] +
device->abs.calibration[5]; device->abs.calibration[5];
}
device->abs.x = x;
device->abs.y = y;
} }
static void static void
@@ -260,6 +258,7 @@ evdev_flush_motion(struct evdev_device *device, uint32_t time)
{ {
struct weston_seat *master = device->seat; struct weston_seat *master = device->seat;
wl_fixed_t x, y; wl_fixed_t x, y;
int32_t cx, cy;
int slot; int slot;
if (!(device->pending_events & EVDEV_SYN)) if (!(device->pending_events & EVDEV_SYN))
@@ -299,10 +298,9 @@ evdev_flush_motion(struct evdev_device *device, uint32_t time)
device->pending_events &= ~EVDEV_ABSOLUTE_MT_UP; device->pending_events &= ~EVDEV_ABSOLUTE_MT_UP;
} }
if (device->pending_events & EVDEV_ABSOLUTE_MOTION) { if (device->pending_events & EVDEV_ABSOLUTE_MOTION) {
transform_absolute(device); transform_absolute(device, &cx, &cy);
weston_output_transform_coordinate(device->output, weston_output_transform_coordinate(device->output,
device->abs.x, cx, cy, &x, &y);
device->abs.y, &x, &y);
if (device->caps & EVDEV_TOUCH) { if (device->caps & EVDEV_TOUCH) {
if (master->num_tp == 0) if (master->num_tp == 0)