[PATCH libinput 2/6] test: rename LITEST_POINTER to LITEST_RELATIVE
Peter Hutterer
peter.hutterer at who-t.net
Thu Nov 6 16:42:17 PST 2014
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
test/device.c | 4 ++--
test/litest-mouse.c | 2 +-
test/litest-ms-surface-cover.c | 2 +-
test/litest-trackpoint.c | 2 +-
test/litest.h | 2 +-
test/pointer.c | 8 ++++----
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/test/device.c b/test/device.c
index 0a60dd9..5f28ada 100644
--- a/test/device.c
+++ b/test/device.c
@@ -606,9 +606,9 @@ int main (int argc, char **argv)
litest_add("device:sendevents", device_sendevents_config_touchpad, LITEST_TOUCHPAD, LITEST_ANY);
litest_add("device:sendevents", device_sendevents_config_touchpad_superset, LITEST_TOUCHPAD, LITEST_ANY);
litest_add("device:sendevents", device_sendevents_config_default, LITEST_ANY, LITEST_ANY);
- litest_add("device:sendevents", device_disable, LITEST_POINTER, LITEST_ANY);
+ litest_add("device:sendevents", device_disable, LITEST_RELATIVE, LITEST_ANY);
litest_add("device:sendevents", device_disable_touchpad, LITEST_TOUCHPAD, LITEST_ANY);
- litest_add("device:sendevents", device_disable_events_pending, LITEST_POINTER, LITEST_TOUCHPAD);
+ litest_add("device:sendevents", device_disable_events_pending, LITEST_RELATIVE, LITEST_TOUCHPAD);
litest_add("device:sendevents", device_double_disable, LITEST_ANY, LITEST_ANY);
litest_add("device:sendevents", device_double_enable, LITEST_ANY, LITEST_ANY);
litest_add_no_device("device:sendevents", device_reenable_syspath_changed);
diff --git a/test/litest-mouse.c b/test/litest-mouse.c
index 5eac572..cf0a7a0 100644
--- a/test/litest-mouse.c
+++ b/test/litest-mouse.c
@@ -55,7 +55,7 @@ static int events[] = {
struct litest_test_device litest_mouse_device = {
.type = LITEST_MOUSE,
- .features = LITEST_POINTER | LITEST_BUTTON | LITEST_WHEEL,
+ .features = LITEST_RELATIVE | LITEST_BUTTON | LITEST_WHEEL,
.shortname = "mouse",
.setup = litest_mouse_setup,
.interface = &interface,
diff --git a/test/litest-ms-surface-cover.c b/test/litest-ms-surface-cover.c
index bd8b1a1..5b9ec23 100644
--- a/test/litest-ms-surface-cover.c
+++ b/test/litest-ms-surface-cover.c
@@ -374,7 +374,7 @@ static int events[] = {
struct litest_test_device litest_ms_surface_cover_device = {
.type = LITEST_MS_SURFACE_COVER,
- .features = LITEST_KEYBOARD | LITEST_POINTER | LITEST_FAKE_MT,
+ .features = LITEST_KEYBOARD | LITEST_RELATIVE | LITEST_FAKE_MT,
.shortname = "MS surface cover",
.setup = litest_ms_surface_cover_setup,
.interface = &interface,
diff --git a/test/litest-trackpoint.c b/test/litest-trackpoint.c
index 01ad34e..061835f 100644
--- a/test/litest-trackpoint.c
+++ b/test/litest-trackpoint.c
@@ -56,7 +56,7 @@ static int events[] = {
struct litest_test_device litest_trackpoint_device = {
.type = LITEST_TRACKPOINT,
- .features = LITEST_POINTER | LITEST_BUTTON | LITEST_POINTINGSTICK,
+ .features = LITEST_RELATIVE | LITEST_BUTTON | LITEST_POINTINGSTICK,
.shortname = "trackpoint",
.setup = litest_trackpoint_setup,
.interface = &interface,
diff --git a/test/litest.h b/test/litest.h
index fe1001a..a2d4190 100644
--- a/test/litest.h
+++ b/test/litest.h
@@ -55,7 +55,7 @@ enum litest_device_feature {
LITEST_CLICKPAD = 1 << 1,
LITEST_BUTTON = 1 << 2,
LITEST_KEYS = 1 << 3,
- LITEST_POINTER = 1 << 4,
+ LITEST_RELATIVE = 1 << 4,
LITEST_WHEEL = 1 << 5,
LITEST_TOUCH = 1 << 6,
LITEST_SINGLE_TOUCH = 1 << 7,
diff --git a/test/pointer.c b/test/pointer.c
index 56b6709..fb3135d 100644
--- a/test/pointer.c
+++ b/test/pointer.c
@@ -520,7 +520,7 @@ END_TEST
int main (int argc, char **argv) {
- litest_add("pointer:motion", pointer_motion_relative, LITEST_POINTER, LITEST_ANY);
+ litest_add("pointer:motion", pointer_motion_relative, LITEST_RELATIVE, LITEST_ANY);
litest_add("pointer:button", pointer_button, LITEST_BUTTON, LITEST_CLICKPAD);
litest_add_no_device("pointer:button_auto_release", pointer_button_auto_release);
litest_add("pointer:scroll", pointer_scroll_wheel, LITEST_WHEEL, LITEST_ANY);
@@ -530,9 +530,9 @@ int main (int argc, char **argv) {
/* tests touchpads too */
litest_add("pointer:left-handed", pointer_left_handed_defaults, LITEST_BUTTON, LITEST_ANY);
- litest_add("pointer:left-handed", pointer_left_handed, LITEST_POINTER|LITEST_BUTTON, LITEST_ANY);
- litest_add("pointer:left-handed", pointer_left_handed_during_click, LITEST_POINTER|LITEST_BUTTON, LITEST_ANY);
- litest_add("pointer:left-handed", pointer_left_handed_during_click_multiple_buttons, LITEST_POINTER|LITEST_BUTTON, LITEST_ANY);
+ litest_add("pointer:left-handed", pointer_left_handed, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY);
+ litest_add("pointer:left-handed", pointer_left_handed_during_click, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY);
+ litest_add("pointer:left-handed", pointer_left_handed_during_click_multiple_buttons, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY);
return litest_run(argc, argv);
}
--
2.1.0
More information about the wayland-devel
mailing list