Add listeners for tizen_input_device
[platform/core/api/efl-util.git] / src / efl_util.c
index ad213a2..0d977d2 100644 (file)
 #include <tbm_surface_internal.h>
 #include <Elementary.h>
 #include <Ecore_Evas.h>
+#include <pthread.h>
 
-#if X11
-#include <X11/Xlib.h>
-#include <X11/extensions/Xvlib.h>
-#include <X11/extensions/Xvproto.h>
-#include <X11/extensions/Xdamage.h>
-#include <dri2.h>
-#include <Ecore_X.h>
-#include <utilX.h>
-#endif /* end of X11 */
-
-#if WAYLAND
 #include <Ecore_Wayland.h>
 #include <wayland-client.h>
 #include <wayland-tbm-client.h>
 #include <tizen-extension-client-protocol.h>
 #include <screenshooter-client-protocol.h>
-#endif /* end of WAYLAND */
+
+#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
@@ -63,7 +62,6 @@ typedef struct _Efl_Util_Callback_Info
    void *data;
 } Efl_Util_Callback_Info;
 
-#if WAYLAND
 typedef struct _Efl_Util_Wl_Surface_Lv_Info
 {
    void *surface; /* wl_surface */
@@ -80,31 +78,31 @@ typedef struct _Efl_Util_Wl_Surface_Scr_Mode_Info
    uint32_t state;
 } Efl_Util_Wl_Surface_Scr_Mode_Info;
 
+typedef struct _Efl_Util_Wl_Surface_Brightness_Info
+{
+   void *surface; /* wl_surface */
+   int brightness;
+   Eina_Bool wait_for_done;
+   uint32_t state;
+} Efl_Util_Wl_Surface_Brightness_Info;
+
 typedef struct _Efl_Util_Wl_Output_Info
 {
     struct wl_output *output;
     int offset_x, offset_y, width, height;
 } Efl_Util_Wl_Output_Info;
-#endif
 
 typedef struct _Efl_Util_Data
 {
-#if X11
-   /* x11 related stuffs */
-   struct
-   {
-      Eina_Bool init;
-      Ecore_Event_Handler *handler; /* x11 client message handler */
-      Ecore_X_Display *dpy;
-   } x11;
-#endif /* end of X11 */
-
-#if WAYLAND
    /* wayland related stuffs */
    struct
    {
       Eina_Bool init;
+      int ref_count;
+
       struct wl_display *dpy;
+      struct wl_registry *reg;
+
       struct wl_event_queue *queue;
 
       struct
@@ -115,17 +113,25 @@ 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
+      {
+         struct tizen_display_policy *proto;
+         Eina_Hash *hash_brightness;
+      } display_policy;
    } wl;
-#endif /* end of WAYLAND */
 
    struct
    {
@@ -136,22 +142,14 @@ typedef struct _Efl_Util_Data
 
 static Efl_Util_Data _eflutil =
 {
-#if X11
    {
       EINA_FALSE,
-      NULL,
-      NULL
-   },
-#endif /* end of X11 */
-#if WAYLAND
-   {
-      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 */
    },
-#endif /* end of WAYLAND */
    {
       { NULL, 0 }, /* handler for notification level */
       { NULL, 0 }  /* handler for screen mode */
@@ -162,15 +160,13 @@ static Eina_Bool               _cb_info_add(Evas_Object *win, Efl_Util_Cb cb, vo
 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);
-#if X11
-static Efl_Util_Callback_Info *_cb_info_find_by_xwin(unsigned int xwin, int idx);
-static Eina_Bool               _cb_x11_client_msg(void *data, int type, void *event);
-static Eina_Bool               _x11_init(void);
-#endif /* end of X11 */
-#if WAYLAND
 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);
@@ -180,11 +176,17 @@ 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);
 
 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);
 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 =
 {
@@ -192,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,
@@ -202,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 =
@@ -212,7 +221,17 @@ struct tizen_input_device_manager_listener _wl_tz_devmgr_listener =
    _cb_block_expired
 };
 
-#endif /* end of WAYLAND */
+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,
+};
 
 static Eina_Bool
 _cb_info_add(Evas_Object *win,
@@ -242,13 +261,6 @@ _cb_info_add(Evas_Object *win,
       = eina_list_append(_eflutil.cb_handler[idx].info_list,
                          info);
 
-#if X11
-   if (!_eflutil.x11.handler)
-     _eflutil.x11.handler = ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE,
-                                                    _cb_x11_client_msg,
-                                                    NULL);
-#endif /* end of X11 */
-
    return EINA_TRUE;
 }
 
@@ -266,15 +278,6 @@ _cb_info_del_by_win(Evas_Object *win,
                          info);
    free(info);
 
-#if X11
-   unsigned int count = eina_list_count(_eflutil.cb_handler[idx].info_list);
-   if ((count == 0) && (_eflutil.x11.handler))
-     {
-        ecore_event_handler_del(_eflutil.x11.handler);
-        _eflutil.x11.handler = NULL;
-     }
-#endif
-
    return EINA_TRUE;
 }
 
@@ -300,121 +303,124 @@ _cb_info_find_by_win(Evas_Object *win,
    return NULL;
 }
 
-#if X11
-static Efl_Util_Callback_Info *
-_cb_info_find_by_xwin(unsigned int xwin,
-                      int idx)
+static Eina_Bool
+_wl_init(void)
 {
-   Eina_List *l, *ll;
-   Efl_Util_Callback_Info *info;
-   unsigned int xwin2;
+   _eflutil.wl.ref_count++;
 
-   l = _cb_info_list_get(idx);
-   EINA_LIST_FOREACH(l, ll, info)
-     {
-        xwin2 = elm_win_xwindow_get(info->win);
-        if (xwin == xwin2) return info;
-     }
+   if (_eflutil.wl.init) return EINA_TRUE;
 
-   return NULL;
-}
+   ecore_wl_init(NULL);
 
