Add listeners for tizen_input_device
[platform/core/api/efl-util.git] / src / efl_util.c
index 324b099..0d977d2 100644 (file)
@@ -30,6 +30,7 @@
 #include <tbm_surface_internal.h>
 #include <Elementary.h>
 #include <Ecore_Evas.h>
+#include <pthread.h>
 
 #include <Ecore_Wayland.h>
 #include <wayland-client.h>
 #include <tizen-extension-client-protocol.h>
 #include <screenshooter-client-protocol.h>
 
+#include <efl_util_screenshot_extension.h>
+
+#include <dlog.h>
+#ifdef LOG_TAG
+#undef LOG_TAG
+#endif
+
+#define LOG_TAG "TIZEN_N_EFL_UTIL"
+
+
 /* callback handler index */
 #define CBH_NOTI_LEV 0
 #define CBH_SCR_MODE 1
@@ -87,7 +98,11 @@ typedef struct _Efl_Util_Data
    struct
    {
       Eina_Bool init;
+      int ref_count;
+
       struct wl_display *dpy;
+      struct wl_registry *reg;
+
       struct wl_event_queue *queue;
 
       struct
@@ -98,14 +113,18 @@ typedef struct _Efl_Util_Data
       } policy;
       struct
       {
+         struct wl_event_queue *queue;
          struct screenshooter *screenshooter;
+         struct tizen_screenshooter *tz_screenshooter;
          struct wayland_tbm_client *tbm_client;
          Eina_List *output_list;
+         uint32_t noti;
       } shot;
       struct
       {
          struct tizen_input_device_manager *devicemgr;
          int request_notified;
+         Eina_List *device_list;
       } devmgr;
       struct
       {
@@ -125,9 +144,10 @@ static Efl_Util_Data _eflutil =
 {
    {
       EINA_FALSE,
-      NULL, NULL,
+      0,
+      NULL, NULL, NULL,
       { NULL, NULL, NULL }, /* tizen_policy protocol */
-      { NULL, NULL, NULL }, /* screenshooter protocol */
+      { NULL, NULL, NULL, NULL, NULL, 0 }, /* screenshooter protocol */
       { NULL, -1 } /* tizen_input_device_manager protocol */
    },
    {
@@ -141,8 +161,12 @@ 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 void                    _wl_shutdown(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_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);
@@ -152,6 +176,7 @@ static void                    _cb_wl_tz_policy_scr_mode_done(void *data, struct
 static void                    _cb_wl_tz_policy_iconify_state_changed(void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface_resource, uint32_t iconified, uint32_t force);
 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_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);
 
@@ -159,6 +184,9 @@ static void                    _cb_device_add(void *data EINA_UNUSED, struct tiz
 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);
 static void                    _cb_block_expired(void *data EINA_UNUSED, struct tizen_input_device_manager *tizen_input_device_manager EINA_UNUSED);
+static void                    _cb_device_info(void *data EINA_UNUSED, struct tizen_input_device *tizen_input_device EINA_UNUSED, const char *name EINA_UNUSED, uint32_t clas EINA_UNUSED, 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 const struct wl_registry_listener _wl_reg_listener =
 {
@@ -166,6 +194,12 @@ static const struct wl_registry_listener _wl_reg_listener =
    _cb_wl_reg_global_remove
 };
 
+static const struct wl_registry_listener _wl_reg_screenshooter_listener =
+{
+   _cb_wl_reg_screenshooter_global,
+   _cb_wl_reg_screenshooter_global_remove
+};
+
 struct tizen_policy_listener _wl_tz_policy_listener =
 {
    _cb_wl_tz_policy_conformant,
@@ -176,6 +210,7 @@ struct tizen_policy_listener _wl_tz_policy_listener =
    _cb_wl_tz_policy_iconify_state_changed,
    _cb_wl_tz_policy_supported_aux_hints,
    _cb_wl_tz_policy_allowed_aux_hint,
+   _cb_wl_tz_policy_aux_message,
 };
 
 struct tizen_input_device_manager_listener _wl_tz_devmgr_listener =
@@ -186,6 +221,13 @@ struct tizen_input_device_manager_listener _wl_tz_devmgr_listener =
    _cb_block_expired
 };
 
+struct tizen_input_device_listener _wl_tz_dev_listener =
+{
+   _cb_device_info,
+   _cb_event_device,
+   _cb_axis,
+};
+
 struct tizen_display_policy_listener _wl_tz_display_policy_listener =
 {
    _cb_wl_tz_display_policy_brightness_done,
@@ -264,7 +306,7 @@ _cb_info_find_by_win(Evas_Object *win,
 static Eina_Bool
 _wl_init(void)
 {
-   struct wl_registry *reg = NULL;
+   _eflutil.wl.ref_count++;
 
    if (_eflutil.wl.init) return EINA_TRUE;
 
@@ -276,11 +318,11 @@ _wl_init(void)
    _eflutil.wl.queue = wl_display_create_queue(_eflutil.wl.dpy);
    EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.queue, fail);
 
-   reg = wl_display_get_registry(_eflutil.wl.dpy);
-   EINA_SAFETY_ON_NULL_GOTO(reg, fail);
+   _eflutil.wl.reg = wl_display_get_registry(_eflutil.wl.dpy);
+   EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.reg, fail);
 
-   wl_proxy_set_queue((struct wl_proxy*)reg, _eflutil.wl.queue);
-   wl_registry_add_listener(reg, &_wl_reg_listener, NULL);
+   wl_proxy_set_queue((struct wl_proxy*)_eflutil.wl.reg, _eflutil.wl.queue);
+   wl_registry_add_listener(_eflutil.wl.reg, &_wl_reg_listener, NULL);
 
    _eflutil.wl.init = EINA_TRUE;
 
@@ -292,13 +334,96 @@ fail:
         _eflutil.wl.queue = NULL;
      }
 
-   if (reg)
-     wl_registry_destroy(reg);
+   if (_eflutil.wl.reg)
+     {
+        wl_registry_destroy(_eflutil.wl.reg);
+        _eflutil.wl.reg = NULL;
+     }
+
+   _eflutil.wl.dpy = NULL;
+
    ecore_wl_shutdown();
    return EINA_FALSE;
 }
 
 static void
+_wl_shutdown(void)
+{
+   Eina_List *l, *ll;
+   struct tizen_input_device *data;
+   Efl_Util_Wl_Output_Info *output;
+
+   if (!_eflutil.wl.init) return;
+
+   _eflutil.wl.ref_count--;
+   if (_eflutil.wl.ref_count > 0)
+     return;
+
+   // tizen_policy
+   if (_eflutil.wl.policy.proto)
+     tizen_policy_destroy(_eflutil.wl.policy.proto);
+   _eflutil.wl.policy.proto = NULL;
+
+   eina_hash_free(_eflutil.wl.policy.hash_noti_lv);
+   _eflutil.wl.policy.hash_noti_lv = NULL;
+   eina_hash_free(_eflutil.wl.policy.hash_scr_mode);
+   _eflutil.wl.policy.hash_scr_mode = NULL;
+
+   // wl_output
+   if (_eflutil.wl.shot.output_list)
+     {
+        EINA_LIST_FREE(_eflutil.wl.shot.output_list, output)
+          {
+             wl_output_destroy(output->output);
+             free(output);
+          }
+     }
+   _eflutil.wl.shot.output_list = NULL;
+
+   // screenshooter
+   if (_eflutil.wl.shot.screenshooter)
+     screenshooter_destroy(_eflutil.wl.shot.screenshooter);
+   _eflutil.wl.shot.screenshooter = NULL;
+
+   // tizen_input_device_manager
+   EINA_LIST_FOREACH_SAFE(_eflutil.wl.devmgr.device_list, l, ll, data)
+     {
+        tizen_input_device_release(data);
+        _eflutil.wl.devmgr.device_list = eina_list_remove_list(_eflutil.wl.devmgr.device_list, l);
+     }
+   ecore_wl_sync();
+   if (_eflutil.wl.devmgr.devicemgr)
+     tizen_input_device_manager_destroy(_eflutil.wl.devmgr.devicemgr);
+   _eflutil.wl.devmgr.devicemgr = NULL;
+
+   // tizen_display_policy
+   if (_eflutil.wl.display_policy.proto)
+     tizen_display_policy_destroy(_eflutil.wl.display_policy.proto);
+   _eflutil.wl.display_policy.proto = NULL;
+
+   eina_hash_free(_eflutil.wl.display_policy.hash_brightness);
+   _eflutil.wl.display_policy.hash_brightness = NULL;
+
+   if (_eflutil.wl.reg)
+     {
+        wl_proxy_set_queue((struct wl_proxy*)_eflutil.wl.reg, NULL);
+        wl_registry_destroy(_eflutil.wl.reg);
+        _eflutil.wl.reg = NULL;
+     }
+
+   if (_eflutil.wl.queue)
+     {
+        wl_event_queue_destroy(_eflutil.wl.queue);
+        _eflutil.wl.queue = NULL;
+     }
+
+   _eflutil.wl.dpy = NULL;
+   _eflutil.wl.init = EINA_FALSE;
+
+   ecore_wl_shutdown();
+}
+
+static void
 _cb_wl_output_geometry(void *data, struct wl_output *wl_output, int x, int y,
                        int physical_width, int physical_height, int subpixel,
                        const char *make, const char *model, int transform)
@@ -355,6 +480,23 @@ static const struct screenshooter_listener screenshooter_listener =
 };
 
 static void
+_cb_tz_screenshot_format(void *data, struct tizen_screenshooter *tz_screenshooter, uint32_t format)
+{
+}
+
+static void
+_cb_tz_screenshot_noti(void *data, struct tizen_screenshooter *tz_screenshooter, uint32_t noti)
+{
+   _eflutil.wl.shot.noti = noti;
+}
+
+static const struct tizen_screenshooter_listener tz_screenshooter_listener =
+{
+    _cb_tz_screenshot_format,
+    _cb_tz_screenshot_noti
+};
+
+static void
 _cb_wl_reg_global(void *data,
                   struct wl_registry *reg,
                   unsigned int name,
@@ -388,11 +530,6 @@ _cb_wl_reg_global(void *data,
         output->output = wl_registry_bind(reg, name, &wl_output_interface, version);
         wl_output_add_listener(output->output, &output_listener, output);
      }
-   else if (strcmp(interface, "screenshooter") == 0)
-     {
-        _eflutil.wl.shot.screenshooter = wl_registry_bind(reg, name, &screenshooter_interface, version);
-        screenshooter_add_listener(_eflutil.wl.shot.screenshooter, &screenshooter_listener, NULL);
-     }
    else if (strcmp(interface, "tizen_input_device_manager") == 0)
      {
         _eflutil.wl.devmgr.devicemgr = wl_registry_bind(reg, name, &tizen_input_device_manager_interface, version);
@@ -411,18 +548,89 @@ _cb_wl_reg_global(void *data,
      }
 
 }
-
+/* LCOV_EXCL_START */
 static void
 _cb_wl_reg_global_remove(void *data,
                          struct wl_registry *reg,
                          unsigned int name)
 {
+   Eina_List *l, *ll;
+   struct tizen_input_device *ddata;
+   Efl_Util_Wl_Output_Info *output;
+
+   // tizen_policy
+   if (_eflutil.wl.policy.proto)
+     tizen_policy_destroy(_eflutil.wl.policy.proto);
    _eflutil.wl.policy.proto = NULL;
+
    eina_hash_free(_eflutil.wl.policy.hash_noti_lv);
+   _eflutil.wl.policy.hash_noti_lv = NULL;
    eina_hash_free(_eflutil.wl.policy.hash_scr_mode);
+   _eflutil.wl.policy.hash_scr_mode = NULL;
+
+   // wl_output
+   if (_eflutil.wl.shot.output_list)
+     {
+        EINA_LIST_FREE(_eflutil.wl.shot.output_list, output)
+          {
+             wl_output_destroy(output->output);
+             free(output);
+          }
+     }
+   _eflutil.wl.shot.output_list = NULL;
 
+   // screenshooter
+   if (_eflutil.wl.shot.screenshooter)
+     screenshooter_destroy(_eflutil.wl.shot.screenshooter);
+   _eflutil.wl.shot.screenshooter = NULL;
+
+   // tizen_input_device_manager
+   EINA_LIST_FOREACH_SAFE(_eflutil.wl.devmgr.device_list, l, ll, ddata)
+     {
+        tizen_input_device_release(ddata);
+        _eflutil.wl.devmgr.device_list = eina_list_remove_list(_eflutil.wl.devmgr.device_list, l);
+     }
+   if (_eflutil.wl.devmgr.devicemgr)
+     tizen_input_device_manager_destroy(_eflutil.wl.devmgr.devicemgr);
+   _eflutil.wl.devmgr.devicemgr = NULL;
+
+   // tizen_display_policy
+   if (_eflutil.wl.display_policy.proto)
+     tizen_display_policy_destroy(_eflutil.wl.display_policy.proto);
    _eflutil.wl.display_policy.proto = NULL;
+
    eina_hash_free(_eflutil.wl.display_policy.hash_brightness);
+   _eflutil.wl.display_policy.hash_brightness = NULL;
+}
+/* LCOV_EXCL_STOP */
+
+static void
+_cb_wl_reg_screenshooter_global(void *data,
+                  struct wl_registry *reg,
+                  unsigned int name,
+                  const char *interface,
+                  unsigned int version)
+{
+   if (strcmp(interface, "screenshooter") == 0)
+     {
+        _eflutil.wl.shot.screenshooter = wl_registry_bind(reg, name, &screenshooter_interface, version);
+        screenshooter_add_listener(_eflutil.wl.shot.screenshooter, &screenshooter_listener, NULL);
+     }
+   else if (strcmp(interface, "tizen_screenshooter") == 0)
+     {
+        _eflutil.wl.shot.tz_screenshooter = wl_registry_bind(reg, name, &tizen_screenshooter_interface, version);
+        tizen_screenshooter_add_listener(_eflutil.wl.shot.tz_screenshooter, &tz_screenshooter_listener, NULL);
+
+        wl_display_roundtrip_queue(_eflutil.wl.dpy, _eflutil.wl.shot.queue);
+     }
+}
+
+/* LCOV_EXCL_START */
+static void
+_cb_wl_reg_screenshooter_global_remove(void *data,
+                         struct wl_registry *reg,
+                         unsigned int name)
+{
 }
 
 static Efl_Util_Callback_Info *
@@ -457,6 +665,7 @@ _cb_wl_tz_policy_conformant_area(void *data, struct tizen_policy *tizen_policy,
                                  uint32_t state, int32_t x, int32_t y, int32_t w, int32_t h)
 {
 }
+/* LCOV_EXCL_STOP */
 
 static void
 _cb_wl_tz_policy_notification_done(void *data,
@@ -487,10 +696,12 @@ _cb_wl_tz_policy_notification_done(void *data,
                cb_info->data);
 }
 
+/* LCOV_EXCL_START */
 static void
 _cb_wl_tz_policy_transient_for_done(void *data, struct tizen_policy *tizen_policy, uint32_t child_id)
 {
 }
+/* LCOV_EXCL_STOP */
 
 static void
 _cb_wl_tz_policy_scr_mode_done(void *data,
@@ -522,6 +733,7 @@ _cb_wl_tz_policy_scr_mode_done(void *data,
                cb_info->data);
 }
 
+/* LCOV_EXCL_START */
 static void                    _cb_wl_tz_policy_iconify_state_changed(void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface_resource, uint32_t iconified, uint32_t force)
 {
 }
@@ -534,6 +746,11 @@ 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)
+{
+}
+/* LCOV_EXCL_STOP */
+
 static void
 _cb_wl_tz_display_policy_brightness_done(void *data,
                                  struct tizen_display_policy *tizen_display_policy,
@@ -562,27 +779,66 @@ _cb_window_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, vo
      return;
 
    eina_hash_del(_eflutil.wl.policy.hash_noti_lv, &lv_info->surface, lv_info);
+
+   eina_hash_population(_eflutil.wl.policy.hash_noti_lv);
+
+   if (eina_hash_population(_eflutil.wl.policy.hash_noti_lv) == 0)
+     {
+        _wl_shutdown();
+     }
+}
+
+static Eina_Bool
+_init_tizen_policy_proto(void)
+{
+   int ret = 0;
+
+   if (!_eflutil.wl.policy.proto)
+     {
+        ret = _wl_init();
+        EINA_SAFETY_ON_FALSE_RETURN_VAL(ret, EINA_FALSE);
+
+        ret = 0;
+        while (!_eflutil.wl.policy.proto && ret != -1)
+          ret = wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
+
+        EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil.wl.policy.proto, EINA_FALSE);
+     }
+
+   return EINA_TRUE;
 }
 
 API int
 efl_util_set_notification_window_level(Evas_Object *window,
                                        efl_util_notification_level_e level)
 {
-   Eina_Bool res;
-
-   EINA_SAFETY_ON_NULL_RETURN_VAL(window, EFL_UTIL_ERROR_INVALID_PARAMETER);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL((level >= EFL_UTIL_NOTIFICATION_LEVEL_NONE) &&
-                                   (level <= EFL_UTIL_NOTIFICATION_LEVEL_TOP),
-                                   EFL_UTIL_ERROR_INVALID_PARAMETER);
-
+   Eina_Bool ret;
    Elm_Win_Type type;
    Ecore_Wl_Window *wlwin;
    struct wl_surface *surface;
    Efl_Util_Wl_Surface_Lv_Info *lv_info;
    Ecore_Wl_Window_Type wl_type;
 
-   res = _wl_init();
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(window, EFL_UTIL_ERROR_INVALID_PARAMETER);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL((level >= EFL_UTIL_NOTIFICATION_LEVEL_NONE) &&
+                                   (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.");
+     }
 
    wlwin = elm_win_wl_window_get(window);
    EINA_SAFETY_ON_NULL_RETURN_VAL(wlwin, EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE);
@@ -595,8 +851,8 @@ efl_util_set_notification_window_level(Evas_Object *window,
                                         EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE);
      }
 
-   while (!_eflutil.wl.policy.proto)
-     wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
+   ret = _init_tizen_policy_proto();
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(ret, EFL_UTIL_ERROR_NOT_SUPPORTED);
 
    surface = ecore_wl_window_surface_get(wlwin);
    EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
@@ -660,19 +916,15 @@ API int
 efl_util_get_notification_window_level(Evas_Object *window,
                                        efl_util_notification_level_e *level)
 {
-   Eina_Bool res;
-
-   EINA_SAFETY_ON_NULL_RETURN_VAL(window, EFL_UTIL_ERROR_INVALID_PARAMETER);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(level, EFL_UTIL_ERROR_INVALID_PARAMETER);
-
+   Eina_Bool ret;
    Elm_Win_Type type;
    Ecore_Wl_Window *wlwin;
    struct wl_surface *surface;
    Efl_Util_Wl_Surface_Lv_Info *lv_info;
    Ecore_Wl_Window_Type wl_type;
 
-   res = _wl_init();
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(window, EFL_UTIL_ERROR_INVALID_PARAMETER);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(level, EFL_UTIL_ERROR_INVALID_PARAMETER);
 
    wlwin = elm_win_wl_window_get(window);
    EINA_SAFETY_ON_NULL_RETURN_VAL(wlwin, EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE);
@@ -685,13 +937,13 @@ efl_util_get_notification_window_level(Evas_Object *window,
                                         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);
    EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
                                   EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE);
 
+   ret = _init_tizen_policy_proto();
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(ret, EFL_UTIL_ERROR_NOT_SUPPORTED);
+
    lv_info = eina_hash_find(_eflutil.wl.policy.hash_noti_lv, &surface);
    if (lv_info)
      {
@@ -738,6 +990,9 @@ 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);
@@ -755,6 +1010,9 @@ efl_util_set_notification_window_level_error_cb(Evas_Object *window,
 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);
@@ -769,28 +1027,14 @@ API int
 efl_util_set_window_opaque_state(Evas_Object *window,
                                  int opaque)
 {
-   Eina_Bool res;
+   Eina_Bool ret;
+   Ecore_Wl_Window *wlwin;
+   struct wl_surface *surface;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(window, EFL_UTIL_ERROR_INVALID_PARAMETER);
    EINA_SAFETY_ON_FALSE_RETURN_VAL(((opaque >= 0) && (opaque <= 1)),
                                    EFL_UTIL_ERROR_INVALID_PARAMETER);
 
-   Ecore_Wl_Window *wlwin;
-   struct wl_surface *surface;
-
-   if (!_eflutil.wl.policy.proto)
-     {
-        int ret = 0;
-
-        res = _wl_init();
-        EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
-
-        while (!_eflutil.wl.policy.proto && ret != -1)
-          ret = wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
-
-        EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil.wl.policy.proto, EFL_UTIL_ERROR_INVALID_PARAMETER);
-     }
-
    wlwin = elm_win_wl_window_get(window);
    if (!wlwin)
       return EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE;
@@ -799,6 +1043,9 @@ efl_util_set_window_opaque_state(Evas_Object *window,
    if (!surface)
       return EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE;
 
+   ret = _init_tizen_policy_proto();
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(ret, EFL_UTIL_ERROR_NOT_SUPPORTED);
+
    tizen_policy_set_opaque_state(_eflutil.wl.policy.proto, surface, opaque);
 
    return EFL_UTIL_ERROR_NONE;
@@ -816,72 +1063,65 @@ efl_util_set_window_screen_mode(Evas_Object *window,
    Ecore_Wl_Window *wlwin;
    struct wl_surface *surface;
    Efl_Util_Wl_Surface_Scr_Mode_Info *scr_mode_info;
-   Eina_Bool res;
-
-   res = _wl_init();
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
+   Eina_Bool ret;
 
    wlwin = elm_win_wl_window_get(window);
-   if (wlwin)
-     {
-        while (!_eflutil.wl.policy.proto)
-          wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wlwin, EFL_UTIL_ERROR_INVALID_PARAMETER);
 
-        surface = ecore_wl_window_surface_get(wlwin);
-        EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
-                                       EFL_UTIL_ERROR_INVALID_PARAMETER);
+   surface = ecore_wl_window_surface_get(wlwin);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(surface, EFL_UTIL_ERROR_INVALID_PARAMETER);
 
-        scr_mode_info = eina_hash_find(_eflutil.wl.policy.hash_scr_mode, &surface);
-        if (!scr_mode_info)
-          {
-             scr_mode_info = calloc(1, sizeof(Efl_Util_Wl_Surface_Scr_Mode_Info));
-             EINA_SAFETY_ON_NULL_RETURN_VAL(scr_mode_info, EFL_UTIL_ERROR_OUT_OF_MEMORY);
+   ret = _init_tizen_policy_proto();
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(ret, EFL_UTIL_ERROR_NOT_SUPPORTED);
+
+   scr_mode_info = eina_hash_find(_eflutil.wl.policy.hash_scr_mode, &surface);
+   if (!scr_mode_info)
+     {
+        scr_mode_info = calloc(1, sizeof(Efl_Util_Wl_Surface_Scr_Mode_Info));
+        EINA_SAFETY_ON_NULL_RETURN_VAL(scr_mode_info, EFL_UTIL_ERROR_OUT_OF_MEMORY);
 
-             scr_mode_info->surface = surface;
-             scr_mode_info->mode = (unsigned int)mode;
-             scr_mode_info->wait_for_done = EINA_TRUE;
-             scr_mode_info->state = TIZEN_POLICY_ERROR_STATE_NONE;
+        scr_mode_info->surface = surface;
+        scr_mode_info->mode = (unsigned int)mode;
+        scr_mode_info->wait_for_done = EINA_TRUE;
+        scr_mode_info->state = TIZEN_POLICY_ERROR_STATE_NONE;
 
-             eina_hash_add(_eflutil.wl.policy.hash_scr_mode,
-                           &surface,
-                           scr_mode_info);
-          }
-        else
+        eina_hash_add(_eflutil.wl.policy.hash_scr_mode,
+                      &surface,
+                      scr_mode_info);
+     }
+   else
+     {
+        scr_mode_info->mode = (unsigned int)mode;
+        scr_mode_info->wait_for_done = EINA_TRUE;
+        scr_mode_info->state = TIZEN_POLICY_ERROR_STATE_NONE;
+     }
+
+   tizen_policy_set_window_screen_mode(_eflutil.wl.policy.proto,
+                                       surface, (unsigned int)mode);
+   if (scr_mode_info->wait_for_done)
+     {
+        int count = 0;
+        while (scr_mode_info->wait_for_done && (count < 3))
           {
-             scr_mode_info->mode = (unsigned int)mode;
-             scr_mode_info->wait_for_done = EINA_TRUE;
-             scr_mode_info->state = TIZEN_POLICY_ERROR_STATE_NONE;
+             ecore_wl_flush();
+             wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
+             count++;
           }
 
-        tizen_policy_set_window_screen_mode(_eflutil.wl.policy.proto,
-                                            surface, (unsigned int)mode);
         if (scr_mode_info->wait_for_done)
           {
-             int count = 0;
-             while (scr_mode_info->wait_for_done && (count < 3))
-               {
-                  ecore_wl_flush();
-                  wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
-                  count++;
-               }
-
-             if (scr_mode_info->wait_for_done)
-               {
-                  return EFL_UTIL_ERROR_INVALID_PARAMETER;
-               }
-             else
+             return EFL_UTIL_ERROR_INVALID_PARAMETER;
+          }
+        else
+          {
+             if (scr_mode_info->state == TIZEN_POLICY_ERROR_STATE_PERMISSION_DENIED)
                {
-                  if (scr_mode_info->state == TIZEN_POLICY_ERROR_STATE_PERMISSION_DENIED)
-                    {
-                       return EFL_UTIL_ERROR_PERMISSION_DENIED;
-                    }
+                  return EFL_UTIL_ERROR_PERMISSION_DENIED;
                }
           }
-
-        return EFL_UTIL_ERROR_NONE;
      }
-   else
-     return EFL_UTIL_ERROR_INVALID_PARAMETER;
+
+   return EFL_UTIL_ERROR_NONE;
 }
 
 API int
@@ -894,50 +1134,51 @@ efl_util_get_window_screen_mode(Evas_Object *window,
    Ecore_Wl_Window *wlwin;
    struct wl_surface *surface;
    Efl_Util_Wl_Surface_Scr_Mode_Info *scr_mode_info;
-   Eina_Bool res;
-
-   res = _wl_init();
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
+   Eina_Bool ret;
 
    wlwin = elm_win_wl_window_get(window);
-   if (wlwin)
-     {
-        while (!_eflutil.wl.policy.proto)
-          wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wlwin, EFL_UTIL_ERROR_INVALID_PARAMETER);
 
-        surface = ecore_wl_window_surface_get(wlwin);
-        EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
-                                       EFL_UTIL_ERROR_INVALID_PARAMETER);
+   surface = ecore_wl_window_surface_get(wlwin);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(surface, EFL_UTIL_ERROR_INVALID_PARAMETER);
 
-        scr_mode_info = eina_hash_find(_eflutil.wl.policy.hash_scr_mode, &surface);
-        if (scr_mode_info)
-          {
-             if (scr_mode_info->wait_for_done)
-               {
-                  while (scr_mode_info->wait_for_done)
-                    {
-                       ecore_wl_flush();
-                       wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
-                    }
-               }
+   ret = _init_tizen_policy_proto();
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(ret, EFL_UTIL_ERROR_NOT_SUPPORTED);
 
-             switch (scr_mode_info->mode)
+   scr_mode_info = eina_hash_find(_eflutil.wl.policy.hash_scr_mode, &surface);
+   if (scr_mode_info)
+     {
+        if (scr_mode_info->wait_for_done)
+          {
+             while (scr_mode_info->wait_for_done)
                {
-                case TIZEN_POLICY_MODE_DEFAULT:   *mode = EFL_UTIL_SCREEN_MODE_DEFAULT;   break;
-                case TIZEN_POLICY_MODE_ALWAYS_ON: *mode = EFL_UTIL_SCREEN_MODE_ALWAYS_ON; break;
-                default:                          *mode = EFL_UTIL_SCREEN_MODE_DEFAULT;
-                  return EFL_UTIL_ERROR_INVALID_PARAMETER;
+                  ecore_wl_flush();
+                  wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
                }
-             return EFL_UTIL_ERROR_NONE;
           }
-        else
+
+        switch (scr_mode_info->mode)
           {
-             *mode = EFL_UTIL_SCREEN_MODE_DEFAULT;
-             return EFL_UTIL_ERROR_INVALID_PARAMETER;
+           case TIZEN_POLICY_MODE_DEFAULT:
+              *mode = EFL_UTIL_SCREEN_MODE_DEFAULT;
+              break;
+
+           case TIZEN_POLICY_MODE_ALWAYS_ON:
+              *mode = EFL_UTIL_SCREEN_MODE_ALWAYS_ON;
+              break;
+
+           default:
+              *mode = EFL_UTIL_SCREEN_MODE_DEFAULT;
+              return EFL_UTIL_ERROR_INVALID_PARAMETER;
           }
+
+        return EFL_UTIL_ERROR_NONE;
      }
    else
-     return EFL_UTIL_ERROR_INVALID_PARAMETER;
+     {
+        *mode = EFL_UTIL_SCREEN_MODE_DEFAULT;
+        return EFL_UTIL_ERROR_INVALID_PARAMETER;
+     }
 }
 
 #ifndef TIZEN_WEARABLE
@@ -946,6 +1187,9 @@ efl_util_set_window_screen_mode_error_cb(Evas_Object *window,
                                          efl_util_window_screen_mode_error_cb callback,
                                          void *user_data)
 {
+   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);
@@ -963,6 +1207,9 @@ efl_util_set_window_screen_mode_error_cb(Evas_Object *window,
 API int
 efl_util_unset_window_screen_mode_error_cb(Evas_Object *window)
 {
+   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);
@@ -974,80 +1221,94 @@ efl_util_unset_window_screen_mode_error_cb(Evas_Object *window)
 }
 #endif
 
+static Eina_Bool
+_init_tizen_display_policy_proto(void)
+{
+   int ret = 0;
+
+   if (!_eflutil.wl.display_policy.proto)
+     {
+        ret = _wl_init();
+        EINA_SAFETY_ON_FALSE_RETURN_VAL(ret, EINA_FALSE);
+
+        ret = 0;
+        while (!_eflutil.wl.display_policy.proto && ret != -1)
+          ret = wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
+
+        EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil.wl.display_policy.proto, EINA_FALSE);
+     }
+
+   return EINA_TRUE;
+}
+
 API int
 efl_util_set_window_brightness(Evas_Object *window, int brightness)
 {
    Ecore_Wl_Window *wlwin;
    struct wl_surface *surface;
    Efl_Util_Wl_Surface_Brightness_Info *brightness_info;
-   Eina_Bool res;
+   Eina_Bool ret;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(window, EFL_UTIL_ERROR_INVALID_PARAMETER);
    EINA_SAFETY_ON_FALSE_RETURN_VAL(brightness <= 100, EFL_UTIL_ERROR_INVALID_PARAMETER);
 
-   res = _wl_init();
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
-
    wlwin = elm_win_wl_window_get(window);
-   if (wlwin)
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wlwin, EFL_UTIL_ERROR_INVALID_PARAMETER);
+
+   surface = ecore_wl_window_surface_get(wlwin);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(surface, EFL_UTIL_ERROR_INVALID_PARAMETER);
+
+   ret = _init_tizen_display_policy_proto();
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(ret, EFL_UTIL_ERROR_NOT_SUPPORTED);
+
+   brightness_info = eina_hash_find(_eflutil.wl.display_policy.hash_brightness, &surface);
+   if (!brightness_info)
      {
-        while (!_eflutil.wl.display_policy.proto)
-          wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
+        brightness_info = calloc(1, sizeof(Efl_Util_Wl_Surface_Brightness_Info));
+        EINA_SAFETY_ON_NULL_RETURN_VAL(brightness_info, EFL_UTIL_ERROR_OUT_OF_MEMORY);
 
-        surface = ecore_wl_window_surface_get(wlwin);
-        EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
-                                       EFL_UTIL_ERROR_INVALID_PARAMETER);
+        brightness_info->surface = surface;
+        brightness_info->brightness = brightness;
+        brightness_info->wait_for_done = EINA_TRUE;
+        brightness_info->state = TIZEN_DISPLAY_POLICY_ERROR_STATE_NONE;
 
