On Mon, Jun 22, 2015 at 12:48:06PM +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. > > Signed-off-by: Andreas Pokorny <[email protected]>
1-4 are Reviewed-by: Peter Hutterer <[email protected]>, no need to resend them, keep them in your repo for the final pull request please. but just to be a PITA, one last comment: > --- > test/Makefile.am | 1 + > test/litest-nexus4-touch-screen.c | 116 > ++++++++++++++++++++++++++++++++++++++ > test/litest.c | 2 + > test/litest.h | 1 + > 4 files changed, 120 insertions(+) > create mode 100644 test/litest-nexus4-touch-screen.c > > diff --git a/test/Makefile.am b/test/Makefile.am > index c4b13be..a28fce7 100644 > --- a/test/Makefile.am > +++ b/test/Makefile.am > @@ -21,6 +21,7 @@ liblitest_la_SOURCES = \ > litest-keyboard.c \ > litest-keyboard-razer-blackwidow.c \ > litest-logitech-trackball.c \ > + litest-nexus4-touch-screen.c \ > litest-mouse.c \ > litest-mouse-roccat.c \ > litest-ms-surface-cover.c \ > diff --git a/test/litest-nexus4-touch-screen.c > b/test/litest-nexus4-touch-screen.c > new file mode 100644 > index 0000000..65cd5fa > --- /dev/null > +++ b/test/litest-nexus4-touch-screen.c > @@ -0,0 +1,116 @@ > +/* > + * Copyright © 2015 Canonical, Ltd. > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice (including the next > + * paragraph) shall be included in all copies or substantial portions of the > + * Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > + * DEALINGS IN THE SOFTWARE. > + */ > + > +#if HAVE_CONFIG_H > +#include "config.h" > +#endif > + > +#include "litest.h" > +#include "litest-int.h" > + > +static void litest_nexus4_setup(void) > +{ > + struct litest_device *d = > + litest_create_device(LITEST_NEXUS4_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_ABS, > + .code = ABS_MT_TOUCH_MAJOR, > + .value = LITEST_AUTO_ASSIGN }, > + { .type = EV_ABS, > + .code = ABS_MT_PRESSURE, .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_ABS, > + .code = ABS_MT_TOUCH_MAJOR, > + .value = LITEST_AUTO_ASSIGN }, > + { .type = EV_ABS, > + .code = ABS_MT_PRESSURE, > + .value = LITEST_AUTO_ASSIGN }, > + { .type = EV_SYN, .code = SYN_REPORT, .value = 0 }, > + { .type = -1, .code = -1 }, ^^ these two are an exception to the 78 rule, having them in one line is a lot more obvious (see the other test devices). sorry Cheers, Peter > +}; > + > +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 }, > + { 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_nexus4_device = { > + .type = LITEST_NEXUS4_TOUCH_SCREEN, > + .features = LITEST_TOUCH|LITEST_ELLIPSE, > + .shortname = "nexus4", > + .setup = litest_nexus4_setup, > + .interface = &interface, > + > + .name = "Nexus 4 touch screen", > + .id = &input_id, > + .events = events, > + .absinfo = absinfo, > +}; > diff --git a/test/litest.c b/test/litest.c > index bed10bf..f1b8315 100644 > --- a/test/litest.c > +++ b/test/litest.c > @@ -353,6 +353,7 @@ extern struct litest_test_device > litest_logitech_trackball_device; > extern struct litest_test_device litest_atmel_hover_device; > extern struct litest_test_device litest_alps_dualpoint_device; > extern struct litest_test_device litest_generic_multitouch_screen_device; > +extern struct litest_test_device litest_nexus4_device; > > struct litest_test_device* devices[] = { > &litest_synaptics_clickpad_device, > @@ -380,6 +381,7 @@ struct litest_test_device* devices[] = { > &litest_atmel_hover_device, > &litest_alps_dualpoint_device, > &litest_generic_multitouch_screen_device, > + &litest_nexus4_device, > NULL, > }; > > diff --git a/test/litest.h b/test/litest.h > index a4fc50d..edb8960 100644 > --- a/test/litest.h > +++ b/test/litest.h > @@ -138,6 +138,7 @@ enum litest_device_type { > LITEST_ATMEL_HOVER = -24, > LITEST_ALPS_DUALPOINT = -25, > LITEST_GENERIC_MULTITOUCH_SCREEN = -26, > + LITEST_NEXUS4_TOUCH_SCREEN = -27, > }; > > enum litest_device_feature { > -- > 2.1.4 > _______________________________________________ wayland-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/wayland-devel