-static Eina_Bool
-_cb_x11_client_msg(void *data,
-                   int type,
-                   void *event)
-{
-   Ecore_X_Event_Client_Message *ev;
-   Ecore_X_Window xwin;
-   Efl_Util_Callback_Info *info;
+   _eflutil.wl.dpy = ecore_wl_display_get();
+   EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.dpy, fail);
 
-   ev = event;
-   if (!ev) return ECORE_CALLBACK_PASS_ON;
+   _eflutil.wl.queue = wl_display_create_queue(_eflutil.wl.dpy);
+   EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.queue, fail);
 
-   xwin = ev->win;
-   if (xwin == 0) return ECORE_CALLBACK_PASS_ON;
+   _eflutil.wl.reg = wl_display_get_registry(_eflutil.wl.dpy);
+   EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.reg, fail);
 
-   if (ev->message_type == _eflutil.cb_handler[CBH_NOTI_LEV].atom)
-     {
-        info = _cb_info_find_by_xwin(xwin, CBH_NOTI_LEV);
+   wl_proxy_set_queue((struct wl_proxy*)_eflutil.wl.reg, _eflutil.wl.queue);
+   wl_registry_add_listener(_eflutil.wl.reg, &_wl_reg_listener, NULL);
 
-        /* permission denied */
-        if ((ev->data.l[1] == 0) &&
-            (info) &&
-            (info->cb))
-          {
-             info->cb(info->win,
-                      EFL_UTIL_ERROR_PERMISSION_DENIED,
-                      info->data);
-          }
-     }
-   else if (ev->message_type == _eflutil.cb_handler[CBH_SCR_MODE].atom)
+   _eflutil.wl.init = EINA_TRUE;
+
+   return EINA_TRUE;
+fail:
+   if (_eflutil.wl.queue)
      {
-        info = _cb_info_find_by_xwin(xwin, CBH_SCR_MODE);
+        wl_event_queue_destroy(_eflutil.wl.queue);
+        _eflutil.wl.queue = NULL;
+     }
 
-        /* permission denied */
-        if ((ev->data.l[1] == 0) &&
-            (info) &&
-            (info->cb))
-          {
-             info->cb(info->win,
-                      EFL_UTIL_ERROR_PERMISSION_DENIED,
-                      info->data);
-          }
+   if (_eflutil.wl.reg)
+     {
+        wl_registry_destroy(_eflutil.wl.reg);
+        _eflutil.wl.reg = NULL;
      }
-   return ECORE_CALLBACK_PASS_ON;
+
+   _eflutil.wl.dpy = NULL;
+
+   ecore_wl_shutdown();
+   return EINA_FALSE;
 }
 
-static Eina_Bool
-_x11_init(void)
+static void
+_wl_shutdown(void)
 {
-   if (_eflutil.x11.init) return EINA_TRUE;
-
-   _eflutil.x11.dpy = ecore_x_display_get();
-   EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil.x11.dpy, EINA_FALSE);
+   Eina_List *l, *ll;
+   struct tizen_input_device *data;
+   Efl_Util_Wl_Output_Info *output;
 
-   _eflutil.x11.init = EINA_TRUE;
+   if (!_eflutil.wl.init) return;
 
-   return EINA_TRUE;
-}
-#endif /* end of X11 */
+   _eflutil.wl.ref_count--;
+   if (_eflutil.wl.ref_count > 0)
+     return;
 
-#if WAYLAND
-static Eina_Bool
-_wl_init(void)
-{
-   struct wl_registry *reg = NULL;
+   // tizen_policy
+   if (_eflutil.wl.policy.proto)
+     tizen_policy_destroy(_eflutil.wl.policy.proto);
+   _eflutil.wl.policy.proto = NULL;
 
-   if (_eflutil.wl.init) return EINA_TRUE;
+   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;
 
-   ecore_wl_init(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;
 
-   _eflutil.wl.dpy = ecore_wl_display_get();
-   EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.dpy, fail);
+   // screenshooter
+   if (_eflutil.wl.shot.screenshooter)
+     screenshooter_destroy(_eflutil.wl.shot.screenshooter);
+   _eflutil.wl.shot.screenshooter = NULL;
 
-   _eflutil.wl.queue = wl_display_create_queue(_eflutil.wl.dpy);
-   EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.queue, fail);
+   // 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;
 
-   reg = wl_display_get_registry(_eflutil.wl.dpy);
-   EINA_SAFETY_ON_NULL_GOTO(reg, fail);
+   // tizen_display_policy
+   if (_eflutil.wl.display_policy.proto)
+     tizen_display_policy_destroy(_eflutil.wl.display_policy.proto);
+   _eflutil.wl.display_policy.proto = NULL;
 
-   wl_proxy_set_queue((struct wl_proxy*)reg, _eflutil.wl.queue);
-   wl_registry_add_listener(reg, &_wl_reg_listener, NULL);
+   eina_hash_free(_eflutil.wl.display_policy.hash_brightness);
+   _eflutil.wl.display_policy.hash_brightness = NULL;
 
-   _eflutil.wl.init = EINA_TRUE;
+   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;
+     }
 
-   return EINA_TRUE;
-fail:
    if (_eflutil.wl.queue)
      {
         wl_event_queue_destroy(_eflutil.wl.queue);
         _eflutil.wl.queue = NULL;
      }
 
-   if (reg)
-     wl_registry_destroy(reg);
+   _eflutil.wl.dpy = NULL;
+   _eflutil.wl.init = EINA_FALSE;
+
    ecore_wl_shutdown();
-   return EINA_FALSE;
 }
 
 static void
@@ -474,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,
@@ -507,26 +530,107 @@ _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);
         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);
+        if (!_eflutil.wl.display_policy.proto) return;
+
+        tizen_display_policy_add_listener(_eflutil.wl.display_policy.proto,
+                                          &_wl_tz_display_policy_listener,
+                                          NULL);
+
+        _eflutil.wl.display_policy.hash_brightness = eina_hash_pointer_new(free);
+     }
 