-        brightness_info = eina_hash_find(_eflutil.wl.display_policy.hash_brightness, &surface);
-        if (!brightness_info)
-          {
-             brightness_info = calloc(1, sizeof(Efl_Util_Wl_Surface_Brightness_Info));
-             EINA_SAFETY_ON_NULL_RETURN_VAL(brightness_info, EFL_UTIL_ERROR_OUT_OF_MEMORY);
-
-             brightness_info->surface = surface;
-             brightness_info->brightness = brightness;
-             brightness_info->wait_for_done = EINA_TRUE;
-             brightness_info->state = TIZEN_DISPLAY_POLICY_ERROR_STATE_NONE;
-
-             eina_hash_add(_eflutil.wl.display_policy.hash_brightness,
-                           &surface,
-                           brightness_info);
-           }
-         else
-           {
-              brightness_info->brightness = brightness;
-              brightness_info->wait_for_done = EINA_TRUE;
-              brightness_info->state = TIZEN_DISPLAY_POLICY_ERROR_STATE_NONE;
-           }
-
-         tizen_display_policy_set_window_brightness(_eflutil.wl.display_policy.proto,
-                                                    surface, brightness);
-         if (brightness_info->wait_for_done)
-           {
-              int count = 0;
-              while (brightness_info->wait_for_done && (count < 3))
-                {
-                   ecore_wl_flush();
-                   wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
-                   count++;
-                }
-
-              if (brightness_info->wait_for_done)
-                {
-                   return EFL_UTIL_ERROR_INVALID_PARAMETER;
-                }
-              else
-                {
-                   if (brightness_info->state == TIZEN_DISPLAY_POLICY_ERROR_STATE_PERMISSION_DENIED)
-                     {
-                        return EFL_UTIL_ERROR_PERMISSION_DENIED;
-                     }
-                }
-           }
-        return EFL_UTIL_ERROR_NONE;
+        eina_hash_add(_eflutil.wl.display_policy.hash_brightness,
+                      &surface,
+                      brightness_info);
      }
    else
