From b76660d71e2ea77752025089bd71deffad64e325 Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Mon, 26 Jul 2010 13:51:34 +0200 Subject: Test implementation of grail api This patch introduces the grail API, and a program to test it (evlink). Signed-off-by: Henrik Rydberg --- include/grail-gesture.h | 90 +++++++++++++++++++++++++++++++++++++++++++++++++ include/grail-touch.h | 8 +++-- include/grail.h | 80 ++++++++++++++++--------------------------- 3 files changed, 124 insertions(+), 54 deletions(-) create mode 100644 include/grail-gesture.h (limited to 'include') diff --git a/include/grail-gesture.h b/include/grail-gesture.h new file mode 100644 index 0000000..fe62b95 --- /dev/null +++ b/include/grail-gesture.h @@ -0,0 +1,90 @@ +/***************************************************************************** + * + * 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 . + * + * Authors: + * Henrik Rydberg + * + ****************************************************************************/ + +#ifndef _GRAIL_GESTURE_H +#define _GRAIL_GESTURE_H + +#include + +#define DIM_GESTURE_PROP 8 +typedef int gesture_prop_t; + +enum gesture_type { + GE_MOVE, + GE_VSCROLL, + DIM_GESTURE_TYPE +}; + +enum gesture_state { + GS_CANCEL, + GS_BEGIN, + GS_END +}; + +struct gesture_flag { + enum gesture_type type; + touch_time_t time; + enum gesture_state state; +}; + +struct gesture_event { + enum gesture_type type; + touch_time_t time; + gesture_prop_t prop[DIM_GESTURE_PROP]; +}; + +struct gesture_dev { + struct gedev_impl *impl; + void *priv; +}; + +struct gesture_client { + void (*gesture)(struct gesture_client *client, + const struct gesture_event *ev); + int priority[DIM_GESTURE_TYPE]; + struct client_impl *impl; + void *priv; +}; + +int client_init(struct gesture_client *client, void *priv); +void client_flag(struct gesture_client *client, + const struct gesture_flag *flag); +void client_event(struct gesture_client *client, + const struct gesture_event *ev); +void client_sync(struct gesture_client *client); +void client_destroy(struct gesture_client *client); + +int gedev_init(struct gesture_dev *dev, void *priv); +int gedev_attach_client(struct gesture_dev *dev, + struct gesture_client *client); + +void gedev_flag(struct gesture_dev *dev, const struct gesture_flag *flag); +void gedev_event(struct gesture_dev *dev, const struct gesture_event *ev); +void gedev_sync(struct gesture_dev *dev); + +void gedev_detach_client(struct gesture_dev *dev, + struct gesture_client *client); +void gedev_destroy(struct gesture_dev *dev); + +#endif diff --git a/include/grail-touch.h b/include/grail-touch.h index 9e8572b..e4bfd7b 100644 --- a/include/grail-touch.h +++ b/include/grail-touch.h @@ -67,7 +67,7 @@ struct touch_dev { void (*modify)(struct touch_dev *dev, int slot, const touch_prop_mask_t *mask, const touch_prop_t *prop); void (*destroy)(struct touch_dev *dev, int slot); - void (*sync)(struct touch_dev *dev, touch_time_t time); + void (*sync)(struct touch_dev *dev, const struct input_event *syn); struct touch_dev_impl *impl; void *priv; }; @@ -75,7 +75,8 @@ struct touch_dev { struct touch_engine { void (*event)(struct touch_engine *engine, const struct input_event *ev); - void (*sync)(struct touch_engine *engine); + void (*sync)(struct touch_engine *engine, + const struct input_event *syn); struct touch_frame frame; void *priv; }; @@ -98,7 +99,8 @@ void touch_dev_close(struct touch_dev *dev, int fd); void touch_engine_init(struct touch_engine *engine, void (*event)(struct touch_engine *engine, const struct input_event *ev), - void (*sync)(struct touch_engine *engine), + void (*sync)(struct touch_engine *engine, + const struct input_event *ev), void *priv); void touch_engine_attach(struct touch_engine *engine, struct touch_dev *dev); void touch_engine_detach(struct touch_engine *engine, struct touch_dev *dev); diff --git a/include/grail.h b/include/grail.h index 087cf0c..c390e22 100644 --- a/include/grail.h +++ b/include/grail.h @@ -25,66 +25,44 @@ #ifndef _GRAIL_H #define _GRAIL_H -#include +#include -#define DIM_GESTURE_PROP 8 -typedef int gesture_prop_t; +#define DIM_GRAIL_PROP 8 +#define DIM_GRAIL_TYPE 64 -enum gesture_type { - GE_MOVE, - GE_VSCROLL, - DIM_GESTURE_TYPE -}; - -enum gesture_state { - GS_CANCEL, - GS_BEGIN, - GS_END -}; - -struct gesture_flag { - enum gesture_type type; - touch_time_t time; - enum gesture_state state; -}; +typedef int grail_prop_t; +typedef __u64 grail_time_t; +typedef unsigned long grail_clientid_t; -struct gesture_event { - enum gesture_type type; - touch_time_t time; - gesture_prop_t prop[DIM_GESTURE_PROP]; +struct grail_event { + int type; + int id; + int x; + int y; + int status; + grail_time_t time; + grail_prop_t prop[DIM_GRAIL_PROP]; }; -struct gesture_dev { - struct gedev_impl *impl; +struct grail { + int (*get_clients)(int x, int y, int screen, + grail_clientid_t *clients, int nclients); + void (*event)(struct grail *ge, + const struct input_event *ev); + void (*gesture)(struct grail *ge, + const struct grail_event *ev); + struct grail_impl *impl; void *priv; }; -struct gesture_client { - void (*gesture)(struct gesture_client *client, - const struct gesture_event *ev); - int priority[DIM_GESTURE_TYPE]; - struct client_impl *impl; - void *priv; -}; - -int client_init(struct gesture_client *client, void *priv); -void client_flag(struct gesture_client *client, - const struct gesture_flag *flag); -void client_event(struct gesture_client *client, - const struct gesture_event *ev); -void client_sync(struct gesture_client *client); -void client_destroy(struct gesture_client *client); - -int gedev_init(struct gesture_dev *dev, void *priv); -int gedev_attach_client(struct gesture_dev *dev, - struct gesture_client *client); +int grail_open(struct grail *ge, int fd); +int grail_idle(struct grail *ge, int fd, int ms); +int grail_pull(struct grail *ge, int fd); +void grail_close(struct grail *ge, int fd); -void gedev_flag(struct gesture_dev *dev, const struct gesture_flag *flag); -void gedev_event(struct gesture_dev *dev, const struct gesture_event *ev); -void gedev_sync(struct gesture_dev *dev); +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); -void gedev_detach_client(struct gesture_dev *dev, - struct gesture_client *client); -void gedev_destroy(struct gesture_dev *dev); #endif -- cgit v1.2.3