+}
+/* 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 *
@@ -561,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,
@@ -591,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,
@@ -626,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)
 {
 }
@@ -638,6 +746,29 @@ 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,
+                                 struct wl_surface *surface,
+                                 int32_t brightness,
+                                 uint32_t state)
+{
+   Efl_Util_Wl_Surface_Brightness_Info *brightness_info;
+
+   brightness_info = eina_hash_find(_eflutil.wl.display_policy.hash_brightness, &surface);
+   if (brightness_info)
+     {
+        brightness_info->brightness = brightness;
+        brightness_info->wait_for_done = EINA_FALSE;
+        brightness_info->state = state;
+     }
+}
+
 static void
 _cb_window_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
@@ -648,60 +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);
-}
-#endif /* end of WAYLAND */
-
-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_hash_population(_eflutil.wl.policy.hash_noti_lv);
 
-#if X11
-   Ecore_X_Window_Type window_type;
-   Ecore_X_Window xwin;
+   if (eina_hash_population(_eflutil.wl.policy.hash_noti_lv) == 0)
+     {
+        _wl_shutdown();
+     }
+}
 
-   res = _x11_init();
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
+static Eina_Bool
+_init_tizen_policy_proto(void)
+{
+   int ret = 0;
 
-   xwin = elm_win_xwindow_get(window);
-   if (xwin)
+   if (!_eflutil.wl.policy.proto)
      {
-        if (ecore_x_netwm_window_type_get(xwin, &window_type) == EINA_TRUE)
-          {
-             // success to get window type
-             if (window_type != ECORE_X_WINDOW_TYPE_NOTIFICATION)
-               {
-                  // given EFL window's type is not notification type.
-                  return EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE;
-               }
-          }
-        else
-          return EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE;
+        ret = _wl_init();
+        EINA_SAFETY_ON_FALSE_RETURN_VAL(ret, EINA_FALSE);
 
-        utilx_set_system_notification_level(_eflutil.x11.dpy,
-                                            xwin,
-                                            level);
-        return EFL_UTIL_ERROR_NONE;
+        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 EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE;
-#endif /* end of X11 */
+   return EINA_TRUE;
+}
 
-#if WAYLAND
+API int
+efl_util_set_notification_window_level(Evas_Object *window,
+                                       efl_util_notification_level_e level)
+{
+   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);
@@ -714,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,
@@ -773,66 +910,21 @@ efl_util_set_notification_window_level(Evas_Object *window,
      }
 
    return EFL_UTIL_ERROR_NONE;
-#endif /* end of WAYLAND */
 }
 
 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);
-
-#if X11
-   Ecore_X_Window_Type window_type;
-   Utilx_Notification_Level utilx_level;
-   Ecore_X_Window xwin;
-
-   res = _x11_init();
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
-
-   xwin = elm_win_xwindow_get(window);
-   if (xwin)
-     {
-        if (ecore_x_netwm_window_type_get(xwin, &window_type) == EINA_TRUE)
-          {
-             // success to get window type
-             if (window_type != ECORE_X_WINDOW_TYPE_NOTIFICATION)
-               {
-                  // given EFL window's type is not notification type.
-                  return EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE;
-               }
-
-             utilx_level = utilx_get_system_notification_level(_eflutil.x11.dpy, xwin);
-             if (utilx_level == UTILX_NOTIFICATION_LEVEL_LOW)
-               *level = EFL_UTIL_NOTIFICATION_LEVEL_1;
-             else if(utilx_level == UTILX_NOTIFICATION_LEVEL_NORMAL)
-               *level = EFL_UTIL_NOTIFICATION_LEVEL_2;
-             else if(utilx_level == UTILX_NOTIFICATION_LEVEL_HIGH)
-               *level = EFL_UTIL_NOTIFICATION_LEVEL_3;
-             else
-               return EFL_UTIL_ERROR_INVALID_PARAMETER;
-          }
-        else
-          return EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE;
-
-        return EFL_UTIL_ERROR_NONE;
-     }
-
-   return EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE;
-#endif /* end of X11 */
-
-#if WAYLAND
+   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);
@@ -845,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)
      {
@@ -891,7 +983,6 @@ efl_util_get_notification_window_level(Evas_Object *window,
      *level = EFL_UTIL_NOTIFICATION_LEVEL_DEFAULT;
 
    return EFL_UTIL_ERROR_NONE;
-#endif /* end of WAYLAND */
 }
 
 API int
@@ -899,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);
@@ -910,17 +1004,15 @@ efl_util_set_notification_window_level_error_cb(Evas_Object *window,
                       CBH_NOTI_LEV);
    if (!ret) return EFL_UTIL_ERROR_OUT_OF_MEMORY;
 
-#if X11
-   if (!_eflutil.cb_handler[CBH_NOTI_LEV].atom)
-     _eflutil.cb_handler[CBH_NOTI_LEV].atom = ecore_x_atom_get("_E_NOTIFICATION_LEVEL_ACCESS_RESULT");
-#endif /* end of X11 */
-
    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);
@@ -935,67 +1027,28 @@ 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);
 
-#if X11
-   Ecore_X_Window xwin;
-   Utilx_Opaque_State state;
-   int ret;
-
-   res = _x11_init();
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
-
-   xwin = elm_win_xwindow_get(window);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(xwin > 0, EFL_UTIL_ERROR_INVALID_PARAMETER);
-
-   if (opaque)
-     state = UTILX_OPAQUE_STATE_ON;
-   else
-     state = UTILX_OPAQUE_STATE_OFF;
-
-   ret = utilx_set_window_opaque_state(_eflutil.x11.dpy,
-                                       xwin,
-                                       state);
-
-   if (!ret)
-     return EFL_UTIL_ERROR_INVALID_PARAMETER;
-   else
-     return EFL_UTIL_ERROR_NONE;
-#endif /* end of X11 */
-
-#if WAYLAND
-   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;
+   wlwin = elm_win_wl_window_get(window);
+   if (!wlwin)
+      return EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE;
 
    surface  = ecore_wl_window_surface_get(wlwin);
    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;
-#endif /* end of WAYLAND */
 }
 
 API int