-     return EFL_UTIL_ERROR_INVALID_PARAMETER;
+     {
+        brightness_info->brightness = brightness;
+        brightness_info->wait_for_done = EINA_TRUE;
+        brightness_info->state = TIZEN_DISPLAY_POLICY_ERROR_STATE_NONE;
+     }
+
+   tizen_display_policy_set_window_brightness(_eflutil.wl.display_policy.proto,
+                                              surface, brightness);
+   if (brightness_info->wait_for_done)
+     {
+        int count = 0;
+        while (brightness_info->wait_for_done && (count < 3))
+          {
+             ecore_wl_flush();
+             wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
+             count++;
+          }
+
+        if (brightness_info->wait_for_done)
+          {
+             return EFL_UTIL_ERROR_INVALID_PARAMETER;
+          }
+        else
+          {
+             if (brightness_info->state == TIZEN_DISPLAY_POLICY_ERROR_STATE_PERMISSION_DENIED)
+               {
+                  return EFL_UTIL_ERROR_PERMISSION_DENIED;
+               }
+          }
+     }
+
+   return EFL_UTIL_ERROR_NONE;
 }
 
 API int
@@ -1056,23 +1317,19 @@ efl_util_get_window_brightness(Evas_Object *window, int *brightness)
    Ecore_Wl_Window *wlwin;
    struct wl_surface *surface;
    Efl_Util_Wl_Surface_Brightness_Info *brightness_info;
