X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Flib%2Felm_gesture_layer.c;h=1cfd219fcd0cfac75afc19cd4cbeff54fbd10151;hb=2e079b6fe2c119b1b47919351a98863f39d0e06a;hp=8cd94969aee17a8ae3e0c7e55d39c796f09aa310;hpb=1cc17813196d506c61746309e36d1812d6b01fef;p=framework%2Fuifw%2Felementary.git diff --git a/src/lib/elm_gesture_layer.c b/src/lib/elm_gesture_layer.c index 8cd9496..1cfd219 100644 --- a/src/lib/elm_gesture_layer.c +++ b/src/lib/elm_gesture_layer.c @@ -7,6 +7,8 @@ /* ELM_GESTURE_NEGATIVE_ANGLE - magic number says we didn't compute this yet */ #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 @@ -156,9 +158,9 @@ typedef struct _Taps_Type Taps_Type; struct _Long_Tap_Type { Elm_Gesture_Taps_Info info; - unsigned int center_x; - unsigned int center_y; - unsigned int n_taps; + Evas_Coord center_x; + Evas_Coord center_y; + unsigned int max_touched; Ecore_Timer *timeout; /* When this expires, long tap STARTed */ Eina_List *touched; }; @@ -172,6 +174,7 @@ struct _Momentum_Type unsigned int t_st_x; /* Time start on X */ unsigned int t_st_y; /* Time start on Y */ unsigned int t_end; /* Time end */ + unsigned int t_up; /* Recent up event time */ int xdir, ydir; }; typedef struct _Momentum_Type Momentum_Type; @@ -248,7 +251,6 @@ struct _Widget_Data Ecore_Timer *dbl_timeout; /* When this expires, dbl click/taps ABORTed */ Eina_List *pending; /* List of devices need to refeed *UP event */ Eina_List *touched; /* Information of touched devices */ - Eina_List *recent_device_event; /* Information of recent pe event of each device */ Eina_Bool repeat_events : 1; }; @@ -327,69 +329,18 @@ _add_touched_device(Eina_List *list, Pointer_Event *pe) return list; } - p = malloc(sizeof(Pointer_Event)); - memcpy(p, pe, sizeof(Pointer_Event)); /* Freed in _remove_touched_device() */ - return eina_list_append(list, p); -} -/* END - Functions to manage touched-device list */ - -/* START - Functions to manage recent device event list */ -/* This list holds the recent-event for each device */ -/* it will hold a single recent-event for each device */ -/* We are using those PE events of this list to */ -/* send them later to test funcs to restart gestures */ -/* We only keep DOWN, MOVE events in this list. */ -/* So when no touch this list is empty. */ -/** - * @internal - * - * Recoed Pointer Event in touched device list - * Note: This fuction allocates memory for PE event - * This memory is released here when device untouched - * or in cleanup. - * @param list Pointer to touched device list. - * @param Pointer_Event Pointer to PE. - * - * @ingroup Elm_Gesture_Layer - */ -static Eina_List * -_add_recent_device_event(Eina_List *list, Pointer_Event *pe) -{ - void *data = eina_list_search_sorted(list, compare_device, pe); - Eina_List *l = list; - Pointer_Event *p = NULL; - if(data) /* First remove recent event for this device */ - l = eina_list_remove(list, data); - - - switch(pe->event_type) - { - case EVAS_CALLBACK_MOUSE_DOWN: - case EVAS_CALLBACK_MOUSE_MOVE: - case EVAS_CALLBACK_MULTI_DOWN: - case EVAS_CALLBACK_MULTI_MOVE: - p = malloc(sizeof(Pointer_Event)); - memcpy(p, pe, sizeof(Pointer_Event)); /* Freed in here or on cleanup */ - l = eina_list_sorted_insert(l, compare_device, p); - break; - - /* Kept those cases for referance */ - case EVAS_CALLBACK_MOUSE_IN: - case EVAS_CALLBACK_MOUSE_OUT: - case EVAS_CALLBACK_MOUSE_WHEEL: - case EVAS_CALLBACK_MOUSE_UP: - case EVAS_CALLBACK_MULTI_UP: - case EVAS_CALLBACK_KEY_DOWN: - case EVAS_CALLBACK_KEY_UP: - break; - - default: - return l; + 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 l; + return list; } -/* END - Functions to manage recent device event list */ +/* END - Functions to manage touched-device list */ /** * @internal @@ -1013,16 +964,14 @@ _event_history_clear(Evas_Object *obj) if (pending) { - wd->pending = eina_list_remove_list(wd->pending, pending); - int device = ELM_MOUSE_DEVICE; - if (wd->event_history_list->event_type == EVAS_CALLBACK_MULTI_UP) - device = ((Evas_Event_Multi_Up *) - (wd->event_history_list->event))->device; + wd->pending = eina_list_remove_list(wd->pending, pending); } else - wd->pending = _add_device_pending(wd->pending, - wd->event_history_list->event, - wd->event_history_list->event_type); + { + wd->pending = _add_device_pending(wd->pending, + wd->event_history_list->event, + wd->event_history_list->event_type); + } } free(wd->event_history_list->event); @@ -1114,9 +1063,6 @@ _del_hook(Evas_Object *obj) EINA_LIST_FREE(wd->touched, data) free(data); - EINA_LIST_FREE(wd->recent_device_event, data) - free(data); - if (!elm_widget_disabled_get(obj)) _unregister_callbacks(obj); @@ -1155,8 +1101,8 @@ compare_match_fingers(const void *data1, const void *data2) 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 */ @@ -1325,7 +1271,19 @@ _tap_gesture_start(Widget_Data *wd, Pointer_Event *pe, { 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 */ @@ -1427,7 +1385,8 @@ _tap_gestures_test(Evas_Object *obj, Pointer_Event *pe, * @ingroup Elm_Gesture_Layer */ static void -_compute_taps_center(Long_Tap_Type *st, Pointer_Event *pe) +_compute_taps_center(Long_Tap_Type *st, + Evas_Coord *x_out, Evas_Coord *y_out, Pointer_Event *pe) { if(!eina_list_count(st->touched)) return; @@ -1449,8 +1408,8 @@ _compute_taps_center(Long_Tap_Type *st, Pointer_Event *pe) } } - st->info.x = x / eina_list_count(st->touched); - st->info.y = y / eina_list_count(st->touched); + *x_out = x / eina_list_count(st->touched); + *y_out = y / eina_list_count(st->touched); } /** @@ -1469,17 +1428,16 @@ _compute_taps_center(Long_Tap_Type *st, Pointer_Event *pe) */ 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; if (!pe) /* this happens when unhandled event arrived */ - return; /* see _make_pointer_event function */ - + return; /* see _make_pointer_event function */ Gesture_Info *gesture = wd->gesture[g_type]; - if (!gesture ) return; + if (!gesture) return; Long_Tap_Type *st = gesture->data; if (!st) @@ -1494,64 +1452,91 @@ _n_long_tap_test(Evas_Object *obj, Pointer_Event *pe, { 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 ((pe->device == 0) && (eina_list_count(st->touched) == 1)) - { /* This is the first mouse down we got */ - st->info.timestamp = pe->timestamp; + 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); + } + } - /* 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); - } + if ((pe->device == 0) && (eina_list_count(st->touched) == 1)) + { /* This is the first mouse down we got */ + st->info.timestamp = pe->timestamp; - consume_event(wd, event_info, event_type, ev_flag); - _compute_taps_center(st, pe); - break; + /* 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; case EVAS_CALLBACK_MULTI_UP: case EVAS_CALLBACK_MOUSE_UP: - st->touched = _remove_touched_device(st->touched, 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 */ - _compute_taps_center(st, pe); - /* Report MOVE if gesture started */ - ev_flag = _set_state(gesture, ELM_GESTURE_STATE_MOVE, - &st->info, EINA_TRUE); - consume_event(wd, event_info, event_type, ev_flag); - } - break; + 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); +#endif + 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; default: - return; + return; } } @@ -1732,8 +1717,17 @@ _momentum_test(Evas_Object *obj, Pointer_Event *pe, 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 state_to_report = ELM_GESTURE_STATE_MOVE; if (!st) { /* Allocated once on first time */ st = calloc(1, sizeof(Momentum_Type)); @@ -1744,38 +1738,70 @@ _momentum_test(Evas_Object *obj, Pointer_Event *pe, if (!pe) return; + /* 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 */ + 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.x += p->x; + pe_local.y += p->y; + cnt++; + } + + + /* Compute avarage to get center point */ + pe_local.x /= cnt; + pe_local.y /= cnt; + + /* If user added finger - reset gesture */ + if ((st->info.n) && (st->info.n < cnt)) + state_to_report = ELM_GESTURE_STATE_ABORT; + + if (st->info.n < cnt) + st->info.n = cnt; + Evas_Event_Flags ev_flag = EVAS_EVENT_FLAG_NONE; switch (event_type) { case EVAS_CALLBACK_MOUSE_DOWN: + case EVAS_CALLBACK_MULTI_DOWN: case EVAS_CALLBACK_MOUSE_MOVE: + case EVAS_CALLBACK_MULTI_MOVE: if (!st->t_st_x) { if ((event_type == EVAS_CALLBACK_MOUSE_DOWN) || + (event_type == EVAS_CALLBACK_MULTI_DOWN) || (wd->glayer_continues_enable)) /* start also on MOVE */ { /* We start on MOVE when cont-enabled only */ - st->line_st.x = st->line_end.x = pe->x; - st->line_st.y = st->line_end.y = pe->y; - st->t_st_x = st->t_st_y = st->t_end = pe->timestamp; + st->line_st.x = st->line_end.x = pe_local.x; + st->line_st.y = st->line_end.y = pe_local.y; + st->t_st_x = st->t_st_y = st->t_end = pe_local.timestamp; st->xdir = st->ydir = 0; - st->info.x2 = st->info.x1 = pe->x; - st->info.y2 = st->info.y1 = pe->y; - st->info.tx = st->info.ty = pe->timestamp; + st->info.x2 = st->info.x1 = pe_local.x; + st->info.y2 = st->info.y1 = pe_local.y; + st->info.tx = st->info.ty = pe_local.timestamp; ev_flag = _set_state(gesture, ELM_GESTURE_STATE_START, &st->info, EINA_FALSE); consume_event(wd, event_info, event_type, ev_flag); - } return; } - state_to_report = ELM_GESTURE_STATE_MOVE; - if ((pe->timestamp - ELM_GESTURE_MOMENTUM_TIMEOUT) > st->t_end) + + /* ABORT gesture if got DOWN or MOVE event after UP+timeout */ + if ((st->t_up) && + ((st->t_up + ELM_GESTURE_MULTI_TIMEOUT) < pe_local.timestamp)) + state_to_report = ELM_GESTURE_STATE_ABORT; + + if ((pe_local.timestamp - ELM_GESTURE_MOMENTUM_TIMEOUT) > st->t_end) { /* Too long of a wait, reset all values */ - st->line_st.x = pe->x; - st->line_st.y = pe->y; - st->t_st_y = st->t_st_x = pe->timestamp; + st->line_st.x = pe_local.x; + st->line_st.y = pe_local.y; + st->t_st_y = st->t_st_x = pe_local.timestamp; st->info.tx = st->t_st_x; st->info.ty = st->t_st_y; st->xdir = st->ydir = 0; @@ -1783,8 +1809,8 @@ _momentum_test(Evas_Object *obj, Pointer_Event *pe, else { int xdir, ydir; - xdir = _get_direction(st->line_st.x, pe->x); - ydir = _get_direction(st->line_st.y, pe->y); + xdir = _get_direction(st->line_st.x, pe_local.x); + ydir = _get_direction(st->line_st.y, pe_local.y); if (!xdir || (xdir == (-st->xdir))) { st->line_st.x = st->line_end.x; @@ -1800,11 +1826,11 @@ _momentum_test(Evas_Object *obj, Pointer_Event *pe, } } - st->info.x2 = st->line_end.x = pe->x; - st->info.y2 = st->line_end.y = pe->y; - st->t_end = pe->timestamp; - _set_momentum(&st->info, st->line_st.x, st->line_st.y, pe->x, pe->y, - st->t_st_x, st->t_st_y, pe->timestamp); + st->info.x2 = st->line_end.x = pe_local.x; + st->info.y2 = st->line_end.y = pe_local.y; + st->t_end = pe_local.timestamp; + _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, state_to_report, &st->info, EINA_TRUE); consume_event(wd, event_info, event_type, ev_flag); @@ -1812,36 +1838,36 @@ _momentum_test(Evas_Object *obj, Pointer_Event *pe, case EVAS_CALLBACK_MOUSE_UP: - /* IGNORE if line info was cleared, like long press, move */ - if (!st->t_st_x) + case EVAS_CALLBACK_MULTI_UP: + st->t_up = pe_local.timestamp; /* Record recent up event time */ + if ((cnt > 1) || /* Ignore if more fingers touch surface */ + (!st->t_st_x)) /* IGNORE if info was cleared, long press,move */ return; - state_to_report = ELM_GESTURE_STATE_END; - if ((pe->timestamp - ELM_GESTURE_MOMENTUM_TIMEOUT) > st->t_end) + if ((pe_local.timestamp - ELM_GESTURE_MOMENTUM_TIMEOUT) > st->t_end) { /* Too long of a wait, reset all values */ - st->line_st.x = pe->x; - st->line_st.y = pe->y; - st->t_st_y = st->t_st_x = pe->timestamp; + st->line_st.x = pe_local.x; + st->line_st.y = pe_local.y; + st->t_st_y = st->t_st_x = pe_local.timestamp; st->xdir = st->ydir = 0; } - st->info.x2 = pe->x; - st->info.y2 = pe->y; - st->line_end.x = pe->x; - st->line_end.y = pe->y; - st->t_end = pe->timestamp; + st->info.x2 = pe_local.x; + st->info.y2 = pe_local.y; + st->line_end.x = pe_local.x; + st->line_end.y = pe_local.y; + st->t_end = pe_local.timestamp; - _set_momentum(&st->info, st->line_st.x, st->line_st.y, pe->x, pe->y, - st->t_st_x, st->t_st_y, pe->timestamp); + _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, state_to_report, &st->info, - EINA_FALSE); - consume_event(wd, event_info, event_type, ev_flag); - - return; + 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; - case EVAS_CALLBACK_MULTI_UP: - ev_flag = _set_state(gesture, ELM_GESTURE_STATE_ABORT, &st->info, + ev_flag = _set_state(gesture, state_to_report, &st->info, EINA_FALSE); consume_event(wd, event_info, event_type, ev_flag); return; @@ -1954,6 +1980,15 @@ _n_line_test(Evas_Object *obj, Pointer_Event *pe, void *event_info, 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) { @@ -2098,7 +2133,7 @@ _n_line_test(Evas_Object *obj, Pointer_Event *pe, void *event_info, } } - st->info.n = started; + st->info.momentum.n = started; if (ended && @@ -2334,7 +2369,6 @@ get_finger_gap_length(Evas_Coord x1, Evas_Coord y1, Evas_Coord x2, * * @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) @@ -2956,8 +2990,18 @@ void continues_gestures_restart(void *data, Eina_Bool states_reset) /* Run through events to restart gestures */ Gesture_Info *g; - Eina_Bool n_lines, n_flicks, zoom, rotate; + Eina_Bool n_momentum, n_lines, n_flicks, zoom, rotate; /* We turn-on flag for finished, aborted, not-started gestures */ + g = wd->gesture[ELM_GESTURE_MOMENTUM]; + n_momentum = (g) ? ((states_reset) | ((g->state != ELM_GESTURE_STATE_START) + && (g->state != ELM_GESTURE_STATE_MOVE))) : EINA_FALSE; + if (n_momentum) + { + _momentum_test_reset(wd->gesture[ELM_GESTURE_MOMENTUM]); + _set_state(g, ELM_GESTURE_STATE_UNDEFINED, NULL, EINA_FALSE); + SET_TEST_BIT(g); + } + g = wd->gesture[ELM_GESTURE_N_LINES]; n_lines = (g) ? ((states_reset) | ((g->state != ELM_GESTURE_STATE_START) && (g->state != ELM_GESTURE_STATE_MOVE))) : EINA_FALSE; @@ -3086,9 +3130,6 @@ _event_process(void *data, Evas_Object *obj __UNUSED__, } } - /* Log event to restart gestures */ - wd->recent_device_event = _add_recent_device_event(wd->recent_device_event, &_pe); - /* we maintain list of touched devices */ /* We also use move to track current device x.y pos */ if ((event_type == EVAS_CALLBACK_MOUSE_DOWN) ||