@@ -1007,109 +1060,68 @@ efl_util_set_window_screen_mode(Evas_Object *window,
                                     (mode <= EFL_UTIL_SCREEN_MODE_ALWAYS_ON)),
                                    EFL_UTIL_ERROR_INVALID_PARAMETER);
 
-#if X11
-   Evas *e;
-   Ecore_Evas *ee;
-   int id;
-
-   e = evas_object_evas_get(window);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(e, EFL_UTIL_ERROR_INVALID_PARAMETER);
-
-   ee = ecore_evas_ecore_evas_get(e);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ee, EFL_UTIL_ERROR_INVALID_PARAMETER);
-
-   id = ecore_evas_aux_hint_id_get(ee, "wm.policy.win.lcd.lock");
-   if (mode == EFL_UTIL_SCREEN_MODE_ALWAYS_ON)
-     {
-        if (id == -1)
-          ecore_evas_aux_hint_add(ee, "wm.policy.win.lcd.lock", "1");
-        else
-          ecore_evas_aux_hint_val_set(ee, id, "1");
-     }
-   else if (mode == EFL_UTIL_SCREEN_MODE_DEFAULT)
-     {
-        if (id == -1)
-          ecore_evas_aux_hint_add(ee, "wm.policy.win.lcd.lock", "0");
-        else
-          ecore_evas_aux_hint_val_set(ee, id, "0");
-     }
-   else
-     return EFL_UTIL_ERROR_INVALID_PARAMETER;
-
-   return EFL_UTIL_ERROR_NONE;
-#endif /* end of X11 */
-
-#if WAYLAND
    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;
-#endif /* end of WAYLAND */
+
+   return EFL_UTIL_ERROR_NONE;
 }
 
 API int
@@ -1119,88 +1131,65 @@ 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);
 
-#if X11
-   Evas *e;
-   Ecore_Evas *ee;
-   const char *str;
-   int id;
-
-   e = evas_object_evas_get(window);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(e, EFL_UTIL_ERROR_INVALID_PARAMETER);
-
-   ee = ecore_evas_ecore_evas_get(e);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ee, EFL_UTIL_ERROR_INVALID_PARAMETER);
-
-   id = ecore_evas_aux_hint_id_get(ee, "wm.policy.win.lcd.lock");
-   EINA_SAFETY_ON_TRUE_RETURN_VAL((id == -1), EFL_UTIL_ERROR_INVALID_PARAMETER);
-
-   str = ecore_evas_aux_hint_val_get(ee, id);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(str, EFL_UTIL_ERROR_INVALID_PARAMETER);
-
-   if (strncmp(str, "1", strlen("1")) == 0)
-     *mode = EFL_UTIL_SCREEN_MODE_ALWAYS_ON;
-   else
-     *mode = EFL_UTIL_SCREEN_MODE_DEFAULT;
-
-   return EFL_UTIL_ERROR_NONE;
-#endif /* end of X11 */
-
-#if WAYLAND
    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;
-#endif /* end of WAYLAND */
+     {
+        *mode = EFL_UTIL_SCREEN_MODE_DEFAULT;
+        return EFL_UTIL_ERROR_INVALID_PARAMETER;
+     }
 }
 
+#ifndef TIZEN_WEARABLE
 API int
 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);
@@ -1212,17 +1201,15 @@ efl_util_set_window_screen_mode_error_cb(Evas_Object *window,
                       CBH_SCR_MODE);
    if (!ret) return EFL_UTIL_ERROR_OUT_OF_MEMORY;
 
-#if X11
-   if (!_eflutil.cb_handler[CBH_SCR_MODE].atom)
-     _eflutil.cb_handler[CBH_SCR_MODE].atom = ecore_x_atom_get("_E_SCREEN_MODE_ACCESS_RESULT");
-#endif /* end of X11 */
-
    return EFL_UTIL_ERROR_NONE;
 }
 
 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);
@@ -1232,34 +1219,184 @@ efl_util_unset_window_screen_mode_error_cb(Evas_Object *window)
 
    return EFL_UTIL_ERROR_NONE;
 }
+#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 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);
+
+   wlwin = elm_win_wl_window_get(window);
+   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)
+     {
+        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;
+}
+
+API int
+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 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);
+
+   wlwin = elm_win_wl_window_get(window);
+   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)
+     {
+        if (brightness_info->wait_for_done)
+          {
+             while (brightness_info->wait_for_done)
+               {
+                  ecore_wl_flush();
+                  wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
+               }
+          }
+         *brightness = brightness_info->brightness;
+     }
+   else
+     *brightness = -1;
+
+   return EFL_UTIL_ERROR_NONE;
+}
+
 
 struct _efl_util_inputgen_h
 {
    unsigned int init_type;
 };
 
-#if WAYLAND
 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 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,
@@ -1269,13 +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)
 {
    ;
 }
