[PATCH 6/7] litest: add mako style touch screen without orientation
Peter Hutterer
peter.hutterer at who-t.net
Wed Jun 10 23:06:36 PDT 2015
On Wed, Jun 10, 2015 at 04:09:16PM +0200, Andreas Pokorny wrote:
> This device provides a circular touch point size and and hence lacks
> orientation. It will be used to test default value handling.
I don't see any tests specifically for orientation here, so my original
comment still stands: I don't think we need separate litest flags here. you
can use libevdev to filter within the test where you specifically test for
orientation but so far no test seems to need this anyway.
> ---
> test/Makefile.am | 1 +
> test/litest-mako-touch-screen.c | 93 +++++++++++++++++++++++++++++++++++++++++
> test/litest.c | 2 +
> test/litest.h | 1 +
> 4 files changed, 97 insertions(+)
> create mode 100644 test/litest-mako-touch-screen.c
>
> diff --git a/test/Makefile.am b/test/Makefile.am
> index ebc8eee..76700ad 100644
> --- a/test/Makefile.am
> +++ b/test/Makefile.am
> @@ -20,6 +20,7 @@ liblitest_la_SOURCES = \
> litest-keyboard.c \
> litest-keyboard-razer-blackwidow.c \
> litest-logitech-trackball.c \
> + litest-mako-touch-screen.c \
> litest-mouse.c \
> litest-mouse-roccat.c \
> litest-ms-surface-cover.c \
> diff --git a/test/litest-mako-touch-screen.c b/test/litest-mako-touch-screen.c
> new file mode 100644
> index 0000000..fcbb9b3
> --- /dev/null
> +++ b/test/litest-mako-touch-screen.c
> @@ -0,0 +1,93 @@
> +/*
> + * Copyright © 2015 Canonical, Ltd.
> + *
> + * Permission to use, copy, modify, distribute, and sell this software and its
> + * documentation for any purpose is hereby granted without fee, provided that
> + * the above copyright notice appear in all copies and that both that copyright
> + * notice and this permission notice appear in supporting documentation, and
> + * that the name of the copyright holders not be used in advertising or
> + * publicity pertaining to distribution of the software without specific,
> + * written prior permission. The copyright holders make no representations
> + * about the suitability of this software for any purpose. It is provided "as
> + * is" without express or implied warranty.
> + *
> + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
> + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
> + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
> + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
> + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
> + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
> + * OF THIS SOFTWARE.
oh, while I'm here: you've probably seen the patch on the list to change the
license. This will affect your patch set too, so best to copy the new
boilerplate in here so I don't have to fix it later :)
> + */
> +
> +#if HAVE_CONFIG_H
> +#include "config.h"
> +#endif
> +
> +#include "litest.h"
> +#include "litest-int.h"
> +
> +static void litest_mako_setup(void)
> +{
> + struct litest_device *d = litest_create_device(LITEST_MAKO_TOUCH_SCREEN);
> + litest_set_current_device(d);
> +}
> +
> +static struct input_event down[] = {
> + { .type = EV_ABS, .code = ABS_MT_SLOT, .value = LITEST_AUTO_ASSIGN },
> + { .type = EV_ABS, .code = ABS_MT_TRACKING_ID, .value = LITEST_AUTO_ASSIGN },
> + { .type = EV_ABS, .code = ABS_MT_POSITION_X, .value = LITEST_AUTO_ASSIGN },
> + { .type = EV_ABS, .code = ABS_MT_POSITION_Y, .value = LITEST_AUTO_ASSIGN },
> + { .type = EV_SYN, .code = SYN_REPORT, .value = 0 },
> + { .type = -1, .code = -1 },
> +};
> +
> +static struct input_event move[] = {
> + { .type = EV_ABS, .code = ABS_MT_SLOT, .value = LITEST_AUTO_ASSIGN },
> + { .type = EV_ABS, .code = ABS_MT_POSITION_X, .value = LITEST_AUTO_ASSIGN },
> + { .type = EV_ABS, .code = ABS_MT_POSITION_Y, .value = LITEST_AUTO_ASSIGN },
> + { .type = EV_SYN, .code = SYN_REPORT, .value = 0 },
> + { .type = -1, .code = -1 },
> +};
> +
> +static struct litest_device_interface interface = {
> + .touch_down_events = down,
> + .touch_move_events = move,
> +};
> +
> +static struct input_absinfo absinfo[] = {
> + { ABS_X, 0, 1500, 0, 0, 0 },
> + { ABS_Y, 0, 2500, 0, 0, 0 },
no resolution? really?
> + { ABS_MT_SLOT, 0, 9, 0, 0, 0 },
> + { ABS_MT_POSITION_X, 0, 1500, 0, 0, 0 },
> + { ABS_MT_POSITION_Y, 0, 2500, 0, 0, 0 },
> + { ABS_MT_TOUCH_MAJOR, 0, 15, 1, 0, 0 },
> + { ABS_MT_PRESSURE, 0, 255, 0, 0, 0 },
> + { ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
> + { .value = -1 },
> +};
> +
> +static struct input_id input_id = {
> + .bustype = 0x1,
> + .vendor = 0x43e,
> + .product = 0x26,
> +};
> +
> +static int events[] = {
> + EV_KEY, BTN_TOUCH,
> + INPUT_PROP_MAX, INPUT_PROP_DIRECT,
> + -1, -1
> +};
> +
> +struct litest_test_device litest_mako_device = {
> + .type = LITEST_MAKO_TOUCH_SCREEN,
> + .features = LITEST_TOUCH|LITEST_PRESSURE|LITEST_ELLIPSE_SIZE,
> + .shortname = "mako",
> + .setup = litest_mako_setup,
> + .interface = &interface,
> +
> + .name = "Nexus 4 touch screen",
I admit I'm not familiar with the various nexus codenames, why not use
nexus4 as shortname?
> + .id = &input_id,
> + .events = events,
> + .absinfo = absinfo,
> +};
> diff --git a/test/litest.c b/test/litest.c
> index e6d70cd..d844906 100644
> --- a/test/litest.c
> +++ b/test/litest.c
> @@ -345,6 +345,7 @@ extern struct litest_test_device litest_ms_surface_cover_device;
> extern struct litest_test_device litest_logitech_trackball_device;
> extern struct litest_test_device litest_atmel_hover_device;
> extern struct litest_test_device litest_generic_multitouch_screen_device;
> +extern struct litest_test_device litest_mako_device;
>
> struct litest_test_device* devices[] = {
> &litest_synaptics_clickpad_device,
> @@ -371,6 +372,7 @@ struct litest_test_device* devices[] = {
> &litest_logitech_trackball_device,
> &litest_atmel_hover_device,
> &litest_generic_multitouch_screen_device,
> + &litest_mako_device,
> NULL,
> };
>
> diff --git a/test/litest.h b/test/litest.h
> index 0d39dd3..5d2c3ab 100644
> --- a/test/litest.h
> +++ b/test/litest.h
> @@ -136,6 +136,7 @@ enum litest_device_type {
> LITEST_LOGITECH_TRACKBALL = -23,
> LITEST_ATMEL_HOVER = -24,
> LITEST_GENERIC_MULTITOUCH_SCREEN= -25,
> + LITEST_MAKO_TOUCH_SCREEN= -26,
space before =, same goes for the other patch now that I see it
Cheers,
Peter
> };
>
> enum litest_device_feature {
> --
> 2.1.4
More information about the wayland-devel
mailing list