From 7be96df1c903c11711336c5ad1859b347ae4b661 Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Tue, 10 Aug 2010 11:47:00 +0100 Subject: api: Rename gestures to conform to design docs Use the names drag, pinch and rotate, and remove the combo gesture. Signed-off-by: Henrik Rydberg --- src/gestures-pan.c | 74 ------------------------------------------------------ 1 file changed, 74 deletions(-) delete mode 100644 src/gestures-pan.c (limited to 'src/gestures-pan.c') diff --git a/src/gestures-pan.c b/src/gestures-pan.c deleted file mode 100644 index c951b78..0000000 --- a/src/gestures-pan.c +++ /dev/null @@ -1,74 +0,0 @@ -/***************************************************************************** - * - * grail - Gesture Recognition And Instantiation Library - * - * Copyright (C) 2010 Canonical Ltd. - * Copyright (C) 2010 Henrik Rydberg - * - * 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 . - * - ****************************************************************************/ - -#include "grail-recognizer.h" -#include -#include - -static const int getype[DIM_TOUCH + 1] = { - -1, - GRAIL_TYPE_POINTER, - GRAIL_TYPE_PAN, - GRAIL_TYPE_SWIPE, - GRAIL_TYPE_BRUSH, - GRAIL_TYPE_HAND, -}; - -static const int fm_mask = 0x03; - -int gru_pan(struct grail *ge, - const struct touch_frame *frame) -{ - struct gesture_recognizer *gru = ge->gru; - struct combo_model *state = &gru->pan; - struct move_model *move = &gru->move; - grail_prop_t prop[DIM_GRAIL_PROP]; - int mask = state->active ? (move->active & fm_mask) : fm_mask; - if (!move->multi && (!gru->pointer_gesture || !move->single)) { - if (state->active) { - gru_end(ge, state->gid, move); - state->active = 0; - } - return 0; - } - if (!(move->tickle & mask)) - return 0; - if (!state->active) { - int type = getype[move->ntouch]; - if (type < 0) - return 0; - state->gid = gin_gid_begin(ge, type, PRIO_GESTURE, frame); - state->active = 1; - } - if (move->single) { - prop[0] = move->fm[FM_X].raw_delta; - prop[1] = move->fm[FM_Y].raw_delta; - } else { - if (!(move->active & fm_mask)) - return 0; - prop[0] = move->fm[FM_X].action_delta; - prop[1] = move->fm[FM_Y].action_delta; - } - gru_event(ge, state->gid, move, prop, 2); - return 1; -} - -- cgit v1.2.3