forked from enlightenment/efl
ecore-wl2: Port Ecore_Evas engines to use Ecore_Wl2 code
Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
parent
4623d57762
commit
caa1b4323b
|
@ -1536,7 +1536,9 @@ _ecore_evas_wayland_window_get(const Ecore_Evas *ee)
|
||||||
{
|
{
|
||||||
Ecore_Evas_Engine_Wl_Data *wdata;
|
Ecore_Evas_Engine_Wl_Data *wdata;
|
||||||
|
|
||||||
if (!ee) return;
|
if (!(!strncmp(ee->driver, "wayland", 7)))
|
||||||
|
return NULL;
|
||||||
|
|
||||||
wdata = ee->engine.data;
|
wdata = ee->engine.data;
|
||||||
return wdata->win;
|
return wdata->win;
|
||||||
}
|
}
|
||||||
|
|
|
@ -163,6 +163,13 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name, unsigned int parent,
|
||||||
return NULL;
|
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))))
|
if (!(ee = calloc(1, sizeof(Ecore_Evas))))
|
||||||
{
|
{
|
||||||
ERR("Failed to allocate Ecore_Evas");
|
ERR("Failed to allocate Ecore_Evas");
|
||||||
|
|
|
@ -162,6 +162,13 @@ ecore_evas_wayland_shm_new_internal(const char *disp_name, unsigned int parent,
|
||||||
return NULL;
|
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))))
|
if (!(ee = calloc(1, sizeof(Ecore_Evas))))
|
||||||
{
|
{
|
||||||
ERR("Failed to allocate Ecore_Evas");
|
ERR("Failed to allocate Ecore_Evas");
|
||||||
|
|
Loading…
Reference in New Issue