enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

add the possibility to have shaped windows in ecore_evas (gdi 

only for now)


SVN revision: 52418
This commit is contained in:
Vincent Torri 2010-09-18 17:24:31 +00:00
parent 9acfb01811
commit f4f1dcf519
2 changed files with 80 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h
View File

@ -246,17 +246,18 @@ struct _Ecore_Evas_Engine
#ifdef BUILD_ECORE_EVAS_WIN32
struct {
Ecore_Win32_Window *parent;
struct {
unsigned char fullscreen : 1;
} state;
struct {
unsigned char region : 1;
unsigned char fullscreen : 1;
} state;
} win32;
#endif
#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
struct {
Ecore_WinCE_Window *window;
struct {
unsigned char fullscreen : 1;
} state;
struct {
unsigned char fullscreen : 1;
} state;
} wince;
#endif

80
legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c
View File

@ -319,9 +319,8 @@ _ecore_evas_win32_event_window_configure(void *data __UNUSED__, int type __UNUSE
ecore_evas_avoid_damage_set(ee, 0);
ecore_evas_avoid_damage_set(ee, 1);
}
/* FIXME: to do... */
/* if (ee->shaped) */
/* _ecore_evas_x_resize_shape(ee); */
/* if (ee->shaped) */
/* _ecore_evas_win32_region_border_resize(ee); */
if ((ee->expecting_resize.w > 0) &&
(ee->expecting_resize.h > 0))
{
@ -413,8 +412,16 @@ _ecore_evas_win32_resize(Ecore_Evas *ee, int width, int height)
evas_output_size_set(ee->evas, ee->w, ee->h);
evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
}
/* FIXME: damage and shape */
if (ee->prop.avoid_damage)
{
int pdam;
pdam = ecore_evas_avoid_damage_get(ee);
ecore_evas_avoid_damage_set(ee, 0);
ecore_evas_avoid_damage_set(ee, pdam);
}
/* if ((ee->shaped) || (ee->alpha)) */
/* _ecore_evas_win32_region_border_resize(ee); */
if (ee->func.fn_resize) ee->func.fn_resize(ee);
}
}
@ -448,7 +455,16 @@ _ecore_evas_win32_move_resize(Ecore_Evas *ee, int x, int y, int width, int heigh
evas_output_size_set(ee->evas, ee->w, ee->h);
evas_output_viewport_set(ee->evas, 0, 0, ee->w, ee->h);
}
/* FIXME: damage and shape */
if (ee->prop.avoid_damage)
{
int pdam;
pdam = ecore_evas_avoid_damage_get(ee);
ecore_evas_avoid_damage_set(ee, 0);
ecore_evas_avoid_damage_set(ee, pdam);
}
/* if ((ee->shaped) || (ee->alpha)) */
/* _ecore_evas_win32_region_border_resize(ee); */
if (change_pos)
{
if (ee->func.fn_move) ee->func.fn_move(ee);
@ -559,6 +575,36 @@ _ecore_evas_win32_rotation_set(Ecore_Evas *ee, int rotation, int resize)
#endif /* BUILD_ECORE_EVAS_SOFTWARE_DDRAW */
}
static void
_ecore_evas_win32_shaped_set(Ecore_Evas *ee, int shaped)
{
if (((ee->shaped) && (shaped)) || ((!ee->shaped) && (!shaped)))
return;
if (!strcmp(ee->driver, "software_ddraw")) return;
#ifdef BUILD_ECORE_EVAS_SOFTWARE_GDI
if (!strcmp(ee->driver, "software_gdi"))
{
Evas_Engine_Info_Software_Gdi *einfo;
einfo = (Evas_Engine_Info_Software_Gdi *)evas_engine_info_get(ee->evas);
ee->shaped = shaped;
if (einfo)
{
ee->engine.win32.state.region = ee->shaped;
einfo->info.region = ee->engine.win32.state.region;
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
if (ee->shaped)
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
}
#endif /* BUILD_ECORE_EVAS_SOFTWARE_GDI */
}
}
static void
_ecore_evas_win32_show(Ecore_Evas *ee)
{
@ -731,6 +777,25 @@ _ecore_evas_win32_borderless_set(Ecore_Evas *ee, int on)
ee->prop.borderless = on;
ecore_win32_window_borderless_set((struct _Ecore_Win32_Window *)ee->prop.window,
ee->prop.borderless);
#ifdef BUILD_ECORE_EVAS_SOFTWARE_GDI
if (!strcmp(ee->driver, "software_gdi"))
{
Evas_Engine_Info_Software_Gdi *einfo;
einfo = (Evas_Engine_Info_Software_Gdi *)evas_engine_info_get(ee->evas);
if (einfo)
{
einfo->info.borderless = ee->prop.borderless;
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
if (ee->prop.borderless)
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
}
}
#endif /* BUILD_ECORE_EVAS_SOFTWARE_GDI */
}
static void
@ -821,7 +886,7 @@ static Ecore_Evas_Engine_Func _ecore_win32_engine_func =
_ecore_evas_win32_resize,
_ecore_evas_win32_move_resize,
_ecore_evas_win32_rotation_set,
NULL, /* _ecore_evas_x_shaped_set */
_ecore_evas_win32_shaped_set,
_ecore_evas_win32_show,
_ecore_evas_win32_hide,
_ecore_evas_win32_raise,
@ -877,10 +942,11 @@ _ecore_evas_engine_software_gdi_init(Ecore_Evas *ee)
{
/* FIXME: REDRAW_DEBUG missing for now */
einfo->info.window = ((struct _Ecore_Win32_Window *)ee->prop.window)->window;
einfo->info.mask = NULL;
einfo->info.depth = ecore_win32_screen_depth_get();
einfo->info.rotation = 0;
einfo->info.borderless = 0;
einfo->info.fullscreen = 0;
einfo->info.region = 0;
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
}