From 7559b3d7aa725cd75ee4e6746246205392fe1c0f Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Thu, 5 Aug 2010 19:33:58 +0200 Subject: Rename and install test binaries Install the test programs as grail-touch and grail-gesture. Signed-off-by: Henrik Rydberg --- .gitignore | 6 +-- src/mtdev-details.h | 19 --------- src/touch-dev.c | 49 ++++++++++++++-------- test/Makefile.am | 10 ++--- test/grail-gesture.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++ test/grail-touch.c | 90 ++++++++++++++++++++++++++++++++++++++++ test/grail.c | 114 --------------------------------------------------- test/touch.c | 90 ---------------------------------------- 8 files changed, 243 insertions(+), 249 deletions(-) delete mode 100644 src/mtdev-details.h create mode 100644 test/grail-gesture.c create mode 100644 test/grail-touch.c delete mode 100644 test/grail.c delete mode 100644 test/touch.c diff --git a/.gitignore b/.gitignore index 904dc45..87fa680 100644 --- a/.gitignore +++ b/.gitignore @@ -76,8 +76,6 @@ core # Edit the following section as needed # For example, !report.pc overrides *.pc. See 'man gitignore' # -test/touch -test/grail +test/grail-touch +test/grail-gesture patches -.bzr -.bzrignore diff --git a/src/mtdev-details.h b/src/mtdev-details.h deleted file mode 100644 index 873528d..0000000 --- a/src/mtdev-details.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef _MTDEV_DETAILS_H -#define _MTDEV_DETAILS_H - -#define MTDEV_TRACKING_ID 9 -#define MTDEV_POSITION_X 5 -#define MTDEV_POSITION_Y 6 -#define MTDEV_TOUCH_MAJOR 0 -#define MTDEV_TOUCH_MINOR 1 -#define MTDEV_WIDTH_MAJOR 2 -#define MTDEV_WIDTH_MINOR 3 -#define MTDEV_ORIENTATION 4 -#define MTDEV_PRESSURE 10 - -int mtdev_fetch_event(struct mtdev *dev, int fd, struct input_event *ev); -void mtdev_put_event(struct mtdev *dev, const struct input_event *ev); -int mtdev_empty(struct mtdev *dev); -void mtdev_get_event(struct mtdev *dev, struct input_event* ev); - -#endif diff --git a/src/touch-dev.c b/src/touch-dev.c index 3c3036c..b327266 100644 --- a/src/touch-dev.c +++ b/src/touch-dev.c @@ -27,7 +27,22 @@ #include #include #include "evbuf.h" -#include "mtdev-details.h" + +/* from mtdev-mapping.h */ +#define MT_TOUCH_MAJOR 0 +#define MT_TOUCH_MINOR 1 +#define MT_WIDTH_MAJOR 2 +#define MT_WIDTH_MINOR 3 +#define MT_ORIENTATION 4 +#define MT_POSITION_X 5 +#define MT_POSITION_Y 6 +#define MT_TRACKING_ID 9 +#define MT_PRESSURE 10 + +int mtdev_fetch_event(struct mtdev *dev, int fd, struct input_event *ev); +void mtdev_put_event(struct mtdev *dev, const struct input_event *ev); +int mtdev_empty(struct mtdev *dev); +void mtdev_get_event(struct mtdev *dev, struct input_event* ev); struct touch_dev_impl { int id[DIM_TOUCH]; @@ -49,22 +64,22 @@ static inline void set_info(struct touch_dev_caps *caps, int code, static void set_caps(struct touch_dev_caps *caps, const struct mtdev_caps *mtcaps) { - if (mtcaps->has_abs[MTDEV_POSITION_X]) - set_info(caps, TP_POS_X, &mtcaps->abs[MTDEV_POSITION_X]); - if (mtcaps->has_abs[MTDEV_POSITION_Y]) - set_info(caps, TP_POS_Y, &mtcaps->abs[MTDEV_POSITION_Y]); - if (mtcaps->has_abs[MTDEV_TOUCH_MAJOR]) - set_info(caps, TP_TOUCH_MAJOR, &mtcaps->abs[MTDEV_TOUCH_MAJOR]); - if (mtcaps->has_abs[MTDEV_TOUCH_MINOR]) - set_info(caps, TP_TOUCH_MINOR, &mtcaps->abs[MTDEV_TOUCH_MINOR]); - if (mtcaps->has_abs[MTDEV_WIDTH_MAJOR]) - set_info(caps, TP_WIDTH_MAJOR, &mtcaps->abs[MTDEV_WIDTH_MAJOR]); - if (mtcaps->has_abs[MTDEV_WIDTH_MINOR]) - set_info(caps, TP_WIDTH_MINOR, &mtcaps->abs[MTDEV_WIDTH_MINOR]); - if (mtcaps->has_abs[MTDEV_ORIENTATION]) - set_info(caps, TP_ORIENTATION, &mtcaps->abs[MTDEV_ORIENTATION]); - if (mtcaps->has_abs[MTDEV_PRESSURE]) - set_info(caps, TP_PRESSURE, &mtcaps->abs[MTDEV_PRESSURE]); + if (mtcaps->has_abs[MT_POSITION_X]) + set_info(caps, TP_POS_X, &mtcaps->abs[MT_POSITION_X]); + if (mtcaps->has_abs[MT_POSITION_Y]) + set_info(caps, TP_POS_Y, &mtcaps->abs[MT_POSITION_Y]); + if (mtcaps->has_abs[MT_TOUCH_MAJOR]) + set_info(caps, TP_TOUCH_MAJOR, &mtcaps->abs[MT_TOUCH_MAJOR]); + if (mtcaps->has_abs[MT_TOUCH_MINOR]) + set_info(caps, TP_TOUCH_MINOR, &mtcaps->abs[MT_TOUCH_MINOR]); + if (mtcaps->has_abs[MT_WIDTH_MAJOR]) + set_info(caps, TP_WIDTH_MAJOR, &mtcaps->abs[MT_WIDTH_MAJOR]); + if (mtcaps->has_abs[MT_WIDTH_MINOR]) + set_info(caps, TP_WIDTH_MINOR, &mtcaps->abs[MT_WIDTH_MINOR]); + if (mtcaps->has_abs[MT_ORIENTATION]) + set_info(caps, TP_ORIENTATION, &mtcaps->abs[MT_ORIENTATION]); + if (mtcaps->has_abs[MT_PRESSURE]) + set_info(caps, TP_PRESSURE, &mtcaps->abs[MT_PRESSURE]); } static int touch_get_fetched(struct touch_dev_impl *x, diff --git a/test/Makefile.am b/test/Makefile.am index e0498ba..4ccbe0a 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,9 +1,9 @@ -noinst_PROGRAMS = touch grail +bin_PROGRAMS = grail-touch grail-gesture INCLUDES=-I$(top_srcdir)/include/ -touch_SOURCES = touch.c -touch_LDFLAGS = -L$(top_builddir)/src/.libs/ -lgrail -lmtdev -lm +grail_touch_SOURCES = grail-touch.c +grail_touch_LDFLAGS = -L$(top_builddir)/src/.libs/ -lgrail -lmtdev -lm -grail_SOURCES = grail.c -grail_LDFLAGS = -L$(top_builddir)/src/.libs/ -lgrail -lmtdev -lm +grail_gesture_SOURCES = grail-gesture.c +grail_gesture_LDFLAGS = -L$(top_builddir)/src/.libs/ -lgrail -lmtdev -lm diff --git a/test/grail-gesture.c b/test/grail-gesture.c new file mode 100644 index 0000000..f34bd6f --- /dev/null +++ b/test/grail-gesture.c @@ -0,0 +1,114 @@ +/***************************************************************************** + * + * grail - Gesture Recognition And Instantiation Library + * + * Copyright (C) 2010 Canonical Ltd. + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * + * Authors: + * Henrik Rydberg + * + ****************************************************************************/ + +#include +#include +#include +#include +#include + +static grail_mask_t flag_mask[DIM_GRAIL_TYPE_BYTES]; + +static int tp_get_clients(struct grail *ge, + struct grail_client_info *clients, int max_clients, + const struct grail_coord *coords, int num_coords, + const grail_mask_t *types, int type_bytes) +{ + memset(&clients[0], 0, sizeof(clients[0])); + clients[0].id.client = 345; + clients[0].id.root = 1; + clients[0].id.event = 2; + clients[0].id.child = 3; + memcpy(clients[0].mask, flag_mask, sizeof(flag_mask)); + return 1; +} + +static void tp_event(struct grail *ge, const struct input_event *ev) +{ + if (!grail_mask_get(flag_mask, GRAIL_TYPE_POINTER)) + return; + fprintf(stderr, "event %d 0x%x %d\n", ev->type, ev->code, ev->value); +} + +static void tp_gesture(struct grail *ge, const struct grail_event *ev) +{ + int i; + fprintf(stderr, "gesture %d %d %d %d - %f %f %d - %d\n", + ev->type, ev->id, ev->client_id.client, ev->client_id.event, + ev->pos.x, ev->pos.y, ev->ntouch, + ev->status); + for (i = 0; i < ev->nprop; i++) + fprintf(stderr, "\t%d: %f\n", i, ev->prop[i]); +} + +static void loop_device(struct grail *ge, int fd) +{ + while (!grail_idle(ge, fd, 5000)) { + grail_pull(ge, fd); + fprintf(stderr, "\r"); + } +} + +int main(int argc, char *argv[]) +{ + struct grail ge; + int fd; + + if (argc < 3) { + fprintf(stderr, "Usage: %s \n", argv[0]); + return -1; + } + + memset(&ge, 0, sizeof(ge)); + ge.get_clients = tp_get_clients; + ge.event = tp_event; + ge.gesture = tp_gesture; + + unsigned mask = atoi(argv[1]); + flag_mask[0] = (mask >> 0) & 255; + flag_mask[1] = (mask >> 8) & 255; + flag_mask[2] = (mask >> 16) & 255; + flag_mask[3] = (mask >> 24) & 255; + + fd = open(argv[2], 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; + } + + if (grail_open(&ge, fd)) { + fprintf(stderr, "error: could not open touch device\n"); + return -1; + } + loop_device(&ge, fd); + grail_close(&ge, fd); + + ioctl(fd, EVIOCGRAB, 0); + close(fd); + return 0; +} diff --git a/test/grail-touch.c b/test/grail-touch.c new file mode 100644 index 0000000..8893c0d --- /dev/null +++ b/test/grail-touch.c @@ -0,0 +1,90 @@ +/***************************************************************************** + * + * grail - Gesture Recognition And Instantiation Library + * + * Copyright (C) 2010 Canonical Ltd. + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * + * Authors: + * Henrik Rydberg + * + ****************************************************************************/ + +#include +#include +#include +#include +#include + +static void tp_event(struct touch_engine *engine, + const struct input_event *ev) +{ + fprintf(stderr, "event %d 0x%x %d\n", ev->type, ev->code, ev->value); +} + +static void tp_sync(struct touch_engine *engine, + const struct input_event *syn) +{ + struct touch_frame *frame = &engine->frame; + int i, j; + for (i = 0; i < frame->nactive; i++) { + struct touch *t = frame->active[i]; + fprintf(stderr, "touch %d %d\n", i, t->slot); + for (j = 0; j < DIM_TOUCH_PROP; j++) + fprintf(stderr, " %d\n", t->prop[j]); + } + fprintf(stderr, "sync %d %lld %d %d\n", + frame->nactive, frame->time, frame->ncreate, frame->ndestroy); +} + +static void loop_device(struct touch_dev *dev, int fd) +{ + struct touch_engine engine; + touch_engine_init(&engine, tp_event, tp_sync, 0); + touch_engine_attach(&engine, dev); + while (!touch_dev_idle(dev, fd, 5000)) { + touch_dev_fetch(dev, fd); + touch_dev_process(dev); + } + touch_engine_detach(&engine, dev); +} + +int main(int argc, char *argv[]) +{ + struct touch_dev dev; + int fd; + if (argc < 2) { + fprintf(stderr, "Usage: %s \n", argv[0]); + 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; + } + if (touch_dev_open(&dev, fd)) { + fprintf(stderr, "error: could not open touch device\n"); + return -1; + } + loop_device(&dev, fd); + touch_dev_close(&dev, fd); + ioctl(fd, EVIOCGRAB, 0); + close(fd); + return 0; +} diff --git a/test/grail.c b/test/grail.c deleted file mode 100644 index f34bd6f..0000000 --- a/test/grail.c +++ /dev/null @@ -1,114 +0,0 @@ -/***************************************************************************** - * - * grail - Gesture Recognition And Instantiation Library - * - * Copyright (C) 2010 Canonical Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Authors: - * Henrik Rydberg - * - ****************************************************************************/ - -#include -#include -#include -#include -#include - -static grail_mask_t flag_mask[DIM_GRAIL_TYPE_BYTES]; - -static int tp_get_clients(struct grail *ge, - struct grail_client_info *clients, int max_clients, - const struct grail_coord *coords, int num_coords, - const grail_mask_t *types, int type_bytes) -{ - memset(&clients[0], 0, sizeof(clients[0])); - clients[0].id.client = 345; - clients[0].id.root = 1; - clients[0].id.event = 2; - clients[0].id.child = 3; - memcpy(clients[0].mask, flag_mask, sizeof(flag_mask)); - return 1; -} - -static void tp_event(struct grail *ge, const struct input_event *ev) -{ - if (!grail_mask_get(flag_mask, GRAIL_TYPE_POINTER)) - return; - fprintf(stderr, "event %d 0x%x %d\n", ev->type, ev->code, ev->value); -} - -static void tp_gesture(struct grail *ge, const struct grail_event *ev) -{ - int i; - fprintf(stderr, "gesture %d %d %d %d - %f %f %d - %d\n", - ev->type, ev->id, ev->client_id.client, ev->client_id.event, - ev->pos.x, ev->pos.y, ev->ntouch, - ev->status); - for (i = 0; i < ev->nprop; i++) - fprintf(stderr, "\t%d: %f\n", i, ev->prop[i]); -} - -static void loop_device(struct grail *ge, int fd) -{ - while (!grail_idle(ge, fd, 5000)) { - grail_pull(ge, fd); - fprintf(stderr, "\r"); - } -} - -int main(int argc, char *argv[]) -{ - struct grail ge; - int fd; - - if (argc < 3) { - fprintf(stderr, "Usage: %s \n", argv[0]); - return -1; - } - - memset(&ge, 0, sizeof(ge)); - ge.get_clients = tp_get_clients; - ge.event = tp_event; - ge.gesture = tp_gesture; - - unsigned mask = atoi(argv[1]); - flag_mask[0] = (mask >> 0) & 255; - flag_mask[1] = (mask >> 8) & 255; - flag_mask[2] = (mask >> 16) & 255; - flag_mask[3] = (mask >> 24) & 255; - - fd = open(argv[2], 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; - } - - if (grail_open(&ge, fd)) { - fprintf(stderr, "error: could not open touch device\n"); - return -1; - } - loop_device(&ge, fd); - grail_close(&ge, fd); - - ioctl(fd, EVIOCGRAB, 0); - close(fd); - return 0; -} diff --git a/test/touch.c b/test/touch.c deleted file mode 100644 index 8893c0d..0000000 --- a/test/touch.c +++ /dev/null @@ -1,90 +0,0 @@ -/***************************************************************************** - * - * grail - Gesture Recognition And Instantiation Library - * - * Copyright (C) 2010 Canonical Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Authors: - * Henrik Rydberg - * - ****************************************************************************/ - -#include -#include -#include -#include -#include - -static void tp_event(struct touch_engine *engine, - const struct input_event *ev) -{ - fprintf(stderr, "event %d 0x%x %d\n", ev->type, ev->code, ev->value); -} - -static void tp_sync(struct touch_engine *engine, - const struct input_event *syn) -{ - struct touch_frame *frame = &engine->frame; - int i, j; - for (i = 0; i < frame->nactive; i++) { - struct touch *t = frame->active[i]; - fprintf(stderr, "touch %d %d\n", i, t->slot); - for (j = 0; j < DIM_TOUCH_PROP; j++) - fprintf(stderr, " %d\n", t->prop[j]); - } - fprintf(stderr, "sync %d %lld %d %d\n", - frame->nactive, frame->time, frame->ncreate, frame->ndestroy); -} - -static void loop_device(struct touch_dev *dev, int fd) -{ - struct touch_engine engine; - touch_engine_init(&engine, tp_event, tp_sync, 0); - touch_engine_attach(&engine, dev); - while (!touch_dev_idle(dev, fd, 5000)) { - touch_dev_fetch(dev, fd); - touch_dev_process(dev); - } - touch_engine_detach(&engine, dev); -} - -int main(int argc, char *argv[]) -{ - struct touch_dev dev; - int fd; - if (argc < 2) { - fprintf(stderr, "Usage: %s \n", argv[0]); - 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; - } - if (touch_dev_open(&dev, fd)) { - fprintf(stderr, "error: could not open touch device\n"); - return -1; - } - loop_device(&dev, fd); - touch_dev_close(&dev, fd); - ioctl(fd, EVIOCGRAB, 0); - close(fd); - return 0; -} -- cgit v1.2.3