From 9e83ddbc483915ea02486bb66f18d0d40fdf9adf Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Mon, 28 Sep 2015 13:42:38 -0400 Subject: [PATCH] ecore-wl2: Port Ecore_Evas engines to use Ecore_Wl2 code Signed-off-by: Chris Michael --- .../ecore_evas/engines/wayland/ecore_evas_wayland_common.c | 2 +- .../ecore_evas/engines/wayland/ecore_evas_wayland_egl.c | 7 +++++++ .../ecore_evas/engines/wayland/ecore_evas_wayland_shm.c | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c index 1659988a47..e9fb914383 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c @@ -1024,7 +1024,7 @@ _ecore_evas_wl_common_name_class_set(Ecore_Evas *ee, const char *n, const char * } if (ee->prop.clas) - ecore_wl2_window_class_set(wdata->win, ee->prop.clas); + ecore_wl2_window_class_name_set(wdata->win, ee->prop.clas); } void diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c index 8f4fea9436..ae4c4bc2fc 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c @@ -149,6 +149,13 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name, unsigned int parent, return NULL; } + ewd = ecore_wl2_display_connect(disp_name); + if (!ewd) + { + ERR("Failed to connect to Wayland Display %s", disp_name); + return NULL; + } + if (!(ee = calloc(1, sizeof(Ecore_Evas)))) { ERR("Failed to allocate Ecore_Evas"); diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c index c516de62cd..2301c6821d 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c @@ -148,6 +148,13 @@ ecore_evas_wayland_shm_new_internal(const char *disp_name, unsigned int parent, return NULL; } + ewd = ecore_wl2_display_connect(disp_name); + if (!ewd) + { + ERR("Failed to connect to Wayland Display %s", disp_name); + return NULL; + } + if (!(ee = calloc(1, sizeof(Ecore_Evas)))) { ERR("Failed to allocate Ecore_Evas");