-#endif /* end of WAYLAND */
+/* 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)
@@ -1296,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;
@@ -1316,7 +1484,7 @@ efl_util_input_initialize_generator(efl_util_input_device_type_e dev_type)
      }
 
    inputgen_h->init_type |= dev_type;
-#if WAYLAND
+
    ret = _wl_init();
    if (ret == (int)EINA_FALSE)
      {
@@ -1338,7 +1506,6 @@ efl_util_input_initialize_generator(efl_util_input_device_type_e dev_type)
    set_last_result(ret);
    if (ret != TIZEN_INPUT_DEVICE_MANAGER_ERROR_NONE)
      goto out;
-#endif
 
    return inputgen_h;
 
@@ -1360,7 +1527,6 @@ efl_util_input_deinitialize_generator(efl_util_inputgen_h inputgen_h)
    free(inputgen_h);
    inputgen_h = NULL;
 
-#if WAYLAND
    EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil.wl.devmgr.devicemgr, EFL_UTIL_ERROR_INVALID_PARAMETER);
 
    tizen_input_device_manager_deinit_generator(_eflutil.wl.devmgr.devicemgr);
@@ -1370,7 +1536,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;
-#endif
+
+   _wl_shutdown();
 
    return ret;
 }
@@ -1385,7 +1552,6 @@ efl_util_input_generate_key(efl_util_inputgen_h inputgen_h, const char *key_name
    EINA_SAFETY_ON_FALSE_RETURN_VAL(pressed == 0 || pressed == 1, EFL_UTIL_ERROR_INVALID_PARAMETER);
    EINA_SAFETY_ON_FALSE_RETURN_VAL(inputgen_h->init_type & EFL_UTIL_INPUT_DEVTYPE_KEYBOARD, EFL_UTIL_ERROR_NO_SUCH_DEVICE);
 
-#if WAYLAND
    EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil.wl.devmgr.devicemgr, EFL_UTIL_ERROR_INVALID_PARAMETER);
 
    tizen_input_device_manager_generate_key(_eflutil.wl.devmgr.devicemgr, key_name, pressed);
@@ -1395,7 +1561,6 @@ efl_util_input_generate_key(efl_util_inputgen_h inputgen_h, const char *key_name
 
    ret = _efl_util_input_convert_input_generator_error(_eflutil.wl.devmgr.request_notified);
    _eflutil.wl.devmgr.request_notified = -1;
-#endif
 
    return ret;
 }
@@ -1405,16 +1570,13 @@ efl_util_input_generate_touch(efl_util_inputgen_h inputgen_h, int idx,
                               efl_util_input_touch_type_e touch_type, int x, int y)
 {
    int ret;
-#if WAYLAND
    enum tizen_input_device_manager_pointer_event_type type;
-#endif
 
    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);
 
-#if WAYLAND
    EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil.wl.devmgr.devicemgr, EFL_UTIL_ERROR_INVALID_PARAMETER);
 
    switch(touch_type)
@@ -1439,310 +1601,169 @@ efl_util_input_generate_touch(efl_util_inputgen_h inputgen_h, int idx,
 
    ret = _efl_util_input_convert_input_generator_error(_eflutil.wl.devmgr.request_notified);
    _eflutil.wl.devmgr.request_notified = -1;
-#endif
 
    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;
    int height;
 
-#if X11
-   Ecore_X_Display *dpy;
-   int internal_display;
-   int screen;
-   Window root;
-   Pixmap pixmap;
-   GC gc;
-   Atom atom_capture;
-
-   /* port */
-   int port;
-
-   /* damage */
-   Damage   damage;
-   int      damage_base;
-
-   /* dri2 */
-   int eventBase, errorBase;
-   int dri2Major, dri2Minor;
-   char *driver_name, *device_name;
-   drm_magic_t magic;
-
-   /* drm */
-   int drm_fd;
-#endif
-
    Eina_Bool shot_done;
 
    /* 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;
 
-#if X11
-#define FOURCC(a,b,c,d) (((unsigned)d&0xff)<<24 | ((unsigned)c&0xff)<<16 | ((unsigned)b&0xff)<<8 | ((unsigned)a&0xff))
-#define FOURCC_RGB32    FOURCC('R','G','B','4')
-#define TIMEOUT_CAPTURE 3
-
-/* x error handling */
-static Bool g_efl_util_x_error_caught;
-
-static int
-_efl_util_screenshot_x_error_handle(Display *dpy, XErrorEvent *ev)
-{
-   if (!g_screenshot || (dpy != g_screenshot->dpy))
-     return 0;
-
-   g_efl_util_x_error_caught = True;
-
-   return 0;
-}
-
-static int
-_efl_util_screenshot_get_port(Display *dpy, unsigned int id, Window win)
+static Eina_Bool
+_screenshot_mutex_init(void)
 {
-   unsigned int ver, rev, req_base, evt_base, err_base;
-   unsigned int adaptors;
-   XvAdaptorInfo *ai = NULL;
-   XvImageFormatValues *fo = NULL;
-   int formats;
-   int i, j, p;
-
-   if (XvQueryExtension(dpy, &ver, &rev, &req_base, &evt_base, &err_base) != Success)
-     {
-        fprintf(stderr, "[screenshot] fail: no XV extension. \n");
-        return -1;
-     }
+   if (shot_mutex_init)
+     return EINA_TRUE;
 
-   if (XvQueryAdaptors(dpy, win, &adaptors, &ai) != Success)
+   if (pthread_mutex_init(&shot_lock, NULL))
      {
-        fprintf(stderr, "[screenshot] fail: query adaptors. \n");
-        return -1;
+        fprintf(stderr, "[screenshot] fail: mutex init"); /*LCOV_EXCL_LINE*/
+        return EINA_FALSE; /*LCOV_EXCL_LINE*/
      }
 
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ai, -1);
+   shot_mutex_init = EINA_TRUE;
 
-   for (i = 0; i < adaptors; i++)
-     {
-        int support_format = False;
-
-        if (!(ai[i].type & XvInputMask) ||
-            !(ai[i].type & XvStillMask))
-          continue;
-
-        p = ai[i].base_id;
-
-        fo = XvListImageFormats(dpy, p, &formats);
-        for (j = 0; j < formats; j++)
-          if (fo[j].id == (int)id)
-            support_format = True;
-
-        if (fo)
-          XFree(fo);
+   return EINA_TRUE;
+}
 
-        if (!support_format)
-          continue;
+static Eina_Bool
+_screenshot_mutex_destory(void)
+{
+   if (!shot_mutex_init)
+     return EINA_TRUE;
 
-        for (; p < ai[i].base_id + ai[i].num_ports; p++)
-          {
-             if (XvGrabPort(dpy, p, 0) == Success)
-               {
-                  XvFreeAdaptorInfo(ai);
-                  return p;
-               }
-          }
+   if (pthread_mutex_destroy(&shot_lock))
+     {
+        fprintf(stderr, "[screenshot] fail: mutex destory"); /*LCOV_EXCL_LINE*/
+        return EINA_FALSE; /*LCOV_EXCL_LINE*/
      }
 
-   XvFreeAdaptorInfo(ai);
-
-   XSync(dpy, False);
+   shot_mutex_init = EINA_FALSE;
 
-   return -1;
+   return EINA_TRUE;
 }
 
