From d2a8e0bfda364730ba5c06be4adc783f9a889073 Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Mon, 19 Jul 2010 13:09:10 +0200 Subject: Change test program name to mtdev-test In order to simplify packaging, rename the current mtdev device test program to mtdev-test. Signed-off-by: Henrik Rydberg --- .gitignore | 2 +- test/Makefile.am | 7 ++-- test/mtdev-test.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ test/mtdev.c | 97 ------------------------------------------------------- 4 files changed, 102 insertions(+), 101 deletions(-) create mode 100644 test/mtdev-test.c delete mode 100644 test/mtdev.c diff --git a/.gitignore b/.gitignore index 9a1bdd0..1961de8 100644 --- a/.gitignore +++ b/.gitignore @@ -76,6 +76,6 @@ core # Edit the following section as needed # For example, !report.pc overrides *.pc. See 'man gitignore' # -test/mtdev +test/mtdev-test test/mtdev-mapgen patches diff --git a/test/Makefile.am b/test/Makefile.am index 2eec163..b1be019 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,8 +1,9 @@ -noinst_PROGRAMS = mtdev-mapgen mtdev +noinst_PROGRAMS = mtdev-mapgen +bin_PROGRAMS = mtdev-test INCLUDES=-I$(top_srcdir)/include/ mtdev_mapgen_SOURCES = mtdev-mapgen.c -mtdev_SOURCES = mtdev.c -mtdev_LDFLAGS = -lmtdev -L$(top_builddir)/src/.libs/ +mtdev_test_SOURCES = mtdev-test.c +mtdev_test_LDFLAGS = -lmtdev -L$(top_builddir)/src/.libs/ diff --git a/test/mtdev-test.c b/test/mtdev-test.c new file mode 100644 index 0000000..b8e56d5 --- /dev/null +++ b/test/mtdev-test.c @@ -0,0 +1,97 @@ +/***************************************************************************** + * + * mtdev - Multitouch Protocol Translation Library (MIT license) + * + * Copyright (C) 2010 Henrik Rydberg + * Copyright (C) 2010 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. + * + ****************************************************************************/ + +#include +#include +#include +#include + +/* year-proof millisecond event time */ +typedef __u64 mstime_t; + +static int use_event(const struct input_event *ev) +{ +#if 0 + return ev->type == EV_ABS && mtdev_is_absmt(ev->code); +#else + return 1; +#endif +} + +static void print_event(const struct input_event *ev) +{ + static const mstime_t ms = 1000; + static int slot; + mstime_t evtime = ev->time.tv_usec / ms + ev->time.tv_sec * ms; + if (ev->type == EV_ABS && ev->code == ABS_MT_SLOT) + slot = ev->value; + fprintf(stderr, "%012llx %02d %01d %04x %d\n", + evtime, slot, ev->type, ev->code, ev->value); +} + +static void loop_device(int fd) +{ + struct mtdev dev; + struct input_event ev; + int ret = mtdev_open(&dev, fd); + if (ret) { + fprintf(stderr, "error: could not open device: %d\n", ret); + return; + } + /* while the device has not been inactive for five seconds */ + while (!mtdev_idle(&dev, fd, 5000)) { + /* extract all available processed events */ + while (mtdev_get(&dev, fd, &ev, 1) > 0) { + if (use_event(&ev)) + print_event(&ev); + } + } + mtdev_close(&dev); +} + +int main(int argc, char *argv[]) +{ + int fd; + if (argc < 2) { + fprintf(stderr, "Usage: mtdev \n"); + return -1; + } + fd = open(argv[1], O_RDONLY | O_NONBLOCK); + if (fd < 0) { + fprintf(stderr, "error: could not open device\n"); + return -1; + } + if (ioctl(fd, EVIOCGRAB, 1)) { + fprintf(stderr, "error: could not grab the device\n"); + return -1; + } + loop_device(fd); + ioctl(fd, EVIOCGRAB, 0); + close(fd); + return 0; +} diff --git a/test/mtdev.c b/test/mtdev.c deleted file mode 100644 index b8e56d5..0000000 --- a/test/mtdev.c +++ /dev/null @@ -1,97 +0,0 @@ -/***************************************************************************** - * - * mtdev - Multitouch Protocol Translation Library (MIT license) - * - * Copyright (C) 2010 Henrik Rydberg - * Copyright (C) 2010 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. - * - ****************************************************************************/ - -#include -#include -#include -#include - -/* year-proof millisecond event time */ -typedef __u64 mstime_t; - -static int use_event(const struct input_event *ev) -{ -#if 0 - return ev->type == EV_ABS && mtdev_is_absmt(ev->code); -#else - return 1; -#endif -} - -static void print_event(const struct input_event *ev) -{ - static const mstime_t ms = 1000; - static int slot; - mstime_t evtime = ev->time.tv_usec / ms + ev->time.tv_sec * ms; - if (ev->type == EV_ABS && ev->code == ABS_MT_SLOT) - slot = ev->value; - fprintf(stderr, "%012llx %02d %01d %04x %d\n", - evtime, slot, ev->type, ev->code, ev->value); -} - -static void loop_device(int fd) -{ - struct mtdev dev; - struct input_event ev; - int ret = mtdev_open(&dev, fd); - if (ret) { - fprintf(stderr, "error: could not open device: %d\n", ret); - return; - } - /* while the device has not been inactive for five seconds */ - while (!mtdev_idle(&dev, fd, 5000)) { - /* extract all available processed events */ - while (mtdev_get(&dev, fd, &ev, 1) > 0) { - if (use_event(&ev)) - print_event(&ev); - } - } - mtdev_close(&dev); -} - -int main(int argc, char *argv[]) -{ - int fd; - if (argc < 2) { - fprintf(stderr, "Usage: mtdev \n"); - return -1; - } - fd = open(argv[1], O_RDONLY | O_NONBLOCK); - if (fd < 0) { - fprintf(stderr, "error: could not open device\n"); - return -1; - } - if (ioctl(fd, EVIOCGRAB, 1)) { - fprintf(stderr, "error: could not grab the device\n"); - return -1; - } - loop_device(fd); - ioctl(fd, EVIOCGRAB, 0); - close(fd); - return 0; -} -- cgit v1.2.3