4 files changed, 108 insertions, 7 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index c8404f8..a24f615 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,4 @@
-noinst_PROGRAMS = touch grail
+noinst_PROGRAMS = touch grail evlink
 
 INCLUDES=-I$(top_srcdir)/include/
 
@@ -7,3 +7,6 @@ touch_LDFLAGS = -L$(top_builddir)/src/.libs/ -lgrail -lmtdev
 
 grail_SOURCES = grail.c
 grail_LDFLAGS = -L$(top_builddir)/src/.libs/ -lgrail -lmtdev
+
+evlink_SOURCES = evlink.c
+evlink_LDFLAGS = -L$(top_builddir)/src/.libs/ -lgrail -lmtdev
diff --git a/test/evlink.c b/test/evlink.c
new file mode 100644
index 0000000..bef5e22
--- /dev/null
+++ b/test/evlink.c
@@ -0,0 +1,96 @@
+/*****************************************************************************
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Henrik Rydberg <rydberg@bitmath.org>
+ *
+ ****************************************************************************/
+
+#include <grail.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+static int tp_get_clients(int x, int y, int screen,
+                          grail_clientid_t *clients, int nclients)
+{
+        return 0;
+}
+
+static void tp_event(struct grail *ge, const struct input_event *ev)
+{
+        fprintf(stderr, "event %d %d %d\n", ev->type, ev->code, ev->value);
+}
+
+static void tp_gesture(struct grail *ge, const struct grail_event *ev)
+{
+        fprintf(stderr, "gesture %d %d\n", ev->type, ev->id);
+}
+
+static void loop_device(struct grail *ge, int fd)
+{
+        while (!grail_idle(ge, fd, 5000))
+                grail_pull(ge, fd);
+}
+
+#if 0
+void grail_add_client(struct grail *ge, grail_clientid_t id,
+                      const int *types, const int *priority, int ntypes);
+void grail_remove_client(struct grail *ge, grail_clientid_t id);
+
+#endif
+
+
+int main(int argc, char *argv[])
+{
+        struct grail ge;
+        int fd;
+
+        if (argc < 2) {
+                fprintf(stderr, "Usage: %s <device>\n", argv[0]);
+                return -1;
+        }
+
+        memset(&ge, 0, sizeof(ge));
+        ge.get_clients = tp_get_clients;
+        ge.event = tp_event;
+        ge.gesture = tp_gesture;
+
+        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 (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.c b/test/grail.c
index 82de65f..e22ffd8 100644
--- a/test/grail.c
+++ b/test/grail.c
@@ -22,7 +22,7 @@
  *
  ****************************************************************************/
 
-#include <grail.h>
+#include <grail-gesture.h>
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -133,7 +133,8 @@ static void tp_event(struct touch_engine *engine,
 {
 }
 
-static void tp_sync(struct touch_engine *engine)
+static void tp_sync(struct touch_engine *engine,
+                    const struct input_event *syn)
 {
         struct gesture_handler *gh = engine->priv;
         struct touch_frame *frame = &engine->frame;
@@ -158,7 +159,7 @@ int main(int argc, char *argv[])
         struct touch_dev dev;
         int fd;
         if (argc < 2) {
-                fprintf(stderr, "Usage: mtdev <device>\n");
+                fprintf(stderr, "Usage: %s <device>\n", argv[0]);
                 return -1;
         }
         fd = open(argv[1], O_RDONLY | O_NONBLOCK);
diff --git a/test/touch.c b/test/touch.c
index 1f9213d..bc10b54 100644
--- a/test/touch.c
+++ b/test/touch.c
@@ -22,7 +22,7 @@
  *
  ****************************************************************************/
 
-#include <grail.h>
+#include <grail-touch.h>
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -34,7 +34,8 @@ static void tp_event(struct touch_engine *engine,
         fprintf(stderr, "event %d %d %d\n", ev->type, ev->code, ev->value);
 }
 
-static void tp_sync(struct touch_engine *engine)
+static void tp_sync(struct touch_engine *engine,
+                    const struct input_event *syn)
 {
         struct touch_frame *frame = &engine->frame;
         int slot, i;
@@ -62,7 +63,7 @@ int main(int argc, char *argv[])
         struct touch_dev dev;
         int fd;
         if (argc < 2) {
-                fprintf(stderr, "Usage: mtdev <device>\n");
+                fprintf(stderr, "Usage: %s <device>\n", argv[0]);
                 return -1;
         }
         fd = open(argv[1], O_RDONLY | O_NONBLOCK);