-   Eina_Bool res;
+   Eina_Bool ret;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(window, EFL_UTIL_ERROR_INVALID_PARAMETER);
    EINA_SAFETY_ON_NULL_RETURN_VAL(brightness, EFL_UTIL_ERROR_INVALID_PARAMETER);
 
-   res = _wl_init();
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
-
    wlwin = 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);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wlwin, EFL_UTIL_ERROR_INVALID_PARAMETER);
 
    surface = ecore_wl_window_surface_get(wlwin);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
-                                  EFL_UTIL_ERROR_INVALID_PARAMETER);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(surface, EFL_UTIL_ERROR_INVALID_PARAMETER);
+
+   ret = _init_tizen_display_policy_proto();
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(ret, EFL_UTIL_ERROR_NOT_SUPPORTED);
 
    brightness_info = eina_hash_find(_eflutil.wl.display_policy.hash_brightness, &surface);
    if (brightness_info)
@@ -1104,22 +1361,42 @@ _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 tizen_input_device *device,
                struct wl_seat *seat EINA_UNUSED)
 {
-   ;
+   Eina_List *l;
+   struct tizen_input_device *ddata;
+
+   EINA_LIST_FOREACH(_eflutil.wl.devmgr.device_list, l, ddata)
+     {
+        if (device == ddata) return;
+     }
+   tizen_input_device_add_listener(device, &_wl_tz_dev_listener, NULL);
+   _eflutil.wl.devmgr.device_list = eina_list_append(_eflutil.wl.devmgr.device_list, device);
 }
 