-static int
-_efl_util_screenshot_get_best_size(Display *dpy, int port, int width, int height, unsigned int *best_width, unsigned int *best_height)
+void
+_screenshot_mutex_lock(void)
 {
-   XErrorHandler old_handler = NULL;
-
-   Atom atom_capture = XInternAtom(dpy, "_USER_WM_PORT_ATTRIBUTE_CAPTURE", False);
-
-   g_efl_util_x_error_caught = False;
-   old_handler = XSetErrorHandler(_efl_util_screenshot_x_error_handle);
-
-   XvSetPortAttribute(dpy, port, atom_capture, 1);
-   XSync(dpy, False);
-
-   g_efl_util_x_error_caught = False;
-   XSetErrorHandler(old_handler);
+   if (!_screenshot_mutex_init())
+     return;
 
-   XvQueryBestSize(dpy, port, 0, 0, 0, width, height, best_width, best_height);
-   if (best_width <= 0 || best_height <= 0)
-     return 0;
+   pthread_mutex_lock(&shot_lock);
+}
 
-   return 1;
+void
+_screenshot_mutex_unlock(void)
+{
+   pthread_mutex_unlock(&shot_lock);
 }
-#endif
 
 API efl_util_screenshot_h
 efl_util_screenshot_initialize(int width, int height)
 {
-#if X11
    efl_util_screenshot_h screenshot = NULL;
-   int depth = 0;
-   int damage_err_base = 0;
-   unsigned int best_width = 0;
-   unsigned int best_height = 0;
+   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);
 
-   if (g_screenshot != NULL)
+   _screenshot_mutex_lock();
+
+   if (!_eflutil.wl.shot.screenshooter)
      {
-        if (g_screenshot->width != width || g_screenshot->height != height)
+        ret = _wl_init();
+        if (ret == (int)EINA_FALSE)
           {
-             // TODO: recreate pixmap and update information
-             if (!_efl_util_screenshot_get_best_size(screenshot->dpy, screenshot->port, width, height, &best_width, &best_height))
-               {
-                  set_last_result(EFL_UTIL_ERROR_SCREENSHOT_INIT_FAIL);
-                  return NULL;
-               }
-
-             g_screenshot->width = width;
-             g_screenshot->height = height;
+             set_last_result(EFL_UTIL_ERROR_INVALID_PARAMETER);
+             _screenshot_mutex_unlock();
+             return NULL;
           }
+        wl_display_roundtrip_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
 
-        return g_screenshot;
-     }
-
-   screenshot = calloc(1, sizeof(struct _efl_util_screenshot_h));
-   EINA_SAFETY_ON_NULL_GOTO(screenshot, fail_memory);
-
-   /* set dpy */
-   screenshot->dpy = ecore_x_display_get();
-   if (!screenshot->dpy)
-     {
-        screenshot->dpy = XOpenDisplay(0);
-        EINA_SAFETY_ON_NULL_GOTO(screenshot, fail_init);
-
-        /* for XCloseDisplay at denitialization */
-        screenshot->internal_display = 1;
-     }
-
-   /* set screen */
-   screenshot->screen = DefaultScreen(screenshot->dpy);
-
-   /* set root window */
-   screenshot->root = DefaultRootWindow(screenshot->dpy);
-
-   /* initialize capture adaptor */
-   screenshot->port = _efl_util_screenshot_get_port(screenshot->dpy, FOURCC_RGB32, screenshot->root);
-   EINA_SAFETY_ON_FALSE_GOTO(screenshot->port > 0, fail_init);
-
-   /* get the best size */
-   _efl_util_screenshot_get_best_size(screenshot->dpy, screenshot->port, width, height, &best_width, &best_height);
-   EINA_SAFETY_ON_FALSE_GOTO(best_width > 0, fail_init);
-   EINA_SAFETY_ON_FALSE_GOTO(best_height > 0, fail_init);
-
-   /* set the width and the height */
-   screenshot->width = best_width;
-   screenshot->height = best_height;
-
-   /* create a pixmap */
-   depth = DefaultDepth(screenshot->dpy, screenshot->screen);
-   screenshot->pixmap = XCreatePixmap(screenshot->dpy, screenshot->root, screenshot->width, screenshot->height, depth);
-   EINA_SAFETY_ON_FALSE_GOTO(screenshot->pixmap > 0, fail_init);
-
-   screenshot->gc = XCreateGC(screenshot->dpy, screenshot->pixmap, 0, 0);
-   EINA_SAFETY_ON_NULL_GOTO(screenshot->gc, fail_init);
-
-   XSetForeground(screenshot->dpy, screenshot->gc, 0xFF000000);
-   XFillRectangle(screenshot->dpy, screenshot->pixmap, screenshot->gc, 0, 0, width, height);
-
-   /* initialize damage */
-   if (!XDamageQueryExtension(screenshot->dpy, &screenshot->damage_base, &damage_err_base))
-     goto fail_init;
+        display_wrapper = wl_proxy_create_wrapper(_eflutil.wl.dpy);
+        EINA_SAFETY_ON_NULL_GOTO(display_wrapper, fail_init);
 
-   screenshot->damage = XDamageCreate(screenshot->dpy, screenshot->pixmap, XDamageReportNonEmpty);
-   EINA_SAFETY_ON_FALSE_GOTO(screenshot->damage > 0, fail_init);
+        _eflutil.wl.shot.queue = wl_display_create_queue(_eflutil.wl.dpy);
+        EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.shot.queue, fail_init);
 
-   /* initialize dri3 and dri2 */
-   if (!DRI2QueryExtension(screenshot->dpy, &screenshot->eventBase, &screenshot->errorBase))
-     {
-        fprintf(stderr, "[screenshot] fail: DRI2QueryExtention\n");
-        goto fail_init;
-     }
+        reg = wl_display_get_registry(display_wrapper);
+        EINA_SAFETY_ON_NULL_GOTO(reg, fail_init);
 
