#define ELM_GESTURE_NEGATIVE_ANGLE (-1.0) /* Magic number */
#define ELM_GESTURE_MOMENTUM_TIMEOUT 50
#define ELM_GESTURE_MULTI_TIMEOUT 50
+#define ELM_GESTURE_MINIMUM_MOMENTUM 0.001
/* Some Trigo values */
#define RAD_90DEG M_PI_2
unsigned int t_st_y; /* Time start on Y */
unsigned int t_end; /* Time end */
unsigned int t_up; /* Recent up event time */
- int n_fingers;
int xdir, ydir;
};
typedef struct _Momentum_Type Momentum_Type;
return list;
}
- p = malloc(sizeof(Pointer_Event));
- memcpy(p, pe, sizeof(Pointer_Event)); /* Freed in _remove_touched_device() */
- return eina_list_append(list, p);
+ if ((pe->event_type == EVAS_CALLBACK_MOUSE_DOWN) ||
+ (pe->event_type == EVAS_CALLBACK_MULTI_DOWN))
+ { /* Add touched device on DOWN event only */
+ p = malloc(sizeof(Pointer_Event));
+ /* Freed in _remove_touched_device() */
+ memcpy(p, pe, sizeof(Pointer_Event));
+ return eina_list_append(list, p);
+ }
+
+ return list;
}
/* END - Functions to manage touched-device list */
static int
compare_pe_device(const void *data1, const void *data2)
-{ /* Compare coords of first item in list to cur coords */
- const Pointer_Event *pe1 = eina_list_data_get(eina_list_last(data1));
+{ /* Compare device of first item in list to our pe device */
+ const Pointer_Event *pe1 = eina_list_data_get(data1);
const Pointer_Event *pe2 = data2;
/* Only match if last was a down event */
{
case EVAS_CALLBACK_MULTI_DOWN:
case EVAS_CALLBACK_MOUSE_DOWN:
+ /* Check if got tap on same cord was tapped before */
pe_list = eina_list_search_unsorted(st->l, compare_match_fingers, pe);
+
+ if ((!pe_list) &&
+ eina_list_search_unsorted(st->l, compare_pe_device, pe))
+ { /* This device was touched in other cord before completion */
+ ev_flag = _set_state(gesture, ELM_GESTURE_STATE_ABORT,
+ &st->info, EINA_FALSE);
+ consume_event(wd, event_info, event_type, ev_flag);
+
+ return EINA_FALSE;
+ }
+
pe_list = _record_pointer_event(st, pe_list, pe, wd, event_info, event_type);
if ((pe->device == 0) && (eina_list_count(pe_list) == 1))
{ /* This is the first mouse down we got */
*/
static void
_n_long_tap_test(Evas_Object *obj, Pointer_Event *pe,
- void *event_info, Evas_Callback_Type event_type,
- Elm_Gesture_Types g_type)
+ void *event_info, Evas_Callback_Type event_type,
+ Elm_Gesture_Types g_type)
{ /* Here we fill Recent_Taps struct and fire-up click/tap timers */
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
{
case EVAS_CALLBACK_MULTI_DOWN:
case EVAS_CALLBACK_MOUSE_DOWN:
- st->touched = _add_touched_device(st->touched, pe);
- st->info.n = eina_list_count(st->touched);
- if (st->info.n > st->max_touched)
- st->max_touched = st->info.n;
- else
- { /* User removed finger from touch, then put back - ABORT */
- if ((gesture->state == ELM_GESTURE_STATE_START) ||
- (gesture->state == ELM_GESTURE_STATE_MOVE))
- {
- ev_flag =_set_state(gesture, ELM_GESTURE_STATE_ABORT,
- &st->info, EINA_FALSE);
- consume_event(wd, event_info, event_type, ev_flag);
- }
- }
+ st->touched = _add_touched_device(st->touched, pe);
+ st->info.n = eina_list_count(st->touched);
+ if (st->info.n > st->max_touched)
+ st->max_touched = st->info.n;
+ else
+ { /* User removed finger from touch, then put back - ABORT */
+ if ((gesture->state == ELM_GESTURE_STATE_START) ||
+ (gesture->state == ELM_GESTURE_STATE_MOVE))
+ {
+ ev_flag =_set_state(gesture, ELM_GESTURE_STATE_ABORT,
+ &st->info, EINA_FALSE);
+ consume_event(wd, event_info, event_type, ev_flag);
+ }
+ }
- if ((pe->device == 0) && (eina_list_count(st->touched) == 1))
- { /* This is the first mouse down we got */
- st->info.timestamp = pe->timestamp;
+ if ((pe->device == 0) && (eina_list_count(st->touched) == 1))
+ { /* This is the first mouse down we got */
+ st->info.timestamp = pe->timestamp;
- /* To test long tap */
- /* When this timer expires, gesture STARTED */
- if (!st->timeout)
- st->timeout = ecore_timer_add(wd->long_tap_start_timeout,
- _long_tap_timeout, gesture);
- }
+ /* To test long tap */
+ /* When this timer expires, gesture STARTED */
+ if (!st->timeout)
+ st->timeout = ecore_timer_add(wd->long_tap_start_timeout,
+ _long_tap_timeout, gesture);
+ }
- consume_event(wd, event_info, event_type, ev_flag);
- _compute_taps_center(st, &st->info.x, &st->info.y, pe);
- st->center_x = st->info.x;
- st->center_y = st->info.y;
- break;
+ consume_event(wd, event_info, event_type, ev_flag);
+ _compute_taps_center(st, &st->info.x, &st->info.y, pe);
+ st->center_x = st->info.x;
+ st->center_y = st->info.y;
+ break;
case EVAS_CALLBACK_MULTI_UP:
case EVAS_CALLBACK_MOUSE_UP:
- st->touched = _remove_touched_device(st->touched, pe);
- _compute_taps_center(st, &st->center_x, &st->center_y, pe);
- if (st->info.n &&
- ((gesture->state == ELM_GESTURE_STATE_START) ||
+ st->touched = _remove_touched_device(st->touched, pe);
+ _compute_taps_center(st, &st->center_x, &st->center_y, pe);
+ if (st->info.n &&
+ ((gesture->state == ELM_GESTURE_STATE_START) ||
(gesture->state == ELM_GESTURE_STATE_MOVE)))
- { /* Report END only for gesture that STARTed */
- if (eina_list_count(st->touched) == 0)
- { /* Report END only at last release event */
- ev_flag =_set_state(gesture, ELM_GESTURE_STATE_END,
- &st->info, EINA_FALSE);
- consume_event(wd, event_info, event_type, ev_flag);
- }
- }
- else
- { /* Stop test, user lifts finger before long-start */
- if (st->timeout) ecore_timer_del(st->timeout);
- st->timeout = NULL;
- ev_flag =_set_state(gesture, ELM_GESTURE_STATE_ABORT,
- &st->info, EINA_FALSE);
- consume_event(wd, event_info, event_type, ev_flag);
- }
+ { /* Report END only for gesture that STARTed */
+ if (eina_list_count(st->touched) == 0)
+ { /* Report END only at last release event */
+ ev_flag =_set_state(gesture, ELM_GESTURE_STATE_END,
+ &st->info, EINA_FALSE);
+ consume_event(wd, event_info, event_type, ev_flag);
+ }
+ }
+ else
+ { /* Stop test, user lifts finger before long-start */
+ if (st->timeout) ecore_timer_del(st->timeout);
+ st->timeout = NULL;
+ ev_flag =_set_state(gesture, ELM_GESTURE_STATE_ABORT,
+ &st->info, EINA_FALSE);
+ consume_event(wd, event_info, event_type, ev_flag);
+ }
- break;
+ break;
case EVAS_CALLBACK_MULTI_MOVE:
case EVAS_CALLBACK_MOUSE_MOVE:
- if(st->info.n &&
- ((gesture->state == ELM_GESTURE_STATE_START) ||
- (gesture->state == ELM_GESTURE_STATE_MOVE)))
- { /* Report MOVE only if STARTED */
- Evas_Coord x;
- Evas_Coord y;
- Elm_Gesture_State state_to_report = ELM_GESTURE_STATE_MOVE;
-
- _compute_taps_center(st, &x, &y, pe);
- /* ABORT if user moved fingers out of tap area */
+ if(st->info.n &&
+ ((gesture->state == ELM_GESTURE_STATE_START) ||
+ (gesture->state == ELM_GESTURE_STATE_MOVE)))
+ { /* Report MOVE only if STARTED */
+ Evas_Coord x = 0;
+ Evas_Coord y = 0;
+ Elm_Gesture_State state_to_report = ELM_GESTURE_STATE_MOVE;
+
+ _compute_taps_center(st, &x, &y, pe);
+ /* ABORT if user moved fingers out of tap area */
#if defined(DEBUG_GESTURE_LAYER)
- printf("%s x,y=(%d,%d) st->info.x,st->info.y=(%d,%d)\n",__func__,x,y,st->info.x,st->info.y);
+ printf("%s x,y=(%d,%d) st->info.x,st->info.y=(%d,%d)\n",__func__,x,y,st->info.x,st->info.y);
#endif
- if (!_inside(x, y, st->center_x, st->center_y))
- state_to_report = ELM_GESTURE_STATE_ABORT;
+ if (!_inside(x, y, st->center_x, st->center_y))
+ state_to_report = ELM_GESTURE_STATE_ABORT;
- /* Report MOVE if gesture started */
- ev_flag = _set_state(gesture, state_to_report,
- &st->info, EINA_TRUE);
- consume_event(wd, event_info, event_type, ev_flag);
- }
- break;
+ /* Report MOVE if gesture started */
+ ev_flag = _set_state(gesture, state_to_report,
+ &st->info, EINA_TRUE);
+ consume_event(wd, event_info, event_type, ev_flag);
+ }
+ break;
default:
- return;
+ return;
}
}
Gesture_Info *gesture = wd->gesture[g_type];
if (!gesture ) return;
+ /* When continues enable = TRUE a gesture may START on MOVE event */
+ /* We don't allow this to happen with the if-statement below. */
+ /* When continues enable = FALSE a gesture may START on DOWN only */
+ /* Therefor it would NOT start on MOVE event. */
+ /* NOTE that touched list is updated AFTER this function returns */
+ /* so (count == 0) when we get here on first touch on surface. */
+ if ((wd->glayer_continues_enable) && (!eina_list_count(wd->touched)))
+ return; /* Got move on mouse-over move */
+
Momentum_Type *st = gesture->data;
Elm_Gesture_State state_to_report = ELM_GESTURE_STATE_MOVE;
if (!st)
/* First make avarage of all touched devices to determine center point */
Eina_List *l;
Pointer_Event *p;
- Pointer_Event pe_local = *pe; /* Copy pe event info to local */
- int cnt = 1; /* We start counter counting current pe event */
+ Pointer_Event pe_local = *pe; /* Copy pe event info to local */
+ unsigned int cnt = 1; /* We start counter counting current pe event */
EINA_LIST_FOREACH(wd->touched, l, p)
if (p->device != pe_local.device)
{
pe_local.y /= cnt;
/* If user added finger - reset gesture */
- if ((st->n_fingers) && (st->n_fingers < cnt))
+ if ((st->info.n) && (st->info.n < cnt))
state_to_report = ELM_GESTURE_STATE_ABORT;
- st->n_fingers = cnt;
+ if (st->info.n < cnt)
+ st->info.n = cnt;
Evas_Event_Flags ev_flag = EVAS_EVENT_FLAG_NONE;
switch (event_type)
_set_momentum(&st->info, st->line_st.x, st->line_st.y, pe_local.x, pe_local.y,
st->t_st_x, st->t_st_y, pe_local.timestamp);
- ev_flag = _set_state(gesture, ELM_GESTURE_STATE_END, &st->info,
+ if ((fabs(st->info.mx) > ELM_GESTURE_MINIMUM_MOMENTUM) ||
+ (fabs(st->info.my) > ELM_GESTURE_MINIMUM_MOMENTUM))
+ state_to_report = ELM_GESTURE_STATE_END;
+ else
+ state_to_report = ELM_GESTURE_STATE_ABORT;
+
+ ev_flag = _set_state(gesture, state_to_report, &st->info,
EINA_FALSE);
consume_event(wd, event_info, event_type, ev_flag);
return;
Gesture_Info *gesture = wd->gesture[g_type];
if (!gesture ) return;
+ /* When continues enable = TRUE a gesture may START on MOVE event */
+ /* We don't allow this to happen with the if-statement below. */
+ /* When continues enable = FALSE a gesture may START on DOWN only */
+ /* Therefor it would NOT start on MOVE event. */
+ /* NOTE that touched list is updated AFTER this function returns */
+ /* so (count == 0) when we get here on first touch on surface. */
+ if ((wd->glayer_continues_enable) && (!eina_list_count(wd->touched)))
+ return; /* Got move on mouse-over move */
+
Line_Type *st = gesture->data;
if (!st)
{
}
}
- st->info.n = started;
+ st->info.momentum.n = started;
if (ended &&
*
* @ingroup Elm_Gesture_Layer
*/
-/* FIXME change float to double */
static double
compute_zoom(Zoom_Type *st, Evas_Coord x1, Evas_Coord y1, unsigned int tm1,
Evas_Coord x2, Evas_Coord y2, unsigned int tm2, double zoom_finger_factor)