diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2016-01-06 16:20:38 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2016-01-15 10:07:18 +1000 |
| commit | f5200c532527644d7a32da6149bb7edb5d8fc9b1 (patch) | |
| tree | 5da3a831813b0b0f81be314b842a124f093b5c45 | |
| parent | d524313d2b207ac70a2089775674bd3410122a53 (diff) | |
tablet: drop delta array, provided by the tablet_axis struct now
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Jason Gerecke <jason.gerecke@wacom.com>
| -rw-r--r-- | src/evdev-tablet.c | 7 | ||||
| -rw-r--r-- | src/evdev-tablet.h | 1 | ||||
| -rw-r--r-- | src/libinput.c | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/src/evdev-tablet.c b/src/evdev-tablet.c index 29c86ad4..1870e7e3 100644 --- a/src/evdev-tablet.c +++ b/src/evdev-tablet.c @@ -430,9 +430,9 @@ tablet_handle_wheel(struct tablet_dispatch *tablet, a = LIBINPUT_TABLET_TOOL_AXIS_REL_WHEEL; if (bit_is_set(tablet->changed_axes, a)) { - *wheel_discrete = tablet->deltas[a]; + *wheel_discrete = tablet->axes.wheel_discrete; tablet->axes.wheel = normalize_wheel(tablet, - tablet->deltas[a]); + tablet->axes.wheel_discrete); } else { tablet->axes.wheel = 0; *wheel_discrete = 0; @@ -457,7 +457,6 @@ tablet_check_notify_axes(struct tablet_dispatch *tablet, axes.pressure = tablet_handle_pressure(tablet, device, tool); axes.distance = tablet_handle_distance(tablet, device); axes.slider = tablet_handle_slider(tablet, device); - axes.tilt = tablet_handle_tilt(tablet, device); /* We must check ROTATION_Z after TILT_X/Y so that the tilt axes are @@ -602,7 +601,7 @@ tablet_process_relative(struct tablet_dispatch *tablet, break; } set_bit(tablet->changed_axes, axis); - tablet->deltas[axis] = -1 * e->value; + tablet->axes.wheel_discrete = -1 * e->value; tablet_set_status(tablet, TABLET_AXES_UPDATED); break; default: diff --git a/src/evdev-tablet.h b/src/evdev-tablet.h index 4d359bbd..1d6fc936 100644 --- a/src/evdev-tablet.h +++ b/src/evdev-tablet.h @@ -54,7 +54,6 @@ struct tablet_dispatch { unsigned int status; unsigned char changed_axes[NCHARS(LIBINPUT_TABLET_TOOL_AXIS_MAX + 1)]; struct tablet_axes axes; - double deltas[LIBINPUT_TABLET_TOOL_AXIS_MAX + 1]; unsigned char axis_caps[NCHARS(LIBINPUT_TABLET_TOOL_AXIS_MAX + 1)]; /* Only used for tablets that don't report serial numbers */ diff --git a/src/libinput.c b/src/libinput.c index 7beb8b77..2f80f039 100644 --- a/src/libinput.c +++ b/src/libinput.c @@ -2240,8 +2240,6 @@ tablet_notify_proximity(struct libinput_device *device, changed_axes, sizeof(proximity_event->changed_axes)); - /* deltas are always 0 on prox-in/out */ - post_device_event(device, time, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY, |