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;
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;
};
static Eina_List *
_remove_touched_device(Eina_List *list, Pointer_Event *pe)
{
+ Eina_List *lst = NULL;
Pointer_Event *p = eina_list_search_unsorted(list, compare_device, pe);
if (p)
{
+ lst = eina_list_remove(list, p);
free(p);
- return eina_list_remove(list, p);
+ return lst;
}
return list;
}
/* 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;
- }
-
- return l;
-}
-/* END - Functions to manage recent device event list */
-
/**
* @internal
*
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);
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);
*/
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;
}
}
/* 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)
}
}
- st->info.n = started;
+ st->info.momentum.n = started;
if (ended &&
if (!wd->gesture[g_type]) return;
Gesture_Info *gesture = wd->gesture[g_type];
- Rotate_Type *st = gesture->data;
+ Rotate_Type *st;
if (gesture)
{
st = gesture->data;
if (_make_pointer_event(data, event_info, event_type, &_pe))
pe = &_pe;
+ if (!pe) return;
+
if (IS_TESTED(ELM_GESTURE_N_LONG_TAPS))
_n_long_tap_test(data, pe, event_info, event_type,
ELM_GESTURE_N_LONG_TAPS);
if (IS_TESTED(ELM_GESTURE_N_FLICKS))
_n_line_test(data, pe, event_info, event_type, ELM_GESTURE_N_FLICKS);
- if (IS_TESTED(ELM_GESTURE_ZOOM))
+ if (_elm_config->glayer_zoom_finger_enable && IS_TESTED(ELM_GESTURE_ZOOM))
_zoom_test(data, pe, event_info, event_type, ELM_GESTURE_ZOOM);
if (IS_TESTED(ELM_GESTURE_ZOOM))
}
}
- /* 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) ||
Evas *e;
Widget_Data *wd;
- EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
+ ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
- wd = ELM_NEW(Widget_Data);
- e = evas_object_evas_get(parent);
- if (!e) return NULL;
- obj = elm_widget_add(e);
ELM_SET_WIDTYPE(widtype, "gesture_layer");
elm_widget_type_set(obj, "gesture_layer");
elm_widget_sub_object_add(parent, obj);
projects / framework / uifw / elementary.git / blobdiff