Hi, On 08/27/2014 06:31 AM, Peter Hutterer wrote: > With a non-zero absmin for both axes and different ranges for x/y, just to > detect those errors. > > Signed-off-by: Peter Hutterer <[email protected]>
Looks good: Reviewed-by: Hans de Goede <[email protected]> Regards, Hans > --- > test/Makefile.am | 1 + > test/litest-generic-singletouch.c | 88 > +++++++++++++++++++++++++++++++++++++++ > test/litest.c | 2 + > test/litest.h | 1 + > 4 files changed, 92 insertions(+) > create mode 100644 test/litest-generic-singletouch.c > > diff --git a/test/Makefile.am b/test/Makefile.am > index 76d4e8c..56ed9d1 100644 > --- a/test/Makefile.am > +++ b/test/Makefile.am > @@ -17,6 +17,7 @@ liblitest_la_SOURCES = \ > litest-int.h \ > litest-alps-semi-mt.c \ > litest-bcm5974.c \ > + litest-generic-singletouch.c \ > litest-keyboard.c \ > litest-mouse.c \ > litest-synaptics.c \ > diff --git a/test/litest-generic-singletouch.c > b/test/litest-generic-singletouch.c > new file mode 100644 > index 0000000..1a1a6c6 > --- /dev/null > +++ b/test/litest-generic-singletouch.c > @@ -0,0 +1,88 @@ > +/* > + * Copyright © 2014 Red Hat, Inc. > + * > + * 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. > + */ > + > +#if HAVE_CONFIG_H > +#include "config.h" > +#endif > + > +#include "litest.h" > +#include "litest-int.h" > + > +static void > +litest_generic_singletouch_touch_setup(void) > +{ > + struct litest_device *d = > litest_create_device(LITEST_GENERIC_SINGLETOUCH); > + litest_set_current_device(d); > +} > + > +static struct input_event down[] = { > + { .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN }, > + { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN }, > + { .type = EV_KEY, .code = BTN_TOUCH, .value = 1 }, > + { .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_X, .value = LITEST_AUTO_ASSIGN }, > + { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN }, > + { .type = EV_KEY, .code = BTN_TOUCH, .value = 1 }, > + { .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, 10000, 20000, 0, 0, 10 }, > + { ABS_Y, -2000, 2000, 0, 0, 9 }, > + { .value = -1 }, > +}; > + > +static struct input_id input_id = { > + .bustype = 0x01, > + .vendor = 0x02, > + .product = 0x03, > +}; > + > +static int events[] = { > + EV_KEY, BTN_TOUCH, > + INPUT_PROP_MAX, INPUT_PROP_DIRECT, > + -1, -1, > +}; > + > +struct litest_test_device litest_generic_singletouch_device = { > + .type = LITEST_GENERIC_SINGLETOUCH, > + .features = LITEST_SINGLE_TOUCH, > + .shortname = "generic-singletouch", > + .setup = litest_generic_singletouch_touch_setup, > + .interface = &interface, > + > + .name = "generic_singletouch", > + .id = &input_id, > + .events = events, > + .absinfo = absinfo, > +}; > diff --git a/test/litest.c b/test/litest.c > index fcc8de1..47a7776 100644 > --- a/test/litest.c > +++ b/test/litest.c > @@ -86,6 +86,7 @@ extern struct litest_test_device litest_bcm5974_device; > extern struct litest_test_device litest_mouse_device; > extern struct litest_test_device litest_wacom_touch_device; > extern struct litest_test_device litest_alps_device; > +extern struct litest_test_device litest_generic_singletouch_device; > > struct litest_test_device* devices[] = { > &litest_synaptics_clickpad_device, > @@ -97,6 +98,7 @@ struct litest_test_device* devices[] = { > &litest_mouse_device, > &litest_wacom_touch_device, > &litest_alps_device, > + &litest_generic_singletouch_device, > NULL, > }; > > diff --git a/test/litest.h b/test/litest.h > index 815a571..aefde3f 100644 > --- a/test/litest.h > +++ b/test/litest.h > @@ -44,6 +44,7 @@ enum litest_device_type { > LITEST_MOUSE, > LITEST_WACOM_TOUCH, > LITEST_ALPS_SEMI_MT, > + LITEST_GENERIC_SINGLETOUCH, > }; > > enum litest_device_feature { > _______________________________________________ wayland-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/wayland-devel
