From f111c8da6dc32686ca1fe787208206fa95013ee4 Mon Sep 17 00:00:00 2001
From: ChunEon Park <hermet@hermet.pe.kr>
Date: Sat, 11 Jan 2014 18:19:43 +0900
Subject: [PATCH] ecore - clean up code.

fix indentation and use Eina_Bool instead of char.
---
 src/lib/ecore_evas/ecore_evas_buffer.c        | 10 ++---
 src/lib/ecore_evas/ecore_evas_ews.c           | 14 +++----
 src/lib/ecore_evas/ecore_evas_private.h       |  9 ++--
 .../engines/cocoa/ecore_evas_cocoa.c          |  4 +-
 .../ecore_evas/engines/drm/ecore_evas_drm.c   |  4 +-
 .../ecore_evas/engines/extn/ecore_evas_extn.c | 12 +++---
 .../ecore_evas/engines/fb/ecore_evas_fb.c     |  6 +--
 .../engines/psl1ght/ecore_evas_psl1ght.c      |  8 ++--
 .../ecore_evas/engines/sdl/ecore_evas_sdl.c   |  8 ++--
 .../wayland/ecore_evas_wayland_common.c       | 10 ++---
 .../wayland/ecore_evas_wayland_private.h      |  2 +-
 .../engines/win32/ecore_evas_win32.c          |  8 ++--
 .../ecore_evas/engines/x/ecore_evas_x.c       | 42 +++++++++----------
 13 files changed, 69 insertions(+), 68 deletions(-)

diff --git a/src/lib/ecore_evas/ecore_evas_buffer.c b/src/lib/ecore_evas/ecore_evas_buffer.c
index c49b5d2a5a..ac90eb58d1 100644
--- a/src/lib/ecore_evas/ecore_evas_buffer.c
+++ b/src/lib/ecore_evas/ecore_evas_buffer.c
@@ -105,7 +105,7 @@ _ecore_evas_show(Ecore_Evas *ee)
 
    if (bdata->image) return;
    if (ee->prop.focused) return;
-   ee->prop.focused = 1;
+   ee->prop.focused = EINA_TRUE;
    evas_focus_in(ee->evas);
    if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
 }
@@ -407,7 +407,7 @@ _ecore_evas_buffer_cb_focus_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
    Ecore_Evas *ee;
 
    ee = data;
-   ee->prop.focused = 1;
+   ee->prop.focused = EINA_TRUE;
    evas_focus_in(ee->evas);
    if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
 }
@@ -418,7 +418,7 @@ _ecore_evas_buffer_cb_focus_out(void *data, Evas *e EINA_UNUSED, Evas_Object *ob
    Ecore_Evas *ee;
 
    ee = data;
-   ee->prop.focused = 0;
+   ee->prop.focused = EINA_FALSE;
    evas_focus_out(ee->evas);
    if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
 }
@@ -646,7 +646,7 @@ ecore_evas_buffer_allocfunc_new(int w, int h,
    ee->prop.max.w = 0;
    ee->prop.max.h = 0;
    ee->prop.layer = 0;
-   ee->prop.focused = 1;
+   ee->prop.focused = EINA_TRUE;
    ee->prop.borderless = 1;
    ee->prop.override = 1;
    ee->prop.maximized = 1;
@@ -774,7 +774,7 @@ ecore_evas_object_image_new(Ecore_Evas *ee_target)
    ee->prop.max.w = 0;
    ee->prop.max.h = 0;
    ee->prop.layer = 0;
-   ee->prop.focused = 0;
+   ee->prop.focused = EINA_FALSE;
    ee->prop.borderless = 1;
    ee->prop.override = 1;
    ee->prop.maximized = 0;
diff --git a/src/lib/ecore_evas/ecore_evas_ews.c b/src/lib/ecore_evas/ecore_evas_ews.c
index 43ead0326b..41e6a005f8 100644
--- a/src/lib/ecore_evas/ecore_evas_ews.c
+++ b/src/lib/ecore_evas/ecore_evas_ews.c
@@ -456,11 +456,11 @@ _ecore_evas_ews_layer_set(Ecore_Evas *ee, int layer)
 }
 
 static void
