#include <Ecore_Evas.h>
#include <pthread.h>
-#include <Ecore_Wayland.h>
+#include <Ecore_Wl2.h>
#include <wayland-client.h>
#include <wayland-tbm-client.h>
#include <tizen-extension-client-protocol.h>
struct
{
Eina_Bool init;
+ Ecore_Wl2_Display *wl2_display;
struct wl_display *dpy;
struct wl_event_queue *queue;
int dpy_fd;
struct
{
+ unsigned int id;
struct tizen_policy *proto;
Eina_Hash *hash_noti_lv;
Eina_Hash *hash_scr_mode;
} devmgr;
struct
{
+ unsigned int id;
struct tizen_display_policy *proto;
Eina_Hash *hash_brightness;
} display_policy;
{
{
EINA_FALSE,
- NULL, NULL,
+ NULL, NULL, NULL,
-1, NULL,
- { NULL, NULL, NULL }, /* tizen_policy protocol */
+ { 0, NULL, NULL, NULL }, /* tizen_policy protocol */
{ NULL, NULL, NULL, NULL, NULL, 0 }, /* screenshooter protocol */
{ NULL, -1 }, /* tizen_input_device_manager protocol */
- { NULL, NULL }, /* display_policy protocol */
+ { 0, NULL, NULL }, /* display_policy protocol */
{ NULL, -1, EINA_FALSE } /* tizen_gesture protocol */
},
{
static void _cb_wl_tz_policy_supported_aux_hints(void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface_resource, struct wl_array *hints, uint32_t num_hints);
static void _cb_wl_tz_policy_allowed_aux_hint(void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface_resource, int id);
static void _cb_wl_tz_policy_aux_message(void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface_resource, const char *key, const char *val, struct wl_array *options);
+static void _cb_wl_conformant_region(void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface, uint32_t conformant_part, uint32_t state, int32_t x, int32_t y, int32_t w, int32_t h, uint32_t serial);
static void _cb_wl_tz_display_policy_brightness_done(void *data, struct tizen_display_policy *tizen_display_policy, struct wl_surface *surface_resource, int32_t brightness, uint32_t state);
_cb_wl_tz_policy_supported_aux_hints,
_cb_wl_tz_policy_allowed_aux_hint,
_cb_wl_tz_policy_aux_message,
+ _cb_wl_conformant_region,
};
struct tizen_input_device_manager_listener _wl_tz_devmgr_listener =
if (_eflutil.wl.init) return EINA_TRUE;
- ecore_wl_init(NULL);
+ ecore_wl2_init();
- _eflutil.wl.dpy = ecore_wl_display_get();
+ _eflutil.wl.wl2_display = ecore_wl2_display_connect(NULL);
+ EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.wl2_display, fail);
+ _eflutil.wl.dpy = ecore_wl2_display_get(_eflutil.wl.wl2_display);
EINA_SAFETY_ON_NULL_GOTO(_eflutil.wl.dpy, fail);
display_wrapper = wl_proxy_create_wrapper(_eflutil.wl.dpy);
_eflutil.wl.queue = NULL;
}
- ecore_wl_shutdown();
+ ecore_wl2_shutdown();
return EINA_FALSE;
}
static void
_cb_wl_reg_global(void *data,
struct wl_registry *reg,
- unsigned int name,
+ unsigned int id,
const char *interface,
unsigned int version)
{
{
struct tizen_policy *proto;
proto = wl_registry_bind(reg,
- name,
+ id,
&tizen_policy_interface,
- 1);
+ 7);
if (!proto) return;
tizen_policy_add_listener(proto,
_eflutil.wl.policy.hash_noti_lv = eina_hash_pointer_new(free);
_eflutil.wl.policy.hash_scr_mode = eina_hash_pointer_new(free);
_eflutil.wl.policy.proto = proto;
+ _eflutil.wl.policy.id = id;
}
else if (strcmp(interface, "wl_output") == 0)
{
_eflutil.wl.shot.output_list = eina_list_append(_eflutil.wl.shot.output_list, output);
- output->output = wl_registry_bind(reg, name, &wl_output_interface, version);
+ output->output = wl_registry_bind(reg, id, &wl_output_interface, version);
wl_output_add_listener(output->output, &output_listener, output);
}
else if (strcmp(interface, "tizen_input_device_manager") == 0)
{
- _eflutil.wl.devmgr.devicemgr = wl_registry_bind(reg, name, &tizen_input_device_manager_interface, version);
+ _eflutil.wl.devmgr.devicemgr = wl_registry_bind(reg, id, &tizen_input_device_manager_interface, version);
tizen_input_device_manager_add_listener(_eflutil.wl.devmgr.devicemgr, &_wl_tz_devmgr_listener, NULL);
}
else if (!strcmp(interface, "tizen_display_policy"))
{
- _eflutil.wl.display_policy.proto = wl_registry_bind(reg, name, &tizen_display_policy_interface, version);
+ _eflutil.wl.display_policy.proto = wl_registry_bind(reg, id, &tizen_display_policy_interface, version);
if (!_eflutil.wl.display_policy.proto) return;
tizen_display_policy_add_listener(_eflutil.wl.display_policy.proto,
NULL);
_eflutil.wl.display_policy.hash_brightness = eina_hash_pointer_new(free);
+ _eflutil.wl.display_policy.id = id;
}
else if (strcmp(interface, "tizen_gesture") == 0)
{
- _eflutil.wl.gesture.proto = wl_registry_bind(reg, name, &tizen_gesture_interface, version);
+ _eflutil.wl.gesture.proto = wl_registry_bind(reg, id, &tizen_gesture_interface, version);
tizen_gesture_add_listener(_eflutil.wl.gesture.proto, &_wl_tz_gesture_listener, NULL);
}
}
static void
_cb_wl_reg_global_remove(void *data,
struct wl_registry *reg,
- unsigned int name)
+ unsigned int id)
{
- _eflutil.wl.policy.proto = NULL;
- eina_hash_free(_eflutil.wl.policy.hash_noti_lv);
- eina_hash_free(_eflutil.wl.policy.hash_scr_mode);
-
- _eflutil.wl.display_policy.proto = NULL;
- eina_hash_free(_eflutil.wl.display_policy.hash_brightness);
+ /* unset each global id number to 0 since global id is started
+ * from number 1 on server side display structure
+ */
+ if (id == _eflutil.wl.policy.id)
+ {
+ _eflutil.wl.policy.id = 0;
+ _eflutil.wl.policy.proto = NULL;
+ eina_hash_free(_eflutil.wl.policy.hash_noti_lv);
+ eina_hash_free(_eflutil.wl.policy.hash_scr_mode);
+ }
+ else if (id == _eflutil.wl.display_policy.id)
+ {
+ _eflutil.wl.display_policy.id = 0;
+ _eflutil.wl.display_policy.proto = NULL;
+ eina_hash_free(_eflutil.wl.display_policy.hash_brightness);
+ }
}
/* LCOV_EXCL_STOP */
{
Eina_List *l, *ll;
Efl_Util_Callback_Info *info;
- Ecore_Wl_Window *wlwin2 = NULL;
+ Ecore_Wl2_Window *wlwin2 = NULL;
void *wlsurf2 = NULL;
l = _cb_info_list_get(idx);
EINA_LIST_FOREACH(l, ll, info)
{
- wlwin2 = elm_win_wl_window_get(info->win);
- wlsurf2 = ecore_wl_window_surface_get(wlwin2);
+ wlwin2 = (Ecore_Wl2_Window *)elm_win_wl_window_get(info->win);
+ wlsurf2 = ecore_wl2_window_surface_get(wlwin2);
if (wlsurf== wlsurf2) return info;
}
static void _cb_wl_tz_policy_aux_message(void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface_resource, const char *key, const char *val, struct wl_array *options)
{
}
+static void _cb_wl_conformant_region(void *data, struct tizen_policy *tizen_policy, struct wl_surface *surface, uint32_t conformant_part, uint32_t state, int32_t x, int32_t y, int32_t w, int32_t h, uint32_t serial)
+{
+}
/* LCOV_EXCL_STOP */
static void
}
Elm_Win_Type type;
- Ecore_Wl_Window *wlwin;
+ Ecore_Wl2_Window *wlwin;
struct wl_surface *surface;
Efl_Util_Wl_Surface_Lv_Info *lv_info;
- Ecore_Wl_Window_Type wl_type;
+ Ecore_Wl2_Window_Type wl_type;
res = _wl_init();
EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
- wlwin = elm_win_wl_window_get(window);
+ wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window);
EINA_SAFETY_ON_NULL_RETURN_VAL(wlwin, EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE);
type = elm_win_type_get(window);
if (type != ELM_WIN_NOTIFICATION)
{
- wl_type = ecore_wl_window_type_get(wlwin);
- EINA_SAFETY_ON_FALSE_RETURN_VAL((wl_type == ECORE_WL_WINDOW_TYPE_NOTIFICATION),
+ wl_type = ecore_wl2_window_type_get(wlwin);
+ EINA_SAFETY_ON_FALSE_RETURN_VAL((wl_type == ECORE_WL2_WINDOW_TYPE_NOTIFICATION),
EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE);
}
while (!_eflutil.wl.policy.proto)
wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
- surface = ecore_wl_window_surface_get(wlwin);
+ surface = ecore_wl2_window_surface_get(wlwin);
EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE);
int count = 0;
while (lv_info->wait_for_done && (count < 3))
{
- ecore_wl_flush();
+ ecore_wl2_display_flush(_eflutil.wl.wl2_display);
wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
count++;
}
EINA_SAFETY_ON_NULL_RETURN_VAL(level, EFL_UTIL_ERROR_INVALID_PARAMETER);
Elm_Win_Type type;
- Ecore_Wl_Window *wlwin;
+ Ecore_Wl2_Window *wlwin;
struct wl_surface *surface;
Efl_Util_Wl_Surface_Lv_Info *lv_info;
- Ecore_Wl_Window_Type wl_type;
+ Ecore_Wl2_Window_Type wl_type;
res = _wl_init();
EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
- wlwin = elm_win_wl_window_get(window);
+ wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window);
EINA_SAFETY_ON_NULL_RETURN_VAL(wlwin, EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE);
type = elm_win_type_get(window);
if (type != ELM_WIN_NOTIFICATION)
{
- wl_type = ecore_wl_window_type_get(wlwin);
- EINA_SAFETY_ON_FALSE_RETURN_VAL((wl_type == ECORE_WL_WINDOW_TYPE_NOTIFICATION),
+ wl_type = ecore_wl2_window_type_get(wlwin);
+ EINA_SAFETY_ON_FALSE_RETURN_VAL((wl_type == ECORE_WL2_WINDOW_TYPE_NOTIFICATION),
EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE);
}
while (!_eflutil.wl.policy.proto)
wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
- surface = ecore_wl_window_surface_get(wlwin);
+ surface = ecore_wl2_window_surface_get(wlwin);
EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE);
int count = 0;
while ((lv_info->wait_for_done) && (count < 3))
{
- ecore_wl_flush();
+ ecore_wl2_display_flush(_eflutil.wl.wl2_display);
wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
count++;
}
EINA_SAFETY_ON_FALSE_RETURN_VAL(((opaque >= 0) && (opaque <= 1)),
EFL_UTIL_ERROR_INVALID_PARAMETER);
- Ecore_Wl_Window *wlwin;
+ Ecore_Wl2_Window *wlwin;
struct wl_surface *surface;
if (!_eflutil.wl.policy.proto)
EINA_SAFETY_ON_NULL_RETURN_VAL(_eflutil.wl.policy.proto, EFL_UTIL_ERROR_INVALID_PARAMETER);
}
- wlwin = elm_win_wl_window_get(window);
+ wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window);
if (!wlwin)
return EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE;
- surface = ecore_wl_window_surface_get(wlwin);
+ surface = ecore_wl2_window_surface_get(wlwin);
if (!surface)
return EFL_UTIL_ERROR_NOT_SUPPORTED_WINDOW_TYPE;
(mode <= EFL_UTIL_SCREEN_MODE_ALWAYS_ON)),
EFL_UTIL_ERROR_INVALID_PARAMETER);
- Ecore_Wl_Window *wlwin;
+ Ecore_Wl2_Window *wlwin;
struct wl_surface *surface;
Efl_Util_Wl_Surface_Scr_Mode_Info *scr_mode_info;
Eina_Bool res;
res = _wl_init();
EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
- wlwin = elm_win_wl_window_get(window);
+ wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window);
if (wlwin)
{
while (!_eflutil.wl.policy.proto)
wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
- surface = ecore_wl_window_surface_get(wlwin);
+ surface = ecore_wl2_window_surface_get(wlwin);
EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
EFL_UTIL_ERROR_INVALID_PARAMETER);
int count = 0;
while (scr_mode_info->wait_for_done && (count < 3))
{
- ecore_wl_flush();
+ ecore_wl2_display_flush(_eflutil.wl.wl2_display);
wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
count++;
}
EINA_SAFETY_ON_NULL_RETURN_VAL(window, EFL_UTIL_ERROR_INVALID_PARAMETER);
EINA_SAFETY_ON_NULL_RETURN_VAL(mode, EFL_UTIL_ERROR_INVALID_PARAMETER);
- Ecore_Wl_Window *wlwin;
+ Ecore_Wl2_Window *wlwin;
struct wl_surface *surface;
Efl_Util_Wl_Surface_Scr_Mode_Info *scr_mode_info;
Eina_Bool res;
res = _wl_init();
EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
- wlwin = elm_win_wl_window_get(window);
+ wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window);
if (wlwin)
{
while (!_eflutil.wl.policy.proto)
wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
- surface = ecore_wl_window_surface_get(wlwin);
+ surface = ecore_wl2_window_surface_get(wlwin);
EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
EFL_UTIL_ERROR_INVALID_PARAMETER);
{
while (scr_mode_info->wait_for_done)
{
- ecore_wl_flush();
+ ecore_wl2_display_flush(_eflutil.wl.wl2_display);
wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
}
}
API int
efl_util_set_window_brightness(Evas_Object *window, int brightness)
{
- Ecore_Wl_Window *wlwin;
+ Ecore_Wl2_Window *wlwin;
struct wl_surface *surface;
Efl_Util_Wl_Surface_Brightness_Info *brightness_info;
Eina_Bool res;
res = _wl_init();
EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
- wlwin = elm_win_wl_window_get(window);
+ wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window);
if (wlwin)
{
while (!_eflutil.wl.display_policy.proto)
wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
- surface = ecore_wl_window_surface_get(wlwin);
+ surface = ecore_wl2_window_surface_get(wlwin);
EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
EFL_UTIL_ERROR_INVALID_PARAMETER);
int count = 0;
while (brightness_info->wait_for_done && (count < 3))
{
- ecore_wl_flush();
+ ecore_wl2_display_flush(_eflutil.wl.wl2_display);
wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
count++;
}
API int
efl_util_get_window_brightness(Evas_Object *window, int *brightness)
{
- Ecore_Wl_Window *wlwin;
+ Ecore_Wl2_Window *wlwin;
struct wl_surface *surface;
Efl_Util_Wl_Surface_Brightness_Info *brightness_info;
Eina_Bool res;
res = _wl_init();
EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EFL_UTIL_ERROR_INVALID_PARAMETER);
- wlwin = elm_win_wl_window_get(window);
+ wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window);
if (!wlwin) return EFL_UTIL_ERROR_INVALID_PARAMETER;
while (!_eflutil.wl.display_policy.proto)
wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
- surface = ecore_wl_window_surface_get(wlwin);
+ surface = ecore_wl2_window_surface_get(wlwin);
EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
EFL_UTIL_ERROR_INVALID_PARAMETER);
{
while (brightness_info->wait_for_done)
{
- ecore_wl_flush();
+ ecore_wl2_display_flush(_eflutil.wl.wl2_display);
wl_display_dispatch_queue(_eflutil.wl.dpy, _eflutil.wl.queue);
}
}
efl_util_gesture_select(efl_util_gesture_h gesture_h, Evas_Object *window, efl_util_gesture_data data)
{
Efl_Util_Gesture_Common_Grab_Data *base_data = NULL;
- Ecore_Wl_Window *wlwin;
+ Ecore_Wl2_Window *wlwin;
struct wl_surface *surface;
int ret;
if (base_data->type != TIZEN_GESTURE_TYPE_PALM_COVER)
return EFL_UTIL_ERROR_NOT_SUPPORTED;
- wlwin = elm_win_wl_window_get(window);
+ wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window);
if (!wlwin) return EFL_UTIL_ERROR_INVALID_PARAMETER;
- surface = ecore_wl_window_surface_get(wlwin);
+ surface = ecore_wl2_window_surface_get(wlwin);
EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
EFL_UTIL_ERROR_INVALID_PARAMETER);
efl_util_gesture_deselect(efl_util_gesture_h gesture_h, Evas_Object *window, efl_util_gesture_data data)
{
Efl_Util_Gesture_Common_Grab_Data *base_data = NULL;
- Ecore_Wl_Window *wlwin;
+ Ecore_Wl2_Window *wlwin;
struct wl_surface *surface;
int ret;
if (base_data->type != TIZEN_GESTURE_TYPE_PALM_COVER)
return EFL_UTIL_ERROR_NOT_SUPPORTED;
- wlwin = elm_win_wl_window_get(window);
+ wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window);
if (!wlwin) return EFL_UTIL_ERROR_INVALID_PARAMETER;
- surface = ecore_wl_window_surface_get(wlwin);
+ surface = ecore_wl2_window_surface_get(wlwin);
EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
EFL_UTIL_ERROR_INVALID_PARAMETER);
API int
efl_util_gesture_activate_set_on_window(efl_util_gesture_h gesture_h, Evas_Object *window, unsigned int type, Eina_Bool active)
{
- Ecore_Wl_Window *wlwin;
+ Ecore_Wl2_Window *wlwin;
struct wl_surface *surface;
int ret;
EINA_SAFETY_ON_NULL_RETURN_VAL(window, EFL_UTIL_ERROR_INVALID_PARAMETER);
EINA_SAFETY_ON_TRUE_RETURN_VAL(type == EFL_UTIL_GESTURE_TYPE_NONE, EFL_UTIL_ERROR_INVALID_PARAMETER);
- wlwin = elm_win_wl_window_get(window);
+ wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(window);
if (!wlwin) return EFL_UTIL_ERROR_INVALID_PARAMETER;
- surface = ecore_wl_window_surface_get(wlwin);
+ surface = ecore_wl2_window_surface_get(wlwin);
EINA_SAFETY_ON_NULL_RETURN_VAL(surface,
EFL_UTIL_ERROR_INVALID_PARAMETER);