From 3b9c20f869a2f55bd9953665c9e7fd713db4ff43 Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Tue, 20 Jul 2010 12:01:32 +0200 Subject: Merge in fix of dev package. This patch moves header files around, and does not contain any logic changes. Signed-off-by: Henrik Rydberg --- include/touch.h | 57 --------------------------------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 include/touch.h (limited to 'include/touch.h') diff --git a/include/touch.h b/include/touch.h deleted file mode 100644 index 56c0044..0000000 --- a/include/touch.h +++ /dev/null @@ -1,57 +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_TOUCH_H -#define _GRAIL_TOUCH_H - -#include - -enum touch_prop_list { - TP_POS_X, - TP_POS_Y, - TP_TOUCH_MAJOR, - TP_TOUCH_MINOR, - TP_WIDTH_MAJOR, - TP_WIDTH_MINOR, - TP_ORIENTATION, - TP_PRESSURE, - DIM_TOUCH_PROP -}; - -typedef int touch_prop_t; -typedef unsigned touch_prop_mask_t; - -struct touch { - int active; - int slot; - int next; - touch_prop_t prop[DIM_TOUCH_PROP]; -}; - -static inline int has_prop(const touch_prop_mask_t *mask, int code) -{ - return (mask[code >> 5] >> (code & 31)) & 1; -} - -#endif -- cgit v1.2.3