-_ecore_evas_ews_focus_set(Ecore_Evas *ee, int val)
+_ecore_evas_ews_focus_set(Ecore_Evas *ee, Eina_Bool on)
 {
-   evas_object_focus_set(ee->engine.ews.image, val);
-   ee->prop.focused = val;
-   if (val)
+   evas_object_focus_set(ee->engine.ews.image, on);
+   ee->prop.focused = on;
+   if (on)
      {
         evas_focus_in(ee->evas);
         if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
@@ -475,10 +475,10 @@ _ecore_evas_ews_focus_set(Ecore_Evas *ee, int val)
 }
 
 static void
-_ecore_evas_ews_iconified_set(Ecore_Evas *ee, int val)
+_ecore_evas_ews_iconified_set(Ecore_Evas *ee, Eina_Bool on)
 {
-   if (ee->prop.iconified == val) return;
-   ee->prop.iconified = val;
+   if (ee->prop.iconified == on) return;
+   ee->prop.iconified = on;
    _ecore_evas_ews_event(ee, ECORE_EVAS_EWS_EVENT_ICONIFIED_CHANGE);
 }
 
diff --git a/src/lib/ecore_evas/ecore_evas_private.h b/src/lib/ecore_evas/ecore_evas_private.h
index c611da9dfe..9cd258ae39 100644
--- a/src/lib/ecore_evas/ecore_evas_private.h
+++ b/src/lib/ecore_evas/ecore_evas_private.h
@@ -81,8 +81,8 @@ struct _Ecore_Evas_Engine_Func
    void (*fn_size_step_set) (Ecore_Evas *ee, int w, int h);
    void (*fn_object_cursor_set) (Ecore_Evas *ee, Evas_Object *obj, int layer, int hot_x, int hot_y);
    void (*fn_layer_set) (Ecore_Evas *ee, int layer);
-   void (*fn_focus_set) (Ecore_Evas *ee, int on);
-   void (*fn_iconified_set) (Ecore_Evas *ee, int on);
+   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);
@@ -189,8 +189,9 @@ struct _Ecore_Evas
       Ecore_Evas     *group_ee;
       Ecore_Window    group_ee_win;
       double          aspect;
