From e0eb1015bf30fd0913db571b000ba6a83ea22660 Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Thu, 29 Jul 2010 15:54:31 +0200 Subject: Split the code into recognizer and inserter Refactor code to make more room for gesture recognition. Also simplify public headers. Signed-off-by: Henrik Rydberg --- include/grail-gesture.h | 90 ------------------------------------------------- include/grail.h | 80 +++++++++++++++++++++++++++++++++---------- 2 files changed, 63 insertions(+), 107 deletions(-) delete mode 100644 include/grail-gesture.h (limited to 'include') diff --git a/include/grail-gesture.h b/include/grail-gesture.h deleted file mode 100644 index fe62b95..0000000 --- a/include/grail-gesture.h +++ /dev/null @@ -1,90 +0,0 @@ -/***************************************************************************** - * - * 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.h b/include/grail.h index c390e22..de202b5 100644 --- a/include/grail.h +++ b/include/grail.h @@ -27,31 +27,82 @@ #include -#define DIM_GRAIL_PROP 8 -#define DIM_GRAIL_TYPE 64 +#define GRAIL_STATUS_BEGIN 0 +#define GRAIL_STATUS_UPDATE 1 +#define GRAIL_STATUS_END 2 +#define DIM_GRAIL_TYPE 64 +#define DIM_GRAIL_TYPE_BYTES (DIM_GRAIL_TYPE >> 3) + +#define GRAIL_TYPE_MOVE 0 +#define GRAIL_TYPE_VSCROLL 1 +#define GRAIL_TYPE_HSCROLL 2 +#define GRAIL_TYPE_SCROLL 3 + +#define DIM_GRAIL_PROP 8 + +static const int GRAIL_NPROP[] = { + 2, /* MOVE */ + 1, /* VSCROLL */ + 1, /* HSCROLL */ + 2, /* SCROLL */ +}; + +typedef unsigned char grail_mask_t; typedef int grail_prop_t; typedef __u64 grail_time_t; -typedef unsigned long grail_clientid_t; + +static inline void grail_set_mask(grail_mask_t *mask, int i) +{ + mask[i >> 3] |= (1 << (i & 7)); +} + +static inline void grail_clear_mask(grail_mask_t *mask, int i) +{ + mask[i >> 3] &= ~(1 << (i & 7)); +} + +static inline int grail_get_mask(const grail_mask_t *mask, int i) +{ + return (mask[i >> 3] >> (i & 7)) & 1; +} + +struct grail_coord { + int x, y; +}; + +struct grail_client_id { + int client; + int root, event, child; +}; + +struct grail_client_info { + struct grail_client_id id; + grail_mask_t mask[DIM_GRAIL_TYPE_BYTES]; +}; struct grail_event { - int type; - int id; - int x; - int y; - int status; - grail_time_t time; - grail_prop_t prop[DIM_GRAIL_PROP]; + int type; + int id; + int status; + struct grail_coord pos; + struct grail_client_id client_id; + grail_time_t time; + grail_prop_t prop[DIM_GRAIL_PROP]; }; struct grail { - int (*get_clients)(int x, int y, int screen, - grail_clientid_t *clients, int nclients); + int (*get_clients)(struct grail *ge, + struct grail_client_info *client, int max_clients, + const struct grail_coord *coords, int num_coords, + const grail_mask_t *types); void (*event)(struct grail *ge, const struct input_event *ev); void (*gesture)(struct grail *ge, const struct grail_event *ev); struct grail_impl *impl; + struct gesture_inserter *gin; + struct gesture_recognizer *gru; void *priv; }; @@ -60,9 +111,4 @@ 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 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 -- cgit v1.2.3