+/* 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 tizen_input_device *device,
                struct wl_seat *seat  EINA_UNUSED)
 {
-   ;
+   Eina_List *l, *ll;
+   struct tizen_input_device *ddata;
+
+   EINA_LIST_FOREACH_SAFE(_eflutil.wl.devmgr.device_list, l, ll, ddata)
+     {
+        if (device == ddata)
+          {
+             _eflutil.wl.devmgr.device_list = eina_list_remove_list(_eflutil.wl.devmgr.device_list, l);
+             tizen_input_device_release(device);
+          }
+     }
 }
+/* LCOV_EXCL_STOP */
 
 static void
 _cb_error(void *data EINA_UNUSED,
@@ -1129,12 +1406,42 @@ _cb_error(void *data EINA_UNUSED,
    _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 */
+
+/* LCOV_EXCL_START */
+static void
+_cb_device_info(void *data EINA_UNUSED,
+                struct tizen_input_device *tizen_input_device EINA_UNUSED,
+                const char *name EINA_UNUSED, uint32_t clas EINA_UNUSED,
+                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)
+{
+   ;
+}
+/* LCOV_EXCL_STOP */
 
 static efl_util_error_e
 _efl_util_input_convert_input_generator_error(int ret)
@@ -1155,13 +1462,15 @@ _efl_util_input_convert_input_generator_error(int ret)
 }
 
 API efl_util_inputgen_h
-efl_util_input_initialize_generator(efl_util_input_device_type_e dev_type)
+efl_util_input_initialize_generator(unsigned int dev_type)
 {
    int ret = EFL_UTIL_ERROR_NONE;
    efl_util_inputgen_h inputgen_h = NULL;
 
-   if ((dev_type <= EFL_UTIL_INPUT_DEVTYPE_NONE) ||
-       (dev_type >= EFL_UTIL_INPUT_DEVTYPE_MAX))
+   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;
@@ -1228,6 +1537,8 @@ efl_util_input_deinitialize_generator(efl_util_inputgen_h inputgen_h)
    ret = _efl_util_input_convert_input_generator_error(_eflutil.wl.devmgr.request_notified);
    _eflutil.wl.devmgr.request_notified = -1;
 
+   _wl_shutdown();
+
    return ret;
 }
 
@@ -1294,6 +1605,46 @@ efl_util_input_generate_touch(efl_util_inputgen_h inputgen_h, int idx,
    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)
+{
+   int ret;
+   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(buttons > 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_POINTER, EFL_UTIL_ERROR_NO_SUCH_DEVICE);
+
+   EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil.wl.devmgr.devicemgr, EFL_UTIL_ERROR_INVALID_PARAMETER);
+
+   switch(pointer_type)
+     {
+        case EFL_UTIL_INPUT_POINTER_BUTTON_DOWN:
+           type = TIZEN_INPUT_DEVICE_MANAGER_POINTER_EVENT_TYPE_BEGIN;
+           break;
+        case EFL_UTIL_INPUT_POINTER_MOVE:
+           type = TIZEN_INPUT_DEVICE_MANAGER_POINTER_EVENT_TYPE_UPDATE;
+           break;
+        case EFL_UTIL_INPUT_POINTER_BUTTON_UP:
+           type = TIZEN_INPUT_DEVICE_MANAGER_POINTER_EVENT_TYPE_END;
+           break;
+        default:
+           return EFL_UTIL_ERROR_INVALID_PARAMETER;
+     }
+
+   tizen_input_device_manager_generate_pointer(_eflutil.wl.devmgr.devicemgr, type, x, y, buttons);
+
+   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
 {
    int width;
@@ -1303,30 +1654,115 @@ struct _efl_util_screenshot_h
 
    /* tbm bufmgr */
    tbm_bufmgr bufmgr;
+
+   Eina_Bool auto_rotation;
 };
 
 /* scrrenshot handle */
 static efl_util_screenshot_h g_screenshot;
+static Eina_Bool shot_mutex_init;
+static pthread_mutex_t shot_lock;
+
+static Eina_Bool
+_screenshot_mutex_init(void)
+{
+   if (shot_mutex_init)
+     return EINA_TRUE;
+
+   if (pthread_mutex_init(&shot_lock, NULL))
+     {
+        fprintf(stderr, "[screenshot] fail: mutex init"); /*LCOV_EXCL_LINE*/
+        return EINA_FALSE; /*LCOV_EXCL_LINE*/
+     }
+
+   shot_mutex_init = EINA_TRUE;
+
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_screenshot_mutex_destory(void)
+{
+   if (!shot_mutex_init)
+     return EINA_TRUE;
+
+   if (pthread_mutex_destroy(&shot_lock))
+     {
+        fprintf(stderr, "[screenshot] fail: mutex destory"); /*LCOV_EXCL_LINE*/
+        return EINA_FALSE; /*LCOV_EXCL_LINE*/
+     }
+
+   shot_mutex_init = EINA_FALSE;
+
+   return EINA_TRUE;
+}
+
+void
+_screenshot_mutex_lock(void)
+{
+   if (!_screenshot_mutex_init())
+     return;
+
+   pthread_mutex_lock(&shot_lock);
+}
+
+void
+_screenshot_mutex_unlock(void)
+{
+   pthread_mutex_unlock(&shot_lock);
+}
 
 API efl_util_screenshot_h
 efl_util_screenshot_initialize(int width, int height)
 {
    efl_util_screenshot_h screenshot = NULL;
+   struct wl_display *display_wrapper = NULL;
+   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);
+
+   _screenshot_mutex_lock();
 
    if (!_eflutil.wl.shot.screenshooter)
      {
-        int ret = 0;
-        _wl_init();
-        while (!_eflutil.wl.shot.screenshooter && ret != -1)
-          ret = wl_display_roundtrip_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
+        ret = _wl_init();
+        if (ret == (int)EINA_FALSE)
+          {
+             set_last_result(EFL_UTIL_ERROR_INVALID_PARAMETER);
+             _screenshot_mutex_unlock();
+             return NULL;
+          }
+        wl_display_roundtrip_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
+
+        display_wrapper = wl_proxy_create_wrapper(_eflutil.wl.dpy);
+        EINA_SAFETY_ON_NULL_GOTO(display_wrapper, fail_init);
+
+        _eflutil.wl.shot.queue = wl_display_create_queue(_eflutil.wl.dpy);
+        EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.shot.queue, fail_init);
+
+        reg = wl_display_get_registry(display_wrapper);
+        EINA_SAFETY_ON_NULL_GOTO(reg, fail_init);
+
+        wl_proxy_set_queue((struct wl_proxy*)reg, _eflutil.wl.shot.queue);
+
+        wl_registry_add_listener(reg, &_wl_reg_screenshooter_listener, NULL);
+
+        ret = wl_display_roundtrip_queue(_eflutil.wl.dpy, _eflutil.wl.shot.queue);
+        EINA_SAFETY_ON_TRUE_GOTO(ret == -1, fail_init);
         EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.shot.screenshooter, fail_init);
+        EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.shot.tz_screenshooter, fail_init);
 
