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

evdev: Use temporary x and y coordinates when applying calibration

Browse Source 
Don't overwrite device->abs.x halfway through the matrix multiplication.
This commit is contained in:
Kristian Høgsberg
2013-07-26 10:41:43 -07:00
parent cee407e0c0
commit 58014bbba8
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/evdev.c
+11 -6
View File
@@ -230,16 +230,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, y;
if (!device->abs.apply_calibration) if (!device->abs.apply_calibration)
return; return;
device->abs.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];
device->abs.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