summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2012-02-06 00:45:23 +0100
committerPeter Hutterer <peter.hutterer@who-t.net>2012-02-07 00:10:25 +1000
commitda0d20d0fd5cce3707b54146e54e2df0c697e1b4 (patch)
tree3f02051f11b52e0c1c2b0fc7a71852e066058d71
parent3822705204f454fea6cc0bf61904c4b7186abee2 (diff)
eventcomm: Fix initialization code
num_mt_axes contains the number of non-x/y multitouch axes, and the valuator mask needs to contains x, y, followed by two empy values for the scroll valuators, followed by the remaining MT axes. https://bugs.freedesktop.org/show_bug.cgi?id=45663 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/eventcomm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/eventcomm.c b/src/eventcomm.c
index c323f8f..be0f4ee 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -180,8 +180,8 @@ InitializeTouch(InputInfoPtr pInfo)
* and Y. */
valuator_mask_set(proto_data->last_mt_vals[i], 0, 0);
valuator_mask_set(proto_data->last_mt_vals[i], 1, 0);
- for (j = 4; j < priv->num_mt_axes; j++)
- valuator_mask_set(proto_data->last_mt_vals[i], j, 0);
+ for (j = 0; j < priv->num_mt_axes; j++)
+ valuator_mask_set(proto_data->last_mt_vals[i], 4 + j, 0);
}
}
#endif