diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2022-09-01 15:31:47 +1000 |
|---|---|---|
| committer | Ping Cheng <pinglinux@gmail.com> | 2022-09-13 15:53:22 -0700 |
| commit | 8e4a77bc28970d23da80838c195550cad4ef8e05 (patch) | |
| tree | 7b21e551b896dca0e7a20df58010257ec4508757 | |
| parent | 1aaa36753c1008733b62cea5f60088ddbddff1e8 (diff) | |
| download | xf86-input-wacom-8e4a77bc28970d23da80838c195550cad4ef8e05.tar.gz | |
x11: de-duplicate the valuator number assignment
Let's add a helper function for this so we can't mess this up.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/x11/xf86Wacom.c | 58 |
1 files changed, 28 insertions, 30 deletions
diff --git a/src/x11/xf86Wacom.c b/src/x11/xf86Wacom.c index fca6fc8..aebf27a 100644 --- a/src/x11/xf86Wacom.c +++ b/src/x11/xf86Wacom.c @@ -370,6 +370,32 @@ void wcmEmitKeycode(WacomDevicePtr priv, int keycode, int state) xf86PostKeyboardEvent (keydev, keycode, state); } +static inline int +valuatorNumber(enum WacomAxisType which) +{ + int pos; + + switch (which){ + case WACOM_AXIS_X: pos = 0; break; + case WACOM_AXIS_Y: pos = 1; break; + case WACOM_AXIS_PRESSURE: pos = 2; break; + case WACOM_AXIS_TILT_X: pos = 3; break; + case WACOM_AXIS_TILT_Y: pos = 4; break; + case WACOM_AXIS_STRIP_X: pos = 3; break; + case WACOM_AXIS_STRIP_Y: pos = 4; break; + case WACOM_AXIS_ROTATION: pos = 3; break; + case WACOM_AXIS_THROTTLE: pos = 4; break; + case WACOM_AXIS_WHEEL: pos = 5; break; + case WACOM_AXIS_RING: pos = 5; break; + case WACOM_AXIS_RING2: pos = 6; break; + break; + default: + abort(); + } + + return pos; +} + static inline void convertAxes(const WacomAxisData *axes, int *first_out, int *num_out, int valuators_out[7]) { @@ -387,24 +413,7 @@ convertAxes(const WacomAxisData *axes, int *first_out, int *num_out, int valuato continue; /* Positions need to match wcmInitAxis */ - switch (which){ - case WACOM_AXIS_X: pos = 0; break; - case WACOM_AXIS_Y: pos = 1; break; - case WACOM_AXIS_PRESSURE: pos = 2; break; - case WACOM_AXIS_TILT_X: pos = 3; break; - case WACOM_AXIS_TILT_Y: pos = 4; break; - case WACOM_AXIS_STRIP_X: pos = 3; break; - case WACOM_AXIS_STRIP_Y: pos = 4; break; - case WACOM_AXIS_ROTATION: pos = 3; break; - case WACOM_AXIS_THROTTLE: pos = 4; break; - case WACOM_AXIS_WHEEL: pos = 5; break; - case WACOM_AXIS_RING: pos = 5; break; - case WACOM_AXIS_RING2: pos = 6; break; - break; - default: - abort(); - } - + pos = valuatorNumber(which); first = min(first, pos); last = max(last, pos); valuators[pos] = value; @@ -490,51 +499,40 @@ void wcmInitAxis(WacomDevicePtr priv, enum WacomAxisType type, switch (type) { case WACOM_AXIS_X: - index = 0; label = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X); break; case WACOM_AXIS_Y: - index = 1; label = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y); break; case WACOM_AXIS_PRESSURE: - index = 2; label = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_PRESSURE); break; case WACOM_AXIS_TILT_X: - index = 3; label = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_X); break; case WACOM_AXIS_TILT_Y: - index = 4; label = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_Y); break; case WACOM_AXIS_STRIP_X: - index = 3; - break; case WACOM_AXIS_STRIP_Y: - index = 4; break; case WACOM_AXIS_ROTATION: - index = 3; label = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_RZ); break; case WACOM_AXIS_THROTTLE: - index = 4; label = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_THROTTLE); break; case WACOM_AXIS_WHEEL: case WACOM_AXIS_RING: - index = 5; label = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_WHEEL); break; case WACOM_AXIS_RING2: - index = 6; break; default: abort(); } + index = valuatorNumber(type); InitValuatorAxisStruct(pInfo->dev, index, label, min, max, res, min_res, max_res, |