summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2010-10-06 11:04:21 +0200
committerPeter Hutterer <peter.hutterer@who-t.net>2010-10-20 09:47:42 +1000
commitdc9d2fd462ef3ba5176c74a2456822fe1671053d (patch)
treeda5a100da121d89a234c09f13e094acf2d30fcaa
parentb7c8e70f3f93e5ff1b64bff33b802d53c867adf8 (diff)
Fix typo when converting raw events from the wire.
The raw values were being miscalculated, containing only the integral part of the FP3232, meanwhile normal valuators were mistakenly added the fractional part of its corresponding raw value. Signed-off-by: Carlos Garnacho <carlosg@gnome.org> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit f237427f897d1dc527494653735d4bb93d740546)
-rw-r--r--src/XExtInt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/XExtInt.c b/src/XExtInt.c
index 80b3fc7..db7aa78 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
@@ -1640,7 +1640,7 @@ wireToRawEvent(xXIRawEvent *in, XGenericEventCookie *cookie)
out->valuators.values[i] = values->integral;
out->valuators.values[i] += ((double)values->frac / (1 << 16) / (1 << 16));
out->raw_values[i] = (values + bits)->integral;
- out->valuators.values[i] += ((double)(values + bits)->frac / (1 << 16) / (1 << 16));
+ out->raw_values[i] += ((double)(values + bits)->frac / (1 << 16) / (1 << 16));
values++;
}