-       _eflutil.wl.shot.tbm_client = wayland_tbm_client_init(_eflutil.wl.dpy);
-       EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.shot.tbm_client, fail_init);
+        _eflutil.wl.shot.tbm_client = wayland_tbm_client_init(_eflutil.wl.dpy);
+        EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.shot.tbm_client, fail_init);
      }
 
-   EINA_SAFETY_ON_FALSE_GOTO(width > 0, fail_param);
-   EINA_SAFETY_ON_FALSE_GOTO(height > 0, fail_param);
+   if (_eflutil.wl.shot.noti == 0)
+     {
+        fprintf(stderr, "[screenshot] fail: privilege error\n"); /* LCOV_EXCL_LINE */
+        goto fail_init;
+     }
 
    if (g_screenshot)
      {
@@ -1336,6 +1772,8 @@ efl_util_screenshot_initialize(int width, int height)
              g_screenshot->height = height;
           }
 
+        _screenshot_mutex_unlock();
+
         return g_screenshot;
      }
 
@@ -1344,6 +1782,7 @@ efl_util_screenshot_initialize(int width, int height)
 
    screenshot->width = width;
    screenshot->height = height;
+   screenshot->auto_rotation = EINA_TRUE;
 
    screenshot->bufmgr = wayland_tbm_client_get_bufmgr(_eflutil.wl.shot.tbm_client);
    EINA_SAFETY_ON_NULL_GOTO(screenshot->bufmgr, fail_init);
