X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fefl_util.c;h=5995e3d4729f653ff8bc52ddb8a2658b4b920dc5;hb=f79480943ba123664a4cb09302cc7f908eb053e5;hp=248578b169fd7d214485ac37e78af0ef74455b3b;hpb=6d1e77999b8e6626ee3beced27f78aeab8da5386;p=platform%2Fcore%2Fapi%2Fefl-util.git diff --git a/src/efl_util.c b/src/efl_util.c index 248578b..5995e3d 100644 --- a/src/efl_util.c +++ b/src/efl_util.c @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include @@ -93,21 +93,9 @@ static inline tizen_profile_t get_tizen_profile() #define LOG_TAG "TIZEN_N_EFL_UTIL" - - -/* callback handler index */ -#define CBH_NOTI_LEV 0 -#define CBH_SCR_MODE 1 -#define CBH_MAX 2 - -typedef void (*Efl_Util_Cb)(Evas_Object *, int, void *); - -typedef struct _Efl_Util_Callback_Info -{ - Evas_Object *win; - Efl_Util_Cb cb; - void *data; -} Efl_Util_Callback_Info; +#define EFL_UTIL_INPUT_GENERATOR_DEFAULT_TIME_OUT 1000 +#define EFL_UTIL_INPUT_GENERATOR_DEFAULT_DISPATCH_TIME_OUT 10 +#define EFL_UTIL_INPUT_GENERATOR_TOUCH_MAX_FINGER 10 typedef struct _Efl_Util_Wl_Surface_Lv_Info { @@ -179,17 +167,35 @@ typedef struct _Efl_Util_Gesture_Palm_Cover_Grab_Data Efl_Util_Gesture_Common_Grab_Data base; } Efl_Util_Gesture_Palm_Cover_Grab_Data; +typedef struct _Efl_Util_Device_Info +{ + struct tizen_input_device *device; + Ecore_Device_Class clas; + Eina_Stringshare *name; +} Efl_Util_Device_Info; + +typedef struct _E_Devicemgr_Inputgen_Touch_Axis +{ + double radius_x; + double radius_y; + double pressure; + double angle; + double palm; +} E_Devicemgr_Inputgen_Touch_Axis; + typedef struct _Efl_Util_Data { /* wayland related stuffs */ struct { Eina_Bool init; + Ecore_Wl2_Display *wl2_display; struct wl_display *dpy; struct wl_event_queue *queue; struct { + unsigned int id; struct tizen_policy *proto; Eina_Hash *hash_noti_lv; Eina_Hash *hash_scr_mode; @@ -207,54 +213,69 @@ typedef struct _Efl_Util_Data { struct tizen_input_device_manager *devicemgr; int request_notified; + Eina_List *devices; + Eina_List *wait_devices; + struct wl_event_source *wait_timer; } devmgr; struct { + unsigned int id; struct tizen_display_policy *proto; Eina_Hash *hash_brightness; } display_policy; + } wl; +} Efl_Util_Data; + +typedef struct _Efl_Util_Data_Default_Queue +{ + /* wayland related stuffs */ + struct + { + Eina_Bool init; + Ecore_Wl2_Display *wl2_display; + struct wl_display *dpy; + struct { + unsigned int id; struct tizen_gesture *proto; int request_notified; int event_init; } gesture; } wl; +} Efl_Util_Data_Default_Queue; - struct - { - Eina_List *info_list; /* list of callback info */ - unsigned int atom; /* x11 atom */ - } cb_handler[CBH_MAX]; -} Efl_Util_Data; static Efl_Util_Data _eflutil = { { EINA_FALSE, - NULL, NULL, - { NULL, NULL, NULL }, /* tizen_policy protocol */ + NULL, NULL, NULL, + { 0, NULL, NULL, NULL }, /* tizen_policy protocol */ { NULL, NULL, NULL, NULL, NULL, 0 }, /* screenshooter protocol */ - { NULL, -1 }, /* tizen_input_device_manager protocol */ - { NULL, NULL }, /* display_policy protocol */ - { NULL, -1, EINA_FALSE } /* tizen_gesture protocol */ + { NULL, -1, NULL, NULL, NULL }, /* tizen_input_device_manager protocol */ + { 0, NULL, NULL } /* display_policy protocol */ }, +}; + +static Efl_Util_Data_Default_Queue _eflutil_defaultqueue = +{ { - { NULL, 0 }, /* handler for notification level */ - { NULL, 0 } /* handler for screen mode */ + EINA_FALSE, + NULL, NULL, + { 0, NULL, -1, 0 } /* gesture protocol */ }, }; -static Eina_Bool _cb_info_add(Evas_Object *win, Efl_Util_Cb cb, void *data, int idx); -static Eina_Bool _cb_info_del_by_win(Evas_Object *win, int idx); -static Eina_List *_cb_info_list_get(int idx); -static Efl_Util_Callback_Info *_cb_info_find_by_win(Evas_Object *win, int idx); + static Eina_Bool _wl_init(void); +static Eina_Bool _wl_init_default_queue(void); static void _cb_wl_reg_global(void *data, struct wl_registry *reg, unsigned int name, const char *interface, unsigned int version); static void _cb_wl_reg_global_remove(void *data, struct wl_registry *reg, unsigned int name); +static void _cb_wl_default_queue_reg_global(void *data, struct wl_registry *reg, unsigned int name, const char *interface, unsigned int version); +static void _cb_wl_default_queue_reg_global_remove(void *data, struct wl_registry *reg, unsigned int name); static void _cb_wl_reg_screenshooter_global(void *data, struct wl_registry *reg, unsigned int name, const char *interface, unsigned int version); static void _cb_wl_reg_screenshooter_global_remove(void *data, struct wl_registry *reg, unsigned int name); -static Efl_Util_Callback_Info *_cb_info_find_by_wlsurf(void *wlsurf, int idx); static void _cb_wl_tz_policy_conformant(void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface, uint32_t is_conformant); static void _cb_wl_tz_policy_conformant_area(void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface, uint32_t conformant_part, uint32_t state, int32_t x, int32_t y, int32_t w, int32_t h); static void _cb_wl_tz_policy_notification_done(void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface, int32_t level, uint32_t state); @@ -264,9 +285,14 @@ static void _cb_wl_tz_policy_iconify_state_changed(void *data static void _cb_wl_tz_policy_supported_aux_hints(void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface_resource, struct wl_array *hints, uint32_t num_hints); static void _cb_wl_tz_policy_allowed_aux_hint(void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface_resource, int id); static void _cb_wl_tz_policy_aux_message(void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface_resource, const char *key, const char *val, struct wl_array *options); +static void _cb_wl_conformant_region(void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface, uint32_t conformant_part, uint32_t state, int32_t x, int32_t y, int32_t w, int32_t h, uint32_t serial); static void _cb_wl_tz_display_policy_brightness_done(void *data, struct tizen_display_policy *tizen_display_policy, struct wl_surface *surface_resource, int32_t brightness, uint32_t state); +static void _cb_device_info(void *data, struct tizen_input_device *tizen_input_device EINA_UNUSED, const char *name, uint32_t clas, uint32_t subclas EINA_UNUSED, struct wl_array *axes EINA_UNUSED); +static void _cb_event_device(void *data EINA_UNUSED, struct tizen_input_device *tizen_input_device EINA_UNUSED, unsigned int serial EINA_UNUSED, const char *name EINA_UNUSED, uint32_t time EINA_UNUSED); +static void _cb_axis(void *data EINA_UNUSED, struct tizen_input_device *tizen_input_device EINA_UNUSED, uint32_t axis_type EINA_UNUSED, wl_fixed_t value EINA_UNUSED); + static void _cb_device_add(void *data EINA_UNUSED, struct tizen_input_device_manager *tizen_input_device_manager EINA_UNUSED, uint32_t serial EINA_UNUSED, const char *identifier EINA_UNUSED, struct tizen_input_device *device EINA_UNUSED, struct wl_seat *seat EINA_UNUSED); static void _cb_device_remove(void *data EINA_UNUSED, struct tizen_input_device_manager *tizen_input_device_manager EINA_UNUSED, uint32_t serial EINA_UNUSED, const char *identifier EINA_UNUSED, struct tizen_input_device *device EINA_UNUSED, struct wl_seat *seat EINA_UNUSED); static void _cb_error(void *data EINA_UNUSED, struct tizen_input_device_manager *tizen_input_device_manager EINA_UNUSED, uint32_t errorcode); @@ -306,6 +332,14 @@ struct tizen_policy_listener _wl_tz_policy_listener = _cb_wl_tz_policy_supported_aux_hints, _cb_wl_tz_policy_allowed_aux_hint, _cb_wl_tz_policy_aux_message, + _cb_wl_conformant_region, +}; + +static const struct tizen_input_device_listener _wl_tz_input_device_listener = +{ + _cb_device_info, + _cb_event_device, + _cb_axis, }; struct tizen_input_device_manager_listener _wl_tz_devmgr_listener = @@ -321,6 +355,12 @@ struct tizen_display_policy_listener _wl_tz_display_policy_listener = _cb_wl_tz_display_policy_brightness_done, }; +static const struct wl_registry_listener _wl_default_queue_reg_listener = +{ + _cb_wl_default_queue_reg_global, + _cb_wl_default_queue_reg_global_remove +}; + struct tizen_gesture_listener _wl_tz_gesture_listener = { _cb_gesture_edge_swipe_notify, @@ -335,117 +375,85 @@ struct tizen_gesture_listener _wl_tz_gesture_listener = }; static Eina_Bool -_cb_info_add(Evas_Object *win, - Efl_Util_Cb cb, - void *data, - int idx) +_wl_init(void) { - Efl_Util_Callback_Info *info; - - info = _cb_info_find_by_win(win, idx); - if (info) - { - _eflutil.cb_handler[idx].info_list - = eina_list_remove(_eflutil.cb_handler[idx].info_list, - info); - free(info); - } + struct wl_display *display_wrapper = NULL; + struct wl_registry *reg = NULL; - info = (Efl_Util_Callback_Info *)calloc(1, sizeof(Efl_Util_Callback_Info)); - if (!info) return EINA_FALSE; + if (_eflutil.wl.init) return EINA_TRUE; - info->win = win; - info->cb = cb; - info->data = data; + ecore_wl2_init(); - _eflutil.cb_handler[idx].info_list - = eina_list_append(_eflutil.cb_handler[idx].info_list, - info); + _eflutil.wl.wl2_display = ecore_wl2_display_connect(NULL); + EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.wl2_display, fail); + _eflutil.wl.dpy = ecore_wl2_display_get(_eflutil.wl.wl2_display); + EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.dpy, fail); - return EINA_TRUE; -} + display_wrapper = wl_proxy_create_wrapper(_eflutil.wl.dpy); + EINA_SAFETY_ON_NULL_GOTO(display_wrapper, fail); -static Eina_Bool -_cb_info_del_by_win(Evas_Object *win, - int idx) -{ - Efl_Util_Callback_Info *info; + _eflutil.wl.queue = wl_display_create_queue(_eflutil.wl.dpy); + EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.queue, fail); - info = _cb_info_find_by_win(win, idx); - if (!info) return EINA_FALSE; + wl_proxy_set_queue((struct wl_proxy *)display_wrapper, _eflutil.wl.queue); - _eflutil.cb_handler[idx].info_list - = eina_list_remove(_eflutil.cb_handler[idx].info_list, - info); - free(info); + reg = wl_display_get_registry(display_wrapper); + wl_proxy_wrapper_destroy(display_wrapper); + display_wrapper = NULL; + EINA_SAFETY_ON_NULL_GOTO(reg, fail); - return EINA_TRUE; -} + wl_registry_add_listener(reg, &_wl_reg_listener, NULL); -static Eina_List * -_cb_info_list_get(int idx) -{ - return _eflutil.cb_handler[idx].info_list; -} + _eflutil.wl.init = EINA_TRUE; -static Efl_Util_Callback_Info * -_cb_info_find_by_win(Evas_Object *win, - int idx) -{ - Eina_List *l, *ll; - Efl_Util_Callback_Info *info; + return EINA_TRUE; +fail: + if (display_wrapper) + wl_proxy_wrapper_destroy(display_wrapper); - l = _cb_info_list_get(idx); - EINA_LIST_FOREACH(l, ll, info) + if (_eflutil.wl.queue) { - if (info->win == win) return info; + wl_event_queue_destroy(_eflutil.wl.queue); + _eflutil.wl.queue = NULL; } - return NULL; + ecore_wl2_shutdown(); + return EINA_FALSE; } static Eina_Bool -_wl_init(void) +_wl_init_default_queue(void) { struct wl_display *display_wrapper = NULL; struct wl_registry *reg = NULL; - if (_eflutil.wl.init) return EINA_TRUE; + if (_eflutil_defaultqueue.wl.init) return EINA_TRUE; - ecore_wl_init(NULL); + if (ecore_wl2_init() <= 0) return EINA_FALSE; - _eflutil.wl.dpy = ecore_wl_display_get(); - EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.dpy, fail); + _eflutil_defaultqueue.wl.wl2_display = ecore_wl2_connected_display_get(NULL); + EINA_SAFETY_ON_NULL_GOTO(_eflutil_defaultqueue.wl.wl2_display, fail); + _eflutil_defaultqueue.wl.dpy = ecore_wl2_display_get(_eflutil_defaultqueue.wl.wl2_display); + EINA_SAFETY_ON_NULL_GOTO(_eflutil_defaultqueue.wl.dpy, fail); - display_wrapper = wl_proxy_create_wrapper(_eflutil.wl.dpy); + display_wrapper = wl_proxy_create_wrapper(_eflutil_defaultqueue.wl.dpy); EINA_SAFETY_ON_NULL_GOTO(display_wrapper, fail); - _eflutil.wl.queue = wl_display_create_queue(_eflutil.wl.dpy); - EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.queue, fail); - - wl_proxy_set_queue((struct wl_proxy *)display_wrapper, _eflutil.wl.queue); - reg = wl_display_get_registry(display_wrapper); wl_proxy_wrapper_destroy(display_wrapper); display_wrapper = NULL; EINA_SAFETY_ON_NULL_GOTO(reg, fail); - wl_registry_add_listener(reg, &_wl_reg_listener, NULL); + wl_registry_add_listener(reg, &_wl_default_queue_reg_listener, NULL); - _eflutil.wl.init = EINA_TRUE; + _eflutil_defaultqueue.wl.init = EINA_TRUE; return EINA_TRUE; fail: if (display_wrapper) wl_proxy_wrapper_destroy(display_wrapper); - if (_eflutil.wl.queue) - { - wl_event_queue_destroy(_eflutil.wl.queue); - _eflutil.wl.queue = NULL; - } - - ecore_wl_shutdown(); + ecore_wl2_shutdown(); return EINA_FALSE; } @@ -525,7 +533,7 @@ static const struct tizen_screenshooter_listener tz_screenshooter_listener = static void _cb_wl_reg_global(void *data, struct wl_registry *reg, - unsigned int name, + unsigned int id, const char *interface, unsigned int version) { @@ -533,9 +541,9 @@ _cb_wl_reg_global(void *data, { struct tizen_policy *proto; proto = wl_registry_bind(reg, - name, + id, &tizen_policy_interface, - 1); + 7); if (!proto) return; tizen_policy_add_listener(proto, @@ -545,6 +553,7 @@ _cb_wl_reg_global(void *data, _eflutil.wl.policy.hash_noti_lv = eina_hash_pointer_new(free); _eflutil.wl.policy.hash_scr_mode = eina_hash_pointer_new(free); _eflutil.wl.policy.proto = proto; + _eflutil.wl.policy.id = id; } else if (strcmp(interface, "wl_output") == 0) { @@ -553,17 +562,17 @@ _cb_wl_reg_global(void *data, _eflutil.wl.shot.output_list = eina_list_append(_eflutil.wl.shot.output_list, output); - output->output = wl_registry_bind(reg, name, &wl_output_interface, version); + output->output = wl_registry_bind(reg, id, &wl_output_interface, version); wl_output_add_listener(output->output, &output_listener, output); } else if (strcmp(interface, "tizen_input_device_manager") == 0) { - _eflutil.wl.devmgr.devicemgr = wl_registry_bind(reg, name, &tizen_input_device_manager_interface, version); + _eflutil.wl.devmgr.devicemgr = wl_registry_bind(reg, id, &tizen_input_device_manager_interface, version); tizen_input_device_manager_add_listener(_eflutil.wl.devmgr.devicemgr, &_wl_tz_devmgr_listener, NULL); } else if (!strcmp(interface, "tizen_display_policy")) { - _eflutil.wl.display_policy.proto = wl_registry_bind(reg, name, &tizen_display_policy_interface, version); + _eflutil.wl.display_policy.proto = wl_registry_bind(reg, id, &tizen_display_policy_interface, version); if (!_eflutil.wl.display_policy.proto) return; tizen_display_policy_add_listener(_eflutil.wl.display_policy.proto, @@ -571,28 +580,63 @@ _cb_wl_reg_global(void *data, NULL); _eflutil.wl.display_policy.hash_brightness = eina_hash_pointer_new(free); - } - else if (strcmp(interface, "tizen_gesture") == 0) - { - _eflutil.wl.gesture.proto = wl_registry_bind(reg, name, &tizen_gesture_interface, version); - tizen_gesture_add_listener(_eflutil.wl.gesture.proto, &_wl_tz_gesture_listener, NULL); + _eflutil.wl.display_policy.id = id; } } /* LCOV_EXCL_START */ static void _cb_wl_reg_global_remove(void *data, struct wl_registry *reg, - unsigned int name) + unsigned int id) { - _eflutil.wl.policy.proto = NULL; - eina_hash_free(_eflutil.wl.policy.hash_noti_lv); - eina_hash_free(_eflutil.wl.policy.hash_scr_mode); + /* unset each global id number to 0 since global id is started + * from number 1 on server side display structure + */ + if (id == _eflutil.wl.policy.id) + { + _eflutil.wl.policy.id = 0; + _eflutil.wl.policy.proto = NULL; + eina_hash_free(_eflutil.wl.policy.hash_noti_lv); + eina_hash_free(_eflutil.wl.policy.hash_scr_mode); + } + else if (id == _eflutil.wl.display_policy.id) + { + _eflutil.wl.display_policy.id = 0; + _eflutil.wl.display_policy.proto = NULL; + eina_hash_free(_eflutil.wl.display_policy.hash_brightness); + } +} +/* LCOV_EXCL_STOP */ - _eflutil.wl.display_policy.proto = NULL; - eina_hash_free(_eflutil.wl.display_policy.hash_brightness); +static void +_cb_wl_default_queue_reg_global(void *data, + struct wl_registry *reg, + unsigned int id, + const char *interface, + unsigned int version) +{ + if (strcmp(interface, "tizen_gesture") == 0) + { + _eflutil_defaultqueue.wl.gesture.id = id; + _eflutil_defaultqueue.wl.gesture.proto = wl_registry_bind(reg, id, &tizen_gesture_interface, version); + tizen_gesture_add_listener(_eflutil_defaultqueue.wl.gesture.proto, &_wl_tz_gesture_listener, NULL); + } +} +/* LCOV_EXCL_START */ +static void +_cb_wl_default_queue_reg_global_remove(void *data, + struct wl_registry *reg, + unsigned int id) +{ + if (id == _eflutil_defaultqueue.wl.gesture.id) + { + _eflutil_defaultqueue.wl.gesture.id = 0; + _eflutil_defaultqueue.wl.gesture.proto = NULL; + } } /* LCOV_EXCL_STOP */ + static void _cb_wl_reg_screenshooter_global(void *data, struct wl_registry *reg, @@ -622,26 +666,6 @@ _cb_wl_reg_screenshooter_global_remove(void *data, { } -static Efl_Util_Callback_Info * -_cb_info_find_by_wlsurf(void *wlsurf, - int idx) -{ - Eina_List *l, *ll; - Efl_Util_Callback_Info *info; - Ecore_Wl_Window *wlwin2 = NULL; - void *wlsurf2 = NULL; - - l = _cb_info_list_get(idx); - EINA_LIST_FOREACH(l, ll, info) - { - wlwin2 = elm_win_wl_window_get(info->win); - wlsurf2 = ecore_wl_window_surface_get(wlwin2); - if (wlsurf== wlsurf2) return info; - } - - return NULL; -} - static void _cb_wl_tz_policy_conformant(void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface, uint32_t is_conformant) @@ -664,7 +688,6 @@ _cb_wl_tz_policy_notification_done(void *data, uint32_t state) { Efl_Util_Wl_Surface_Lv_Info *lv_info; - Efl_Util_Callback_Info *cb_info; lv_info = eina_hash_find(_eflutil.wl.policy.hash_noti_lv, &surface); if (lv_info) @@ -673,16 +696,6 @@ _cb_wl_tz_policy_notification_done(void *data, lv_info->wait_for_done = EINA_FALSE; lv_info->state = state; } - - if (state != TIZEN_POLICY_ERROR_STATE_PERMISSION_DENIED) return; - - cb_info = _cb_info_find_by_wlsurf((void *)surface, CBH_NOTI_LEV); - if (!cb_info) return; - if (!cb_info->cb) return; - - cb_info->cb(cb_info->win, - EFL_UTIL_ERROR_PERMISSION_DENIED, - cb_info->data); } /* LCOV_EXCL_START */ @@ -699,9 +712,7 @@ _cb_wl_tz_policy_scr_mode_done(void *data, uint32_t mode, uint32_t state) { - Efl_Util_Wl_Surface_Scr_Mode_Info *scr_mode_info; - Efl_Util_Callback_Info *cb_info; scr_mode_info = eina_hash_find(_eflutil.wl.policy.hash_scr_mode, &surface); if (scr_mode_info) @@ -710,16 +721,6 @@ _cb_wl_tz_policy_scr_mode_done(void *data, scr_mode_info->wait_for_done = EINA_FALSE; scr_mode_info->state = state; } - - if (state != TIZEN_POLICY_ERROR_STATE_PERMISSION_DENIED) return; - - cb_info = _cb_info_find_by_wlsurf((void *)surface, CBH_SCR_MODE); - if (!cb_info) return; - if (!cb_info->cb) return; - - cb_info->cb(cb_info->win, - EFL_UTIL_ERROR_PERMISSION_DENIED, - cb_info->data); } /* LCOV_EXCL_START */ @@ -738,6 +739,9 @@ static void _cb_wl_tz_policy_allowed_aux_hint(void *data, str static void _cb_wl_tz_policy_aux_message(void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface_resource, const char *key, const char *val, struct wl_array *options) { } +static void _cb_wl_conformant_region(void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface, uint32_t conformant_part, uint32_t state, int32_t x, int32_t y, int32_t w, int32_t h, uint32_t serial) +{ +} /* LCOV_EXCL_STOP */ static void @@ -781,46 +785,30 @@ efl_util_set_notification_window_level(Evas_Object *window, (level <= EFL_UTIL_NOTIFICATION_LEVEL_TOP), EFL_UTIL_ERROR_INVALID_PARAMETER); - if (level == EFL_UTIL_NOTIFICATION_LEVEL_1) - { - dlog_print(DLOG_WARN, LOG_TAG, - "DEPRECATION WARNING: EFL_UTIL_NOTIFICATION_LEVEL_1 is deprecated and will be removed from next release. Use EFL_UTIL_NOTIFICATION_LEVEL_DEFAULT instead."); - } - else if (level == EFL_UTIL_NOTIFICATION_LEVEL_2) - { - dlog_print(DLOG_WARN, LOG_TAG, - "DEPRECATION WARNING: EFL_UTIL_NOTIFICATION_LEVEL_2 is deprecated and will be removed from next release. Use EFL_UTIL_NOTIFICATION_LEVEL_MEDIUM instead."); - } - else if (level == EFL_UTIL_NOTIFICATION_LEVEL_3) - { - dlog_print(DLOG_WARN, LOG_TAG, - "DEPRECATION WARNING: EFL_UTIL_NOTIFICATION_LEVEL_3 is deprecated and will be removed from next release. Use EFL_UTIL_NOTIFICATION_LEVEL_TOP instead."); - } - Elm_Win_Type type; - Ecore_Wl_Window *wlwin; + Ecore_Wl2_Window *wlwin; struct wl_surface *surface; Efl_Util_Wl_Surface_Lv_Info *lv_info; - Ecore_Wl_Window_Type wl_type; + Ecore_Wl2_Window_Type wl_type; res = _wl_init(); EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER); - wlwin = elm_win_wl_window_get(window); + wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window); EINA_SAFETY_ON_NULL_RETURN_VAL(wlwin, EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE); type = elm_win_type_get(window); if (type != ELM_WIN_NOTIFICATION) { - wl_type = ecore_wl_window_type_get(wlwin); - EINA_SAFETY_ON_FALSE_RETURN_VAL((wl_type == ECORE_WL_WINDOW_TYPE_NOTIFICATION), + wl_type = ecore_wl2_window_type_get(wlwin); + EINA_SAFETY_ON_FALSE_RETURN_VAL((wl_type == ECORE_WL2_WINDOW_TYPE_NOTIFICATION), EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE); } while (!_eflutil.wl.policy.proto) wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); - surface = ecore_wl_window_surface_get(wlwin); + surface = ecore_wl2_window_surface_get(wlwin); EINA_SAFETY_ON_NULL_RETURN_VAL(surface, EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE); @@ -857,7 +845,7 @@ efl_util_set_notification_window_level(Evas_Object *window, int count = 0; while (lv_info->wait_for_done && (count < 3)) { - ecore_wl_flush(); + ecore_wl2_display_flush(_eflutil.wl.wl2_display); wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); count++; } @@ -888,29 +876,29 @@ efl_util_get_notification_window_level(Evas_Object *window, EINA_SAFETY_ON_NULL_RETURN_VAL(level, EFL_UTIL_ERROR_INVALID_PARAMETER); Elm_Win_Type type; - Ecore_Wl_Window *wlwin; + Ecore_Wl2_Window *wlwin; struct wl_surface *surface; Efl_Util_Wl_Surface_Lv_Info *lv_info; - Ecore_Wl_Window_Type wl_type; + Ecore_Wl2_Window_Type wl_type; res = _wl_init(); EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER); - wlwin = elm_win_wl_window_get(window); + wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window); EINA_SAFETY_ON_NULL_RETURN_VAL(wlwin, EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE); type = elm_win_type_get(window); if (type != ELM_WIN_NOTIFICATION) { - wl_type = ecore_wl_window_type_get(wlwin); - EINA_SAFETY_ON_FALSE_RETURN_VAL((wl_type == ECORE_WL_WINDOW_TYPE_NOTIFICATION), + wl_type = ecore_wl2_window_type_get(wlwin); + EINA_SAFETY_ON_FALSE_RETURN_VAL((wl_type == ECORE_WL2_WINDOW_TYPE_NOTIFICATION), EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE); } while (!_eflutil.wl.policy.proto) wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); - surface = ecore_wl_window_surface_get(wlwin); + surface = ecore_wl2_window_surface_get(wlwin); EINA_SAFETY_ON_NULL_RETURN_VAL(surface, EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE); @@ -922,7 +910,7 @@ efl_util_get_notification_window_level(Evas_Object *window, int count = 0; while ((lv_info->wait_for_done) && (count < 3)) { - ecore_wl_flush(); + ecore_wl2_display_flush(_eflutil.wl.wl2_display); wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); count++; } @@ -936,9 +924,6 @@ efl_util_get_notification_window_level(Evas_Object *window, switch (lv_info->level) { - case TIZEN_POLICY_LEVEL_1: *level = EFL_UTIL_NOTIFICATION_LEVEL_1; break; - case TIZEN_POLICY_LEVEL_2: *level = EFL_UTIL_NOTIFICATION_LEVEL_2; break; - case TIZEN_POLICY_LEVEL_3: *level = EFL_UTIL_NOTIFICATION_LEVEL_3; break; case TIZEN_POLICY_LEVEL_NONE: *level = EFL_UTIL_NOTIFICATION_LEVEL_NONE; break; case TIZEN_POLICY_LEVEL_DEFAULT: *level = EFL_UTIL_NOTIFICATION_LEVEL_DEFAULT; break; case TIZEN_POLICY_LEVEL_MEDIUM: *level = EFL_UTIL_NOTIFICATION_LEVEL_MEDIUM; break; @@ -956,44 +941,6 @@ efl_util_get_notification_window_level(Evas_Object *window, } API int -efl_util_set_notification_window_level_error_cb(Evas_Object *window, - efl_util_notification_window_level_error_cb callback, - void *user_data) -{ - dlog_print(DLOG_WARN, LOG_TAG, - "DEPRECATION WARNING: efl_util_set_notification_window_level_error_cb() is deprecated and will be removed from next release. Use the return value of efl_util_set_notification_window_level() instead."); - - Eina_Bool ret = EINA_FALSE; - - EINA_SAFETY_ON_NULL_RETURN_VAL(window, EFL_UTIL_ERROR_INVALID_PARAMETER); - EINA_SAFETY_ON_NULL_RETURN_VAL(callback, EFL_UTIL_ERROR_INVALID_PARAMETER); - - ret = _cb_info_add(window, - (Efl_Util_Cb)callback, - user_data, - CBH_NOTI_LEV); - if (!ret) return EFL_UTIL_ERROR_OUT_OF_MEMORY; - - return EFL_UTIL_ERROR_NONE; -} - -API int -efl_util_unset_notification_window_level_error_cb(Evas_Object *window) -{ - dlog_print(DLOG_WARN, LOG_TAG, - "DEPRECATION WARNING: efl_util_unset_notification_window_level_error_cb() is deprecated and will be removed from next release. Use the return value of efl_util_set_notification_window_level() instead."); - - Eina_Bool ret = EINA_FALSE; - - EINA_SAFETY_ON_NULL_RETURN_VAL(window, EFL_UTIL_ERROR_INVALID_PARAMETER); - - ret = _cb_info_del_by_win(window, CBH_NOTI_LEV); - if (!ret) return EFL_UTIL_ERROR_INVALID_PARAMETER; - - return EFL_UTIL_ERROR_NONE; -} - -API int efl_util_set_window_opaque_state(Evas_Object *window, int opaque) { @@ -1003,7 +950,7 @@ efl_util_set_window_opaque_state(Evas_Object *window, EINA_SAFETY_ON_FALSE_RETURN_VAL(((opaque >= 0) && (opaque <= 1)), EFL_UTIL_ERROR_INVALID_PARAMETER); - Ecore_Wl_Window *wlwin; + Ecore_Wl2_Window *wlwin; struct wl_surface *surface; if (!_eflutil.wl.policy.proto) @@ -1019,11 +966,11 @@ efl_util_set_window_opaque_state(Evas_Object *window, EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil.wl.policy.proto, EFL_UTIL_ERROR_INVALID_PARAMETER); } - wlwin = elm_win_wl_window_get(window); + wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window); if (!wlwin) return EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE; - surface = ecore_wl_window_surface_get(wlwin); + surface = ecore_wl2_window_surface_get(wlwin); if (!surface) return EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE; @@ -1041,7 +988,7 @@ efl_util_set_window_screen_mode(Evas_Object *window, (mode <= EFL_UTIL_SCREEN_MODE_ALWAYS_ON)), EFL_UTIL_ERROR_INVALID_PARAMETER); - Ecore_Wl_Window *wlwin; + Ecore_Wl2_Window *wlwin; struct wl_surface *surface; Efl_Util_Wl_Surface_Scr_Mode_Info *scr_mode_info; Eina_Bool res; @@ -1049,13 +996,13 @@ efl_util_set_window_screen_mode(Evas_Object *window, res = _wl_init(); EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER); - wlwin = elm_win_wl_window_get(window); + wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window); if (wlwin) { while (!_eflutil.wl.policy.proto) wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); - surface = ecore_wl_window_surface_get(wlwin); + surface = ecore_wl2_window_surface_get(wlwin); EINA_SAFETY_ON_NULL_RETURN_VAL(surface, EFL_UTIL_ERROR_INVALID_PARAMETER); @@ -1088,7 +1035,7 @@ efl_util_set_window_screen_mode(Evas_Object *window, int count = 0; while (scr_mode_info->wait_for_done && (count < 3)) { - ecore_wl_flush(); + ecore_wl2_display_flush(_eflutil.wl.wl2_display); wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); count++; } @@ -1119,7 +1066,7 @@ efl_util_get_window_screen_mode(Evas_Object *window, EINA_SAFETY_ON_NULL_RETURN_VAL(window, EFL_UTIL_ERROR_INVALID_PARAMETER); EINA_SAFETY_ON_NULL_RETURN_VAL(mode, EFL_UTIL_ERROR_INVALID_PARAMETER); - Ecore_Wl_Window *wlwin; + Ecore_Wl2_Window *wlwin; struct wl_surface *surface; Efl_Util_Wl_Surface_Scr_Mode_Info *scr_mode_info; Eina_Bool res; @@ -1127,13 +1074,13 @@ efl_util_get_window_screen_mode(Evas_Object *window, res = _wl_init(); EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER); - wlwin = elm_win_wl_window_get(window); + wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window); if (wlwin) { while (!_eflutil.wl.policy.proto) wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); - surface = ecore_wl_window_surface_get(wlwin); + surface = ecore_wl2_window_surface_get(wlwin); EINA_SAFETY_ON_NULL_RETURN_VAL(surface, EFL_UTIL_ERROR_INVALID_PARAMETER); @@ -1144,7 +1091,7 @@ efl_util_get_window_screen_mode(Evas_Object *window, { while (scr_mode_info->wait_for_done) { - ecore_wl_flush(); + ecore_wl2_display_flush(_eflutil.wl.wl2_display); wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); } } @@ -1169,55 +1116,9 @@ efl_util_get_window_screen_mode(Evas_Object *window, } API int -efl_util_set_window_screen_mode_error_cb(Evas_Object *window, - efl_util_window_screen_mode_error_cb callback, - void *user_data) -{ - /* Wearable device cannot use this. */ - if (get_tizen_profile() == TIZEN_PROFILE_WEARABLE) - return EFL_UTIL_ERROR_NO_SUCH_DEVICE; - - dlog_print(DLOG_WARN, LOG_TAG, - "DEPRECATION WARNING: efl_util_set_window_screen_mode_error_cb() is deprecated and will be removed from next release. Use the return value of efl_util_set_window_screen_mode() instead."); - - Eina_Bool ret = EINA_FALSE; - - EINA_SAFETY_ON_NULL_RETURN_VAL(window, EFL_UTIL_ERROR_INVALID_PARAMETER); - EINA_SAFETY_ON_NULL_RETURN_VAL(callback, EFL_UTIL_ERROR_INVALID_PARAMETER); - - ret = _cb_info_add(window, - (Efl_Util_Cb)callback, - user_data, - CBH_SCR_MODE); - if (!ret) return EFL_UTIL_ERROR_OUT_OF_MEMORY; - - return EFL_UTIL_ERROR_NONE; -} - -API int -efl_util_unset_window_screen_mode_error_cb(Evas_Object *window) -{ - /* Wearable device cannot use this. */ - if (get_tizen_profile() == TIZEN_PROFILE_WEARABLE) - return EFL_UTIL_ERROR_NO_SUCH_DEVICE; - - dlog_print(DLOG_WARN, LOG_TAG, - "DEPRECATION WARNING: efl_util_unset_window_screen_mode_error_cb() is deprecated and will be removed from next release. Use the return value of efl_util_set_window_screen_mode() instead."); - - Eina_Bool ret = EINA_FALSE; - - EINA_SAFETY_ON_NULL_RETURN_VAL(window, EFL_UTIL_ERROR_INVALID_PARAMETER); - - ret = _cb_info_del_by_win(window, CBH_SCR_MODE); - if (!ret) return EFL_UTIL_ERROR_INVALID_PARAMETER; - - return EFL_UTIL_ERROR_NONE; -} - -API int efl_util_set_window_brightness(Evas_Object *window, int brightness) { - Ecore_Wl_Window *wlwin; + Ecore_Wl2_Window *wlwin; struct wl_surface *surface; Efl_Util_Wl_Surface_Brightness_Info *brightness_info; Eina_Bool res; @@ -1228,13 +1129,13 @@ efl_util_set_window_brightness(Evas_Object *window, int brightness) res = _wl_init(); EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER); - wlwin = elm_win_wl_window_get(window); + wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window); if (wlwin) { while (!_eflutil.wl.display_policy.proto) wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); - surface = ecore_wl_window_surface_get(wlwin); + surface = ecore_wl2_window_surface_get(wlwin); EINA_SAFETY_ON_NULL_RETURN_VAL(surface, EFL_UTIL_ERROR_INVALID_PARAMETER); @@ -1267,7 +1168,7 @@ efl_util_set_window_brightness(Evas_Object *window, int brightness) int count = 0; while (brightness_info->wait_for_done && (count < 3)) { - ecore_wl_flush(); + ecore_wl2_display_flush(_eflutil.wl.wl2_display); wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); count++; } @@ -1293,7 +1194,7 @@ efl_util_set_window_brightness(Evas_Object *window, int brightness) API int efl_util_get_window_brightness(Evas_Object *window, int *brightness) { - Ecore_Wl_Window *wlwin; + Ecore_Wl2_Window *wlwin; struct wl_surface *surface; Efl_Util_Wl_Surface_Brightness_Info *brightness_info; Eina_Bool res; @@ -1304,13 +1205,13 @@ efl_util_get_window_brightness(Evas_Object *window, int *brightness) res = _wl_init(); EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER); - wlwin = elm_win_wl_window_get(window); + wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window); if (!wlwin) return EFL_UTIL_ERROR_INVALID_PARAMETER; while (!_eflutil.wl.display_policy.proto) wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); - surface = ecore_wl_window_surface_get(wlwin); + surface = ecore_wl2_window_surface_get(wlwin); EINA_SAFETY_ON_NULL_RETURN_VAL(surface, EFL_UTIL_ERROR_INVALID_PARAMETER); @@ -1321,7 +1222,7 @@ efl_util_get_window_brightness(Evas_Object *window, int *brightness) { while (brightness_info->wait_for_done) { - ecore_wl_flush(); + ecore_wl2_display_flush(_eflutil.wl.wl2_display); wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); } } @@ -1338,69 +1239,329 @@ struct _efl_util_inputgen_h { unsigned int init_type; char name[32]; + E_Devicemgr_Inputgen_Touch_Axis *axis_info; }; -static void -_cb_device_add(void *data EINA_UNUSED, - struct tizen_input_device_manager *tizen_input_device_manager EINA_UNUSED, - uint32_t serial EINA_UNUSED, - const char *identifier EINA_UNUSED, - struct tizen_input_device *device EINA_UNUSED, - struct wl_seat *seat EINA_UNUSED) -{ - ; -} +static Eina_Bool +_efl_util_input_check_wait_device_full(void) +{ + Eina_List *l, *ll, *l_next; + Efl_Util_Device_Info *dev, *wait_dev; + int wait_cnt = 0; + + wait_cnt = eina_list_count(_eflutil.wl.devmgr.wait_devices); + if (wait_cnt <= 0) return EINA_TRUE; + + EINA_LIST_FOREACH(_eflutil.wl.devmgr.devices, l, dev) + { + EINA_LIST_FOREACH_SAFE(_eflutil.wl.devmgr.wait_devices, ll, l_next, wait_dev) + { + if ((dev->clas == wait_dev->clas) && + (!strncmp(dev->name, wait_dev->name, eina_stringshare_strlen(wait_dev->name)))) + { + eina_stringshare_del(wait_dev->name); + _eflutil.wl.devmgr.wait_devices = eina_list_remove_list(_eflutil.wl.devmgr.wait_devices, ll); + free(wait_dev); + + wait_cnt--; + if (wait_cnt <= 0) return EINA_TRUE; + + break; + } + } + } + + return EINA_FALSE; +} + +static Eina_Bool +_efl_util_input_check_wait_device(const char *name, unsigned int type) +{ + Eina_List *l, *l_next; + Efl_Util_Device_Info *wait_dev; + int wait_cnt = 0; + + wait_cnt = eina_list_count(_eflutil.wl.devmgr.wait_devices); + if (wait_cnt <= 0) return EINA_TRUE; + + EINA_LIST_FOREACH_SAFE(_eflutil.wl.devmgr.wait_devices, l, l_next, wait_dev) + { + if ((type == wait_dev->clas) && + (!strncmp(name, wait_dev->name, eina_stringshare_strlen(wait_dev->name)))) + { + eina_stringshare_del(wait_dev->name); + _eflutil.wl.devmgr.wait_devices = eina_list_remove_list(_eflutil.wl.devmgr.wait_devices, l); + free(wait_dev); + + wait_cnt--; + if (wait_cnt <= 0) return EINA_TRUE; + + break; + } + } + + return EINA_FALSE; +} + +static void +_cb_device_info(void *data, struct tizen_input_device *tizen_input_device EINA_UNUSED, const char *name, uint32_t clas, uint32_t subclas EINA_UNUSED, struct wl_array *axes EINA_UNUSED) +{ + Efl_Util_Device_Info *dev; + + if (!(dev = data)) return; + dev->clas = (Ecore_Device_Class)clas; + dev->name = eina_stringshare_add(name); + + if (_eflutil.wl.devmgr.wait_timer && + _efl_util_input_check_wait_device(name, clas)) + { + wl_event_source_remove(_eflutil.wl.devmgr.wait_timer); + _eflutil.wl.devmgr.wait_timer = NULL; + } +} + +/* LCOV_EXCL_START */ +static void +_cb_event_device(void *data EINA_UNUSED, struct tizen_input_device *tizen_input_device EINA_UNUSED, unsigned int serial EINA_UNUSED, const char *name EINA_UNUSED, uint32_t time EINA_UNUSED) +{ + ; +} + +static void +_cb_axis(void *data EINA_UNUSED, struct tizen_input_device *tizen_input_device EINA_UNUSED, uint32_t axis_type EINA_UNUSED, wl_fixed_t value EINA_UNUSED) +{ + ; +} +/* LCOV_EXCL_STOP */ + +static void +_cb_device_add(void *data EINA_UNUSED, + struct tizen_input_device_manager *tizen_input_device_manager EINA_UNUSED, + uint32_t serial EINA_UNUSED, + const char *identifier EINA_UNUSED, + struct tizen_input_device *device, + struct wl_seat *seat EINA_UNUSED) +{ + Efl_Util_Device_Info *dev; + + EINA_SAFETY_ON_NULL_RETURN(device); + + dev = (Efl_Util_Device_Info *)calloc(1, sizeof(Efl_Util_Device_Info)); + EINA_SAFETY_ON_NULL_RETURN(dev); + + dev->device = device; + tizen_input_device_add_listener(device, &_wl_tz_input_device_listener, dev); + + _eflutil.wl.devmgr.devices = eina_list_append(_eflutil.wl.devmgr.devices, dev); +} + +static void +_cb_device_remove(void *data EINA_UNUSED, + struct tizen_input_device_manager *tizen_input_device_manager EINA_UNUSED, + uint32_t serial EINA_UNUSED, + const char *identifier EINA_UNUSED, + struct tizen_input_device *device, + struct wl_seat *seat EINA_UNUSED) +{ + Eina_List *l, *l_next; + Efl_Util_Device_Info *dev; + + EINA_LIST_FOREACH_SAFE(_eflutil.wl.devmgr.devices, l, l_next, dev) + { + if (dev->device == device) + { + if (dev->name) eina_stringshare_del(dev->name); + tizen_input_device_release(dev->device); + + _eflutil.wl.devmgr.devices = eina_list_remove_list(_eflutil.wl.devmgr.devices, l); + free(dev); + + break; + } + } +} + +static void +_cb_error(void *data EINA_UNUSED, + struct tizen_input_device_manager *tizen_input_device_manager EINA_UNUSED, + uint32_t errorcode) +{ + _eflutil.wl.devmgr.request_notified = errorcode; +} + +/* LCOV_EXCL_START */ +static void +_cb_block_expired(void *data EINA_UNUSED, + struct tizen_input_device_manager *tizen_input_device_manager EINA_UNUSED) +{ + ; +} +/* LCOV_EXCL_STOP */ + +static efl_util_error_e +_efl_util_input_convert_input_generator_error(int ret) +{ + switch (ret) + { + case TIZEN_INPUT_DEVICE_MANAGER_ERROR_NONE: + return EFL_UTIL_ERROR_NONE; + case TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_PERMISSION: + return EFL_UTIL_ERROR_PERMISSION_DENIED; + case TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_SYSTEM_RESOURCES: + return EFL_UTIL_ERROR_OUT_OF_MEMORY; + case TIZEN_INPUT_DEVICE_MANAGER_ERROR_INVALID_PARAMETER: + return EFL_UTIL_ERROR_INVALID_PARAMETER; + default : + return EFL_UTIL_ERROR_NONE; + } +} + +/* LCOV_EXCL_START */ +static int +_timer_wait(void *data) +{ + Efl_Util_Device_Info *dev; + + _eflutil.wl.devmgr.request_notified = TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_SYSTEM_RESOURCES; + + if (eina_list_count(_eflutil.wl.devmgr.wait_devices) > 0) + { + EINA_LIST_FREE(_eflutil.wl.devmgr.wait_devices, dev) + { + eina_stringshare_del(dev->name); + dev->name = NULL; + } + } + + wl_event_source_remove(_eflutil.wl.devmgr.wait_timer); + _eflutil.wl.devmgr.wait_timer = NULL; + + return 1; +} +/* LCOV_EXCL_STOP */ + +static void +_efl_util_input_initialize_wait_device(void) +{ + struct wl_event_loop *loop; + int ret = -1; + + if (_efl_util_input_check_wait_device_full()) return; + + loop = wl_event_loop_create(); + _eflutil.wl.devmgr.wait_timer = wl_event_loop_add_timer(loop, _timer_wait, NULL); + if (_eflutil.wl.devmgr.wait_timer) + { + ret = wl_event_source_timer_update(_eflutil.wl.devmgr.wait_timer, + EFL_UTIL_INPUT_GENERATOR_DEFAULT_TIME_OUT); + if (ret != 0) _timer_wait(NULL); + return; + } + + while (_eflutil.wl.devmgr.wait_timer) + { + wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); + ret = wl_event_loop_dispatch(loop, EFL_UTIL_INPUT_GENERATOR_DEFAULT_DISPATCH_TIME_OUT); + if (ret != 0) _timer_wait(NULL); + } +} + +static void +_efl_util_input_initialize_append_device(const char *name, Ecore_Device_Class clas) +{ + Efl_Util_Device_Info *dev; + + dev = (Efl_Util_Device_Info *)calloc(1, sizeof(Efl_Util_Device_Info)); + EINA_SAFETY_ON_NULL_RETURN(dev); + + dev->name = eina_stringshare_add(name); + dev->clas = clas; + + _eflutil.wl.devmgr.wait_devices = eina_list_append(_eflutil.wl.devmgr.wait_devices, dev); +} + +static void +_efl_util_input_initialize_add_wait_device(const char *name, unsigned int dev_type) +{ + EINA_SAFETY_ON_NULL_RETURN(name); + + if (dev_type & EFL_UTIL_INPUT_DEVTYPE_TOUCHSCREEN) + _efl_util_input_initialize_append_device(name, ECORE_DEVICE_CLASS_TOUCH); + + if (dev_type & EFL_UTIL_INPUT_DEVTYPE_KEYBOARD) + _efl_util_input_initialize_append_device(name, ECORE_DEVICE_CLASS_KEYBOARD); + + if (dev_type & EFL_UTIL_INPUT_DEVTYPE_POINTER) + _efl_util_input_initialize_append_device(name, ECORE_DEVICE_CLASS_MOUSE); +} + +API efl_util_inputgen_h +efl_util_input_initialize_generator(unsigned int dev_type) +{ + int ret = EFL_UTIL_ERROR_NONE; + efl_util_inputgen_h inputgen_h = NULL; + unsigned int clas = 0x0; + + if (!dev_type || + dev_type & ~(EFL_UTIL_INPUT_DEVTYPE_TOUCHSCREEN + | EFL_UTIL_INPUT_DEVTYPE_KEYBOARD + | EFL_UTIL_INPUT_DEVTYPE_POINTER)) + { + set_last_result(EFL_UTIL_ERROR_NO_SUCH_DEVICE); + goto out; + } + + inputgen_h = (efl_util_inputgen_h)calloc(1, sizeof(struct _efl_util_inputgen_h)); + if (!inputgen_h) + { + set_last_result(EFL_UTIL_ERROR_OUT_OF_MEMORY); + goto out; + } + + inputgen_h->init_type |= dev_type; + + ret = _wl_init(); + if (ret == (int)EINA_FALSE) + { + set_last_result(EFL_UTIL_ERROR_INVALID_PARAMETER); + goto out; + } + + if (dev_type & EFL_UTIL_INPUT_DEVTYPE_TOUCHSCREEN) + clas |= TIZEN_INPUT_DEVICE_MANAGER_CLAS_TOUCHSCREEN; + if (dev_type & EFL_UTIL_INPUT_DEVTYPE_KEYBOARD) + clas |= TIZEN_INPUT_DEVICE_MANAGER_CLAS_KEYBOARD; + if (dev_type & EFL_UTIL_INPUT_DEVTYPE_POINTER) + clas |= TIZEN_INPUT_DEVICE_MANAGER_CLAS_MOUSE; + + while (!_eflutil.wl.devmgr.devicemgr) + wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); + + tizen_input_device_manager_init_generator(_eflutil.wl.devmgr.devicemgr, clas); + + while (_eflutil.wl.devmgr.request_notified == -1) + wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); -/* LCOV_EXCL_START */ -static void -_cb_device_remove(void *data EINA_UNUSED, - struct tizen_input_device_manager *tizen_input_device_manager EINA_UNUSED, - uint32_t serial EINA_UNUSED, - const char *identifier EINA_UNUSED, - struct tizen_input_device *device EINA_UNUSED, - struct wl_seat *seat EINA_UNUSED) -{ - ; -} -/* LCOV_EXCL_STOP */ + ret = _efl_util_input_convert_input_generator_error(_eflutil.wl.devmgr.request_notified); + _eflutil.wl.devmgr.request_notified = -1; -static void -_cb_error(void *data EINA_UNUSED, - struct tizen_input_device_manager *tizen_input_device_manager EINA_UNUSED, - uint32_t errorcode) -{ - _eflutil.wl.devmgr.request_notified = errorcode; -} + set_last_result(ret); + if (ret != TIZEN_INPUT_DEVICE_MANAGER_ERROR_NONE) + goto out; -/* LCOV_EXCL_START */ -static void -_cb_block_expired(void *data EINA_UNUSED, - struct tizen_input_device_manager *tizen_input_device_manager EINA_UNUSED) -{ - ; -} -/* LCOV_EXCL_STOP */ + return inputgen_h; -static efl_util_error_e -_efl_util_input_convert_input_generator_error(int ret) -{ - switch (ret) +out: + if (inputgen_h) { - case TIZEN_INPUT_DEVICE_MANAGER_ERROR_NONE: - return EFL_UTIL_ERROR_NONE; - case TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_PERMISSION: - return EFL_UTIL_ERROR_PERMISSION_DENIED; - case TIZEN_INPUT_DEVICE_MANAGER_ERROR_NO_SYSTEM_RESOURCES: - return EFL_UTIL_ERROR_OUT_OF_MEMORY; - case TIZEN_INPUT_DEVICE_MANAGER_ERROR_INVALID_PARAMETER: - return EFL_UTIL_ERROR_INVALID_PARAMETER; - default : - return EFL_UTIL_ERROR_NONE; + free(inputgen_h); + inputgen_h = NULL; } + return NULL; } API efl_util_inputgen_h -efl_util_input_initialize_generator(unsigned int dev_type) +efl_util_input_initialize_generator_with_name(unsigned int dev_type, const char *name) { int ret = EFL_UTIL_ERROR_NONE; efl_util_inputgen_h inputgen_h = NULL; @@ -1423,6 +1584,7 @@ efl_util_input_initialize_generator(unsigned int dev_type) } inputgen_h->init_type |= dev_type; + strncpy(inputgen_h->name, name, 31); ret = _wl_init(); if (ret == (int)EINA_FALSE) @@ -1441,7 +1603,7 @@ efl_util_input_initialize_generator(unsigned int dev_type) while (!_eflutil.wl.devmgr.devicemgr) wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); - tizen_input_device_manager_init_generator(_eflutil.wl.devmgr.devicemgr, clas); + tizen_input_device_manager_init_generator_with_name(_eflutil.wl.devmgr.devicemgr, clas, inputgen_h->name); while (_eflutil.wl.devmgr.request_notified == -1) wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); @@ -1465,7 +1627,7 @@ out: } API efl_util_inputgen_h -efl_util_input_initialize_generator_with_name(unsigned int dev_type, const char *name) +efl_util_input_initialize_generator_with_sync(unsigned int dev_type, const char *name) { int ret = EFL_UTIL_ERROR_NONE; efl_util_inputgen_h inputgen_h = NULL; @@ -1488,7 +1650,8 @@ efl_util_input_initialize_generator_with_name(unsigned int dev_type, const char } inputgen_h->init_type |= dev_type; - strncpy(inputgen_h->name, name, 31); + if (name) strncpy(inputgen_h->name, name, 31); + else strncpy(inputgen_h->name, "Input Generator", 31); ret = _wl_init(); if (ret == (int)EINA_FALSE) @@ -1515,6 +1678,17 @@ efl_util_input_initialize_generator_with_name(unsigned int dev_type, const char ret = _efl_util_input_convert_input_generator_error(_eflutil.wl.devmgr.request_notified); _eflutil.wl.devmgr.request_notified = -1; + if (ret == EFL_UTIL_ERROR_NONE) + { + _efl_util_input_initialize_add_wait_device(inputgen_h->name, dev_type); + _efl_util_input_initialize_wait_device(); + if (_eflutil.wl.devmgr.request_notified != -1) + { + ret = _efl_util_input_convert_input_generator_error(_eflutil.wl.devmgr.request_notified); + _eflutil.wl.devmgr.request_notified = -1; + } + } + set_last_result(ret); if (ret != TIZEN_INPUT_DEVICE_MANAGER_ERROR_NONE) goto out; @@ -1530,7 +1704,6 @@ out: return NULL; } - API int efl_util_input_deinitialize_generator(efl_util_inputgen_h inputgen_h) { @@ -1545,6 +1718,9 @@ efl_util_input_deinitialize_generator(efl_util_inputgen_h inputgen_h) if (inputgen_h->init_type & EFL_UTIL_INPUT_DEVTYPE_POINTER) clas |= TIZEN_INPUT_DEVICE_MANAGER_CLAS_MOUSE; + if (inputgen_h->axis_info) + free(inputgen_h->axis_info); + free(inputgen_h); inputgen_h = NULL; @@ -1624,6 +1800,146 @@ efl_util_input_generate_touch(efl_util_inputgen_h inputgen_h, int idx, return ret; } +static int +_efl_util_input_generate_touch_axis_send(unsigned int type, double value) +{ + int ret; + + tizen_input_device_manager_generate_axis(_eflutil.wl.devmgr.devicemgr, type, wl_fixed_from_double(value)); + + while (_eflutil.wl.devmgr.request_notified == -1) + wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); + + ret = _efl_util_input_convert_input_generator_error(_eflutil.wl.devmgr.request_notified); + _eflutil.wl.devmgr.request_notified = -1; + + return ret; +} + +static void +_efl_util_input_generate_touch_axis_cleanup(efl_util_inputgen_h inputgen_h, int idx) +{ + int i; + if (idx >= 0) + { + inputgen_h->axis_info[idx].radius_x = 1.0; + inputgen_h->axis_info[idx].radius_y = 1.0; + inputgen_h->axis_info[idx].pressure = 1.0; + inputgen_h->axis_info[idx].angle = 0.0; + inputgen_h->axis_info[idx].palm = 0.0; + } + else + { + for (i = 0; i < EFL_UTIL_INPUT_GENERATOR_TOUCH_MAX_FINGER; i++) + { + inputgen_h->axis_info[i].radius_x = 1.0; + inputgen_h->axis_info[i].radius_y = 1.0; + inputgen_h->axis_info[i].pressure = 1.0; + inputgen_h->axis_info[i].angle = 0.0; + inputgen_h->axis_info[i].palm = 0.0; + } + } +} + +static int +_efl_util_input_generate_touch_axis_process(efl_util_inputgen_h inputgen_h, int idx, double radius_x, + double radius_y, double pressure, double angle, double palm) +{ + int ret = EFL_UTIL_ERROR_NONE; + + if (!inputgen_h->axis_info) + { + inputgen_h->axis_info = calloc(EFL_UTIL_INPUT_GENERATOR_TOUCH_MAX_FINGER, + sizeof(E_Devicemgr_Inputgen_Touch_Axis)); + _efl_util_input_generate_touch_axis_cleanup(inputgen_h, -1); + } + + if (inputgen_h->axis_info[idx].radius_x != radius_x) + { + ret = _efl_util_input_generate_touch_axis_send(TIZEN_INPUT_DEVICE_MANAGER_AXIS_TYPE_RADIUS_X, radius_x); + if (ret != EFL_UTIL_ERROR_NONE) return ret; + inputgen_h->axis_info[idx].radius_x = radius_x; + } + if (inputgen_h->axis_info[idx].radius_y != radius_y) + { + ret = _efl_util_input_generate_touch_axis_send(TIZEN_INPUT_DEVICE_MANAGER_AXIS_TYPE_RADIUS_Y, radius_y); + if (ret != EFL_UTIL_ERROR_NONE) return ret; + inputgen_h->axis_info[idx].radius_y = radius_y; + } + if (inputgen_h->axis_info[idx].pressure != pressure) + { + ret = _efl_util_input_generate_touch_axis_send(TIZEN_INPUT_DEVICE_MANAGER_AXIS_TYPE_PRESSURE, pressure); + if (ret != EFL_UTIL_ERROR_NONE) return ret; + inputgen_h->axis_info[idx].pressure = pressure; + } + if (inputgen_h->axis_info[idx].angle != angle) + { + ret = _efl_util_input_generate_touch_axis_send(TIZEN_INPUT_DEVICE_MANAGER_AXIS_TYPE_ANGLE, angle); + if (ret != EFL_UTIL_ERROR_NONE) return ret; + inputgen_h->axis_info[idx].angle = angle; + } + if (inputgen_h->axis_info[idx].palm != palm) + { + ret = _efl_util_input_generate_touch_axis_send(TIZEN_INPUT_DEVICE_MANAGER_AXIS_TYPE_PALM, palm); + if (ret != EFL_UTIL_ERROR_NONE) return ret; + inputgen_h->axis_info[idx].palm = palm; + } + + return ret; +} + +API int +efl_util_input_generate_touch_axis(efl_util_inputgen_h inputgen_h, int idx, + efl_util_input_touch_type_e touch_type, int x, int y, + double radius_x, double radius_y, + double pressure, double angle, double palm) +{ + int ret, version; + enum tizen_input_device_manager_pointer_event_type type; + + EINA_SAFETY_ON_NULL_RETURN_VAL(inputgen_h, EFL_UTIL_ERROR_INVALID_PARAMETER); + EINA_SAFETY_ON_FALSE_RETURN_VAL(idx >= 0, EFL_UTIL_ERROR_INVALID_PARAMETER); + EINA_SAFETY_ON_FALSE_RETURN_VAL((x >= 0 && y >= 0), EFL_UTIL_ERROR_INVALID_PARAMETER); + EINA_SAFETY_ON_FALSE_RETURN_VAL(inputgen_h->init_type & EFL_UTIL_INPUT_DEVTYPE_TOUCHSCREEN, EFL_UTIL_ERROR_NO_SUCH_DEVICE); + EINA_SAFETY_ON_FALSE_RETURN_VAL((radius_x >= 0.0 && radius_y >= 0.0), EFL_UTIL_ERROR_INVALID_PARAMETER); + EINA_SAFETY_ON_FALSE_RETURN_VAL((pressure >= 0.0 && palm >= 0.0), EFL_UTIL_ERROR_INVALID_PARAMETER); + + EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil.wl.devmgr.devicemgr, EFL_UTIL_ERROR_INVALID_PARAMETER); + version = tizen_input_device_manager_get_version(_eflutil.wl.devmgr.devicemgr); + EINA_SAFETY_ON_FALSE_RETURN_VAL((version >= 3), EFL_UTIL_ERROR_NOT_SUPPORTED); + + switch(touch_type) + { + case EFL_UTIL_INPUT_TOUCH_BEGIN: + type = TIZEN_INPUT_DEVICE_MANAGER_POINTER_EVENT_TYPE_BEGIN; + break; + case EFL_UTIL_INPUT_TOUCH_UPDATE: + type = TIZEN_INPUT_DEVICE_MANAGER_POINTER_EVENT_TYPE_UPDATE; + break; + case EFL_UTIL_INPUT_TOUCH_END: + type = TIZEN_INPUT_DEVICE_MANAGER_POINTER_EVENT_TYPE_END; + break; + default: + return EFL_UTIL_ERROR_INVALID_PARAMETER; + } + + if (touch_type != EFL_UTIL_INPUT_TOUCH_END) + _efl_util_input_generate_touch_axis_process(inputgen_h, idx, radius_x, radius_y, pressure, angle, palm); + else + _efl_util_input_generate_touch_axis_cleanup(inputgen_h, idx); + + tizen_input_device_manager_generate_touch(_eflutil.wl.devmgr.devicemgr, type, x, y, idx); + + while (_eflutil.wl.devmgr.request_notified == -1) + wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); + + ret = _efl_util_input_convert_input_generator_error(_eflutil.wl.devmgr.request_notified); + _eflutil.wl.devmgr.request_notified = -1; + + return ret; +} + + API int efl_util_input_generate_pointer(efl_util_inputgen_h inputgen_h, int buttons, efl_util_input_pointer_type_e pointer_type, int x, int y) { @@ -1663,6 +1979,43 @@ efl_util_input_generate_pointer(efl_util_inputgen_h inputgen_h, int buttons, efl return ret; } +API int +efl_util_input_generate_wheel(efl_util_inputgen_h inputgen_h, efl_util_input_pointer_wheel_type_e wheel_type, int value) +{ + int ret, version; + enum tizen_input_device_manager_pointer_event_type type; + + EINA_SAFETY_ON_NULL_RETURN_VAL(inputgen_h, EFL_UTIL_ERROR_INVALID_PARAMETER); + EINA_SAFETY_ON_FALSE_RETURN_VAL(inputgen_h->init_type & EFL_UTIL_INPUT_DEVTYPE_POINTER, EFL_UTIL_ERROR_NO_SUCH_DEVICE); + + EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil.wl.devmgr.devicemgr, EFL_UTIL_ERROR_INVALID_PARAMETER); + version = tizen_input_device_manager_get_version(_eflutil.wl.devmgr.devicemgr); + EINA_SAFETY_ON_FALSE_RETURN_VAL((version >= 3), EFL_UTIL_ERROR_NOT_SUPPORTED); + + switch(wheel_type) + { + case EFL_UTIL_INPUT_POINTER_WHEEL_VERT: + type = TIZEN_INPUT_DEVICE_MANAGER_AXIS_TYPE_WHEEL; + break; + case EFL_UTIL_INPUT_POINTER_WHEEL_HORZ: + type = TIZEN_INPUT_DEVICE_MANAGER_AXIS_TYPE_HWHEEL; + break; + default: + return EFL_UTIL_ERROR_INVALID_PARAMETER; + } + + tizen_input_device_manager_generate_axis(_eflutil.wl.devmgr.devicemgr, type, wl_fixed_from_int(value)); + + while (_eflutil.wl.devmgr.request_notified == -1) + wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); + + ret = _efl_util_input_convert_input_generator_error(_eflutil.wl.devmgr.request_notified); + _eflutil.wl.devmgr.request_notified = -1; + + return ret; +} + + struct _efl_util_screenshot_h { @@ -1739,11 +2092,20 @@ efl_util_screenshot_initialize(int width, int height) struct wl_registry *reg = NULL; int ret = 0; - EINA_SAFETY_ON_FALSE_GOTO(width > 0, fail_param); - EINA_SAFETY_ON_FALSE_GOTO(height > 0, fail_param); + if (width <= 0 || height <= 0) + { + set_last_result(EFL_UTIL_ERROR_INVALID_PARAMETER); + return NULL; + } _screenshot_mutex_lock(); + if (!g_screenshot) + { + screenshot = calloc(1, sizeof(struct _efl_util_screenshot_h)); + EINA_SAFETY_ON_NULL_GOTO(screenshot, fail_memory); + } + if (!_eflutil.wl.shot.screenshooter) { ret = _wl_init(); @@ -1777,6 +2139,9 @@ efl_util_screenshot_initialize(int width, int height) _eflutil.wl.shot.tbm_client = wayland_tbm_client_init(_eflutil.wl.dpy); EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.shot.tbm_client, fail_init); + + wl_registry_destroy(reg); + reg = NULL; } if (_eflutil.wl.shot.noti == 0) @@ -1792,15 +2157,13 @@ efl_util_screenshot_initialize(int width, int height) g_screenshot->width = width; g_screenshot->height = height; } + set_last_result(EFL_UTIL_ERROR_NONE); _screenshot_mutex_unlock(); return g_screenshot; } - screenshot = calloc(1, sizeof(struct _efl_util_screenshot_h)); - EINA_SAFETY_ON_NULL_GOTO(screenshot, fail_memory); - screenshot->width = width; screenshot->height = height; screenshot->auto_rotation = EINA_TRUE; @@ -1817,20 +2180,26 @@ efl_util_screenshot_initialize(int width, int height) return g_screenshot; -fail_param: - set_last_result(EFL_UTIL_ERROR_INVALID_PARAMETER); - return NULL; -fail_memory: /* LCOV_EXCL_START */ +fail_memory: if (display_wrapper) wl_proxy_wrapper_destroy(display_wrapper); set_last_result(EFL_UTIL_ERROR_OUT_OF_MEMORY); + _screenshot_mutex_unlock(); return NULL; + fail_init: + if (reg) + wl_registry_destroy(reg); if (screenshot) - efl_util_screenshot_deinitialize(screenshot); - _screenshot_mutex_unlock(); - set_last_result(EFL_UTIL_ERROR_SCREENSHOT_INIT_FAIL); + { + _screenshot_mutex_unlock(); + efl_util_screenshot_deinitialize(screenshot); + } + if (_eflutil.wl.shot.noti == 0) + set_last_result(EFL_UTIL_ERROR_PERMISSION_DENIED); + else + set_last_result(EFL_UTIL_ERROR_SCREENSHOT_INIT_FAIL); return NULL; /* LCOV_EXCL_STOP */ } @@ -1850,10 +2219,10 @@ efl_util_screenshot_deinitialize(efl_util_screenshot_h screenshot) free(screenshot); g_screenshot = NULL; - if (_eflutil.wl.shot.queue) + if (_eflutil.wl.shot.tbm_client) { - wl_event_queue_destroy(_eflutil.wl.shot.queue); - _eflutil.wl.shot.queue = NULL; + wayland_tbm_client_deinit(_eflutil.wl.shot.tbm_client); + _eflutil.wl.shot.tbm_client = NULL; } if (_eflutil.wl.shot.screenshooter) @@ -1867,6 +2236,12 @@ efl_util_screenshot_deinitialize(efl_util_screenshot_h screenshot) _eflutil.wl.shot.tz_screenshooter = NULL; } + if (_eflutil.wl.shot.queue) + { + wl_event_queue_destroy(_eflutil.wl.shot.queue); + _eflutil.wl.shot.queue = NULL; + } + _screenshot_mutex_unlock(); _screenshot_mutex_destory(); @@ -1924,7 +2299,7 @@ efl_util_screenshot_take_tbm_surface(efl_util_screenshot_h screenshot) goto fail; } - wl_buffer_destroy(buffer); + wayland_tbm_client_destroy_buffer(_eflutil.wl.shot.tbm_client, buffer); /* reset shot_done for next screenshot */ screenshot->shot_done = EINA_FALSE; @@ -1939,7 +2314,7 @@ fail: if (t_surface) tbm_surface_destroy(t_surface); if (buffer) - wl_buffer_destroy(buffer); + wayland_tbm_client_destroy_buffer(_eflutil.wl.shot.tbm_client, buffer); set_last_result(EFL_UTIL_ERROR_SCREENSHOT_EXECUTION_FAIL); @@ -1988,10 +2363,11 @@ API int EFL_UTIL_EVENT_GESTURE_EDGE_DRAG = 0; API int EFL_UTIL_EVENT_GESTURE_TAP = 0; API int EFL_UTIL_EVENT_GESTURE_PALM_COVER = 0; +/* LCOV_EXCL_START */ static void _cb_gesture_edge_swipe_notify(void *data EINA_UNUSED, struct tizen_gesture *tizen_gesture EINA_UNUSED, uint32_t fingers EINA_UNUSED, uint32_t edge EINA_UNUSED, uint32_t edge_size EINA_UNUSED, uint32_t start_point EINA_UNUSED, uint32_t end_point EINA_UNUSED, uint32_t error) { - _eflutil.wl.gesture.request_notified = error; + _eflutil_defaultqueue.wl.gesture.request_notified = error; } static void @@ -2015,7 +2391,7 @@ _cb_gesture_edge_swipe(void *data EINA_UNUSED, struct tizen_gesture *tizen_gestu static void _cb_gesture_edge_drag_notify(void *data EINA_UNUSED, struct tizen_gesture *tizen_gesture EINA_UNUSED, uint32_t fingers EINA_UNUSED, uint32_t edge EINA_UNUSED, uint32_t edge_size EINA_UNUSED, uint32_t start_point EINA_UNUSED, uint32_t end_point EINA_UNUSED, uint32_t error) { - _eflutil.wl.gesture.request_notified = error; + _eflutil_defaultqueue.wl.gesture.request_notified = error; } static void @@ -2039,7 +2415,7 @@ _cb_gesture_edge_drag(void *data EINA_UNUSED, struct tizen_gesture *tizen_gestur static void _cb_gesture_tap_notify(void *data EINA_UNUSED, struct tizen_gesture *tizen_gesture EINA_UNUSED, uint32_t fingers EINA_UNUSED, uint32_t repeat EINA_UNUSED, uint32_t error) { - _eflutil.wl.gesture.request_notified = error; + _eflutil_defaultqueue.wl.gesture.request_notified = error; } static void @@ -2057,13 +2433,15 @@ _cb_gesture_tap(void *data EINA_UNUSED, struct tizen_gesture *tizen_gesture EINA ecore_event_add(EFL_UTIL_EVENT_GESTURE_TAP, ev, NULL, NULL); } +/* LCOV_EXCL_STOP */ static void _cb_gesture_palm_cover_notify(void *data EINA_UNUSED, struct tizen_gesture *tizen_gesture EINA_UNUSED, struct wl_surface *surface EINA_UNUSED, uint32_t error) { - _eflutil.wl.gesture.request_notified = error; + _eflutil_defaultqueue.wl.gesture.request_notified = error; } +/* LCOV_EXCL_START */ static void _cb_gesture_palm_cover(void *data EINA_UNUSED, struct tizen_gesture *tizen_gesture EINA_UNUSED, struct wl_surface *surface, uint32_t mode, uint32_t duration, int cx, int cy, uint32_t size, wl_fixed_t pressure) { @@ -2082,11 +2460,12 @@ _cb_gesture_palm_cover(void *data EINA_UNUSED, struct tizen_gesture *tizen_gestu ecore_event_add(EFL_UTIL_EVENT_GESTURE_PALM_COVER, ev, NULL, NULL); } +/* LCOV_EXCL_STOP */ static void _cb_gesture_activate_notify(void *data EINA_UNUSED, struct tizen_gesture *tizen_gesture EINA_UNUSED, struct wl_surface *surface EINA_UNUSED, uint32_t type EINA_UNUSED, uint32_t active EINA_UNUSED, uint32_t error) { - _eflutil.wl.gesture.request_notified = error; + _eflutil_defaultqueue.wl.gesture.request_notified = error; } static efl_util_error_e @@ -2111,6 +2490,7 @@ _efl_util_gesture_convert_error(int ret) } } +/* LCOV_EXCL_START */ static int _efl_util_gesture_grab_edge_swipe(efl_util_gesture_data data) { @@ -2125,7 +2505,7 @@ _efl_util_gesture_grab_edge_swipe(efl_util_gesture_data data) base_data = (Efl_Util_Gesture_Common_Grab_Data *)data; - EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil.wl.gesture.proto, EFL_UTIL_ERROR_INVALID_PARAMETER); + EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil_defaultqueue.wl.gesture.proto, EFL_UTIL_ERROR_INVALID_PARAMETER); EINA_SAFETY_ON_NULL_RETURN_VAL(base_data, EFL_UTIL_ERROR_INVALID_PARAMETER); EINA_SAFETY_ON_FALSE_RETURN_VAL(base_data->type == TIZEN_GESTURE_TYPE_EDGE_SWIPE, EFL_UTIL_ERROR_INVALID_PARAMETER); @@ -2138,13 +2518,13 @@ _efl_util_gesture_grab_edge_swipe(efl_util_gesture_data data) start_point = edge_swipe_data->start_point; end_point = edge_swipe_data->end_point; - tizen_gesture_grab_edge_swipe(_eflutil.wl.gesture.proto, fingers, edge, edge_size, start_point, end_point); + tizen_gesture_grab_edge_swipe(_eflutil_defaultqueue.wl.gesture.proto, fingers, edge, edge_size, start_point, end_point); - while (_eflutil.wl.gesture.request_notified == -1) - wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); + while (_eflutil_defaultqueue.wl.gesture.request_notified == -1) + wl_display_dispatch(_eflutil_defaultqueue.wl.dpy); - ret = _efl_util_gesture_convert_error(_eflutil.wl.gesture.request_notified); - _eflutil.wl.gesture.request_notified = -1; + ret = _efl_util_gesture_convert_error(_eflutil_defaultqueue.wl.gesture.request_notified); + _eflutil_defaultqueue.wl.gesture.request_notified = -1; return ret; } @@ -2163,7 +2543,7 @@ _efl_util_gesture_ungrab_edge_swipe(efl_util_gesture_data data) base_data = (Efl_Util_Gesture_Common_Grab_Data *)data; - EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil.wl.gesture.proto, EFL_UTIL_ERROR_INVALID_PARAMETER); + EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil_defaultqueue.wl.gesture.proto, EFL_UTIL_ERROR_INVALID_PARAMETER); EINA_SAFETY_ON_NULL_RETURN_VAL(base_data, EFL_UTIL_ERROR_INVALID_PARAMETER); EINA_SAFETY_ON_FALSE_RETURN_VAL(base_data->type == TIZEN_GESTURE_TYPE_EDGE_SWIPE, EFL_UTIL_ERROR_INVALID_PARAMETER); @@ -2176,13 +2556,13 @@ _efl_util_gesture_ungrab_edge_swipe(efl_util_gesture_data data) start_point = edge_swipe_data->start_point; end_point = edge_swipe_data->end_point; - tizen_gesture_ungrab_edge_swipe(_eflutil.wl.gesture.proto, fingers, edge, edge_size, start_point, end_point); + tizen_gesture_ungrab_edge_swipe(_eflutil_defaultqueue.wl.gesture.proto, fingers, edge, edge_size, start_point, end_point); - while (_eflutil.wl.gesture.request_notified == -1) - wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); + while (_eflutil_defaultqueue.wl.gesture.request_notified == -1) + wl_display_dispatch(_eflutil_defaultqueue.wl.dpy); - ret = _efl_util_gesture_convert_error(_eflutil.wl.gesture.request_notified); - _eflutil.wl.gesture.request_notified = -1; + ret = _efl_util_gesture_convert_error(_eflutil_defaultqueue.wl.gesture.request_notified); + _eflutil_defaultqueue.wl.gesture.request_notified = -1; return ret; } @@ -2201,7 +2581,7 @@ _efl_util_gesture_grab_edge_drag(efl_util_gesture_data data) base_data = (Efl_Util_Gesture_Common_Grab_Data *)data; - EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil.wl.gesture.proto, EFL_UTIL_ERROR_INVALID_PARAMETER); + EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil_defaultqueue.wl.gesture.proto, EFL_UTIL_ERROR_INVALID_PARAMETER); EINA_SAFETY_ON_NULL_RETURN_VAL(base_data, EFL_UTIL_ERROR_INVALID_PARAMETER); EINA_SAFETY_ON_FALSE_RETURN_VAL(base_data->type == TIZEN_GESTURE_TYPE_EDGE_DRAG, EFL_UTIL_ERROR_INVALID_PARAMETER); @@ -2214,13 +2594,13 @@ _efl_util_gesture_grab_edge_drag(efl_util_gesture_data data) start_point = edge_drag_data->start_point; end_point = edge_drag_data->end_point; - tizen_gesture_grab_edge_drag(_eflutil.wl.gesture.proto, fingers, edge, edge_size, start_point, end_point); + tizen_gesture_grab_edge_drag(_eflutil_defaultqueue.wl.gesture.proto, fingers, edge, edge_size, start_point, end_point); - while (_eflutil.wl.gesture.request_notified == -1) - wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); + while (_eflutil_defaultqueue.wl.gesture.request_notified == -1) + wl_display_dispatch(_eflutil_defaultqueue.wl.dpy); - ret = _efl_util_gesture_convert_error(_eflutil.wl.gesture.request_notified); - _eflutil.wl.gesture.request_notified = -1; + ret = _efl_util_gesture_convert_error(_eflutil_defaultqueue.wl.gesture.request_notified); + _eflutil_defaultqueue.wl.gesture.request_notified = -1; return ret; } @@ -2239,7 +2619,7 @@ _efl_util_gesture_ungrab_edge_drag(efl_util_gesture_data data) base_data = (Efl_Util_Gesture_Common_Grab_Data *)data; - EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil.wl.gesture.proto, EFL_UTIL_ERROR_INVALID_PARAMETER); + EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil_defaultqueue.wl.gesture.proto, EFL_UTIL_ERROR_INVALID_PARAMETER); EINA_SAFETY_ON_NULL_RETURN_VAL(base_data, EFL_UTIL_ERROR_INVALID_PARAMETER); EINA_SAFETY_ON_FALSE_RETURN_VAL(base_data->type == TIZEN_GESTURE_TYPE_EDGE_DRAG, EFL_UTIL_ERROR_INVALID_PARAMETER); @@ -2252,13 +2632,13 @@ _efl_util_gesture_ungrab_edge_drag(efl_util_gesture_data data) start_point = edge_drag_data->start_point; end_point = edge_drag_data->end_point; - tizen_gesture_ungrab_edge_drag(_eflutil.wl.gesture.proto, fingers, edge, edge_size, start_point, end_point); + tizen_gesture_ungrab_edge_drag(_eflutil_defaultqueue.wl.gesture.proto, fingers, edge, edge_size, start_point, end_point); - while (_eflutil.wl.gesture.request_notified == -1) - wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); + while (_eflutil_defaultqueue.wl.gesture.request_notified == -1) + wl_display_dispatch(_eflutil_defaultqueue.wl.dpy); - ret = _efl_util_gesture_convert_error(_eflutil.wl.gesture.request_notified); - _eflutil.wl.gesture.request_notified = -1; + ret = _efl_util_gesture_convert_error(_eflutil_defaultqueue.wl.gesture.request_notified); + _eflutil_defaultqueue.wl.gesture.request_notified = -1; return ret; } @@ -2275,7 +2655,7 @@ _efl_util_gesture_grab_tap(efl_util_gesture_data data) base_data = (Efl_Util_Gesture_Common_Grab_Data *)data; - EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil.wl.gesture.proto, EFL_UTIL_ERROR_INVALID_PARAMETER); + EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil_defaultqueue.wl.gesture.proto, EFL_UTIL_ERROR_INVALID_PARAMETER); EINA_SAFETY_ON_NULL_RETURN_VAL(base_data, EFL_UTIL_ERROR_INVALID_PARAMETER); EINA_SAFETY_ON_FALSE_RETURN_VAL(base_data->type == TIZEN_GESTURE_TYPE_TAP, EFL_UTIL_ERROR_INVALID_PARAMETER); @@ -2285,13 +2665,13 @@ _efl_util_gesture_grab_tap(efl_util_gesture_data data) fingers = tap_data->fingers; repeats = tap_data->repeats; - tizen_gesture_grab_tap(_eflutil.wl.gesture.proto, fingers, repeats); + tizen_gesture_grab_tap(_eflutil_defaultqueue.wl.gesture.proto, fingers, repeats); - while (_eflutil.wl.gesture.request_notified == -1) - wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); + while (_eflutil_defaultqueue.wl.gesture.request_notified == -1) + wl_display_dispatch(_eflutil_defaultqueue.wl.dpy); - ret = _efl_util_gesture_convert_error(_eflutil.wl.gesture.request_notified); - _eflutil.wl.gesture.request_notified = -1; + ret = _efl_util_gesture_convert_error(_eflutil_defaultqueue.wl.gesture.request_notified); + _eflutil_defaultqueue.wl.gesture.request_notified = -1; return ret; } @@ -2307,7 +2687,7 @@ _efl_util_gesture_ungrab_tap(efl_util_gesture_data data) base_data = (Efl_Util_Gesture_Common_Grab_Data *)data; - EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil.wl.gesture.proto, EFL_UTIL_ERROR_INVALID_PARAMETER); + EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil_defaultqueue.wl.gesture.proto, EFL_UTIL_ERROR_INVALID_PARAMETER); EINA_SAFETY_ON_NULL_RETURN_VAL(base_data, EFL_UTIL_ERROR_INVALID_PARAMETER); EINA_SAFETY_ON_FALSE_RETURN_VAL(base_data->type == TIZEN_GESTURE_TYPE_TAP, EFL_UTIL_ERROR_INVALID_PARAMETER); @@ -2317,13 +2697,13 @@ _efl_util_gesture_ungrab_tap(efl_util_gesture_data data) fingers = tap_data->fingers; repeats = tap_data->repeats; - tizen_gesture_ungrab_tap(_eflutil.wl.gesture.proto, fingers, repeats); + tizen_gesture_ungrab_tap(_eflutil_defaultqueue.wl.gesture.proto, fingers, repeats); - while (_eflutil.wl.gesture.request_notified == -1) - wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); + while (_eflutil_defaultqueue.wl.gesture.request_notified == -1) + wl_display_dispatch(_eflutil_defaultqueue.wl.dpy); - ret = _efl_util_gesture_convert_error(_eflutil.wl.gesture.request_notified); - _eflutil.wl.gesture.request_notified = -1; + ret = _efl_util_gesture_convert_error(_eflutil_defaultqueue.wl.gesture.request_notified); + _eflutil_defaultqueue.wl.gesture.request_notified = -1; return ret; } @@ -2336,18 +2716,18 @@ _efl_util_gesture_grab_palm_cover(efl_util_gesture_data data) base_data = (Efl_Util_Gesture_Common_Grab_Data *)data; - EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil.wl.gesture.proto, EFL_UTIL_ERROR_INVALID_PARAMETER); + EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil_defaultqueue.wl.gesture.proto, EFL_UTIL_ERROR_INVALID_PARAMETER); EINA_SAFETY_ON_NULL_RETURN_VAL(base_data, EFL_UTIL_ERROR_INVALID_PARAMETER); EINA_SAFETY_ON_FALSE_RETURN_VAL(base_data->type == TIZEN_GESTURE_TYPE_PALM_COVER, EFL_UTIL_ERROR_INVALID_PARAMETER); - tizen_gesture_grab_palm_cover(_eflutil.wl.gesture.proto); + tizen_gesture_grab_palm_cover(_eflutil_defaultqueue.wl.gesture.proto); - while (_eflutil.wl.gesture.request_notified == -1) - wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); + while (_eflutil_defaultqueue.wl.gesture.request_notified == -1) + wl_display_dispatch(_eflutil_defaultqueue.wl.dpy); - ret = _efl_util_gesture_convert_error(_eflutil.wl.gesture.request_notified); - _eflutil.wl.gesture.request_notified = -1; + ret = _efl_util_gesture_convert_error(_eflutil_defaultqueue.wl.gesture.request_notified); + _eflutil_defaultqueue.wl.gesture.request_notified = -1; return ret; } @@ -2360,21 +2740,22 @@ _efl_util_gesture_ungrab_palm_cover(efl_util_gesture_data data) base_data = (Efl_Util_Gesture_Common_Grab_Data *)data; - EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil.wl.gesture.proto, EFL_UTIL_ERROR_INVALID_PARAMETER); + EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil_defaultqueue.wl.gesture.proto, EFL_UTIL_ERROR_INVALID_PARAMETER); EINA_SAFETY_ON_NULL_RETURN_VAL(base_data, EFL_UTIL_ERROR_INVALID_PARAMETER); EINA_SAFETY_ON_FALSE_RETURN_VAL(base_data->type == TIZEN_GESTURE_TYPE_PALM_COVER, EFL_UTIL_ERROR_INVALID_PARAMETER); - tizen_gesture_ungrab_palm_cover(_eflutil.wl.gesture.proto); + tizen_gesture_ungrab_palm_cover(_eflutil_defaultqueue.wl.gesture.proto); - while (_eflutil.wl.gesture.request_notified == -1) - wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); + while (_eflutil_defaultqueue.wl.gesture.request_notified == -1) + wl_display_dispatch(_eflutil_defaultqueue.wl.dpy); - ret = _efl_util_gesture_convert_error(_eflutil.wl.gesture.request_notified); - _eflutil.wl.gesture.request_notified = -1; + ret = _efl_util_gesture_convert_error(_eflutil_defaultqueue.wl.gesture.request_notified); + _eflutil_defaultqueue.wl.gesture.request_notified = -1; return ret; } +/* LCOV_EXCL_STOP */ API efl_util_gesture_h efl_util_gesture_initialize(void) @@ -2384,43 +2765,46 @@ efl_util_gesture_initialize(void) gesture_h = (efl_util_gesture_h)calloc(1, sizeof(struct _efl_util_gesture_h)); if (!gesture_h) { - set_last_result(EFL_UTIL_ERROR_OUT_OF_MEMORY); - goto out; + set_last_result(EFL_UTIL_ERROR_OUT_OF_MEMORY); /* LCOV_EXCL_LINE */ + goto out; /* LCOV_EXCL_LINE */ } - if (_wl_init() == (int)EINA_FALSE) + if (_wl_init_default_queue() == (int)EINA_FALSE) { - set_last_result(EFL_UTIL_ERROR_NOT_SUPPORTED); - goto out; + set_last_result(EFL_UTIL_ERROR_NOT_SUPPORTED); /* LCOV_EXCL_LINE */ + goto out; /* LCOV_EXCL_LINE */ } - while (!_eflutil.wl.gesture.proto) - wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); + while (!_eflutil_defaultqueue.wl.gesture.proto) + wl_display_dispatch(_eflutil_defaultqueue.wl.dpy); /* LCOV_EXCL_LINE */ - if (_eflutil.wl.gesture.event_init <= 0) + if (_eflutil_defaultqueue.wl.gesture.event_init <= 0) { if (ecore_event_init() <= 0) { - set_last_result(EFL_UTIL_ERROR_NOT_SUPPORTED); - goto out; + set_last_result(EFL_UTIL_ERROR_NOT_SUPPORTED); /* LCOV_EXCL_LINE */ + goto out; /* LCOV_EXCL_LINE */ } EFL_UTIL_EVENT_GESTURE_EDGE_SWIPE = ecore_event_type_new(); EFL_UTIL_EVENT_GESTURE_EDGE_DRAG = ecore_event_type_new(); EFL_UTIL_EVENT_GESTURE_TAP = ecore_event_type_new(); EFL_UTIL_EVENT_GESTURE_PALM_COVER = ecore_event_type_new(); } - _eflutil.wl.gesture.event_init++; + _eflutil_defaultqueue.wl.gesture.event_init++; + gesture_h->init = EINA_TRUE; set_last_result(EFL_UTIL_ERROR_NONE); return gesture_h; out: +/* LCOV_EXCL_START */ if (gesture_h) { free(gesture_h); gesture_h = NULL; } return gesture_h; +/* LCOV_EXCL_STOP */ } API int @@ -2432,11 +2816,11 @@ efl_util_gesture_deinitialize(efl_util_gesture_h gesture_h) free(gesture_h); gesture_h = NULL; - _eflutil.wl.gesture.event_init--; + _eflutil_defaultqueue.wl.gesture.event_init--; - if (_eflutil.wl.gesture.event_init <= 0) + if (_eflutil_defaultqueue.wl.gesture.event_init <= 0) { - _eflutil.wl.gesture.event_init = 0; + _eflutil_defaultqueue.wl.gesture.event_init = 0; ecore_event_shutdown(); EFL_UTIL_EVENT_GESTURE_EDGE_SWIPE = 0; EFL_UTIL_EVENT_GESTURE_EDGE_DRAG = 0; @@ -2467,8 +2851,8 @@ efl_util_gesture_edge_swipe_new(efl_util_gesture_h gesture_h, unsigned int finge data = (Efl_Util_Gesture_Edge_Swipe_Grab_Data *)calloc(1, sizeof(Efl_Util_Gesture_Edge_Swipe_Grab_Data)); if (!data) { - set_last_result(EFL_UTIL_ERROR_OUT_OF_MEMORY); - return NULL; + set_last_result(EFL_UTIL_ERROR_OUT_OF_MEMORY); /* LCOV_EXCL_LINE */ + return NULL; /* LCOV_EXCL_LINE */ } data->base.type = TIZEN_GESTURE_TYPE_EDGE_SWIPE; @@ -2539,8 +2923,8 @@ efl_util_gesture_edge_drag_new(efl_util_gesture_h gesture_h, unsigned int finger data = (Efl_Util_Gesture_Edge_Drag_Grab_Data *)calloc(1, sizeof(Efl_Util_Gesture_Edge_Drag_Grab_Data)); if (!data) { - set_last_result(EFL_UTIL_ERROR_OUT_OF_MEMORY); - return NULL; + set_last_result(EFL_UTIL_ERROR_OUT_OF_MEMORY); /* LCOV_EXCL_LINE */ + return NULL; /* LCOV_EXCL_LINE */ } data->base.type = TIZEN_GESTURE_TYPE_EDGE_DRAG; @@ -2611,8 +2995,8 @@ efl_util_gesture_tap_new(efl_util_gesture_h gesture_h, unsigned int fingers, uns data = (Efl_Util_Gesture_Tap_Grab_Data *)calloc(1, sizeof(Efl_Util_Gesture_Tap_Grab_Data)); if (!data) { - set_last_result(EFL_UTIL_ERROR_OUT_OF_MEMORY); - return NULL; + set_last_result(EFL_UTIL_ERROR_OUT_OF_MEMORY); /* LCOV_EXCL_LINE */ + return NULL; /* LCOV_EXCL_LINE */ } data->base.type = TIZEN_GESTURE_TYPE_TAP; @@ -2657,8 +3041,8 @@ efl_util_gesture_palm_cover_new(efl_util_gesture_h gesture_h) data = (Efl_Util_Gesture_Palm_Cover_Grab_Data *)calloc(1, sizeof(Efl_Util_Gesture_Palm_Cover_Grab_Data)); if (!data) { - set_last_result(EFL_UTIL_ERROR_OUT_OF_MEMORY); - return NULL; + set_last_result(EFL_UTIL_ERROR_OUT_OF_MEMORY); /* LCOV_EXCL_LINE */ + return NULL; /* LCOV_EXCL_LINE */ } data->base.type = TIZEN_GESTURE_TYPE_PALM_COVER; @@ -2687,6 +3071,7 @@ efl_util_gesture_palm_cover_free(efl_util_gesture_h gesture_h, efl_util_gesture_ return EFL_UTIL_ERROR_NONE; } +/* LCOV_EXCL_START */ API int efl_util_gesture_grab(efl_util_gesture_h gesture_h, efl_util_gesture_data data) { @@ -2752,12 +3137,13 @@ efl_util_gesture_ungrab(efl_util_gesture_h gesture_h, efl_util_gesture_data data return ret; } +/* LCOV_EXCL_STOP */ API int efl_util_gesture_select(efl_util_gesture_h gesture_h, Evas_Object *window, efl_util_gesture_data data) { Efl_Util_Gesture_Common_Grab_Data *base_data = NULL; - Ecore_Wl_Window *wlwin; + Ecore_Wl2_Window *wlwin; struct wl_surface *surface; int ret; @@ -2771,20 +3157,20 @@ efl_util_gesture_select(efl_util_gesture_h gesture_h, Evas_Object *window, efl_u if (base_data->type != TIZEN_GESTURE_TYPE_PALM_COVER) return EFL_UTIL_ERROR_NOT_SUPPORTED; - wlwin = elm_win_wl_window_get(window); + wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window); if (!wlwin) return EFL_UTIL_ERROR_INVALID_PARAMETER; - surface = ecore_wl_window_surface_get(wlwin); + surface = ecore_wl2_window_surface_get(wlwin); EINA_SAFETY_ON_NULL_RETURN_VAL(surface, EFL_UTIL_ERROR_INVALID_PARAMETER); - tizen_gesture_select_palm_cover(_eflutil.wl.gesture.proto, surface); + tizen_gesture_select_palm_cover(_eflutil_defaultqueue.wl.gesture.proto, surface); - while (_eflutil.wl.gesture.request_notified == -1) - wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); + while (_eflutil_defaultqueue.wl.gesture.request_notified == -1) + wl_display_dispatch(_eflutil_defaultqueue.wl.dpy); - ret = _efl_util_gesture_convert_error(_eflutil.wl.gesture.request_notified); - _eflutil.wl.gesture.request_notified = -1; + ret = _efl_util_gesture_convert_error(_eflutil_defaultqueue.wl.gesture.request_notified); + _eflutil_defaultqueue.wl.gesture.request_notified = -1; return ret; } @@ -2793,7 +3179,7 @@ API int efl_util_gesture_deselect(efl_util_gesture_h gesture_h, Evas_Object *window, efl_util_gesture_data data) { Efl_Util_Gesture_Common_Grab_Data *base_data = NULL; - Ecore_Wl_Window *wlwin; + Ecore_Wl2_Window *wlwin; struct wl_surface *surface; int ret; @@ -2807,24 +3193,25 @@ efl_util_gesture_deselect(efl_util_gesture_h gesture_h, Evas_Object *window, efl if (base_data->type != TIZEN_GESTURE_TYPE_PALM_COVER) return EFL_UTIL_ERROR_NOT_SUPPORTED; - wlwin = elm_win_wl_window_get(window); + wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window); if (!wlwin) return EFL_UTIL_ERROR_INVALID_PARAMETER; - surface = ecore_wl_window_surface_get(wlwin); + surface = ecore_wl2_window_surface_get(wlwin); EINA_SAFETY_ON_NULL_RETURN_VAL(surface, EFL_UTIL_ERROR_INVALID_PARAMETER); - tizen_gesture_deselect_palm_cover(_eflutil.wl.gesture.proto, surface); + tizen_gesture_deselect_palm_cover(_eflutil_defaultqueue.wl.gesture.proto, surface); - while (_eflutil.wl.gesture.request_notified == -1) - wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); + while (_eflutil_defaultqueue.wl.gesture.request_notified == -1) + wl_display_dispatch(_eflutil_defaultqueue.wl.dpy); - ret = _efl_util_gesture_convert_error(_eflutil.wl.gesture.request_notified); - _eflutil.wl.gesture.request_notified = -1; + ret = _efl_util_gesture_convert_error(_eflutil_defaultqueue.wl.gesture.request_notified); + _eflutil_defaultqueue.wl.gesture.request_notified = -1; return ret; } +/* LCOV_EXCL_START */ API int efl_util_gesture_activate_set(efl_util_gesture_h gesture_h, unsigned int type, Eina_Bool active) { @@ -2834,21 +3221,22 @@ efl_util_gesture_activate_set(efl_util_gesture_h gesture_h, unsigned int type, E EINA_SAFETY_ON_FALSE_RETURN_VAL(gesture_h->init, EFL_UTIL_ERROR_INVALID_PARAMETER); EINA_SAFETY_ON_TRUE_RETURN_VAL(type == EFL_UTIL_GESTURE_TYPE_NONE, EFL_UTIL_ERROR_INVALID_PARAMETER); - tizen_gesture_activate_set(_eflutil.wl.gesture.proto, NULL, type, active); + tizen_gesture_activate_set(_eflutil_defaultqueue.wl.gesture.proto, NULL, type, active); - while (_eflutil.wl.gesture.request_notified == -1) - wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); + while (_eflutil_defaultqueue.wl.gesture.request_notified == -1) + wl_display_dispatch(_eflutil_defaultqueue.wl.dpy); - ret = _efl_util_gesture_convert_error(_eflutil.wl.gesture.request_notified); - _eflutil.wl.gesture.request_notified = -1; + ret = _efl_util_gesture_convert_error(_eflutil_defaultqueue.wl.gesture.request_notified); + _eflutil_defaultqueue.wl.gesture.request_notified = -1; return ret; } +/* LCOV_EXCL_STOP */ API int efl_util_gesture_activate_set_on_window(efl_util_gesture_h gesture_h, Evas_Object *window, unsigned int type, Eina_Bool active) { - Ecore_Wl_Window *wlwin; + Ecore_Wl2_Window *wlwin; struct wl_surface *surface; int ret; @@ -2857,20 +3245,20 @@ efl_util_gesture_activate_set_on_window(efl_util_gesture_h gesture_h, Evas_Objec EINA_SAFETY_ON_NULL_RETURN_VAL(window, EFL_UTIL_ERROR_INVALID_PARAMETER); EINA_SAFETY_ON_TRUE_RETURN_VAL(type == EFL_UTIL_GESTURE_TYPE_NONE, EFL_UTIL_ERROR_INVALID_PARAMETER); - wlwin = elm_win_wl_window_get(window); + wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window); if (!wlwin) return EFL_UTIL_ERROR_INVALID_PARAMETER; - surface = ecore_wl_window_surface_get(wlwin); + surface = ecore_wl2_window_surface_get(wlwin); EINA_SAFETY_ON_NULL_RETURN_VAL(surface, EFL_UTIL_ERROR_INVALID_PARAMETER); - tizen_gesture_activate_set(_eflutil.wl.gesture.proto, surface, type, active); + tizen_gesture_activate_set(_eflutil_defaultqueue.wl.gesture.proto, surface, type, active); - while (_eflutil.wl.gesture.request_notified == -1) - wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue); + while (_eflutil_defaultqueue.wl.gesture.request_notified == -1) + wl_display_dispatch(_eflutil_defaultqueue.wl.dpy); - ret = _efl_util_gesture_convert_error(_eflutil.wl.gesture.request_notified); - _eflutil.wl.gesture.request_notified = -1; + ret = _efl_util_gesture_convert_error(_eflutil_defaultqueue.wl.gesture.request_notified); + _eflutil_defaultqueue.wl.gesture.request_notified = -1; return ret; }