kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ecore_evas_wayland: Make transparent_set common 

Moves transparent set into the common implementation - there is a
functional change here - the egl engine now calls transparent_set in
render_updates like the shm engine.

It is probable the this was the intended behaviour all along.
This commit is contained in:
Derek Foreman 2016-11-01 17:15:24 -05:00
parent 9ca6e274a4
commit 5d2a25a01d
4 changed files with 46 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
View File

@ -1821,18 +1821,6 @@ _ecore_evas_wayland_resize(Ecore_Evas *ee, int location)
}
}
static void
_ecore_evas_wayland_transparent_do(Ecore_Evas *ee, int transparent)
{
if (!ee) return;
if (!strcmp(ee->driver, "wayland_shm"))
{
#ifdef BUILD_ECORE_EVAS_WAYLAND_SHM
_ecore_evas_wayland_shm_transparent_do(ee, transparent);
#endif
}
}
static void
_ecore_evas_wayland_move(Ecore_Evas *ee, int x, int y)
{
@ -2035,3 +2023,46 @@ _ecore_evas_wl_common_alpha_set(Ecore_Evas *ee, int alpha)
_ecore_evas_wayland_alpha_do(ee, alpha);
}
static void
_ecore_evas_wayland_transparent_do(Ecore_Evas *ee, int transparent)
{
Evas_Engine_Info_Wayland *einfo;
Ecore_Evas_Engine_Wl_Data *wdata;
int fw, fh;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!ee) return;
if (ee->transparent == transparent) return;
ee->transparent = transparent;
wdata = ee->engine.data;
if (!wdata->sync_done) return;
if (wdata->win)
ecore_wl2_window_transparent_set(wdata->win, ee->transparent);
evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
if ((einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas)))
{
einfo->info.destination_alpha = EINA_TRUE;
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w + fw, ee->h + fh);
}
}
void
_ecore_evas_wl_common_transparent_set(Ecore_Evas *ee, int transparent)
{
if (ee->in_async_render)
{
ee->delayed.transparent = transparent;
ee->delayed.transparent_changed = EINA_TRUE;
return;
}
_ecore_evas_wayland_transparent_do(ee, transparent);
}

46
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
View File

@ -34,7 +34,6 @@ extern EAPI Eina_List *_evas_canvas_image_data_unset(Evas *eo_e);
extern EAPI void _evas_canvas_image_data_regenerate(Eina_List *list);
/* local function prototypes */
static void _ecore_evas_wl_transparent_set(Ecore_Evas *ee, int transparent);
static void _ecore_evas_wl_rotation_set(Ecore_Evas *ee, int rotation, int resize);
static Ecore_Evas_Engine_Func _ecore_wl_engine_func =
@ -85,7 +84,7 @@ static Ecore_Evas_Engine_Func _ecore_wl_engine_func =
NULL, // func sticky set
_ecore_evas_wl_common_ignore_events_set,
_ecore_evas_wl_common_alpha_set,
_ecore_evas_wl_transparent_set,
_ecore_evas_wl_common_transparent_set,
NULL, // func profiles set
NULL, // func profile set
NULL, // window group set
@ -466,49 +465,6 @@ _ecore_evas_wl_rotation_set(Ecore_Evas *ee, int rotation, int resize)
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
static void
_ecore_evas_wayland_egl_transparent_do(Ecore_Evas *ee, int transparent)
{
Evas_Engine_Info_Wayland *einfo;
Ecore_Evas_Engine_Wl_Data *wdata;
int fw, fh;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!ee) return;
if (ee->transparent == transparent) return;
ee->transparent = transparent;
wdata = ee->engine.data;
if (!wdata->sync_done) return;
if (wdata->win)
ecore_wl2_window_transparent_set(wdata->win, ee->transparent);
evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
if ((einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas)))
{
einfo->info.destination_alpha = EINA_TRUE;
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w + fw, ee->h + fh);
}
}
static void
_ecore_evas_wl_transparent_set(Ecore_Evas *ee, int transparent)
{
if (ee->in_async_render)
{
ee->delayed.transparent = transparent;
ee->delayed.transparent_changed = EINA_TRUE;
return;
}
_ecore_evas_wayland_egl_transparent_do(ee, transparent);
}
void
_ecore_evas_wayland_egl_resize(Ecore_Evas *ee, int location)
{

2
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
View File

@ -99,6 +99,7 @@ void _ecore_evas_wl_common_withdrawn_set(Ecore_Evas *ee, Eina_Bool on);
void _ecore_evas_wl_common_show(Ecore_Evas *ee);
void _ecore_evas_wl_common_hide(Ecore_Evas *ee);
void _ecore_evas_wl_common_alpha_set(Ecore_Evas *ee, int alpha);
void _ecore_evas_wl_common_transparent_set(Ecore_Evas *ee, int transparent);
void _ecore_evas_wl_common_frame_callback_clean(Ecore_Evas *ee);
@ -112,7 +113,6 @@ extern Eina_List *ee_list;
#ifdef BUILD_ECORE_EVAS_WAYLAND_SHM
void _ecore_evas_wayland_shm_resize(Ecore_Evas *ee, int location);
void _ecore_evas_wayland_shm_resize_edge_set(Ecore_Evas *ee, int edge);
void _ecore_evas_wayland_shm_transparent_do(Ecore_Evas *ee, int transparent);
#endif
#ifdef BUILD_ECORE_EVAS_WAYLAND_EGL

45
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
View File

@ -31,7 +31,6 @@
#endif /* ! _WIN32 */
/* local function prototypes */
static void _ecore_evas_wl_transparent_set(Ecore_Evas *ee, int transparent);
static void _ecore_evas_wl_rotation_set(Ecore_Evas *ee, int rotation, int resize);
static Ecore_Evas_Engine_Func _ecore_wl_engine_func =
@ -82,7 +81,7 @@ static Ecore_Evas_Engine_Func _ecore_wl_engine_func =
NULL, // func sticky set
_ecore_evas_wl_common_ignore_events_set,
_ecore_evas_wl_common_alpha_set,
_ecore_evas_wl_transparent_set,
_ecore_evas_wl_common_transparent_set,
NULL, // func profiles set
NULL, // func profile set
NULL, // window group set
@ -395,48 +394,6 @@ _ecore_evas_wl_rotation_set(Ecore_Evas *ee, int rotation, int resize)
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
void
_ecore_evas_wayland_shm_transparent_do(Ecore_Evas *ee, int transparent)
{
Evas_Engine_Info_Wayland *einfo;
Ecore_Evas_Engine_Wl_Data *wdata;
int fw, fh;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!ee) return;
if (ee->transparent == transparent) return;
ee->transparent = transparent;
wdata = ee->engine.data;
if (!wdata->sync_done) return;
if (wdata->win)
ecore_wl2_window_transparent_set(wdata->win, ee->transparent);
evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
if ((einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas)))
{
einfo->info.destination_alpha = EINA_TRUE;//ee->transparent;
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w + fw, ee->h + fh);
}
}
static void
_ecore_evas_wl_transparent_set(Ecore_Evas *ee, int transparent)
{
if (ee->in_async_render)
{
ee->delayed.transparent = transparent;
ee->delayed.transparent_changed = EINA_TRUE;
return;
}
_ecore_evas_wayland_shm_transparent_do(ee, transparent);
}
void
_ecore_evas_wayland_shm_resize(Ecore_Evas *ee, int location)
{