aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2015-09-28 13:42:38 -0400
committerChris Michael <cp.michael@samsung.com>2015-12-03 11:33:29 -0500
commit85381ee8399ce354a66eb4eb5eb12c08c0f7daf0 (patch)
treec80da946db11ab1a703f6623975fe161c072381c
parentEdje entry: Use markup text for password in preedit mode (diff)
downloadefl-85381ee8399ce354a66eb4eb5eb12c08c0f7daf0.tar.gz
ecore-wl2: Port Ecore_Evas engines to use Ecore_Wl2 code
Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c4
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c7
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c7
3 files changed, 17 insertions, 1 deletions
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 9049fe3935..3cf676f4d2 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
@@ -1524,7 +1524,9 @@ _ecore_evas_wayland_window_get(const Ecore_Evas *ee)
{
Ecore_Evas_Engine_Wl_Data *wdata;
- if (!ee) return;
+ if (!(!strncmp(ee->driver, "wayland", 7)))
+ return NULL;
+
wdata = ee->engine.data;
return wdata->win;
}
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 0c5f8d5946..cb7befb2b7 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
@@ -163,6 +163,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 52d1c68c3f..e8be5893f2 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
@@ -162,6 +162,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");