e_comp_object: make _F_E_COMP_OBJECT_INTERCEPT_HOOK_ feature as a default

Change-Id: I01a2f3dba9ef57c92eaf972211949f96465e9a16

diff --git a/configure.ac b/configure.ac
index 1041592acca6ca500debc22b4dde7398cb952a93..197d19691dbe1f392c890f7277378ace3ab4cff8 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -618,8 +618,8 @@ glib-2.0 \
 "
 
 e_libs="$E_LIBS $fnmatch_libs $execinfo_libs $DLOG_LIBS"
-e_cflags="-DUSE_E_CONFIG_H $E_CFLAGS -D_F_ZONE_WINDOW_ROTATION_ -D_F_E_VIRTUAL_KEYBOARD_TYPE_ -D_F_E_COMP_OBJECT_INTERCEPT_HOOK_ -D_F_TRANSIENT_FOR_PATCH -D_F_DISABLE_BACKLIGHT_MOD_SUPPORT $DLOG_CFLAGS"
-e_configflags="-DUSE_E_CONFIG_H -D_F_ZONE_WINDOW_ROTATION_ -D_F_E_VIRTUAL_KEYBOARD_TYPE_ -D_F_E_COMP_OBJECT_INTERCEPT_HOOK_ -D_F_TRANSIENT_FOR_PATCH -D_F_DISABLE_BACKLIGHT_MOD_SUPPORT"
+e_cflags="-DUSE_E_CONFIG_H $E_CFLAGS -D_F_ZONE_WINDOW_ROTATION_ -D_F_E_VIRTUAL_KEYBOARD_TYPE_ -D_F_TRANSIENT_FOR_PATCH -D_F_DISABLE_BACKLIGHT_MOD_SUPPORT $DLOG_CFLAGS"
+e_configflags="-DUSE_E_CONFIG_H -D_F_ZONE_WINDOW_ROTATION_ -D_F_E_VIRTUAL_KEYBOARD_TYPE_ -D_F_TRANSIENT_FOR_PATCH -D_F_DISABLE_BACKLIGHT_MOD_SUPPORT"
 
 AC_SUBST([e_libs])
 AC_SUBST([e_cflags])

diff --git a/src/bin/compmgr/e_comp_object.c b/src/bin/compmgr/e_comp_object.c
index 250fb1b6a70ae0b2459c83920d8518ae48b27119..0fa5a1c6487497caae92c47f63ebf96dc39f19db 100644 (file)
--- a/src/bin/compmgr/e_comp_object.c
+++ b/src/bin/compmgr/e_comp_object.c
@@ -118,7 +118,6 @@ static Eina_Inlist *_e_comp_object_hooks[] =
    [E_COMP_OBJECT_HOOK_RENDER_UPDATE_LOCK_UNSET] = NULL,
 };
 
-#ifdef _F_E_COMP_OBJECT_INTERCEPT_HOOK_
 static int _e_comp_object_intercept_hooks_delete = 0;
 static int _e_comp_object_intercept_hooks_walking = 0;
 
@@ -127,7 +126,6 @@ static Eina_Inlist *_e_comp_object_intercept_hooks[] =
    [E_COMP_OBJECT_INTERCEPT_HOOK_SHOW_HELPER] = NULL,
    [E_COMP_OBJECT_INTERCEPT_HOOK_HIDE] = NULL,
 };
-#endif
 
 static Eina_Bool _damage_trace = EINA_FALSE;
 static Eina_List *_damage_trace_objs = NULL;
@@ -209,7 +207,6 @@ _e_comp_object_hook_call(E_Comp_Object_Hook_Point hookpoint, E_Client *ec)
    return ret;
 }
 
