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 --- src/grail-inserter.h | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 src/grail-inserter.h (limited to 'src/grail-inserter.h') diff --git a/src/grail-inserter.h b/src/grail-inserter.h new file mode 100644 index 0000000..1e02d5f --- /dev/null +++ b/src/grail-inserter.h @@ -0,0 +1,69 @@ +/***************************************************************************** + * + * 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 +#include +#include "gebuf.h" + +#define DIM_EV_TYPE EV_CNT +#define DIM_EV_TYPE_BYTES (DIM_EV_TYPE >> 3) + +#define DIM_SLOT 32 +#define DIM_SLOT_BYTES (DIM_SLOT >> 3) + +#define DIM_CLIENT 32 + +struct slot_state { + int type, id, status, x, y, nclient; + struct grail_client_id client_id[DIM_CLIENT]; + grail_mask_t span[DIM_SLOT_BYTES]; + struct gebuf buf; +}; + +struct gesture_inserter { + struct slot_state state[DIM_SLOT]; + grail_mask_t used[DIM_SLOT_BYTES]; + grail_time_t time; + int gestureid; +}; + +int gin_init(struct grail *ge); +void gin_destroy(struct grail *ge); + +void gin_frame_begin(struct grail *ge, grail_time_t time); +void gin_frame_end(struct grail *ge, grail_mask_t *filtered); + +int gin_gesture_begin(struct grail *ge, const struct touch_frame *frame, + int type, int x, int y, const grail_mask_t *span); +void gin_gesture_discard(struct gesture_inserter *gin, int slot); +void gin_gesture_end(struct gesture_inserter *gin, int slot); +void gin_gesture_end_all(struct gesture_inserter *gin); + +void gin_gesture_event(struct gesture_inserter *gin, int slot, + const grail_prop_t *prop); + +#endif -- cgit v1.2.3