fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-02-04 18:40:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tablet: Rename TILT_VERTICAL and TILT_HORIZONTAL to TILT_X and TILT_Y

Browse source 
Since the orientation of the tablet can potentially change, this naming scheme
makes a lot more sense then VERTICAL and HORIZONTAL does since they don't
reflect the actual physical movement.

Signed-off-by: Stephen Chandler Paul <thatslyude@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Stephen Chandler Paul 2014-07-09 01:14:48 -04:00 • committed by Peter Hutterer
parent 521bd2f112
commit 43356a2979
5 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/evdev-tablet.c
View file

@ -149,8 +149,8 @@ tablet_check_notify_axes(struct tablet_dispatch *tablet,
case LIBINPUT_TABLET_AXIS_PRESSURE:
tablet->axes[a] = normalize_pressure_or_dist(absinfo);
break;
case LIBINPUT_TABLET_AXIS_TILT_VERTICAL:
case LIBINPUT_TABLET_AXIS_TILT_HORIZONTAL:
case LIBINPUT_TABLET_AXIS_TILT_X:
case LIBINPUT_TABLET_AXIS_TILT_Y:
tablet->axes[a] = normalize_tilt(absinfo);
break;
default:

8
src/evdev-tablet.h
View file

@ -75,10 +75,10 @@ evcode_to_axis(const uint32_t evcode)
axis = LIBINPUT_TABLET_AXIS_PRESSURE;
break;
case ABS_TILT_X:
axis = LIBINPUT_TABLET_AXIS_TILT_HORIZONTAL;
axis = LIBINPUT_TABLET_AXIS_TILT_Y;
break;
case ABS_TILT_Y:
axis = LIBINPUT_TABLET_AXIS_TILT_VERTICAL;
axis = LIBINPUT_TABLET_AXIS_TILT_X;
break;
default:
axis = LIBINPUT_TABLET_AXIS_NONE;
@ -106,10 +106,10 @@ axis_to_evcode(const enum libinput_tablet_axis axis)
case LIBINPUT_TABLET_AXIS_PRESSURE:
evcode = ABS_PRESSURE;
break;
case LIBINPUT_TABLET_AXIS_TILT_VERTICAL:
case LIBINPUT_TABLET_AXIS_TILT_X:
evcode = ABS_TILT_X;
break;
case LIBINPUT_TABLET_AXIS_TILT_HORIZONTAL:
case LIBINPUT_TABLET_AXIS_TILT_Y:
evcode = ABS_TILT_Y;
break;
default:

13
src/libinput.h
View file

@ -182,9 +182,9 @@ enum libinput_tablet_axis {
LIBINPUT_TABLET_AXIS_Y = 1,
LIBINPUT_TABLET_AXIS_DISTANCE = 2,
LIBINPUT_TABLET_AXIS_PRESSURE = 3,
LIBINPUT_TABLET_AXIS_TILT_VERTICAL = 4,
LIBINPUT_TABLET_AXIS_TILT_HORIZONTAL = 5,
LIBINPUT_TABLET_AXIS_CNT = LIBINPUT_TABLET_AXIS_TILT_HORIZONTAL + 1
LIBINPUT_TABLET_AXIS_TILT_X = 4,
LIBINPUT_TABLET_AXIS_TILT_Y = 5,
LIBINPUT_TABLET_AXIS_CNT = LIBINPUT_TABLET_AXIS_TILT_Y + 1
};
/**
@ -871,10 +871,9 @@ libinput_event_tablet_axis_has_changed(struct libinput_event_tablet *event,
* sensor, normalized from 0 to 1
* - @ref LIBINPUT_TABLET_AXIS_PRESSURE - The current pressure being applied on
* the tool in use, normalized from 0 to 1
* - @ref LIBINPUT_TABLET_AXIS_TILT_VERTICAL and @ref
* LIBINPUT_TABLET_AXIS_TILT_HORIZONTAL - normalized value between -1 and 1
* that indicates the tilt vertical or horizontal tilt of the tool
* respectively
* - @ref LIBINPUT_TABLET_AXIS_TILT_X and @ref LIBINPUT_TABLET_AXIS_TILT_Y -
* normalized value between -1 and 1 that indicates the X or Y tilt of the
* tool
*
* @param event The libinput tablet event
* @param axis The axis to retrieve the value of

16
test/tablet.c
View file

@ -403,22 +403,22 @@ START_TEST(normalization)
if (libinput_event_tablet_axis_has_changed(
tablet_event,
LIBINPUT_TABLET_AXIS_TILT_VERTICAL)) {
LIBINPUT_TABLET_AXIS_TILT_X)) {
tilt_vertical =
libinput_event_tablet_get_axis_value(
tablet_event,
LIBINPUT_TABLET_AXIS_TILT_VERTICAL);
LIBINPUT_TABLET_AXIS_TILT_X);
litest_assert_double_eq(tilt_vertical, -1);
}
if (libinput_event_tablet_axis_has_changed(
tablet_event,
LIBINPUT_TABLET_AXIS_TILT_HORIZONTAL)) {
LIBINPUT_TABLET_AXIS_TILT_Y)) {
tilt_horizontal =
libinput_event_tablet_get_axis_value(
tablet_event,
LIBINPUT_TABLET_AXIS_TILT_HORIZONTAL);
LIBINPUT_TABLET_AXIS_TILT_Y);
litest_assert_double_eq(tilt_horizontal, -1);
}
@ -465,22 +465,22 @@ START_TEST(normalization)
if (libinput_event_tablet_axis_has_changed(
tablet_event,
LIBINPUT_TABLET_AXIS_TILT_VERTICAL)) {
LIBINPUT_TABLET_AXIS_TILT_X)) {
tilt_vertical =
libinput_event_tablet_get_axis_value(
tablet_event,
LIBINPUT_TABLET_AXIS_TILT_VERTICAL);
LIBINPUT_TABLET_AXIS_TILT_X);
litest_assert_double_eq(tilt_vertical, 1);
}
if (libinput_event_tablet_axis_has_changed(
tablet_event,
LIBINPUT_TABLET_AXIS_TILT_HORIZONTAL)) {
LIBINPUT_TABLET_AXIS_TILT_Y)) {
tilt_horizontal =
libinput_event_tablet_get_axis_value(
tablet_event,
LIBINPUT_TABLET_AXIS_TILT_HORIZONTAL);
LIBINPUT_TABLET_AXIS_TILT_Y);
litest_assert_double_eq(tilt_horizontal, 1);
}

8
tools/event-debug.c
View file

@ -397,11 +397,11 @@ print_tablet_axis_event(struct libinput_event *ev)
x, tablet_axis_changed_sym(t, LIBINPUT_TABLET_AXIS_X),
y, tablet_axis_changed_sym(t, LIBINPUT_TABLET_AXIS_Y));
x = libinput_event_tablet_get_axis_value(t, LIBINPUT_TABLET_AXIS_TILT_VERTICAL);
y = libinput_event_tablet_get_axis_value(t, LIBINPUT_TABLET_AXIS_TILT_HORIZONTAL);
x = libinput_event_tablet_get_axis_value(t, LIBINPUT_TABLET_AXIS_TILT_X);
y = libinput_event_tablet_get_axis_value(t, LIBINPUT_TABLET_AXIS_TILT_Y);
printf("\ttilt: %.2f%s/%.2f%s ",
x, tablet_axis_changed_sym(t, LIBINPUT_TABLET_AXIS_TILT_VERTICAL),
y, tablet_axis_changed_sym(t, LIBINPUT_TABLET_AXIS_TILT_HORIZONTAL));
x, tablet_axis_changed_sym(t, LIBINPUT_TABLET_AXIS_TILT_X),
y, tablet_axis_changed_sym(t, LIBINPUT_TABLET_AXIS_TILT_Y));
dist = libinput_event_tablet_get_axis_value(t, LIBINPUT_TABLET_AXIS_DISTANCE);
pressure = libinput_event_tablet_get_axis_value(t, LIBINPUT_TABLET_AXIS_PRESSURE);