From 768c25a99b2f4ec07993eb15a0f05a5e22b5c695 Mon Sep 17 00:00:00 2001 From: Chase Douglas Date: Mon, 24 Jan 2011 11:49:05 -0500 Subject: Add support for masked valuators With the X server now supporting masked valuators for XI2, enable support in X evdev. Signed-off-by: Chase Douglas Signed-off-by: Peter Hutterer --- src/evdev.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/evdev.h') diff --git a/src/evdev.h b/src/evdev.h index d5b0f07..e68f7f2 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -109,8 +109,9 @@ typedef struct { int num_vals; /* number of valuators */ int axis_map[max(ABS_CNT, REL_CNT)]; /* Map evdev to index */ - int vals[MAX_VALUATORS]; - int old_vals[MAX_VALUATORS]; /* Translate absolute inputs to relative */ + ValuatorMask *vals; /* new values coming in */ + ValuatorMask *old_vals; /* old values for calculating relative motion */ + ValuatorMask *prox; /* last values set while not in proximity */ int flags; int in_proximity; /* device in proximity */ @@ -122,7 +123,6 @@ typedef struct { int delta[REL_CNT]; unsigned int abs_queued, rel_queued, prox_queued; - unsigned int abs_prox; /* valuators posted while out of prox? */ /* XKB stuff has to be per-device rather than per-driver */ XkbRMLVOSet rmlvo; -- cgit v1.2.3