From cb2cad3b8c506a08a6bdad548a10ff47f85ef38b Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Thu, 12 Aug 2010 18:50:00 +0100 Subject: Repackaged to utouch-grail v1.0.8 Signed-off-by: Henrik Rydberg --- src/Makefile.am | 10 +++++----- src/grail-api.c | 13 +++---------- 2 files changed, 8 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 96ac7ed..3171edd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,11 +1,11 @@ -lib_LTLIBRARIES = libgrail.la +lib_LTLIBRARIES = libutouch-grail.la -libgrail_la_LDFLAGS = \ +libutouch_grail_la_LDFLAGS = \ -version-info @LIB_VERSION@ \ -lm \ $(MTDEV_LIBS) -libgrail_la_SOURCES = \ +libutouch_grail_la_SOURCES = \ evbuf.h \ gebuf.h \ touch-dev.c \ @@ -27,8 +27,8 @@ AM_CFLAGS = $(CWARNFLAGS) INCLUDES = -I$(top_srcdir)/include/ -libgrailincludedir = $(includedir) -libgrailinclude_HEADERS = \ +libutouch_grailincludedir = $(includedir) +libutouch_grailinclude_HEADERS = \ $(top_srcdir)/include/grail-bits.h \ $(top_srcdir)/include/grail-types.h \ $(top_srcdir)/include/grail-touch.h \ diff --git a/src/grail-api.c b/src/grail-api.c index 03355dc..7c054a9 100644 --- a/src/grail-api.c +++ b/src/grail-api.c @@ -82,17 +82,10 @@ static void tp_sync(struct touch_engine *engine, evbuf_clear(&x->evbuf); return; } - if (hack > x->hack_status) { - ev = *syn; - ev.type = EV_KEY; - ev.code = BTN_TOUCH; - ev.value = hack; - ge->event(ge, &ev); - x->hack_status = hack; - nevent++; - } while (!evbuf_empty(&x->evbuf)) { evbuf_get(&x->evbuf, &ev); + if (!hack && ev.type == EV_ABS) + continue; if (dofilt && grail_mask_get(filtered, ev.type)) continue; if (extra_filtered(&ev)) @@ -100,7 +93,7 @@ static void tp_sync(struct touch_engine *engine, ge->event(ge, &ev); nevent++; } - if (hack < x->hack_status) { + if (hack != x->hack_status) { ev = *syn; ev.type = EV_KEY; ev.code = BTN_TOUCH; -- cgit v1.2.3