-      char            focused      : 1;
-      char            iconified    : 1;
+      Eina_Bool       focused      : 1;
+      Eina_Bool       iconified    : 1;
+//FIXME: keep going change to Eina_Bool
       char            borderless   : 1;
       char            override     : 1;
       char            maximized    : 1;
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 9d1ba65e36..05a05728b5 100644
--- a/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
+++ b/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
@@ -110,7 +110,7 @@ _ecore_evas_cocoa_event_got_focus(void *data EINA_UNUSED, int type EINA_UNUSED,
   ee = _ecore_evas_cocoa_match();
 
   if (!ee) return ECORE_CALLBACK_PASS_ON;
-  ee->prop.focused = 1;
+  ee->prop.focused = EINA_TRUE;
   evas_focus_in(ee->evas);
   if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
    
@@ -128,7 +128,7 @@ _ecore_evas_cocoa_event_lost_focus(void *data EINA_UNUSED, int type EINA_UNUSED,
 
   if (!ee) return ECORE_CALLBACK_PASS_ON;
   evas_focus_out(ee->evas);
-  ee->prop.focused = 0;
+  ee->prop.focused = EINA_FALSE;
   if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
 
   return ECORE_CALLBACK_PASS_ON;
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 3b4072908c..9c41ad693e 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -70,8 +70,8 @@ static Ecore_Evas_Engine_Func _ecore_evas_drm_engine_func =
    NULL, //void (*fn_size_step_set) (Ecore_Evas *ee, int w, int h);
    NULL, //void (*fn_object_cursor_set) (Ecore_Evas *ee, Evas_Object *obj, int layer, int hot_x, int hot_y);
    NULL, //void (*fn_layer_set) (Ecore_Evas *ee, int layer);
-   NULL, //void (*fn_focus_set) (Ecore_Evas *ee, int on);
-   NULL, //void (*fn_iconified_set) (Ecore_Evas *ee, int on);
+   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);
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 9c33ea53eb..2a998f9cc5 100644
--- a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
+++ b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
@@ -726,7 +726,7 @@ _ecore_evas_extn_cb_focus_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj E
    Ecore_Evas_Engine_Buffer_Data *bdata = ee->engine.data;
    Extn *extn;
 
-   ee->prop.focused = 1;
+   ee->prop.focused = EINA_TRUE;
    extn = bdata->data;
    if (!extn) return;
    if (!extn->ipc.server) return;
@@ -740,7 +740,7 @@ _ecore_evas_extn_cb_focus_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
    Ecore_Evas_Engine_Buffer_Data *bdata = ee->engine.data;
    Extn *extn;
 
-   ee->prop.focused = 0;
+   ee->prop.focused = EINA_FALSE;
    extn = bdata->data;
    if (!extn) return;
    if (!extn->ipc.server) return;
@@ -1157,7 +1157,7 @@ ecore_evas_extn_plug_new_internal(Ecore_Evas *ee_target)
    ee->prop.max.w = 0;
    ee->prop.max.h = 0;
    ee->prop.layer = 0;
-   ee->prop.focused = 0;
+   ee->prop.focused = EINA_FALSE;
    ee->prop.borderless = 1;
    ee->prop.override = 1;
    ee->prop.maximized = 0;
@@ -1601,7 +1601,7 @@ _ipc_client_data(void *data, int type EINA_UNUSED, void *event)
       case OP_FOCUS:
          if (!ee->prop.focused)
            {
-              ee->prop.focused = 1;
+              ee->prop.focused = EINA_TRUE;
               evas_focus_in(ee->evas);
               if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
            }
@@ -1609,7 +1609,7 @@ _ipc_client_data(void *data, int type EINA_UNUSED, void *event)
       case OP_UNFOCUS:
          if (ee->prop.focused)
            {
-              ee->prop.focused = 0;
+              ee->prop.focused = EINA_FALSE;
               evas_focus_out(ee->evas);
               if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
            }
@@ -2041,7 +2041,7 @@ ecore_evas_extn_socket_new_internal(int w, int h)
    ee->prop.max.w = 0;
    ee->prop.max.h = 0;
    ee->prop.layer = 0;
-   ee->prop.focused = 0;
+   ee->prop.focused = EINA_FALSE;
    ee->prop.borderless = 1;
    ee->prop.override = 1;
    ee->prop.maximized = 0;
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 2531819334..1045abb59b 100644
--- a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
+++ b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
@@ -389,7 +389,7 @@ static void
 _ecore_evas_show(Ecore_Evas *ee)
 {
    if (ee->prop.focused) return;
-   ee->prop.focused = 1;
+   ee->prop.focused = EINA_TRUE;
    evas_focus_in(ee->evas);
    if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
 }
@@ -399,7 +399,7 @@ _ecore_evas_hide(Ecore_Evas *ee)
 {
    if (ee->prop.focused)
      {
-        ee->prop.focused = 0;
+        ee->prop.focused = EINA_FALSE;
         evas_focus_out(ee->evas);
         if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
      }
@@ -612,7 +612,7 @@ ecore_evas_fb_new_internal(const char *disp_name, int rotation, int w, int h)
    ee->prop.max.w = 0;
    ee->prop.max.h = 0;
    ee->prop.layer = 0;
-   ee->prop.focused = 0;
+   ee->prop.focused = EINA_FALSE;
    ee->prop.borderless = 1;
    ee->prop.override = 1;
    ee->prop.maximized = 1;
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 112e619904..76b4bdee1f 100644
--- a/src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c
+++ b/src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c
@@ -45,7 +45,7 @@ _ecore_evas_psl1ght_event_got_focus(void *data EINA_UNUSED, int type EINA_UNUSED
 
    if (!ee) return ECORE_CALLBACK_PASS_ON;
    /* pass on event */
-   ee->prop.focused = 1;
+   ee->prop.focused = EINA_TRUE;
    evas_focus_in(ee->evas);
    if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
 
@@ -62,7 +62,7 @@ _ecore_evas_psl1ght_event_lost_focus(void *data EINA_UNUSED, int type EINA_UNUSE
    if (!ee) return ECORE_CALLBACK_PASS_ON;
    /* pass on event */
    evas_focus_out(ee->evas);
-   ee->prop.focused = 0;
+   ee->prop.focused = EINA_FALSE;
    if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
 
    return ECORE_CALLBACK_PASS_ON;
@@ -290,7 +290,7 @@ static void
 _ecore_evas_show(Ecore_Evas *ee)
 {
    if (ee->prop.focused) return;
-   ee->prop.focused = 1;
+   ee->prop.focused = EINA_TRUE;
    evas_focus_in(ee->evas);
    if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
 }
@@ -438,7 +438,7 @@ ecore_evas_psl1ght_new_internal(const char *name, int w, int h)
    ee->prop.max.w = 0;
    ee->prop.max.h = 0;
    ee->prop.layer = 0;
-   ee->prop.focused = 1;
+   ee->prop.focused = EINA_TRUE;
    ee->prop.borderless = 1;
    ee->prop.override = 1;
    ee->prop.maximized = 1;
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 88808e9021..8b443366dc 100644
--- a/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
+++ b/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
@@ -60,7 +60,7 @@ _ecore_evas_sdl_event_got_focus(void *data EINA_UNUSED, int type EINA_UNUSED, vo
 
    if (!ee) return ECORE_CALLBACK_PASS_ON;
    /* pass on event */
-   ee->prop.focused = 1;
+   ee->prop.focused = EINA_TRUE;
    evas_focus_in(ee->evas);
    if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
    return ECORE_CALLBACK_PASS_ON;
@@ -75,7 +75,7 @@ _ecore_evas_sdl_event_lost_focus(void *data EINA_UNUSED, int type EINA_UNUSED, v
 
    if (!ee) return ECORE_CALLBACK_PASS_ON;
    /* pass on event */
-   ee->prop.focused = 0;
+   ee->prop.focused = EINA_FALSE;
    evas_focus_out(ee->evas);
    if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
    return ECORE_CALLBACK_PASS_ON;
@@ -340,7 +340,7 @@ static void
 _ecore_evas_show(Ecore_Evas *ee)
 {
    if (ee->prop.focused) return;
-   ee->prop.focused = 1;
+   ee->prop.focused = EINA_TRUE;
    evas_event_feed_mouse_in(ee->evas, (unsigned int)((unsigned long long)(ecore_time_get() * 1000.0) & 0xffffffff), NULL);
 }
 
@@ -479,7 +479,7 @@ _ecore_evas_internal_sdl_new(int rmethod, const char* name, int w, int h, int fu
    ee->prop.max.w = 0;
    ee->prop.max.h = 0;
    ee->prop.layer = 0;
-   ee->prop.focused = 1;
+   ee->prop.focused = EINA_TRUE;
    ee->prop.borderless = 1;
    ee->prop.override = 1;
    ee->prop.maximized = 1;
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 2d037002da..5ba8da1cfb 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
@@ -155,7 +155,7 @@ _ecore_evas_wl_common_cb_focus_in(void *data EINA_UNUSED, int type EINA_UNUSED,
    if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
    if (ev->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
    if (ee->prop.focused) return ECORE_CALLBACK_PASS_ON;
-   ee->prop.focused = 1;
+   ee->prop.focused = EINA_TRUE;
    evas_focus_in(ee->evas);
    if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
    return ECORE_CALLBACK_PASS_ON;
@@ -175,7 +175,7 @@ _ecore_evas_wl_common_cb_focus_out(void *data EINA_UNUSED, int type EINA_UNUSED,
    if (ev->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
    if (!ee->prop.focused) return ECORE_CALLBACK_PASS_ON;
    evas_focus_out(ee->evas);
-   ee->prop.focused = 0;
+   ee->prop.focused = EINA_FALSE;
    if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
    return ECORE_CALLBACK_PASS_ON;
 }
@@ -1229,13 +1229,13 @@ _ecore_evas_wl_common_layer_set(Ecore_Evas *ee, int layer)
 }
 
 void
-_ecore_evas_wl_common_iconified_set(Ecore_Evas *ee, int iconify)
+_ecore_evas_wl_common_iconified_set(Ecore_Evas *ee, Eina_Bool on)
 {
    LOGFN(__FILE__, __LINE__, __FUNCTION__);
 
    if (!ee) return;
-   if (ee->prop.iconified == iconify) return;
-   ee->prop.iconified = iconify;
+   if (ee->prop.iconified == on) return;
+   ee->prop.iconified = on;
    /* FIXME: Implement this in Wayland someshow */
 }
 
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 504ea32f8c..944db405bf 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
@@ -64,7 +64,7 @@ void _ecore_evas_wl_common_size_step_set(Ecore_Evas *ee, int w, int h);
 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, int iconify);
+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_ignore_events_set(Ecore_Evas *ee, int ignore);
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 84c4596c82..78974a9e04 100644
--- a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
+++ b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
@@ -212,7 +212,7 @@ _ecore_evas_win32_event_window_focus_in(void *data EINA_UNUSED, int type EINA_UN
    if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
    if ((Ecore_Window)e->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
 
-   ee->prop.focused = 1;
+   ee->prop.focused = EINA_TRUE;
    evas_focus_in(ee->evas);
    if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
    return ECORE_CALLBACK_PASS_ON;
@@ -230,7 +230,7 @@ _ecore_evas_win32_event_window_focus_out(void *data EINA_UNUSED, int type EINA_U
    if ((Ecore_Window)e->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
 
    evas_focus_out(ee->evas);
-   ee->prop.focused = 0;
+   ee->prop.focused = EINA_FALSE;
    if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
    return ECORE_CALLBACK_PASS_ON;
 }
@@ -845,13 +845,13 @@ _ecore_evas_win32_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int ho
 }
 
 static void
-_ecore_evas_win32_focus_set(Ecore_Evas *ee, int on EINA_UNUSED)
+_ecore_evas_win32_focus_set(Ecore_Evas *ee, Eina_Bool on EINA_UNUSED)
 {
    ecore_win32_window_focus((struct _Ecore_Win32_Window *)ee->prop.window);
 }
 
 static void
-_ecore_evas_win32_iconified_set(Ecore_Evas *ee, int on)
+_ecore_evas_win32_iconified_set(Ecore_Evas *ee, Eina_Bool on)
 {
 /*    if (((ee->prop.borderless) && (on)) || */
 /*        ((!ee->prop.borderless) && (!on))) return; */
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 56514c71d4..cfef9933b9 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -89,7 +89,7 @@ struct _Ecore_Evas_Engine_Data_X11 {
      unsigned char done : 1; // need to send change done event to the WM
    } profile;
    Ecore_X_Window win_shaped_input;
-   struct 
+   struct
      {
         unsigned int front, back; // front and back pixmaps (double-buffer)
         Evas_Coord w, h; // store pixmap size (saves X roundtrips)
@@ -121,8 +121,8 @@ _ecore_evas_x_hints_update(Ecore_Evas *ee)
    ecore_x_icccm_hints_set
      (ee->prop.window,
          !ee->prop.focus_skip /* accepts_focus */,
-         ee->prop.iconified ? ECORE_X_WINDOW_STATE_HINT_ICONIC : 
-         ee->prop.withdrawn ? ECORE_X_WINDOW_STATE_HINT_WITHDRAWN : 
+         ee->prop.iconified ? ECORE_X_WINDOW_STATE_HINT_ICONIC :
+         ee->prop.withdrawn ? ECORE_X_WINDOW_STATE_HINT_WITHDRAWN :
          ECORE_X_WINDOW_STATE_HINT_NORMAL /* initial_state */,
          0 /* icon_pixmap */,
          0 /* icon_mask */,
@@ -341,7 +341,7 @@ _ecore_evas_x_gl_window_new(Ecore_Evas *ee, Ecore_X_Window parent, int x, int y,
                            (evas_version->micro >= 99))
                        einfo->swap_mode = opt[op];
                     }
-#endif                  
+#endif
                }
           }
 
@@ -880,14 +880,14 @@ _ecore_evas_x_event_property_change(void *data EINA_UNUSED, int type EINA_UNUSED
                {
                   state_change = 1;
                   ee->prop.withdrawn = 1;
-                  ee->prop.iconified = 0;
+                  ee->prop.iconified = EINA_FALSE;
                }
              break;
            case ECORE_X_WINDOW_STATE_HINT_ICONIC:
              if ((!ee->prop.iconified) || (ee->prop.withdrawn))
                {
                   state_change = 1;
-                  ee->prop.iconified = 1;
+                  ee->prop.iconified = EINA_TRUE;
                   ee->prop.withdrawn = 0;
                }
              break;
@@ -895,7 +895,7 @@ _ecore_evas_x_event_property_change(void *data EINA_UNUSED, int type EINA_UNUSED
              if ((ee->prop.iconified) || (ee->prop.withdrawn))
                {
                   state_change = 1;
-                  ee->prop.iconified = 0;
+                  ee->prop.iconified = EINA_FALSE;
                   ee->prop.withdrawn = 0;
                }
              break;
@@ -948,7 +948,7 @@ _ecore_evas_x_event_client_message(void *data EINA_UNUSED, int type EINA_UNUSED,
      {
         ee = ecore_event_window_match(e->data.l[0]);
         if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
-	edata = ee->engine.data;
+        edata = ee->engine.data;
         if (e->data.l[0] != (long)ee->prop.window)
           return ECORE_CALLBACK_PASS_ON;
         if (!edata->sync_began)
@@ -963,7 +963,7 @@ _ecore_evas_x_event_client_message(void *data EINA_UNUSED, int type EINA_UNUSED,
      {
         ee = ecore_event_window_match(e->data.l[0]);
         if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
-	edata = ee->engine.data;
+        edata = ee->engine.data;
         if (e->data.l[0] != (long)ee->prop.window)
           return ECORE_CALLBACK_PASS_ON;
         edata->sync_began = 0;
@@ -973,7 +973,7 @@ _ecore_evas_x_event_client_message(void *data EINA_UNUSED, int type EINA_UNUSED,
      {
         ee = ecore_event_window_match(e->data.l[0]);
         if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
-	edata = ee->engine.data;
+        edata = ee->engine.data;
         if (e->data.l[0] != (long)ee->prop.window)
           return ECORE_CALLBACK_PASS_ON;
         edata->sync_began = 0;
@@ -984,7 +984,7 @@ _ecore_evas_x_event_client_message(void *data EINA_UNUSED, int type EINA_UNUSED,
      {
         ee = ecore_event_window_match(e->win);
         if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
-	edata = ee->engine.data;
+        edata = ee->engine.data;
         edata->netwm_sync_val_lo = (unsigned int)e->data.l[2];
         edata->netwm_sync_val_hi = (int)e->data.l[3];
         edata->netwm_sync_set = 1;
@@ -993,7 +993,7 @@ _ecore_evas_x_event_client_message(void *data EINA_UNUSED, int type EINA_UNUSED,
      {
         ee = ecore_event_window_match(e->win);
         if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
-	edata = ee->engine.data;
+        edata = ee->engine.data;
         if (ee->profile_supported)
           {
              char *p = ecore_x_atom_name_get(e->data.l[1]);
@@ -1014,10 +1014,10 @@ _ecore_evas_x_event_client_message(void *data EINA_UNUSED, int type EINA_UNUSED,
           }
      }
    else if (e->message_type == ECORE_X_ATOM_E_ILLUME_ACCESS_CONTROL)
-   	{
-   	   ///TODO after access structure determined
- 	   // if (ee->func.fn_msg_handle)
-	   // ee->func.fn_msg_handle(ee, msg_domain, msg_id, data, size);
+     {
+        ///TODO after access structure determined
+        // if (ee->func.fn_msg_handle)
+        // ee->func.fn_msg_handle(ee, msg_domain, msg_id, data, size);
      }
    else if (e->message_type == ECORE_X_ATOM_E_DEICONIFY_APPROVE)
      {
@@ -1033,7 +1033,7 @@ _ecore_evas_x_event_client_message(void *data EINA_UNUSED, int type EINA_UNUSED,
                                       ECORE_X_EVENT_MASK_WINDOW_CONFIGURE,
                                       e->win, 1,
                                       0, 0, 0);
-   	}
+     }
    return ECORE_CALLBACK_PASS_ON;
 }
 
@@ -1232,7 +1232,7 @@ _ecore_evas_x_event_window_focus_in(void *data EINA_UNUSED, int type EINA_UNUSED
    if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
 //xx// filtering with these doesnt help   
 //xx//   if (e->mode == ECORE_X_EVENT_MODE_UNGRAB) return ECORE_CALLBACK_PASS_ON;
-   ee->prop.focused = 1;
+   ee->prop.focused = EINA_TRUE;
    evas_focus_in(ee->evas);
    if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
    return ECORE_CALLBACK_PASS_ON;
@@ -1254,7 +1254,7 @@ _ecore_evas_x_event_window_focus_out(void *data EINA_UNUSED, int type EINA_UNUSE
 //   if (ee->prop.fullscreen)
 //     ecore_x_window_focus(ee->prop.window);
    evas_focus_out(ee->evas);
-   ee->prop.focused = 0;
+   ee->prop.focused = EINA_FALSE;
    if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
    return ECORE_CALLBACK_PASS_ON;
 }
@@ -2800,13 +2800,13 @@ _ecore_evas_x_layer_set(Ecore_Evas *ee, int layer)
 }
 
 static void
-_ecore_evas_x_focus_set(Ecore_Evas *ee, int on EINA_UNUSED)
+_ecore_evas_x_focus_set(Ecore_Evas *ee, Eina_Bool on EINA_UNUSED)
 {
    ecore_x_window_focus(ee->prop.window);
 }
 
 static void
-_ecore_evas_x_iconified_set(Ecore_Evas *ee, int on)
+_ecore_evas_x_iconified_set(Ecore_Evas *ee, Eina_Bool on)
 {
    Ecore_Evas_Engine_Data_X11 *edata = ee->engine.data;