@@ -1353,21 +1792,26 @@ efl_util_screenshot_initialize(int width, int height)
 
    screenshooter_set_user_data(_eflutil.wl.shot.screenshooter, &screenshot->shot_done);
 
+   _screenshot_mutex_unlock();
+
    return g_screenshot;
 
 fail_param:
-   if (screenshot)
-     efl_util_screenshot_deinitialize(screenshot);
    set_last_result(EFL_UTIL_ERROR_INVALID_PARAMETER);
    return NULL;
 fail_memory:
-   if (screenshot)
-     efl_util_screenshot_deinitialize(screenshot);
+/* LCOV_EXCL_START */
+   if (display_wrapper)
+     wl_proxy_wrapper_destroy(display_wrapper);
    set_last_result(EFL_UTIL_ERROR_OUT_OF_MEMORY);
    return NULL;
+/* LCOV_EXCL_STOP */
 fail_init:
    if (screenshot)
      efl_util_screenshot_deinitialize(screenshot);
+   _screenshot_mutex_unlock();
+   if (display_wrapper)
+     wl_proxy_wrapper_destroy(display_wrapper);
    set_last_result(EFL_UTIL_ERROR_SCREENSHOT_INIT_FAIL);
    return NULL;
 }
@@ -1375,14 +1819,39 @@ fail_init:
 API int
 efl_util_screenshot_deinitialize(efl_util_screenshot_h screenshot)
 {
+   _screenshot_mutex_lock();
+
    if (!screenshot)
-     return EFL_UTIL_ERROR_INVALID_PARAMETER;
+     {
+        _screenshot_mutex_unlock();
+        _screenshot_mutex_destory();
+        return EFL_UTIL_ERROR_INVALID_PARAMETER;
+     }
 
    free(screenshot);
    g_screenshot = NULL;
 
+   if (_eflutil.wl.shot.queue)
+     {
+        wl_event_queue_destroy(_eflutil.wl.shot.queue);
+        _eflutil.wl.shot.queue = NULL;
+     }
+
    if (_eflutil.wl.shot.screenshooter)
-     screenshooter_set_user_data(_eflutil.wl.shot.screenshooter, NULL);
+     {
+        screenshooter_destroy(_eflutil.wl.shot.screenshooter);
+        _eflutil.wl.shot.screenshooter = NULL;
+     }
+   if (_eflutil.wl.shot.tz_screenshooter)
+     {
+        tizen_screenshooter_destroy(_eflutil.wl.shot.tz_screenshooter);
+        _eflutil.wl.shot.tz_screenshooter = NULL;
+     }
+
+   _screenshot_mutex_unlock();
+   _screenshot_mutex_destory();
+
+   _wl_shutdown();
 
    return EFL_UTIL_ERROR_NONE;
 }
