hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=fb59ac34a1ec65680ca4ff3fc62d1fc42aa72f5a
commit fb59ac34a1ec65680ca4ff3fc62d1fc42aa72f5a
Author: ChunEon Park <her...@hermet.pe.kr>
Date: Mon Jan 13 14:26:36 2014 +0900
ecore_evas - use eina_bool instead of the char for interal data.
---
src/lib/ecore_evas/ecore_evas.c | 20 ++--
src/lib/ecore_evas/ecore_evas_buffer.c | 24 ++---
src/lib/ecore_evas/ecore_evas_ews.c | 44 ++++-----
src/lib/ecore_evas/ecore_evas_private.h | 47 +++++-----
.../ecore_evas/engines/cocoa/ecore_evas_cocoa.c | 4 +-
.../ecore_evas/engines/drm/ecore_evas_drm.c | 20 ++--
.../ecore_evas/engines/extn/ecore_evas_extn.c | 24 ++---
src/modules/ecore_evas/engines/fb/ecore_evas_fb.c | 14 +--
.../engines/psl1ght/ecore_evas_psl1ght.c | 14 +--
.../ecore_evas/engines/sdl/ecore_evas_sdl.c | 10 +-
.../engines/wayland/ecore_evas_wayland_common.c | 24 ++---
.../engines/wayland/ecore_evas_wayland_egl.c | 4 +-
.../engines/wayland/ecore_evas_wayland_private.h | 8 +-
.../engines/wayland/ecore_evas_wayland_shm.c | 4 +-
.../ecore_evas/engines/win32/ecore_evas_win32.c | 10 +-
src/modules/ecore_evas/engines/x/ecore_evas_x.c | 103 +++++++++++----------
16 files changed, 188 insertions(+), 186 deletions(-)
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 75510ef..ad368e5 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -2023,7 +2023,7 @@ ecore_evas_withdrawn_get(const Ecore_Evas *ee)
}
EAPI void
-ecore_evas_sticky_set(Ecore_Evas *ee, Eina_Bool sticky)
+ecore_evas_sticky_set(Ecore_Evas *ee, Eina_Bool on)
{
if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
{
@@ -2032,7 +2032,7 @@ ecore_evas_sticky_set(Ecore_Evas *ee, Eina_Bool sticky)
return;
}
- IFC(ee, fn_sticky_set) (ee, sticky);
+ IFC(ee, fn_sticky_set) (ee, on);
IFE;
}
@@ -2101,7 +2101,7 @@ ecore_evas_aspect_get(const Ecore_Evas *ee)
}
EAPI void
-ecore_evas_urgent_set(Ecore_Evas *ee, Eina_Bool urgent)
+ecore_evas_urgent_set(Ecore_Evas *ee, Eina_Bool on)
{
if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
{
@@ -2110,7 +2110,7 @@ ecore_evas_urgent_set(Ecore_Evas *ee, Eina_Bool urgent)
return;
}
- IFC(ee, fn_urgent_set) (ee, urgent);
+ IFC(ee, fn_urgent_set) (ee, on);
IFE;
}
@@ -2127,7 +2127,7 @@ ecore_evas_urgent_get(const Ecore_Evas *ee)
}
EAPI void
-ecore_evas_modal_set(Ecore_Evas *ee, Eina_Bool modal)
+ecore_evas_modal_set(Ecore_Evas *ee, Eina_Bool on)
{
if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
{
@@ -2136,7 +2136,7 @@ ecore_evas_modal_set(Ecore_Evas *ee, Eina_Bool modal)
return;
}
- IFC(ee, fn_modal_set) (ee, modal);
+ IFC(ee, fn_modal_set) (ee, on);
IFE;
}
@@ -2153,7 +2153,7 @@ ecore_evas_modal_get(const Ecore_Evas *ee)
}
EAPI void
-ecore_evas_demand_attention_set(Ecore_Evas *ee, Eina_Bool demand)
+ecore_evas_demand_attention_set(Ecore_Evas *ee, Eina_Bool on)
{
if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
{
@@ -2162,7 +2162,7 @@ ecore_evas_demand_attention_set(Ecore_Evas *ee, Eina_Bool
demand)
return;
}
- IFC(ee, fn_demands_attention_set) (ee, demand);
+ IFC(ee, fn_demands_attention_set) (ee, on);
IFE;
}
@@ -2179,7 +2179,7 @@ ecore_evas_demand_attention_get(const Ecore_Evas *ee)
}
EAPI void
-ecore_evas_focus_skip_set(Ecore_Evas *ee, Eina_Bool skip)
+ecore_evas_focus_skip_set(Ecore_Evas *ee, Eina_Bool on)
{
if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
{
@@ -2188,7 +2188,7 @@ ecore_evas_focus_skip_set(Ecore_Evas *ee, Eina_Bool skip)
return;
}
- IFC(ee, fn_focus_skip_set) (ee, skip);
+ IFC(ee, fn_focus_skip_set) (ee, on);
IFE;
}
diff --git a/src/lib/ecore_evas/ecore_evas_buffer.c
b/src/lib/ecore_evas/ecore_evas_buffer.c
index ac90eb5..0b9e124 100644
--- a/src/lib/ecore_evas/ecore_evas_buffer.c
+++ b/src/lib/ecore_evas/ecore_evas_buffer.c
@@ -647,12 +647,12 @@ ecore_evas_buffer_allocfunc_new(int w, int h,
ee->prop.max.h = 0;
ee->prop.layer = 0;
ee->prop.focused = EINA_TRUE;
- ee->prop.borderless = 1;
- ee->prop.override = 1;
- ee->prop.maximized = 1;
- ee->prop.fullscreen = 0;
- ee->prop.withdrawn = 0;
- ee->prop.sticky = 0;
+ ee->prop.borderless = EINA_TRUE;
+ ee->prop.override = EINA_TRUE;
+ ee->prop.maximized = EINA_TRUE;
+ ee->prop.fullscreen = EINA_FALSE;
+ ee->prop.withdrawn = EINA_FALSE;
+ ee->prop.sticky = EINA_FALSE;
/* init evas here */
ee->evas = evas_new();
@@ -775,12 +775,12 @@ ecore_evas_object_image_new(Ecore_Evas *ee_target)
ee->prop.max.h = 0;
ee->prop.layer = 0;
ee->prop.focused = EINA_FALSE;
- ee->prop.borderless = 1;
- ee->prop.override = 1;
- ee->prop.maximized = 0;
- ee->prop.fullscreen = 0;
- ee->prop.withdrawn = 0;
- ee->prop.sticky = 0;
+ ee->prop.borderless = EINA_TRUE;
+ ee->prop.override = EINA_TRUE;
+ ee->prop.maximized = EINA_FALSE;
+ ee->prop.fullscreen = EINA_FALSE;
+ ee->prop.withdrawn = EINA_FALSE;
+ ee->prop.sticky = EINA_FALSE;
/* init evas here */
ee->evas = evas_new();
diff --git a/src/lib/ecore_evas/ecore_evas_ews.c
b/src/lib/ecore_evas/ecore_evas_ews.c
index 41e6a00..9aa1dba 100644
--- a/src/lib/ecore_evas/ecore_evas_ews.c
+++ b/src/lib/ecore_evas/ecore_evas_ews.c
@@ -483,39 +483,39 @@ _ecore_evas_ews_iconified_set(Ecore_Evas *ee, Eina_Bool
on)
}
static void
-_ecore_evas_ews_borderless_set(Ecore_Evas *ee, int val)
+_ecore_evas_ews_borderless_set(Ecore_Evas *ee, Eina_Bool on)
{
- if (ee->prop.borderless == val) return;
- ee->prop.borderless = val;
+ if (ee->prop.borderless == on) return;
+ ee->prop.borderless = on;
_ecore_evas_ews_event(ee, ECORE_EVAS_EWS_EVENT_CONFIG_CHANGE);
}
static void
-_ecore_evas_ews_override_set(Ecore_Evas *ee, int val)
+_ecore_evas_ews_override_set(Ecore_Evas *ee, Eina_Bool on)
{
- if (ee->prop.override == val) return;
+ if (ee->prop.override == on) return;
if (ee->visible) evas_object_show(ee->engine.ews.image);
if (ee->prop.focused) evas_object_focus_set(ee->engine.ews.image,
EINA_TRUE);
- ee->prop.override = val;
+ ee->prop.override = on;
_ecore_evas_ews_event(ee, ECORE_EVAS_EWS_EVENT_CONFIG_CHANGE);
}
static void
-_ecore_evas_ews_maximized_set(Ecore_Evas *ee, int val)
+_ecore_evas_ews_maximized_set(Ecore_Evas *ee, Eina_Bool on)
{
- if (ee->prop.maximized == val) return;
- ee->prop.maximized = val;
- if (val) evas_object_show(ee->engine.ews.image);
+ if (ee->prop.maximized == on) return;
+ ee->prop.maximized = on;
+ if (on) evas_object_show(ee->engine.ews.image);
_ecore_evas_ews_event(ee, ECORE_EVAS_EWS_EVENT_MAXIMIZED_CHANGE);
}
static void
-_ecore_evas_ews_fullscreen_set(Ecore_Evas *ee, int val)
+_ecore_evas_ews_fullscreen_set(Ecore_Evas *ee, Eina_Bool on)
{
- if (ee->prop.fullscreen == val) return;
- ee->prop.fullscreen = val;
+ if (ee->prop.fullscreen == on) return;
+ ee->prop.fullscreen = on;
- if (!val)
+ if (!on)
{
evas_object_move(ee->engine.ews.image, ee->x, ee->y);
evas_object_resize(ee->engine.ews.image, ee->w, ee->h);
@@ -546,20 +546,20 @@ _ecore_evas_ews_avoid_damage_set(Ecore_Evas *ee, int val)
}
static void
-_ecore_evas_ews_withdrawn_set(Ecore_Evas *ee, int val)
+_ecore_evas_ews_withdrawn_set(Ecore_Evas *ee, Eina_Bool on)
{
- if (ee->prop.withdrawn == val) return;
- ee->prop.withdrawn = val;
+ if (ee->prop.withdrawn == on) return;
+ ee->prop.withdrawn = on;
_ecore_evas_ews_event(ee, ECORE_EVAS_EWS_EVENT_CONFIG_CHANGE);
}
static void
-_ecore_evas_ews_sticky_set(Ecore_Evas *ee, int val)
+_ecore_evas_ews_sticky_set(Ecore_Evas *ee, Eina_Bool on)
{
- if (ee->prop.sticky == val) return;
- ee->prop.sticky = val;
- if ((val) && (ee->func.fn_sticky)) ee->func.fn_sticky(ee);
- else if ((!val) && (ee->func.fn_unsticky)) ee->func.fn_unsticky(ee);
+ if (ee->prop.sticky == on) return;
+ ee->prop.sticky = on;
+ if ((on) && (ee->func.fn_sticky)) ee->func.fn_sticky(ee);
+ else if ((!on) && (ee->func.fn_unsticky)) ee->func.fn_unsticky(ee);
_ecore_evas_ews_event(ee, ECORE_EVAS_EWS_EVENT_CONFIG_CHANGE);
}
diff --git a/src/lib/ecore_evas/ecore_evas_private.h
b/src/lib/ecore_evas/ecore_evas_private.h
index 6613970..1984dbb 100644
--- a/src/lib/ecore_evas/ecore_evas_private.h
+++ b/src/lib/ecore_evas/ecore_evas_private.h
@@ -83,13 +83,13 @@ struct _Ecore_Evas_Engine_Func
void (*fn_layer_set) (Ecore_Evas *ee, int layer);
void (*fn_focus_set) (Ecore_Evas *ee, Eina_Bool on);
void (*fn_iconified_set) (Ecore_Evas *ee, Eina_Bool on);
- void (*fn_borderless_set) (Ecore_Evas *ee, int on);
- void (*fn_override_set) (Ecore_Evas *ee, int on);
- void (*fn_maximized_set) (Ecore_Evas *ee, int on);
- void (*fn_fullscreen_set) (Ecore_Evas *ee, int on);
+ void (*fn_borderless_set) (Ecore_Evas *ee, Eina_Bool on);
+ void (*fn_override_set) (Ecore_Evas *ee, Eina_Bool on);
+ void (*fn_maximized_set) (Ecore_Evas *ee, Eina_Bool on);
+ void (*fn_fullscreen_set) (Ecore_Evas *ee, Eina_Bool on);
void (*fn_avoid_damage_set) (Ecore_Evas *ee, int on);
- void (*fn_withdrawn_set) (Ecore_Evas *ee, int withdrawn);
- void (*fn_sticky_set) (Ecore_Evas *ee, int sticky);
+ void (*fn_withdrawn_set) (Ecore_Evas *ee, Eina_Bool on);
+ void (*fn_sticky_set) (Ecore_Evas *ee, Eina_Bool on);
void (*fn_ignore_events_set) (Ecore_Evas *ee, int ignore);
void (*fn_alpha_set) (Ecore_Evas *ee, int alpha);
void (*fn_transparent_set) (Ecore_Evas *ee, int transparent);
@@ -98,10 +98,10 @@ struct _Ecore_Evas_Engine_Func
void (*fn_window_group_set) (Ecore_Evas *ee, const Ecore_Evas *ee_group);
void (*fn_aspect_set) (Ecore_Evas *ee, double aspect);
- void (*fn_urgent_set) (Ecore_Evas *ee, int urgent);
- void (*fn_modal_set) (Ecore_Evas *ee, int modal);
- void (*fn_demands_attention_set) (Ecore_Evas *ee, int demand);
- void (*fn_focus_skip_set) (Ecore_Evas *ee, int skip);
+ void (*fn_urgent_set) (Ecore_Evas *ee, Eina_Bool on);
+ void (*fn_modal_set) (Ecore_Evas *ee, Eina_Bool on);
+ void (*fn_demands_attention_set) (Ecore_Evas *ee, Eina_Bool on);
+ void (*fn_focus_skip_set) (Ecore_Evas *ee, Eina_Bool on);
int (*fn_render) (Ecore_Evas *ee);
void (*fn_screen_geometry_get) (const Ecore_Evas *ee, int *x, int *y, int
*w, int *h);
@@ -191,20 +191,19 @@ struct _Ecore_Evas
double aspect;
Eina_Bool focused : 1;
Eina_Bool iconified : 1;
-//FIXME: keep going change to Eina_Bool
- char borderless : 1;
- char override : 1;
- char maximized : 1;
- char fullscreen : 1;
- char withdrawn : 1;
- char sticky : 1;
- char request_pos : 1;
- char draw_frame : 1;
- char hwsurface : 1;
- char urgent : 1;
- char modal : 1;
- char demand_attention : 1;
- char focus_skip : 1;
+ Eina_Bool borderless : 1;
+ Eina_Bool override : 1;
+ Eina_Bool maximized : 1;
+ Eina_Bool fullscreen : 1;
+ Eina_Bool withdrawn : 1;
+ Eina_Bool sticky : 1;
+ Eina_Bool request_pos : 1;
+ Eina_Bool draw_frame : 1;
+ Eina_Bool hwsurface : 1;
+ Eina_Bool urgent : 1;
+ Eina_Bool modal : 1;
+ Eina_Bool demand_attention : 1;
+ Eina_Bool focus_skip : 1;
} prop;
struct {
diff --git a/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
b/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
index 05a0572..4079c11 100644
--- a/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
+++ b/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
@@ -516,8 +516,8 @@ ecore_evas_cocoa_new_internal(Ecore_Cocoa_Window *parent,
int x, int y, int w, i
ee->prop.max.w = 32767;
ee->prop.max.h = 32767;
ee->prop.layer = 4;
- ee->prop.request_pos = 0;
- ee->prop.sticky = 0;
+ ee->prop.request_pos = EINA_FALSE;
+ ee->prop.sticky = EINA_FALSE;
ee->prop.window = 0;
printf("Create New Evas\n");
diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
index 9c41ad6..be62c79 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -72,13 +72,13 @@ static Ecore_Evas_Engine_Func _ecore_evas_drm_engine_func =
NULL, //void (*fn_layer_set) (Ecore_Evas *ee, int layer);
NULL, //void (*fn_focus_set) (Ecore_Evas *ee, Eina_Bool on);
NULL, //void (*fn_iconified_set) (Ecore_Evas *ee, Eina_Bool on);
- NULL, //void (*fn_borderless_set) (Ecore_Evas *ee, int on);
- NULL, //void (*fn_override_set) (Ecore_Evas *ee, int on);
- NULL, //void (*fn_maximized_set) (Ecore_Evas *ee, int on);
- NULL, //void (*fn_fullscreen_set) (Ecore_Evas *ee, int on);
+ NULL, //void (*fn_borderless_set) (Ecore_Evas *ee, Eina_Bool on);
+ NULL, //void (*fn_override_set) (Ecore_Evas *ee, Eina_Bool on);
+ NULL, //void (*fn_maximized_set) (Ecore_Evas *ee, Eina_Bool on);
+ NULL, //void (*fn_fullscreen_set) (Ecore_Evas *ee, Eina_Bool on);
NULL, //void (*fn_avoid_damage_set) (Ecore_Evas *ee, int on);
- NULL, //void (*fn_withdrawn_set) (Ecore_Evas *ee, int withdrawn);
- NULL, //void (*fn_sticky_set) (Ecore_Evas *ee, int sticky);
+ NULL, //void (*fn_withdrawn_set) (Ecore_Evas *ee, Eina_Bool on);
+ NULL, //void (*fn_sticky_set) (Ecore_Evas *ee, Eina_Bool on);
NULL, //void (*fn_ignore_events_set) (Ecore_Evas *ee, int ignore);
NULL, //void (*fn_alpha_set) (Ecore_Evas *ee, int alpha);
NULL, //void (*fn_transparent_set) (Ecore_Evas *ee, int transparent);
@@ -87,10 +87,10 @@ static Ecore_Evas_Engine_Func _ecore_evas_drm_engine_func =
NULL, //void (*fn_window_group_set) (Ecore_Evas *ee, const Ecore_Evas
*ee_group);
NULL, //void (*fn_aspect_set) (Ecore_Evas *ee, double aspect);
- NULL, //void (*fn_urgent_set) (Ecore_Evas *ee, int urgent);
- NULL, //void (*fn_modal_set) (Ecore_Evas *ee, int modal);
- NULL, //void (*fn_demands_attention_set) (Ecore_Evas *ee, int demand);
- NULL, //void (*fn_focus_skip_set) (Ecore_Evas *ee, int skip);
+ NULL, //void (*fn_urgent_set) (Ecore_Evas *ee, Eina_Bool on);
+ NULL, //void (*fn_modal_set) (Ecore_Evas *ee, Eina_Bool on);
+ NULL, //void (*fn_demands_attention_set) (Ecore_Evas *ee, Eina_Bool on);
+ NULL, //void (*fn_focus_skip_set) (Ecore_Evas *ee, Eina_Bool on);
NULL, //int (*fn_render) (Ecore_Evas *ee);
NULL, //void (*fn_screen_geometry_get) (const Ecore_Evas *ee, int *x, int
*y, int *w, int *h);
diff --git a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
index 2a998f9..9e08555 100644
--- a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
+++ b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
@@ -1158,12 +1158,12 @@ ecore_evas_extn_plug_new_internal(Ecore_Evas *ee_target)
ee->prop.max.h = 0;
ee->prop.layer = 0;
ee->prop.focused = EINA_FALSE;
- ee->prop.borderless = 1;
- ee->prop.override = 1;
- ee->prop.maximized = 0;
- ee->prop.fullscreen = 0;
- ee->prop.withdrawn = 0;
- ee->prop.sticky = 0;
+ ee->prop.borderless = EINA_TRUE;
+ ee->prop.override = EINA_TRUE;
+ ee->prop.maximized = EINA_FALSE;
+ ee->prop.fullscreen = EINA_FALSE;
+ ee->prop.withdrawn = EINA_FALSE;
+ ee->prop.sticky = EINA_FALSE;
bdata->image = o;
evas_object_data_set(bdata->image, "Ecore_Evas", ee);
@@ -2042,12 +2042,12 @@ ecore_evas_extn_socket_new_internal(int w, int h)
ee->prop.max.h = 0;
ee->prop.layer = 0;
ee->prop.focused = EINA_FALSE;
- ee->prop.borderless = 1;
- ee->prop.override = 1;
- ee->prop.maximized = 0;
- ee->prop.fullscreen = 0;
- ee->prop.withdrawn = 0;
- ee->prop.sticky = 0;
+ ee->prop.borderless = EINA_TRUE;
+ ee->prop.override = EINA_TRUE;
+ ee->prop.maximized = EINA_FALSE;
+ ee->prop.fullscreen = EINA_FALSE;
+ ee->prop.withdrawn = EINA_FALSE;
+ ee->prop.sticky = EINA_FALSE;
/* init evas here */
ee->evas = evas_new();
diff --git a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
index 1045abb..3a04b95 100644
--- a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
+++ b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
@@ -448,7 +448,7 @@ _ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object
*obj, int layer, int h
}
static void
-_ecore_evas_fullscreen_set(Ecore_Evas *ee, int on)
+_ecore_evas_fullscreen_set(Ecore_Evas *ee, Eina_Bool on)
{
Eina_List *l;
Ecore_Fb_Input_Device *dev;
@@ -613,12 +613,12 @@ ecore_evas_fb_new_internal(const char *disp_name, int
rotation, int w, int h)
ee->prop.max.h = 0;
ee->prop.layer = 0;
ee->prop.focused = EINA_FALSE;
- ee->prop.borderless = 1;
- ee->prop.override = 1;
- ee->prop.maximized = 1;
- ee->prop.fullscreen = 0;
- ee->prop.withdrawn = 0;
- ee->prop.sticky = 0;
+ ee->prop.borderless = EINA_TRUE;
+ ee->prop.override = EINA_TRUE;
+ ee->prop.maximized = EINA_TRUE;
+ ee->prop.fullscreen = EINA_FALSE;
+ ee->prop.withdrawn = EINA_FALSE;
+ ee->prop.sticky = EINA_FALSE;
/* init evas here */
ee->evas = evas_new();
diff --git a/src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c
b/src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c
index 76b4bde..a0fe244bd 100644
--- a/src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c
+++ b/src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c
@@ -242,7 +242,7 @@ _ecore_evas_screen_resized(Ecore_Evas *ee)
int w, h;
/* Do not resize if the window is not fullscreen */
- if (ee->prop.fullscreen == 0) return;
+ if (!ee->prop.fullscreen) return;
ecore_psl1ght_screen_resolution_get (&w, &h);
@@ -439,12 +439,12 @@ ecore_evas_psl1ght_new_internal(const char *name, int w,
int h)
ee->prop.max.h = 0;
ee->prop.layer = 0;
ee->prop.focused = EINA_TRUE;
- ee->prop.borderless = 1;
- ee->prop.override = 1;
- ee->prop.maximized = 1;
- ee->prop.fullscreen = 0;
- ee->prop.withdrawn = 0;
- ee->prop.sticky = 0;
+ ee->prop.borderless = EINA_TRUE;
+ ee->prop.override = EINA_TRUE;
+ ee->prop.maximized = EINA_TRUE;
+ ee->prop.fullscreen = EINA_FALSE;
+ ee->prop.withdrawn = EINA_FALSE;
+ ee->prop.sticky = EINA_FALSE;
ee->prop.window = 0;
/* init evas here */
diff --git a/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
b/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
index 8b44336..f8f4827 100644
--- a/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
+++ b/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
@@ -480,12 +480,12 @@ _ecore_evas_internal_sdl_new(int rmethod, const char*
name, int w, int h, int fu
ee->prop.max.h = 0;
ee->prop.layer = 0;
ee->prop.focused = EINA_TRUE;
- ee->prop.borderless = 1;
- ee->prop.override = 1;
- ee->prop.maximized = 1;
+ ee->prop.borderless = EINA_TRUE;
+ ee->prop.override = EINA_TRUE;
+ ee->prop.maximized = EINA_TRUE;
ee->prop.fullscreen = fullscreen;
- ee->prop.withdrawn = 0;
- ee->prop.sticky = 0;
+ ee->prop.withdrawn = EINA_FALSE;
+ ee->prop.sticky = EINA_FALSE;
ee->prop.window = 0;
ee->alpha = alpha;
ee->prop.hwsurface = hwsurface;
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 5ba8da1..738721a 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
@@ -1265,43 +1265,43 @@ _ecore_evas_wl_common_border_update(Ecore_Evas *ee)
}
void
-_ecore_evas_wl_common_borderless_set(Ecore_Evas *ee, int borderless)
+_ecore_evas_wl_common_borderless_set(Ecore_Evas *ee, Eina_Bool on)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!ee) return;
- if (ee->prop.borderless == borderless) return;
- ee->prop.borderless = borderless;
+ if (ee->prop.borderless == on) return;
+ ee->prop.borderless = on;
_ecore_evas_wl_common_border_update(ee);
_ecore_evas_wl_common_state_update(ee);
}
void
-_ecore_evas_wl_common_maximized_set(Ecore_Evas *ee, int max)
+_ecore_evas_wl_common_maximized_set(Ecore_Evas *ee, Eina_Bool on)
{
Ecore_Evas_Engine_Wl_Data *wdata;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!ee) return;
- if (ee->prop.maximized == max) return;
+ if (ee->prop.maximized == on) return;
wdata = ee->engine.data;
- ecore_wl_window_maximized_set(wdata->win, max);
+ ecore_wl_window_maximized_set(wdata->win, on);
// _ecore_evas_wl_common_state_update(ee);
}
void
-_ecore_evas_wl_common_fullscreen_set(Ecore_Evas *ee, int full)
+_ecore_evas_wl_common_fullscreen_set(Ecore_Evas *ee, Eina_Bool on)
{
Ecore_Evas_Engine_Wl_Data *wdata;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (!ee) return;
- if (ee->prop.fullscreen == full) return;
+ if (ee->prop.fullscreen == on) return;
wdata = ee->engine.data;
- ecore_wl_window_fullscreen_set(wdata->win, full);
+ ecore_wl_window_fullscreen_set(wdata->win, on);
// _ecore_evas_wl_common_state_update(ee);
}
@@ -1480,16 +1480,16 @@ _ecore_evas_wl_common_render(Ecore_Evas *ee)
}
void
-_ecore_evas_wl_common_withdrawn_set(Ecore_Evas *ee, int val)
+_ecore_evas_wl_common_withdrawn_set(Ecore_Evas *ee, Eina_Bool on)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
val = !!val;
- if (ee->prop.withdrawn == val)
+ if (ee->prop.withdrawn == on)
return;
- ee->prop.withdrawn = val;
+ ee->prop.withdrawn = on;
if (val)
ecore_evas_hide(ee);
else
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 43b54af..45aa069 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
@@ -153,8 +153,8 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name,
unsigned int parent,
ee->prop.max.w = 32767;
ee->prop.max.h = 32767;
ee->prop.layer = 4;
- ee->prop.request_pos = 0;
- ee->prop.sticky = 0;
+ ee->prop.request_pos = EINA_FALSE;
+ ee->prop.sticky = EINA_FALSE;
ee->prop.draw_frame = frame;
ee->alpha = EINA_FALSE;
diff --git
a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
index 944db40..905aa26 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
@@ -65,8 +65,8 @@ void _ecore_evas_wl_common_aspect_set(Ecore_Evas *ee, double
aspect);
void _ecore_evas_wl_common_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj,
int layer, int hot_x, int hot_y);
void _ecore_evas_wl_common_layer_set(Ecore_Evas *ee, int layer);
void _ecore_evas_wl_common_iconified_set(Ecore_Evas *ee, Eina_Bool on);
-void _ecore_evas_wl_common_maximized_set(Ecore_Evas *ee, int max);
-void _ecore_evas_wl_common_fullscreen_set(Ecore_Evas *ee, int full);
+void _ecore_evas_wl_common_maximized_set(Ecore_Evas *ee, Eina_Bool on);
+void _ecore_evas_wl_common_fullscreen_set(Ecore_Evas *ee, Eina_Bool on);
void _ecore_evas_wl_common_ignore_events_set(Ecore_Evas *ee, int ignore);
int _ecore_evas_wl_common_pre_render(Ecore_Evas *ee);
/* int _ecore_evas_wl_common_render_updates(Ecore_Evas *ee); */
@@ -76,8 +76,8 @@ void _ecore_evas_wl_common_screen_geometry_get(const
Ecore_Evas *ee, int *x, int
void _ecore_evas_wl_common_screen_dpi_get(const Ecore_Evas *ee, int *xdpi, int
*ydpi);
void _ecore_evas_wl_common_render_updates(void *data, Evas *evas, void *event);
void _ecore_evas_wl_common_rotation_set(Ecore_Evas *ee, int rotation, int
resize);
-void _ecore_evas_wl_common_borderless_set(Ecore_Evas *ee, int borderless);
-void _ecore_evas_wl_common_withdrawn_set(Ecore_Evas *ee, int val);
+void _ecore_evas_wl_common_borderless_set(Ecore_Evas *ee, Eina_Bool on);
+void _ecore_evas_wl_common_withdrawn_set(Ecore_Evas *ee, Eina_Bool on);
void _ecore_evas_wl_common_frame_callback_clean(Ecore_Evas *ee);
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 f521f0e..ccaf684 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
@@ -151,8 +151,8 @@ ecore_evas_wayland_shm_new_internal(const char *disp_name,
unsigned int parent,
ee->prop.max.w = 32767;
ee->prop.max.h = 32767;
ee->prop.layer = 4;
- ee->prop.request_pos = 0;
- ee->prop.sticky = 0;
+ ee->prop.request_pos = EINA_FALSE;
+ ee->prop.sticky = EINA_FALSE;
ee->prop.draw_frame = frame;
ee->alpha = EINA_FALSE;
diff --git a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
index 78974a9..c0add20 100644
--- a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
+++ b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
@@ -861,7 +861,7 @@ _ecore_evas_win32_iconified_set(Ecore_Evas *ee, Eina_Bool
on)
}
static void
-_ecore_evas_win32_borderless_set(Ecore_Evas *ee, int on)
+_ecore_evas_win32_borderless_set(Ecore_Evas *ee, Eina_Bool on)
{
if (((ee->prop.borderless) && (on)) ||
((!ee->prop.borderless) && (!on))) return;
@@ -890,7 +890,7 @@ _ecore_evas_win32_borderless_set(Ecore_Evas *ee, int on)
}
static void
-_ecore_evas_win32_override_set(Ecore_Evas *ee, int on)
+_ecore_evas_win32_override_set(Ecore_Evas *ee, Eina_Bool on)
{
struct _Ecore_Win32_Window *window;
@@ -908,7 +908,7 @@ _ecore_evas_win32_override_set(Ecore_Evas *ee, int on)
}
static void
-_ecore_evas_win32_fullscreen_set(Ecore_Evas *ee, int on)
+_ecore_evas_win32_fullscreen_set(Ecore_Evas *ee, Eina_Boo on)
{
struct _Ecore_Win32_Window *window;
Ecore_Evas_Engine_Data_Win32 *wdata = ee->engine.data;
@@ -1272,8 +1272,8 @@ _ecore_evas_win32_new_internal(int
(*_ecore_evas_engine_backend_init)(Ecore_Evas
ee->prop.max.w = 32767;
ee->prop.max.h = 32767;
ee->prop.layer = 4;
- ee->prop.request_pos = 0;
- ee->prop.sticky = 0;
+ ee->prop.request_pos = EINA_FALSE;
+ ee->prop.sticky = EINA_FALSE;
/* FIXME: sticky to add */
ee->prop.window = 0;
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index 979815f..4489db9 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -306,7 +306,7 @@ _ecore_evas_x_window_profile_set(Ecore_Evas *ee)
# ifdef BUILD_ECORE_EVAS_OPENGL_X11
static Ecore_X_Window
-_ecore_evas_x_gl_window_new(Ecore_Evas *ee, Ecore_X_Window parent, int x, int
y, int w, int h, int override, int argb, const int *opt)
+_ecore_evas_x_gl_window_new(Ecore_Evas *ee, Ecore_X_Window parent, int x, int
y, int w, int h, Eina_Bool override, int argb, const int *opt)
{
Evas_Engine_Info_GL_X11 *einfo;
Ecore_X_Window win;
@@ -793,11 +793,11 @@ _ecore_evas_x_event_property_change(void *data
EINA_UNUSED, int type EINA_UNUSED
edata->state.above = 0;
edata->state.below = 0;
- ee->prop.modal = 0;
- ee->prop.maximized = 0;
- ee->prop.sticky = 0;
- ee->prop.fullscreen = 0;
- ee->prop.focus_skip = 0;
+ ee->prop.modal = EINA_FALSE;
+ ee->prop.maximized = EINA_FALSE;
+ ee->prop.sticky = EINA_FALSE;
+ ee->prop.fullscreen = EINA_FALSE;
+ ee->prop.focus_skip = EINA_FALSE;
ecore_x_netwm_window_state_get(e->win, &state, &num);
if (state)
@@ -808,30 +808,30 @@ _ecore_evas_x_event_property_change(void *data
EINA_UNUSED, int type EINA_UNUSED
{
case ECORE_X_WINDOW_STATE_MODAL:
edata->state.modal = 1;
- ee->prop.modal = 1;
+ ee->prop.modal = EINA_TRUE;
break;
case ECORE_X_WINDOW_STATE_STICKY:
- ee->prop.sticky = 1;
+ ee->prop.sticky = EINA_TRUE;
edata->state.sticky = 1;
break;
case ECORE_X_WINDOW_STATE_MAXIMIZED_VERT:
edata->state.maximized_v = 1;
- ee->prop.maximized = 1;
+ ee->prop.maximized = EINA_TRUE;
break;
case ECORE_X_WINDOW_STATE_MAXIMIZED_HORZ:
edata->state.maximized_h = 1;
- ee->prop.maximized = 1;
+ ee->prop.maximized = EINA_TRUE;
break;
case ECORE_X_WINDOW_STATE_SHADED:
edata->state.shaded = 1;
break;
case ECORE_X_WINDOW_STATE_SKIP_TASKBAR:
edata->state.skip_taskbar = 1;
- ee->prop.focus_skip = 1;
+ ee->prop.focus_skip = EINA_TRUE;
break;
case ECORE_X_WINDOW_STATE_SKIP_PAGER:
edata->state.skip_pager = 1;
- ee->prop.focus_skip = 1;
+ ee->prop.focus_skip = EINA_TRUE;
break;
case ECORE_X_WINDOW_STATE_FULLSCREEN:
ee->prop.fullscreen = 1;
@@ -879,7 +879,7 @@ _ecore_evas_x_event_property_change(void *data EINA_UNUSED,
int type EINA_UNUSED
if ((!ee->prop.withdrawn) || (ee->prop.iconified))
{
state_change = 1;
- ee->prop.withdrawn = 1;
+ ee->prop.withdrawn = EINA_TRUE;
ee->prop.iconified = EINA_FALSE;
}
break;
@@ -888,7 +888,7 @@ _ecore_evas_x_event_property_change(void *data EINA_UNUSED,
int type EINA_UNUSED
{
state_change = 1;
ee->prop.iconified = EINA_TRUE;
- ee->prop.withdrawn = 0;
+ ee->prop.withdrawn = EINA_FALSE;
}
break;
case ECORE_X_WINDOW_STATE_HINT_NORMAL:
@@ -896,7 +896,7 @@ _ecore_evas_x_event_property_change(void *data EINA_UNUSED,
int type EINA_UNUSED
{
state_change = 1;
ee->prop.iconified = EINA_FALSE;
- ee->prop.withdrawn = 0;
+ ee->prop.withdrawn = EINA_FALSE;
}
break;
default:
@@ -1777,7 +1777,7 @@ _ecore_evas_x_move(Ecore_Evas *ee, int x, int y)
if (!ee->should_be_visible)
{
/* We need to request pos */
- ee->prop.request_pos = 1;
+ ee->prop.request_pos = EINA_TRUE;
_ecore_evas_x_size_pos_hints_update(ee);
}
if (ee->func.fn_move) ee->func.fn_move(ee);
@@ -1800,7 +1800,7 @@ _ecore_evas_x_move(Ecore_Evas *ee, int x, int y)
if (!ee->should_be_visible)
{
/* We need to request pos */
- ee->prop.request_pos = 1;
+ ee->prop.request_pos = EINA_TRUE;
_ecore_evas_x_size_pos_hints_update(ee);
}
}
@@ -2560,58 +2560,61 @@ _ecore_evas_x_aspect_set(Ecore_Evas *ee, double aspect)
}
static void
-_ecore_evas_x_urgent_set(Ecore_Evas *ee, int urgent)
+_ecore_evas_x_urgent_set(Ecore_Evas *ee, Eina_Bool on)
{
- if (ee->prop.urgent == urgent) return;
+ if (ee->prop.urgent == on) return;
- ee->prop.urgent = urgent;
+ ee->prop.urgent = on;
_ecore_evas_x_hints_update(ee);
}
static void
-_ecore_evas_x_modal_set(Ecore_Evas *ee, int modal)
+_ecore_evas_x_modal_set(Ecore_Evas *ee, Eina_Bool on)
{
Ecore_Evas_Engine_Data_X11 *edata = ee->engine.data;
- if (ee->prop.modal == modal) return;
+ if (ee->prop.modal == on) return;
- ee->prop.modal = modal;
+ ee->prop.modal = on;
if (ee->should_be_visible)
ecore_x_netwm_state_request_send(ee->prop.window, edata->win_root,
- ECORE_X_WINDOW_STATE_MODAL, -1, modal);
+ ECORE_X_WINDOW_STATE_MODAL, -1, on);
else
_ecore_evas_x_state_update(ee);
}
static void
-_ecore_evas_x_demand_attention_set(Ecore_Evas *ee, int demand)
+_ecore_evas_x_demand_attention_set(Ecore_Evas *ee, Eina_Bool on)
{
Ecore_Evas_Engine_Data_X11 *edata = ee->engine.data;
- if (ee->prop.demand_attention == demand) return;
+ if (ee->prop.demand_attention == on) return;
- ee->prop.demand_attention = demand;
+ ee->prop.demand_attention = on;
if (ee->should_be_visible)
ecore_x_netwm_state_request_send(ee->prop.window, edata->win_root,
- ECORE_X_WINDOW_STATE_DEMANDS_ATTENTION,
-1, demand);
+ ECORE_X_WINDOW_STATE_DEMANDS_ATTENTION,
+ -1, on);
else
_ecore_evas_x_state_update(ee);
}
static void
-_ecore_evas_x_focus_skip_set(Ecore_Evas *ee, int skip)
+_ecore_evas_x_focus_skip_set(Ecore_Evas *ee, Eina_Bool on)
{
Ecore_Evas_Engine_Data_X11 *edata = ee->engine.data;
- if (ee->prop.focus_skip == skip) return;
+ if (ee->prop.focus_skip == on) return;
- ee->prop.focus_skip = skip;
+ ee->prop.focus_skip = on;
if (ee->should_be_visible)
{
ecore_x_netwm_state_request_send(ee->prop.window, edata->win_root,
- ECORE_X_WINDOW_STATE_SKIP_TASKBAR,
-1, skip);
+ ECORE_X_WINDOW_STATE_SKIP_TASKBAR, -1,
+ on);
ecore_x_netwm_state_request_send(ee->prop.window, edata->win_root,
- ECORE_X_WINDOW_STATE_SKIP_PAGER, -1,
skip);
+ ECORE_X_WINDOW_STATE_SKIP_PAGER, -1,
+ on);
}
else
_ecore_evas_x_state_update(ee);
@@ -2821,7 +2824,7 @@ _ecore_evas_x_iconified_set(Ecore_Evas *ee, Eina_Bool on)
}
static void
-_ecore_evas_x_borderless_set(Ecore_Evas *ee, int on)
+_ecore_evas_x_borderless_set(Ecore_Evas *ee, Eina_Bool on)
{
if (ee->prop.borderless == on) return;
ee->prop.borderless = on;
@@ -2831,33 +2834,33 @@ _ecore_evas_x_borderless_set(Ecore_Evas *ee, int on)
/* FIXME: This function changes the initial state of the ee
* whilest the iconic function changes the current state! */
static void
-_ecore_evas_x_withdrawn_set(Ecore_Evas *ee, int withdrawn)
+_ecore_evas_x_withdrawn_set(Ecore_Evas *ee, Eina_Bool on)
{
- if (ee->prop.withdrawn == withdrawn) return;
-// ee->prop.withdrawn = withdrawn;
+ if (ee->prop.withdrawn == on) return;
+// ee->prop.withdrawn = on;
_ecore_evas_x_hints_update(ee);
- if (withdrawn)
+ if (on)
ecore_evas_hide(ee);
else
ecore_evas_show(ee);
}
static void
-_ecore_evas_x_sticky_set(Ecore_Evas *ee, int sticky)
+_ecore_evas_x_sticky_set(Ecore_Evas *ee, Eina_Bool on)
{
Ecore_Evas_Engine_Data_X11 *edata = ee->engine.data;
- if (ee->prop.sticky == sticky) return;
+ if (ee->prop.sticky == on) return;
/* We dont want to set prop.sticky here as it will cause
* the sticky callback not to get called. Its set on the
* property change event.
- * ee->prop.sticky = sticky;
+ * ee->prop.sticky = on;
*/
-// edata->state.sticky = sticky;
+// edata->state.sticky = on;
if (ee->should_be_visible)
ecore_x_netwm_state_request_send(ee->prop.window, edata->win_root,
- ECORE_X_WINDOW_STATE_STICKY, -1, sticky);
+ ECORE_X_WINDOW_STATE_STICKY, -1, on);
else
_ecore_evas_x_state_update(ee);
}
@@ -2906,7 +2909,7 @@ _ecore_evas_x_reinit_win(Ecore_Evas *ee)
*/
static void
-_ecore_evas_x_override_set(Ecore_Evas *ee, int on)
+_ecore_evas_x_override_set(Ecore_Evas *ee, Eina_Bool on)
{
if (ee->prop.override == on) return;
if (ee->should_be_visible) ecore_x_window_hide(ee->prop.window);
@@ -2917,7 +2920,7 @@ _ecore_evas_x_override_set(Ecore_Evas *ee, int on)
}
static void
-_ecore_evas_x_maximized_set(Ecore_Evas *ee, int on)
+_ecore_evas_x_maximized_set(Ecore_Evas *ee, Eina_Bool on)
{
Ecore_Evas_Engine_Data_X11 *edata = ee->engine.data;
@@ -2937,7 +2940,7 @@ _ecore_evas_x_maximized_set(Ecore_Evas *ee, int on)
}
static void
-_ecore_evas_x_fullscreen_set(Ecore_Evas *ee, int on)
+_ecore_evas_x_fullscreen_set(Ecore_Evas *ee, Eina_Bool on)
{
Ecore_Evas_Engine_Data_X11 *edata = ee->engine.data;
@@ -3471,7 +3474,7 @@ ecore_evas_software_x11_new_internal(const char
*disp_name, Ecore_X_Window paren
ee->prop.max.w = 32767;
ee->prop.max.h = 32767;
ee->prop.layer = 4;
- ee->prop.request_pos = 0;
+ ee->prop.request_pos = EINA_FALSE;
ee->prop.sticky = 0;
edata->state.sticky = 0;
@@ -3674,7 +3677,7 @@ ecore_evas_software_x11_pixmap_new_internal(const char
*disp_name, Ecore_X_Windo
ee->prop.max.w = 32767;
ee->prop.max.h = 32767;
ee->prop.layer = 4;
- ee->prop.request_pos = 0;
+ ee->prop.request_pos = EINA_FALSE;
ee->prop.sticky = 0;
edata->state.sticky = 0;
@@ -4002,7 +4005,7 @@ ecore_evas_gl_x11_options_new_internal(const char
*disp_name, Ecore_X_Window par
ee->prop.max.w = 32767;
ee->prop.max.h = 32767;
ee->prop.layer = 4;
- ee->prop.request_pos = 0;
+ ee->prop.request_pos = EINA_FALSE;
ee->prop.sticky = 0;
edata->state.sticky = 0;
@@ -4139,7 +4142,7 @@ ecore_evas_gl_x11_pixmap_new_internal(const char
*disp_name, Ecore_X_Window pare
ee->prop.max.w = 32767;
ee->prop.max.h = 32767;
ee->prop.layer = 4;
- ee->prop.request_pos = 0;
+ ee->prop.request_pos = EINA_FALSE;
ee->prop.sticky = 0;
edata->state.sticky = 0;
--
