Simplify e_canvas_new code slightly for wayland-only and
wayland-client support. Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
parent
3d10a3d34e
commit
160412dcf2
|
@ -148,15 +148,6 @@ e_canvas_new(Ecore_Window win, int x, int y, int w, int h,
|
||||||
{
|
{
|
||||||
Ecore_Evas *ee = NULL;
|
Ecore_Evas *ee = NULL;
|
||||||
|
|
||||||
#ifdef HAVE_WAYLAND_ONLY
|
|
||||||
ee = ecore_evas_wayland_shm_new(NULL, win, x, y, w, h, 0);
|
|
||||||
if (ee)
|
|
||||||
{
|
|
||||||
ecore_evas_override_set(ee, override);
|
|
||||||
if (win_ret)
|
|
||||||
*win_ret = ecore_wl_window_id_get(ecore_evas_wayland_window_get(ee));
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
switch (e_comp_get(NULL)->comp_type)
|
switch (e_comp_get(NULL)->comp_type)
|
||||||
{
|
{
|
||||||
case E_PIXMAP_TYPE_X:
|
case E_PIXMAP_TYPE_X:
|
||||||
|
@ -168,7 +159,7 @@ e_canvas_new(Ecore_Window win, int x, int y, int w, int h,
|
||||||
if (win_ret) *win_ret = ecore_evas_software_x11_window_get(ee);
|
if (win_ret) *win_ret = ecore_evas_software_x11_window_get(ee);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
# ifdef HAVE_WAYLAND_CLIENTS
|
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY)
|
||||||
case E_PIXMAP_TYPE_WL:
|
case E_PIXMAP_TYPE_WL:
|
||||||
ee = ecore_evas_wayland_shm_new(NULL, win, x, y, w, h, 0);
|
ee = ecore_evas_wayland_shm_new(NULL, win, x, y, w, h, 0);
|
||||||
if (ee)
|
if (ee)
|
||||||
|
@ -181,10 +172,9 @@ e_canvas_new(Ecore_Window win, int x, int y, int w, int h,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
# endif
|
#endif
|
||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
if (!ee)
|
if (!ee)
|
||||||
EINA_LOG_ERR("Impossible to build any Ecore_Evas window !!");
|
EINA_LOG_ERR("Impossible to build any Ecore_Evas window !!");
|
||||||
return ee;
|
return ee;
|
||||||
|
|
Loading…
Reference in New Issue