@@ -1396,30 +1865,33 @@ efl_util_screenshot_take_tbm_surface(efl_util_screenshot_h screenshot)
    Efl_Util_Wl_Output_Info *output;
    int ret = 0;
 
-   if (screenshot != g_screenshot)
+   _screenshot_mutex_lock();
+
+   if (!screenshot || (screenshot != g_screenshot))
      {
         set_last_result(EFL_UTIL_ERROR_INVALID_PARAMETER);
+        _screenshot_mutex_unlock();
         return NULL;
      }
 
    output = eina_list_nth(_eflutil.wl.shot.output_list, 0);
    if (!output)
      {
-        fprintf(stderr, "[screenshot] fail: no output for screenshot\n");
+        fprintf(stderr, "[screenshot] fail: no output for screenshot\n"); /* LCOV_EXCL_LINE */
         goto fail;
      }
 
    t_surface = tbm_surface_create(screenshot->width, screenshot->height, TBM_FORMAT_XRGB8888);
    if (!t_surface)
      {
-        fprintf(stderr, "[screenshot] fail: tbm_surface_create\n");
+        fprintf(stderr, "[screenshot] fail: tbm_surface_create\n"); /* LCOV_EXCL_LINE */
         goto fail;
      }
 
    buffer = wayland_tbm_client_create_buffer(_eflutil.wl.shot.tbm_client, t_surface);
    if (!buffer)
      {
-        fprintf(stderr, "[screenshot] fail: create wl_buffer for screenshot\n");
+        fprintf(stderr, "[screenshot] fail: create wl_buffer for screenshot\n"); /* LCOV_EXCL_LINE */
         goto fail;
      }
 
@@ -1427,11 +1899,11 @@ efl_util_screenshot_take_tbm_surface(efl_util_screenshot_h screenshot)
 
    screenshot->shot_done = EINA_FALSE;
    while (!screenshot->shot_done && ret != -1)
-     ret = wl_display_roundtrip_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
+     ret = wl_display_roundtrip_queue(_eflutil.wl.dpy, _eflutil.wl.shot.queue);
 
    if (ret == -1)
      {
-        fprintf(stderr, "[screenshot] fail: screenshooter_shoot\n");
+        fprintf(stderr, "[screenshot] fail: screenshooter_shoot\n"); /* LCOV_EXCL_LINE */
         goto fail;
      }
 
@@ -1440,6 +1912,10 @@ efl_util_screenshot_take_tbm_surface(efl_util_screenshot_h screenshot)
    /* reset shot_done for next screenshot */
    screenshot->shot_done = EINA_FALSE;
 
+   set_last_result(EFL_UTIL_ERROR_NONE);
+
+   _screenshot_mutex_unlock();
+
    return t_surface;
 
 fail:
@@ -1450,5 +1926,37 @@ fail:
 
    set_last_result(EFL_UTIL_ERROR_SCREENSHOT_EXECUTION_FAIL);
 
+   _screenshot_mutex_unlock();
+
    return NULL;
 }
+
+API int
+efl_util_screenshot_set_auto_rotation(efl_util_screenshot_h screenshot, int set)
+{
+   if (!screenshot || (screenshot != g_screenshot))
+     return EFL_UTIL_ERROR_INVALID_PARAMETER;
+
+   if (!(set == 0 || set == 1))
+     return EFL_UTIL_ERROR_INVALID_PARAMETER;
+
+   if (set)
+     g_screenshot->auto_rotation = EINA_TRUE;
+   else
+     g_screenshot->auto_rotation = EINA_FALSE;
+
+   tizen_screenshooter_set_oneshot_auto_rotation(_eflutil.wl.shot.tz_screenshooter, g_screenshot->auto_rotation);
+
+   return EFL_UTIL_ERROR_NONE;
+}
+
+API int
+efl_util_screenshot_get_auto_rotation(efl_util_screenshot_h screenshot, int *set)
+{
+   if (!screenshot || (screenshot != g_screenshot) || !set)
+     return EFL_UTIL_ERROR_INVALID_PARAMETER;
+
+   *set = g_screenshot->auto_rotation;
+
+   return EFL_UTIL_ERROR_NONE;
+}