-   if (!DRI2QueryVersion(screenshot->dpy, &screenshot->dri2Major, &screenshot->dri2Minor))
-     {
-        fprintf(stderr, "[screenshot] fail: DRI2QueryVersion\n");
-        goto fail_init;
-     }
+        wl_proxy_set_queue((struct wl_proxy*)reg, _eflutil.wl.shot.queue);
 
-   if (!DRI2Connect(screenshot->dpy, screenshot->root, &screenshot->driver_name, &screenshot->device_name))
-     {
-        fprintf(stderr, "[screenshot] fail: DRI2Connect\n");
-        goto fail_init;
-     }
-
-   screenshot->drm_fd = open(screenshot->device_name, O_RDWR);
-   EINA_SAFETY_ON_FALSE_GOTO(screenshot->drm_fd >= 0, fail_init);
+        wl_registry_add_listener(reg, &_wl_reg_screenshooter_listener, NULL);
 
-   if (drmGetMagic(screenshot->drm_fd, &screenshot->magic))
-     {
-        fprintf(stderr, "[screenshot] fail: drmGetMagic\n");
-        goto fail_init;
-     }
+        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);
 
-   if (!DRI2Authenticate(screenshot->dpy, screenshot->root, screenshot->magic))
-     {
-        fprintf(stderr, "[screenshot] fail: DRI2Authenticate\n");
-        goto 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);
      }
 
-   if (!drmAuthMagic(screenshot->drm_fd, screenshot->magic))
+   if (_eflutil.wl.shot.noti == 0)
      {
-        fprintf(stderr, "[screenshot] fail: drmAuthMagic\n");
+        fprintf(stderr, "[screenshot] fail: privilege error\n"); /* LCOV_EXCL_LINE */
         goto fail_init;
      }
 
-   DRI2CreateDrawable(screenshot->dpy, screenshot->pixmap);
-
-   /* tbm bufmgr */
-   screenshot->bufmgr = tbm_bufmgr_init(screenshot->drm_fd);
-   EINA_SAFETY_ON_NULL_GOTO(screenshot->bufmgr, fail_init);
-
-   XFlush(screenshot->dpy);
-
-   g_screenshot = screenshot;
-   set_last_result(EFL_UTIL_ERROR_NONE);
-
-   return g_screenshot;
-#endif
-
-#if WAYLAND
-   efl_util_screenshot_h screenshot = NULL;
-
-   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);
-        EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.shot.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);
-     }
-
-   EINA_SAFETY_ON_FALSE_GOTO(width > 0, fail_param);
-   EINA_SAFETY_ON_FALSE_GOTO(height > 0, fail_param);
-
    if (g_screenshot)
      {
         if (g_screenshot->width != width || g_screenshot->height != height)
@@ -1751,6 +1772,8 @@ efl_util_screenshot_initialize(int width, int height)
              g_screenshot->height = height;
           }
 
+        _screenshot_mutex_unlock();
+
         return g_screenshot;
      }
 
@@ -1759,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);
@@ -1768,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;
-#endif
+
 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;
 }