-#ifdef _F_E_COMP_OBJECT_INTERCEPT_HOOK_
 static void
 _e_comp_object_intercept_hooks_clean(void)
 {
@@ -252,7 +249,6 @@ _e_comp_object_intercept_hook_call(E_Comp_Object_Intercept_Hook_Point hookpoint,
 
    return ret;
 }
-#endif
 
 static void
 _e_comp_object_event_free(void *d EINA_UNUSED, void *event)
@@ -1631,13 +1627,11 @@ _e_comp_intercept_hide(void *data, Evas_Object *obj)
 {
    E_Comp_Object *cw = data;
 
-#ifdef _F_E_COMP_OBJECT_INTERCEPT_HOOK_
    if( !_e_comp_object_intercept_hook_call(E_COMP_OBJECT_INTERCEPT_HOOK_HIDE, cw->ec))
      {
         ELOGF("COMP", "Hide. intercepted", cw->ec);
         return;
      }
-#endif
 
    if (cw->ec->launching == EINA_TRUE)
      {
@@ -1727,13 +1721,11 @@ _e_comp_intercept_show_helper(E_Comp_Object *cw, E_Comp *comp)
         return;
      }
 
-#ifdef _F_E_COMP_OBJECT_INTERCEPT_HOOK_
    if (!_e_comp_object_intercept_hook_call(E_COMP_OBJECT_INTERCEPT_HOOK_SHOW_HELPER, ec))
      {
         ELOGF("COMP", "show_helper. intercepted", cw->ec);
         return;
      }
-#endif
 
    ELOGF("COMP", "show_helper. cw(v:%d,a:%d,dh:%d,ct:%d,u:%p,s(%d,%d)), ec(i:%d(%d,%d),o:%d,g:%d,n:%d)", ec,
          cw->visible, cw->animating, cw->defer_hide, cw->content_type, cw->updates, cw->w, cw->h,
@@ -2727,7 +2719,6 @@ e_comp_object_hook_del(E_Comp_Object_Hook *ch)
      _e_comp_object_hooks_delete++;
 }
 
-#ifdef _F_E_COMP_OBJECT_INTERCEPT_HOOK_
 E_API E_Comp_Object_Intercept_Hook *
 e_comp_object_intercept_hook_add(E_Comp_Object_Intercept_Hook_Point hookpoint, E_Comp_Object_Intercept_Hook_Cb func, const void *data)
 {
@@ -2755,7 +2746,6 @@ e_comp_object_intercept_hook_del(E_Comp_Object_Intercept_Hook *ch)
    else
      _e_comp_object_intercept_hooks_delete++;
 }
-#endif
 
 /* utility functions for deleting objects when their "owner" is deleted */
 EINTERN void

diff --git a/src/include/e_comp_object.h b/src/include/e_comp_object.h
index 083991f422852127d6a52dee39854cec47f5e5b5..9e7e697fc8227172f60659dc8053998e6792a706 100644 (file)
--- a/src/include/e_comp_object.h
+++ b/src/include/e_comp_object.h
@@ -67,7 +67,6 @@ struct _E_Comp_Object_Hook
    unsigned char delete_me : 1;
 };
 
-#ifdef _F_E_COMP_OBJECT_INTERCEPT_HOOK_
 typedef struct _E_Comp_Object_Intercept_Hook E_Comp_Object_Intercept_Hook;
 
 typedef enum _E_Comp_Object_Intercept_Hook_Point
@@ -87,7 +86,6 @@ struct _E_Comp_Object_Intercept_Hook
    void               *data;
    unsigned char       delete_me : 1;
 };
-#endif
 
 E_API void      e_comp_object_damage(Evas_Object *obj, int x, int y, int w, int h);
 E_API void      e_comp_object_dirty(Evas_Object *obj);
@@ -147,10 +145,8 @@ E_API Eina_Bool e_comp_object_render_update_lock_get(Evas_Object *obj);
 E_API E_Comp_Object_Hook *e_comp_object_hook_add(E_Comp_Object_Hook_Point hookpoint, E_Comp_Object_Hook_Cb func, const void *data);
 E_API void                e_comp_object_hook_del(E_Comp_Object_Hook *ch);
 
-#ifdef _F_E_COMP_OBJECT_INTERCEPT_HOOK_
 E_API E_Comp_Object_Intercept_Hook *e_comp_object_intercept_hook_add(E_Comp_Object_Intercept_Hook_Point hookpoint, E_Comp_Object_Intercept_Hook_Cb func, const void *data);
 E_API void                          e_comp_object_intercept_hook_del(E_Comp_Object_Intercept_Hook *ch);
-#endif
 
 #endif