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 --- src/mtdev-details.h | 19 ------------------- src/touch-dev.c | 49 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 32 insertions(+), 36 deletions(-) delete mode 100644 src/mtdev-details.h (limited to 'src') 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, -- cgit v1.2.3