@@ -1790,236 +1819,79 @@ fail_init:
 API int
 efl_util_screenshot_deinitialize(efl_util_screenshot_h screenshot)
 {
-#if X11
-   if (!screenshot)
-     return EFL_UTIL_ERROR_INVALID_PARAMETER;
-
-   /* tbm bufmgr */
-   if (screenshot->bufmgr)
-     tbm_bufmgr_deinit(screenshot->bufmgr);
-
-   DRI2DestroyDrawable(screenshot->dpy, screenshot->pixmap);
-
-   /* dri2 */
-   if (screenshot->drm_fd)
-     close(screenshot->drm_fd);
-   if (screenshot->driver_name)
-     free(screenshot->driver_name);
-   if (screenshot->device_name)
-     free(screenshot->device_name);
-
-   /* xv */
-   if (screenshot->port > 0 && screenshot->pixmap > 0)
-     XvStopVideo(screenshot->dpy, screenshot->port, screenshot->pixmap);
-
-   /* damage */
-   if (screenshot->damage)
-     XDamageDestroy(screenshot->dpy, screenshot->damage);
-
-   /* gc */
-   if (screenshot->gc)
-     XFreeGC(screenshot->dpy, screenshot->gc);
-
-   /* pixmap */
-   if (screenshot->pixmap > 0)
-     XFreePixmap(screenshot->dpy, screenshot->pixmap);
-
-   /* port */
-   if (screenshot->port > 0)
-     XvUngrabPort(screenshot->dpy, screenshot->port, 0);
-
-   XSync(screenshot->dpy, False);
-
-   /* dpy */
-   if (screenshot->internal_display ==1 && screenshot->dpy)
-     XCloseDisplay(screenshot->dpy);
-
-   free(screenshot);
-   g_screenshot = NULL;
+   _screenshot_mutex_lock();
 
-   return EFL_UTIL_ERROR_NONE;
-#endif
-#if WAYLAND
    if (!screenshot)
-     return EFL_UTIL_ERROR_INVALID_PARAMETER;
-
-   free(screenshot);
-   g_screenshot = NULL;
-
-   if (_eflutil.wl.shot.screenshooter)
-     screenshooter_set_user_data(_eflutil.wl.shot.screenshooter, NULL);
-
-   return EFL_UTIL_ERROR_NONE;
-#endif
-}
-
-
-API tbm_surface_h
-efl_util_screenshot_take_tbm_surface(efl_util_screenshot_h screenshot)
-{
-#if X11
-   XEvent ev = {0,};
-   XErrorHandler old_handler = NULL;
-   unsigned int attachment = DRI2BufferFrontLeft;
-   int nbufs = 0;
-   DRI2Buffer *bufs = NULL;
-   tbm_bo t_bo = NULL;
-   tbm_surface_h t_surface = NULL;
-   int buf_width = 0;
-   int buf_height = 0;
-   tbm_surface_info_s surf_info;
-   int i;
-
-   if (screenshot != g_screenshot)
      {
-        set_last_result(EFL_UTIL_ERROR_INVALID_PARAMETER);
-        return NULL;
+        _screenshot_mutex_unlock();
+        _screenshot_mutex_destory();
+        return EFL_UTIL_ERROR_INVALID_PARAMETER;
      }
 
-   /* for flush other pending requests and pending events */
-   XSync(screenshot->dpy, 0);
-
-   g_efl_util_x_error_caught = False;
-   old_handler = XSetErrorHandler(_efl_util_screenshot_x_error_handle);
-
-   /* dump here */
-   XvPutStill(screenshot->dpy, screenshot->port, screenshot->pixmap, screenshot->gc,
-              0, 0, screenshot->width, screenshot->height,
-              0, 0, screenshot->width, screenshot->height);
-
-   XSync(screenshot->dpy, 0);
+   free(screenshot);
+   g_screenshot = NULL;
 
-   if (g_efl_util_x_error_caught)
+   if (_eflutil.wl.shot.queue)
      {
-        g_efl_util_x_error_caught = False;
-        XSetErrorHandler(old_handler);
-        goto fail;
+        wl_event_queue_destroy(_eflutil.wl.shot.queue);
+        _eflutil.wl.shot.queue = NULL;
      }
 
-   g_efl_util_x_error_caught = False;
-   XSetErrorHandler(old_handler);
-
-   if (XPending(screenshot->dpy))
-     XNextEvent(screenshot->dpy, &ev);
-   else
+   if (_eflutil.wl.shot.screenshooter)
      {
-        int fd = ConnectionNumber(screenshot->dpy);
-        fd_set mask;
-        struct timeval tv;
-        int ret;
-
-        FD_ZERO(&mask);
-        FD_SET(fd, &mask);
-
-        tv.tv_usec = 0;
-        tv.tv_sec = TIMEOUT_CAPTURE;
-
-        ret = select(fd + 1, &mask, 0, 0, &tv);
-        if (ret < 0)
-          fprintf(stderr, "[screenshot] fail: select.\n");
-        else if (ret == 0)
-          fprintf(stderr, "[screenshot] fail: timeout(%d sec)!\n", TIMEOUT_CAPTURE);
-        else if (XPending(screenshot->dpy))
-          XNextEvent(screenshot->dpy, &ev);
-        else
-          fprintf(stderr, "[screenshot] fail: not passed a event!\n");
+        screenshooter_destroy(_eflutil.wl.shot.screenshooter);
+        _eflutil.wl.shot.screenshooter = NULL;
      }
-
-   /* check if the capture is done by xserver and pixmap has got the captured image */
-   if (ev.type == (screenshot->damage_base + XDamageNotify))
+   if (_eflutil.wl.shot.tz_screenshooter)
      {
-        XDamageNotifyEvent *damage_ev = (XDamageNotifyEvent *)&ev;
-        if (damage_ev->drawable == screenshot->pixmap)
-          {
-             /* Get DRI2 FrontLeft buffer of the pixmap */
-             bufs = DRI2GetBuffers(screenshot->dpy, screenshot->pixmap, &buf_width, &buf_height, &attachment, 1, &nbufs);
-             if (!bufs)
-               {
-                  fprintf(stderr, "[screenshot] fail: DRI2GetBuffers\n");
-                  goto fail;
-               }
-
-             t_bo = tbm_bo_import(screenshot->bufmgr, bufs[0].name);
-             if (!t_bo)
-               {
-                  fprintf(stderr, "[screenshot] fail: import tbm_bo!\n");
-                  goto fail;
-               }
-
-             surf_info.width = buf_width;
-             surf_info.height = buf_height;
-             surf_info.format = TBM_FORMAT_XRGB8888;
-             surf_info.bpp = 32;
-             surf_info.size = bufs->pitch * surf_info.height;
-             surf_info.num_planes = 1;
-             for (i = 0; i < surf_info.num_planes; i++)
-               {
-                  surf_info.planes[i].size = bufs->pitch * surf_info.height;
-                  surf_info.planes[i].stride = bufs->pitch;
-                  surf_info.planes[i].offset = 0;
-               }
-             t_surface = tbm_surface_internal_create_with_bos(&surf_info, &t_bo, 1);
-             if (!t_surface)
-               {
-                  fprintf(stderr, "[screenshot] fail: get tbm_surface!\n");
-                  goto fail;
-               }
-
-             tbm_bo_unref(t_bo);
-             free(bufs);
-
-             XDamageSubtract(screenshot->dpy, screenshot->damage, None, None );
-
-             set_last_result(EFL_UTIL_ERROR_NONE);
-
-             return t_surface;
-          }
-
-        XDamageSubtract(screenshot->dpy, screenshot->damage, None, None );
+        tizen_screenshooter_destroy(_eflutil.wl.shot.tz_screenshooter);
+        _eflutil.wl.shot.tz_screenshooter = NULL;
      }
 
-fail:
+   _screenshot_mutex_unlock();
+   _screenshot_mutex_destory();
 
-   if (t_bo)
-     tbm_bo_unref(t_bo);
-   if (bufs)
-     free(bufs);
+   _wl_shutdown();
 
-   set_last_result(EFL_UTIL_ERROR_SCREENSHOT_EXECUTION_FAIL);
+   return EFL_UTIL_ERROR_NONE;
+}
 
-   return NULL;
-#endif
 
-#if WAYLAND
+API tbm_surface_h
+efl_util_screenshot_take_tbm_surface(efl_util_screenshot_h screenshot)
+{
    tbm_surface_h t_surface = NULL;
    struct wl_buffer *buffer = NULL;
    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;
      }
 
@@ -2027,11 +1899,11 @@ fail:
 
    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;
      }
 
@@ -2040,6 +1912,10 @@ fail:
    /* 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:
@@ -2050,6 +1926,37 @@ fail:
 
    set_last_result(EFL_UTIL_ERROR_SCREENSHOT_EXECUTION_FAIL);
 
+   _screenshot_mutex_unlock();
+
    return NULL;
-#endif
+}
+
+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;
 }