From c0666a895e7fe8e488332263fd106ced0ed7cab7 Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Sun, 2 Jan 2011 11:00:52 +0100 Subject: Replace touch logic with utouch frame engine The original grail uses an internal touch framework and exports some touch information as extended attributes to gesture events. This was never quite the intention, but rather to expose gestures and touches on a similar footing, such that grail can be input agnostic. This patch starts off by replacing the internal touch framework with the utouch-frame engine. Signed-off-by: Henrik Rydberg --- src/grail-impl.h | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'src/grail-impl.h') diff --git a/src/grail-impl.h b/src/grail-impl.h index 2859186..dcbaedd 100644 --- a/src/grail-impl.h +++ b/src/grail-impl.h @@ -23,15 +23,26 @@ #ifndef _GRAIL_IMPL_H #define _GRAIL_IMPL_H -#include +#define MTDEV_NO_LEGACY_API +#define GRAIL_NO_LEGACY_API + +#include +#include #include "evbuf.h" #include "grailbuf.h" +#define DIM_TOUCH 32 +#define DIM_TOUCH_BYTES ((DIM_TOUCH + 7) >> 3) + struct grail_impl { - struct touch_dev dev; - struct touch_caps emu; + struct evemu_device *evemu; + struct mtdev *mtdev; + utouch_frame_handle fh; + const struct utouch_frame *frame; struct evbuf evbuf; struct grailbuf gbuf; + float emin_x, emin_y; + float emax_x, emax_y; int filter_abs; int pointer_status; int pointer_x, pointer_y; -- cgit v1.2.3