diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | src/grail-api.c | 13 |
2 files changed, 8 insertions, 15 deletions
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 @@ | |||
| 1 | lib_LTLIBRARIES = libgrail.la | 1 | lib_LTLIBRARIES = libutouch-grail.la |
| 2 | 2 | ||
| 3 | libgrail_la_LDFLAGS = \ | 3 | libutouch_grail_la_LDFLAGS = \ |
| 4 | -version-info @LIB_VERSION@ \ | 4 | -version-info @LIB_VERSION@ \ |
| 5 | -lm \ | 5 | -lm \ |
| 6 | $(MTDEV_LIBS) | 6 | $(MTDEV_LIBS) |
| 7 | 7 | ||
| 8 | libgrail_la_SOURCES = \ | 8 | libutouch_grail_la_SOURCES = \ |
| 9 | evbuf.h \ | 9 | evbuf.h \ |
| 10 | gebuf.h \ | 10 | gebuf.h \ |
| 11 | touch-dev.c \ | 11 | touch-dev.c \ |
| @@ -27,8 +27,8 @@ AM_CFLAGS = $(CWARNFLAGS) | |||
| 27 | 27 | ||
| 28 | INCLUDES = -I$(top_srcdir)/include/ | 28 | INCLUDES = -I$(top_srcdir)/include/ |
| 29 | 29 | ||
| 30 | libgrailincludedir = $(includedir) | 30 | libutouch_grailincludedir = $(includedir) |
| 31 | libgrailinclude_HEADERS = \ | 31 | libutouch_grailinclude_HEADERS = \ |
| 32 | $(top_srcdir)/include/grail-bits.h \ | 32 | $(top_srcdir)/include/grail-bits.h \ |
| 33 | $(top_srcdir)/include/grail-types.h \ | 33 | $(top_srcdir)/include/grail-types.h \ |
| 34 | $(top_srcdir)/include/grail-touch.h \ | 34 | $(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, | |||
| 82 | evbuf_clear(&x->evbuf); | 82 | evbuf_clear(&x->evbuf); |
| 83 | return; | 83 | return; |
| 84 | } | 84 | } |
| 85 | if (hack > x->hack_status) { | ||
| 86 | ev = *syn; | ||
| 87 | ev.type = EV_KEY; | ||
| 88 | ev.code = BTN_TOUCH; | ||
| 89 | ev.value = hack; | ||
| 90 | ge->event(ge, &ev); | ||
| 91 | x->hack_status = hack; | ||
| 92 | nevent++; | ||
| 93 | } | ||
| 94 | while (!evbuf_empty(&x->evbuf)) { | 85 | while (!evbuf_empty(&x->evbuf)) { |
| 95 | evbuf_get(&x->evbuf, &ev); | 86 | evbuf_get(&x->evbuf, &ev); |
| 87 | if (!hack && ev.type == EV_ABS) | ||
| 88 | continue; | ||
| 96 | if (dofilt && grail_mask_get(filtered, ev.type)) | 89 | if (dofilt && grail_mask_get(filtered, ev.type)) |
| 97 | continue; | 90 | continue; |
| 98 | if (extra_filtered(&ev)) | 91 | if (extra_filtered(&ev)) |
| @@ -100,7 +93,7 @@ static void tp_sync(struct touch_engine *engine, | |||
| 100 | ge->event(ge, &ev); | 93 | ge->event(ge, &ev); |
| 101 | nevent++; | 94 | nevent++; |
| 102 | } | 95 | } |
| 103 | if (hack < x->hack_status) { | 96 | if (hack != x->hack_status) { |
| 104 | ev = *syn; | 97 | ev = *syn; |
| 105 | ev.type = EV_KEY; | 98 | ev.type = EV_KEY; |
| 106 | ev.code = BTN_TOUCH; | 99 | ev.code = BTN_TOUCH; |
