omitted the prefix _e_mod at the beginning of each function name for brevity.

Change-Id: Iecc22358f7422758a5558b8ca7e1aef08a85c34e

diff --git a/src/e_mod_effect.c b/src/e_mod_effect.c
index 58a99a1..5fd266b 100644 (file)
--- a/src/e_mod_effect.c
+++ b/src/e_mod_effect.c
@@ -12,7 +12,7 @@ typedef struct _E_Effect_Client
 } E_Effect_Client;
 
 static void
-_e_mod_effect_event_send(E_Client *ec, Eina_Bool start, E_Effect_Type type)
+_eff_event_send(E_Client *ec, Eina_Bool start, E_Effect_Type type)
 {
    struct wl_resource *res_surf;
    struct wl_resource *res_eff;
@@ -72,7 +72,7 @@ _e_mod_effect_event_send(E_Client *ec, Eina_Bool start, E_Effect_Type type)
 }
 
 static E_Effect_Client*
-_e_mod_effect_client_new(E_Client *ec)
+_eff_client_new(E_Client *ec)
 {
    E_Effect_Client *efc;
 
@@ -85,14 +85,14 @@ _e_mod_effect_client_new(E_Client *ec)
 }
 
 static E_Effect_Client *
-_e_mod_effect_client_get(E_Client *ec)
+_eff_client_get(E_Client *ec)
 {
    if (!_eff) return NULL;
    return eina_hash_find(_eff->clients, &ec);
 }
 
 static E_Effect_Group
-_e_mod_effect_group_get(E_Client *ec)
+_eff_group_get(E_Client *ec)
 {
    E_Effect_Group group = E_EFFECT_GROUP_NORMAL;
 
@@ -129,7 +129,7 @@ _e_mod_effect_group_get(E_Client *ec)
 }
 
 static Eina_Bool
-_e_mod_effect_ref(E_Client *ec)
+_eff_ref(E_Client *ec)
 {
    E_Effect_Client *efc;
 
@@ -142,7 +142,7 @@ _e_mod_effect_ref(E_Client *ec)
         return EINA_FALSE;
      }
 
-   efc = _e_mod_effect_client_get(ec);
+   efc = _eff_client_get(ec);
    if (!efc) return EINA_FALSE;
 
    if (!ec->pixmap) return EINA_FALSE;
@@ -161,7 +161,7 @@ _e_mod_effect_ref(E_Client *ec)
 }
 
 static E_Client *
-_e_mod_effect_unref(E_Client *ec)
+_eff_unref(E_Client *ec)
 {
    E_Effect_Client *efc;
    int do_unref = 1;
@@ -169,7 +169,7 @@ _e_mod_effect_unref(E_Client *ec)
    if (!_eff) return NULL;
    if (!ec) return NULL;
 
-   efc = _e_mod_effect_client_get(ec);
+   efc = _eff_client_get(ec);
    if (!efc) return NULL;
 
    if (e_object_is_del(E_OBJECT(ec)))
@@ -205,7 +205,7 @@ _e_mod_effect_unref(E_Client *ec)
 }
 
 static void
-_e_mod_effect_object_setup(E_Client *ec)
+_eff_object_setup(E_Client *ec)
 {
    E_Comp_Config *cfg;
    cfg = e_comp_config_get();
@@ -222,7 +222,7 @@ _e_mod_effect_object_setup(E_Client *ec)
 }
 
 static void
-_e_mod_effect_object_layer_up(E_Client *ec)
+_eff_object_layer_up(E_Client *ec)
 {
    int map_ly;
 
@@ -241,14 +241,14 @@ _e_mod_effect_object_layer_up(E_Client *ec)
 }
 
 static void
-_e_mod_effect_object_layer_down(E_Client *ec)
+_eff_object_layer_down(E_Client *ec)
 {
    evas_object_layer_set(ec->frame, ec->layer);
    ec->layer_block = 0;
 }
 
 static void
-_e_mod_effect_pending_effect_start(void)
+_eff_pending_effect_start(void)
 {
    E_Client *ec;
 
@@ -260,7 +260,7 @@ _e_mod_effect_pending_effect_start(void)
 
    if (_eff->next_done.cb)
      {
-        _e_mod_effect_event_send(ec, EINA_TRUE, _eff->next_done.type);
+        _eff_event_send(ec, EINA_TRUE, _eff->next_done.type);
         e_comp_object_effect_start(ec->frame,
                                    _eff->next_done.cb,
                                    _eff->next_done.data);
@@ -270,9 +270,9 @@ _e_mod_effect_pending_effect_start(void)
 }
 
 static void
-_e_mod_effect_pending_effect_set(E_Client *ec, void *data, E_Effect_Type type, Edje_Signal_Cb done_cb)
+_eff_pending_effect_set(E_Client *ec, void *data, E_Effect_Type type, Edje_Signal_Cb done_cb)
 {
-   _e_mod_effect_pending_effect_start();
+   _eff_pending_effect_start();
 
    EFFINF("Pending eff Set type(%d)",
           ec->pixmap, ec, type);
@@ -284,7 +284,7 @@ _e_mod_effect_pending_effect_set(E_Client *ec, void *data, E_Effect_Type type, E
 }
 
 static void
-_e_mod_effect_stack_update()
+_eff_stack_update()
 {
    E_Client *ec;
    Evas_Object *o;
@@ -307,7 +307,7 @@ _e_mod_effect_stack_update()
 }
 
 static Eina_Bool
-_e_mod_effect_visibility_stack_check(E_Client *ec, Eina_List *stack)
+_eff_visibility_stack_check(E_Client *ec, Eina_List *stack)
 {
    Eina_List *l;
    E_Client *_ec;
@@ -351,7 +351,7 @@ _e_mod_effect_visibility_stack_check(E_Client *ec, Eina_List *stack)
 }
 
 static const char*
-_e_mod_effect_restack_effect_check(E_Client *ec)
+_eff_restack_effect_check(E_Client *ec)
 {
    const char* emission = NULL;
    Eina_Bool v1, v2;
@@ -359,8 +359,8 @@ _e_mod_effect_restack_effect_check(E_Client *ec)
    if (!evas_object_visible_get(ec->frame)) return NULL;
    if (ec->new_client) return NULL;
 
-   v1 = _e_mod_effect_visibility_stack_check(ec, _eff->stack.old);
-   v2 = _e_mod_effect_visibility_stack_check(ec, _eff->stack.cur);
+   v1 = _eff_visibility_stack_check(ec, _eff->stack.old);
+   v2 = _eff_visibility_stack_check(ec, _eff->stack.cur);
 
    if (v1 != v2)
      {
@@ -372,7 +372,7 @@ _e_mod_effect_restack_effect_check(E_Client *ec)
    else
      {
         E_Effect_Client *efc;
-        efc = _e_mod_effect_client_get(ec);
+        efc = _eff_client_get(ec);
 
         // TODO : it's for transients windows. wish using other check */
         if ((efc) && (!efc->animating))
@@ -396,28 +396,28 @@ _e_mod_effect_restack_effect_check(E_Client *ec)
 }
 
 static void
-_e_mod_effect_cb_visible_done(void *data, Evas_Object *obj EINA_UNUSED, const char *sig EINA_UNUSED, const char *src EINA_UNUSED)
+_eff_cb_visible_done(void *data, Evas_Object *obj EINA_UNUSED, const char *sig EINA_UNUSED, const char *src EINA_UNUSED)
 {
    E_Client *ec = NULL;
 
    if ((ec = (E_Client*) data))
      {
-        _e_mod_effect_event_send(ec, EINA_FALSE, E_EFFECT_TYPE_SHOW);
-        if (_e_mod_effect_unref(ec))
+        _eff_event_send(ec, EINA_FALSE, E_EFFECT_TYPE_SHOW);
+        if (_eff_unref(ec))
           {
-             if (_e_mod_effect_client_get(ec))
+             if (_eff_client_get(ec))
                {
                   //e_client_visibility_skip_set(ec, EINA_FALSE);
                }
           }
      }
 
-   _e_mod_effect_stack_update();
+   _eff_stack_update();
    e_comp_override_del();
 }
 
 static Eina_Bool
-_e_mod_effect_cb_visible(void *data, Evas_Object *obj, const char *signal)
+_eff_cb_visible(void *data, Evas_Object *obj, const char *signal)
 {
    E_Client *ec;
    E_Effect_Group group;
@@ -428,11 +428,11 @@ _e_mod_effect_cb_visible(void *data, Evas_Object *obj, const char *signal)
    if (!ec) return EINA_FALSE;
    if (e_object_is_del(E_OBJECT(ec))) return EINA_FALSE;
 
-   group = _e_mod_effect_group_get(ec);
+   group = _eff_group_get(ec);
    if (group != E_EFFECT_GROUP_NORMAL) return EINA_FALSE;
 
    if (evas_object_visible_get(obj)) return EINA_FALSE;
-   if (!_e_mod_effect_ref(ec)) return EINA_FALSE;
+   if (!_eff_ref(ec)) return EINA_FALSE;
 
    e_comp_override_add();
    //e_client_visibility_skip_set(ec, EINA_TRUE);
@@ -440,36 +440,36 @@ _e_mod_effect_cb_visible(void *data, Evas_Object *obj, const char *signal)
    EFFINF("SET EXTRA_ANIMATING...", ec->pixmap, ec);
    ec->extra_animating = EINA_TRUE;
 
-   _e_mod_effect_object_setup(ec);
+   _eff_object_setup(ec);
    e_comp_object_effect_params_set(ec->frame, 0, (int[]){0}, 1);
    if (e_comp->nocomp)
      {
-        _e_mod_effect_pending_effect_set(ec,
+        _eff_pending_effect_set(ec,
                                          (void*)ec,
                                          E_EFFECT_TYPE_SHOW,
-                                         _e_mod_effect_cb_visible_done);
+                                         _eff_cb_visible_done);
         return EINA_TRUE;
      }
 
-   _e_mod_effect_event_send(ec, EINA_TRUE, E_EFFECT_TYPE_SHOW);
-   e_comp_object_effect_start(ec->frame, _e_mod_effect_cb_visible_done, ec);
+   _eff_event_send(ec, EINA_TRUE, E_EFFECT_TYPE_SHOW);
+   e_comp_object_effect_start(ec->frame, _eff_cb_visible_done, ec);
 
    return EINA_TRUE;
 }
 
 static void
-_e_mod_effect_cb_hidden_done(void *data, Evas_Object *obj, const char *sig, const char *src)
+_eff_cb_hidden_done(void *data, Evas_Object *obj, const char *sig, const char *src)
 {
    E_Client *ec = NULL;
 
    if ((ec = (E_Client*) data))
      {
-        _e_mod_effect_event_send(ec, EINA_FALSE, E_EFFECT_TYPE_HIDE);
-        if (_e_mod_effect_unref(ec))
+        _eff_event_send(ec, EINA_FALSE, E_EFFECT_TYPE_HIDE);
+        if (_eff_unref(ec))
           {
-             if (_e_mod_effect_client_get(ec))
+             if (_eff_client_get(ec))
                {
-                  _e_mod_effect_object_layer_down(ec);
+                  _eff_object_layer_down(ec);
                   //e_client_visibility_skip_set(ec, EINA_FALSE);
                   evas_object_hide(ec->frame);
                }
@@ -480,7 +480,7 @@ _e_mod_effect_cb_hidden_done(void *data, Evas_Object *obj, const char *sig, cons
 }
 
 static Eina_Bool
-_e_mod_effect_cb_hidden(void *data, Evas_Object *obj, const char *signal)
+_eff_cb_hidden(void *data, Evas_Object *obj, const char *signal)
 {
    E_Client *ec;
    E_Effect_Group group;
@@ -494,11 +494,11 @@ _e_mod_effect_cb_hidden(void *data, Evas_Object *obj, const char *signal)
    if (!ec) return EINA_FALSE;
    if (e_object_is_del(E_OBJECT(ec))) return EINA_FALSE;
 
-   group = _e_mod_effect_group_get(ec);
+   group = _eff_group_get(ec);
    if (group != E_EFFECT_GROUP_NORMAL) return EINA_FALSE;
 
    if (!evas_object_visible_get(obj)) return EINA_FALSE;
-   if (!_e_mod_effect_ref(ec)) return EINA_FALSE;
+   if (!_eff_ref(ec)) return EINA_FALSE;
 
    e_comp_override_add();
 
@@ -512,44 +512,44 @@ _e_mod_effect_cb_hidden(void *data, Evas_Object *obj, const char *signal)
 
    if (lowered)
      {
-        _e_mod_effect_object_layer_up(ec);
+        _eff_object_layer_up(ec);
         //e_client_visibility_skip_set(ec, EINA_TRUE);
      }
 
-   _e_mod_effect_object_setup(ec);
+   _eff_object_setup(ec);
    e_comp_object_effect_params_set(ec->frame, 0, (int[]){1}, 1);
 
    if (e_comp->nocomp)
      {
-        _e_mod_effect_pending_effect_set(ec,
+        _eff_pending_effect_set(ec,
                                          (void*)ec,
                                          E_EFFECT_TYPE_HIDE,
-                                         _e_mod_effect_cb_hidden_done);
+                                         _eff_cb_hidden_done);
         return EINA_TRUE;
      }
 
-   _e_mod_effect_event_send(ec, EINA_TRUE, E_EFFECT_TYPE_HIDE);
-   e_comp_object_effect_start(ec->frame, _e_mod_effect_cb_hidden_done, ec);
+   _eff_event_send(ec, EINA_TRUE, E_EFFECT_TYPE_HIDE);
+   e_comp_object_effect_start(ec->frame, _eff_cb_hidden_done, ec);
 
    return EINA_TRUE;
 }
 
 static void
-_e_mod_effect_cb_uniconify_done(void *data, Evas_Object *obj, const char *sig, const char *src)
+_eff_cb_uniconify_done(void *data, Evas_Object *obj, const char *sig, const char *src)
 {
    E_Client *ec = NULL;
 
    if ((ec = (E_Client*) data))
      {
-        _e_mod_effect_event_send(ec, EINA_FALSE, E_EFFECT_TYPE_SHOW);
-        _e_mod_effect_unref(ec);
+        _eff_event_send(ec, EINA_FALSE, E_EFFECT_TYPE_SHOW);
+        _eff_unref(ec);
      }
 
    e_comp_override_del();
 }
 
 static Eina_Bool
-_e_mod_effect_cb_uniconify(void *data, Evas_Object *obj, const char *signal)
+_eff_cb_uniconify(void *data, Evas_Object *obj, const char *signal)
 {
    E_Client *ec;
    E_Effect_Group group;
@@ -563,15 +563,15 @@ _e_mod_effect_cb_uniconify(void *data, Evas_Object *obj, const char *signal)
 
    if (evas_object_visible_get(obj)) return EINA_FALSE;
 
-   group = _e_mod_effect_group_get(ec);
+   group = _eff_group_get(ec);
 
    /* for HOME group */
    if (group == E_EFFECT_GROUP_HOME)
      {
         E_Client *below;
 
-        v1 = _e_mod_effect_visibility_stack_check(ec, _eff->stack.old);
-        v2 = _e_mod_effect_visibility_stack_check(ec, _eff->stack.cur);
+        v1 = _eff_visibility_stack_check(ec, _eff->stack.old);
+        v2 = _eff_visibility_stack_check(ec, _eff->stack.cur);
 
         EFFINF("Uniconify eff Check v1(%d) -> v2(%d) obscured:%d changed:%d",
                ec->pixmap, ec,
@@ -594,7 +594,7 @@ _e_mod_effect_cb_uniconify(void *data, Evas_Object *obj, const char *signal)
           }
 
         if (!below) return EINA_FALSE;
-        group = _e_mod_effect_group_get(below);
+        group = _eff_group_get(below);
         if (group != E_EFFECT_GROUP_NORMAL) return EINA_FALSE;
 
         EFFINF("Uniconify HOME group do hide eff of %p",
@@ -606,8 +606,8 @@ _e_mod_effect_cb_uniconify(void *data, Evas_Object *obj, const char *signal)
    /* for NORMAL group */
    else if (group == E_EFFECT_GROUP_NORMAL)
      {
-        v1 = _e_mod_effect_visibility_stack_check(ec, _eff->stack.old);
-        v2 = _e_mod_effect_visibility_stack_check(ec, _eff->stack.cur);
+        v1 = _eff_visibility_stack_check(ec, _eff->stack.old);
+        v2 = _eff_visibility_stack_check(ec, _eff->stack.cur);
 
         EFFINF("Uniconify eff Check v1(%d) -> v2(%d) obscured:%d changed:%d",
                ec->pixmap, ec,
@@ -617,24 +617,24 @@ _e_mod_effect_cb_uniconify(void *data, Evas_Object *obj, const char *signal)
         if ((v2) && (ec->visibility.obscured == E_VISIBILITY_UNOBSCURED)) return EINA_FALSE;
         if ((!v2) && (ec->visibility.obscured != E_VISIBILITY_UNOBSCURED)) return EINA_FALSE;
 
-        if (!_e_mod_effect_ref(ec)) return EINA_FALSE;
+        if (!_eff_ref(ec)) return EINA_FALSE;
 
         e_comp_override_add();
 
-        _e_mod_effect_object_setup(ec);
+        _eff_object_setup(ec);
         e_comp_object_effect_params_set(ec->frame, 0, (int[]){0}, 1);
 
         if (e_comp->nocomp)
           {
-             _e_mod_effect_pending_effect_set(ec,
+             _eff_pending_effect_set(ec,
                                               (void*)ec,
                                               E_EFFECT_TYPE_SHOW,
-                                              _e_mod_effect_cb_uniconify_done);
+                                              _eff_cb_uniconify_done);
              return EINA_TRUE;
           }
 
-        _e_mod_effect_event_send(ec, EINA_TRUE, E_EFFECT_TYPE_SHOW);
-        e_comp_object_effect_start(ec->frame, _e_mod_effect_cb_uniconify_done, ec);
+        _eff_event_send(ec, EINA_TRUE, E_EFFECT_TYPE_SHOW);
+        e_comp_object_effect_start(ec->frame, _eff_cb_uniconify_done, ec);
         return EINA_TRUE;
      }
 
@@ -642,16 +642,16 @@ _e_mod_effect_cb_uniconify(void *data, Evas_Object *obj, const char *signal)
 }
 
 static void
-_e_mod_effect_cb_iconify_done(void *data, Evas_Object *obj, const char *sig, const char *src)
+_eff_cb_iconify_done(void *data, Evas_Object *obj, const char *sig, const char *src)
 {
    E_Client *ec = NULL;
 
    if ((ec = (E_Client *)data))
      {
-        _e_mod_effect_event_send(ec, EINA_FALSE, E_EFFECT_TYPE_HIDE);
-        if (_e_mod_effect_unref(ec))
+        _eff_event_send(ec, EINA_FALSE, E_EFFECT_TYPE_HIDE);
+        if (_eff_unref(ec))
           {
-             if (_e_mod_effect_client_get(ec))
+             if (_eff_client_get(ec))
                evas_object_hide(ec->frame);
           }
      }
@@ -660,7 +660,7 @@ _e_mod_effect_cb_iconify_done(void *data, Evas_Object *obj, const char *sig, con
 }
 
 static Eina_Bool
-_e_mod_effect_cb_iconify(void *data, Evas_Object *obj, const char *signal)
+_eff_cb_iconify(void *data, Evas_Object *obj, const char *signal)
 {
    E_Client *ec;
    E_Effect_Group group;
@@ -672,13 +672,13 @@ _e_mod_effect_cb_iconify(void *data, Evas_Object *obj, const char *signal)
    if (!ec) return EINA_FALSE;
    if (e_object_is_del(E_OBJECT(ec))) return EINA_FALSE;
 
-   group = _e_mod_effect_group_get(ec);
+   group = _eff_group_get(ec);
    if (group != E_EFFECT_GROUP_NORMAL) return EINA_FALSE;
 
    if (!evas_object_visible_get(obj)) return EINA_FALSE;
 
-   v1 = _e_mod_effect_visibility_stack_check(ec, _eff->stack.old);
-   v2 = _e_mod_effect_visibility_stack_check(ec, _eff->stack.cur);
+   v1 = _eff_visibility_stack_check(ec, _eff->stack.old);
+   v2 = _eff_visibility_stack_check(ec, _eff->stack.cur);
 
    EFFINF("Iconify eff Check v1(%d) -> v2(%d) obscured:%d changed:%d",
           ec->pixmap, ec,
@@ -688,61 +688,61 @@ _e_mod_effect_cb_iconify(void *data, Evas_Object *obj, const char *signal)
    if ((v2) && (ec->visibility.obscured == E_VISIBILITY_UNOBSCURED)) return EINA_FALSE;
    if ((!v2) && (ec->visibility.obscured != E_VISIBILITY_UNOBSCURED)) return EINA_FALSE;
 
-   if (!_e_mod_effect_ref(ec)) return EINA_FALSE;
+   if (!_eff_ref(ec)) return EINA_FALSE;
 
    e_comp_override_add();
 
-   _e_mod_effect_object_setup(ec);
+   _eff_object_setup(ec);
    e_comp_object_effect_params_set(ec->frame, 0, (int[]){1}, 1);
 
    if (e_comp->nocomp)
      {
-        _e_mod_effect_pending_effect_set(ec,
+        _eff_pending_effect_set(ec,
                                          (void*)ec,
                                          E_EFFECT_TYPE_HIDE,
-                                         _e_mod_effect_cb_iconify_done);
+                                         _eff_cb_iconify_done);
         return EINA_TRUE;
      }
 
-   _e_mod_effect_event_send(ec, EINA_TRUE, E_EFFECT_TYPE_HIDE);
-   e_comp_object_effect_start(ec->frame, _e_mod_effect_cb_iconify_done, ec);
+   _eff_event_send(ec, EINA_TRUE, E_EFFECT_TYPE_HIDE);
+   e_comp_object_effect_start(ec->frame, _eff_cb_iconify_done, ec);
 
    return EINA_TRUE;
 }
 static void
-_e_mod_effect_cb_restack_show_done(void *data, Evas_Object *obj, const char *sig, const char *src)
+_eff_cb_restack_show_done(void *data, Evas_Object *obj, const char *sig, const char *src)
 {
    E_Client *ec = NULL;
 
    if ((ec = (E_Client *)data))
      {
-        _e_mod_effect_event_send(ec, EINA_FALSE, E_EFFECT_TYPE_RESTACK_SHOW);
-        if (_e_mod_effect_unref(ec))
+        _eff_event_send(ec, EINA_FALSE, E_EFFECT_TYPE_RESTACK_SHOW);
+        if (_eff_unref(ec))
           {
-             if (_e_mod_effect_client_get(ec))
+             if (_eff_client_get(ec))
                {
-                  _e_mod_effect_object_layer_down(ec);
+                  _eff_object_layer_down(ec);
                   //e_client_visibility_skip_set(ec, EINA_FALSE);
                }
           }
      }
 
-   _e_mod_effect_stack_update();
+   _eff_stack_update();
    e_comp_override_del();
 }
 
 static void
-_e_mod_effect_cb_restack_hide_done(void *data, Evas_Object *obj, const char *sig, const char *src)
+_eff_cb_restack_hide_done(void *data, Evas_Object *obj, const char *sig, const char *src)
 {
    E_Client *ec = NULL;
 
    if ((ec = (E_Client *)data))
      {
-        if (_e_mod_effect_unref(ec))
+        if (_eff_unref(ec))
           {
-             if (_e_mod_effect_client_get(ec))
+             if (_eff_client_get(ec))
                {
-                  _e_mod_effect_object_layer_down(ec);
+                  _eff_object_layer_down(ec);
                   //e_client_visibility_skip_set(ec, EINA_FALSE);
                   e_comp_object_signal_emit(ec->frame,
                                             "e,action,restack,finish", "e");
@@ -750,21 +750,21 @@ _e_mod_effect_cb_restack_hide_done(void *data, Evas_Object *obj, const char *sig
           }
      }
 
-   _e_mod_effect_stack_update();
+   _eff_stack_update();
    e_comp_override_del();
 }
 
 static void
-_e_mod_effect_cb_restack_finish_done(void *data, Evas_Object *obj, const char *sig, const char *src)
+_eff_cb_restack_finish_done(void *data, Evas_Object *obj, const char *sig, const char *src)
 {
    E_Client *ec = NULL;
 
    if ((ec = (E_Client *)data))
      {
-        _e_mod_effect_event_send(ec, EINA_FALSE, E_EFFECT_TYPE_RESTACK_HIDE);
+        _eff_event_send(ec, EINA_FALSE, E_EFFECT_TYPE_RESTACK_HIDE);
 
         E_Effect_Client *efc = NULL;
-        efc = _e_mod_effect_client_get(ec);
+        efc = _eff_client_get(ec);
         if (efc && efc->reverse_ec)
           {
              E_Client *ec_home = efc->reverse_ec;
@@ -776,17 +776,17 @@ _e_mod_effect_cb_restack_finish_done(void *data, Evas_Object *obj, const char *s
                        ec_home->launching = EINA_FALSE;
                        e_comp_object_signal_emit(ec_home->frame, "e,action,launch,done", "e");
                     }
-                  _e_mod_effect_unref(ec_home);
+                  _eff_unref(ec_home);
                }
           }
 
-        _e_mod_effect_unref(ec);
+        _eff_unref(ec);
      }
    e_comp_override_del();
 }
 
 static Eina_Bool
-_e_mod_effect_cb_restack(void *data, Evas_Object *obj, const char *signal)
+_eff_cb_restack(void *data, Evas_Object *obj, const char *signal)
 {
    E_Client *ec;
    E_Effect_Group group;
@@ -799,7 +799,7 @@ _e_mod_effect_cb_restack(void *data, Evas_Object *obj, const char *signal)
    if (!ec) return EINA_FALSE;
    if (e_object_is_del(E_OBJECT(ec))) return EINA_FALSE;
 
-   group = _e_mod_effect_group_get(ec);
+   group = _eff_group_get(ec);
    emission = eina_stringshare_add(signal);
 
    /* for HOME group: replace eff target client */
@@ -824,7 +824,7 @@ _e_mod_effect_cb_restack(void *data, Evas_Object *obj, const char *signal)
 
         ec_home = ec;
         ec = below;
-        group = _e_mod_effect_group_get(ec);
+        group = _eff_group_get(ec);
 
         if (emission) eina_stringshare_del(emission);
         emission = eina_stringshare_add("e,action,restack,hide");
@@ -833,42 +833,42 @@ _e_mod_effect_cb_restack(void *data, Evas_Object *obj, const char *signal)
    if (group != E_EFFECT_GROUP_NORMAL) return EINA_FALSE;
    if ((!e_util_strcmp(emission, "e,action,restack,show")))
      {
-        if (!_e_mod_effect_ref(ec)) return EINA_FALSE;
+        if (!_eff_ref(ec)) return EINA_FALSE;
 
         EFFINF("SET EXTRA_ANIMATING...", ec->pixmap, ec);
         ec->extra_animating = EINA_TRUE;
 
         e_comp_override_add();
 
-        _e_mod_effect_object_layer_up(ec);
+        _eff_object_layer_up(ec);
         //e_client_visibility_skip_set(ec, EINA_TRUE);
 
-        _e_mod_effect_object_setup(ec);
+        _eff_object_setup(ec);
         e_comp_object_effect_params_set(ec->frame, 0, (int[]){2}, 1);
 
         if (e_comp->nocomp)
           {
-             _e_mod_effect_pending_effect_set(ec,
+             _eff_pending_effect_set(ec,
                                               (void*)ec,
                                               E_EFFECT_TYPE_SHOW,
-                                              _e_mod_effect_cb_restack_show_done);
+                                              _eff_cb_restack_show_done);
              return EINA_TRUE;
           }
 
-        _e_mod_effect_event_send(ec, EINA_TRUE, E_EFFECT_TYPE_RESTACK_SHOW);
-        e_comp_object_effect_start(ec->frame, _e_mod_effect_cb_restack_show_done, ec);
+        _eff_event_send(ec, EINA_TRUE, E_EFFECT_TYPE_RESTACK_SHOW);
+        e_comp_object_effect_start(ec->frame, _eff_cb_restack_show_done, ec);
      }
    else if (!e_util_strcmp(emission, "e,action,restack,hide"))
      {
-        if (!_e_mod_effect_ref(ec)) return EINA_FALSE;
+        if (!_eff_ref(ec)) return EINA_FALSE;
 
         if (ec_home)
           {
              E_Effect_Client *efc = NULL;
-             efc = _e_mod_effect_client_get(ec);
+             efc = _eff_client_get(ec);
              if (efc)
                {
-                  if (_e_mod_effect_ref(ec_home))
+                  if (_eff_ref(ec_home))
                     {
                        EFFINF("SET EXTRA_ANIMATING...", ec_home->pixmap, ec_home);
                        ec_home->extra_animating = EINA_TRUE;
@@ -883,50 +883,50 @@ _e_mod_effect_cb_restack(void *data, Evas_Object *obj, const char *signal)
 
         e_comp_override_add();
 
-        _e_mod_effect_object_layer_up(ec);
+        _eff_object_layer_up(ec);
         //e_client_visibility_skip_set(ec, EINA_TRUE);
 
-        _e_mod_effect_object_setup(ec);
+        _eff_object_setup(ec);
         e_comp_object_effect_params_set(ec->frame, 0, (int[]){3}, 1);
 
         if (e_comp->nocomp)
           {
-             _e_mod_effect_pending_effect_set(ec,
+             _eff_pending_effect_set(ec,
                                               (void*)ec,
                                               E_EFFECT_TYPE_HIDE,
-                                              _e_mod_effect_cb_restack_hide_done);
+                                              _eff_cb_restack_hide_done);
              return EINA_TRUE;
           }
 
-        _e_mod_effect_event_send(ec, EINA_TRUE, E_EFFECT_TYPE_RESTACK_HIDE);
-        e_comp_object_effect_start(ec->frame, _e_mod_effect_cb_restack_hide_done, ec);
+        _eff_event_send(ec, EINA_TRUE, E_EFFECT_TYPE_RESTACK_HIDE);
+        e_comp_object_effect_start(ec->frame, _eff_cb_restack_hide_done, ec);
      }
    else if (!e_util_strcmp(emission, "e,action,restack,finish"))
      {
-        if (!_e_mod_effect_ref(ec)) return EINA_FALSE;
+        if (!_eff_ref(ec)) return EINA_FALSE;
 
         e_comp_override_add();
 
-        _e_mod_effect_object_setup(ec);
+        _eff_object_setup(ec);
         e_comp_object_effect_params_set(ec->frame, 0, (int[]){4}, 1);
 
         if (e_comp->nocomp)
           {
-             _e_mod_effect_pending_effect_set(ec,
+             _eff_pending_effect_set(ec,
                                               (void*)ec,
                                               E_EFFECT_TYPE_HIDE,
-                                              _e_mod_effect_cb_restack_finish_done);
+                                              _eff_cb_restack_finish_done);
              return EINA_TRUE;
           }
 
-        e_comp_object_effect_start(ec->frame, _e_mod_effect_cb_restack_finish_done, ec);
+        e_comp_object_effect_start(ec->frame, _eff_cb_restack_finish_done, ec);
      }
 
    return EINA_TRUE;
 }
 
 static Eina_Bool
-_e_mod_effect_cb_launch(void *data, Evas_Object *obj, const char *signal)
+_eff_cb_launch(void *data, Evas_Object *obj, const char *signal)
 {
    E_Client *ec;
    struct wl_resource *res_surf;
@@ -960,22 +960,22 @@ _e_mod_effect_cb_launch(void *data, Evas_Object *obj, const char *signal)
 }
 
 static void
-_e_mod_effect_cb_hook_client_new(void *d EINA_UNUSED, E_Client *ec)
+_eff_cb_hook_client_new(void *d EINA_UNUSED, E_Client *ec)
 {
    E_Effect_Client *efc;
 
    if (!_eff) return;
 
-   efc = _e_mod_effect_client_get(ec);
+   efc = _eff_client_get(ec);
    if (efc) return;
 
-   efc = _e_mod_effect_client_new(ec);
+   efc = _eff_client_new(ec);
    if (efc)
      eina_hash_add(_eff->clients, &ec, efc);
 }
 
 static void
-_e_mod_effect_cb_hook_client_del(void *d EINA_UNUSED, E_Client *ec)
+_eff_cb_hook_client_del(void *d EINA_UNUSED, E_Client *ec)
 {
    E_Effect_Client *efc = NULL;
 
@@ -987,7 +987,7 @@ _e_mod_effect_cb_hook_client_del(void *d EINA_UNUSED, E_Client *ec)
    if (_eff->next_done.ec == ec)
      memset(&_eff->next_done, 0, sizeof(_eff->next_done));
 
-   if ((efc = _e_mod_effect_client_get(ec)))
+   if ((efc = _eff_client_get(ec)))
      {
         if (!efc->animating)
           eina_hash_del_by_key(_eff->clients, &ec);
@@ -995,7 +995,7 @@ _e_mod_effect_cb_hook_client_del(void *d EINA_UNUSED, E_Client *ec)
 }
 
 static Eina_Bool
-_e_mod_effect_cb_client_restack(void *data, int type, void *event)
+_eff_cb_client_restack(void *data, int type, void *event)
 {
    E_Client *ec;
    E_Event_Client *ev = event;
@@ -1009,28 +1009,28 @@ _e_mod_effect_cb_client_restack(void *data, int type, void *event)
 
    EFFINF("Client restacked", ec->pixmap, ec);
 
-   _e_mod_effect_stack_update();
+   _eff_stack_update();
 
-   if (!_e_mod_effect_client_get(ec)) return ECORE_CALLBACK_PASS_ON;
+   if (!_eff_client_get(ec)) return ECORE_CALLBACK_PASS_ON;
 
-   if ((emission = _e_mod_effect_restack_effect_check(ec)))
+   if ((emission = _eff_restack_effect_check(ec)))
      e_comp_object_signal_emit(ec->frame, emission, "e");
 
    return ECORE_CALLBACK_PASS_ON;
 }
 
 static Eina_Bool
-_e_mod_effect_cb_comp_enabled(void *data, int ev_type, void *event)
+_eff_cb_comp_enabled(void *data, int ev_type, void *event)
 {
    if (!_eff) return ECORE_CALLBACK_PASS_ON;
 
-   _e_mod_effect_pending_effect_start();
+   _eff_pending_effect_start();
 
    return ECORE_CALLBACK_PASS_ON;
 }
 
 static Eina_Bool
-_e_mod_effect_cb_client_buffer_change(void *data, int ev_type, void *event)
+_eff_cb_client_buffer_change(void *data, int ev_type, void *event)
 {
    E_Event_Client *ev = event;
    E_Client *ec;
@@ -1042,7 +1042,7 @@ _e_mod_effect_cb_client_buffer_change(void *data, int ev_type, void *event)
    ec = ev->ec;
    if (!ec) return ECORE_CALLBACK_PASS_ON;
 
-   efc = _e_mod_effect_client_get(ec);
+   efc = _eff_client_get(ec);
    if (!efc) return ECORE_CALLBACK_PASS_ON;
 
    if (ec->pixmap)
@@ -1077,7 +1077,7 @@ _tz_effect_cb_effect_destroy(struct wl_resource *tz_res_eff)
 }
 
 static void
-_e_mod_effect_cb_bind(struct wl_client *client, void *data EINA_UNUSED, uint32_t version EINA_UNUSED, uint32_t id)
+_eff_cb_bind(struct wl_client *client, void *data EINA_UNUSED, uint32_t version EINA_UNUSED, uint32_t id)
 {
    struct wl_resource *res;
 
@@ -1097,7 +1097,7 @@ _e_mod_effect_cb_bind(struct wl_client *client, void *data EINA_UNUSED, uint32_t
 }
 
 static void
-_e_mod_effect_cb_client_data_free(void *data)
+_eff_cb_client_data_free(void *data)
 {
    E_Effect_Client *efc = data;
 
@@ -1157,16 +1157,16 @@ e_mod_effect_init(void)
         eff->style = "no-eff";
      }
 
-   eff->clients = eina_hash_pointer_new(_e_mod_effect_cb_client_data_free);
+   eff->clients = eina_hash_pointer_new(_eff_cb_client_data_free);
    EINA_SAFETY_ON_NULL_GOTO(eff->clients, err);
 
    EINA_LIST_FOREACH(e_comp->clients, l, ec)
      {
         if (ec->ignored) continue;
 
-        efc = _e_mod_effect_client_get(ec);
+        efc = _eff_client_get(ec);
         if (!efc)
-          efc = _e_mod_effect_client_new(ec);
+          efc = _eff_client_new(ec);
         if (efc)
           eina_hash_add(eff->clients, &ec, efc);
      }
@@ -1178,24 +1178,24 @@ e_mod_effect_init(void)
                                   &tizen_effect_interface,
                                   1,
                                   eff,
-                                  _e_mod_effect_cb_bind);
+                                  _eff_cb_bind);
    if (!eff->global)
      {
         ERR("Could not add tizen_efffect wayland globals: %m");
         goto err;
      }
 
-   E_LIST_HANDLER_APPEND(eff->event_hdlrs,          E_EVENT_COMPOSITOR_ENABLE,    _e_mod_effect_cb_comp_enabled,         eff);
-   E_LIST_HANDLER_APPEND(eff->event_hdlrs,          E_EVENT_CLIENT_BUFFER_CHANGE, _e_mod_effect_cb_client_buffer_change, eff);
-   E_LIST_HANDLER_APPEND(eff->event_hdlrs,          E_EVENT_CLIENT_STACK,         _e_mod_effect_cb_client_restack,       eff);
-   E_CLIENT_HOOK_APPEND(eff->hooks_ec,              E_CLIENT_HOOK_NEW_CLIENT,     _e_mod_effect_cb_hook_client_new,      eff);
-   E_CLIENT_HOOK_APPEND(eff->hooks_ec,              E_CLIENT_HOOK_DEL,            _e_mod_effect_cb_hook_client_del,      eff);
-   E_COMP_OBJ_EFF_MOVER_APPEND(eff->providers, 100, "e,state,visible",            _e_mod_effect_cb_visible,              eff);
-   E_COMP_OBJ_EFF_MOVER_APPEND(eff->providers, 100, "e,state,hidden",             _e_mod_effect_cb_hidden,               eff);
-   E_COMP_OBJ_EFF_MOVER_APPEND(eff->providers, 100, "e,action,iconify",           _e_mod_effect_cb_iconify,              eff);
-   E_COMP_OBJ_EFF_MOVER_APPEND(eff->providers, 100, "e,action,uniconify",         _e_mod_effect_cb_uniconify,            eff);
-   E_COMP_OBJ_EFF_MOVER_APPEND(eff->providers, 100, "e,action,restack*",          _e_mod_effect_cb_restack,              eff);
-   E_COMP_OBJ_EFF_MOVER_APPEND(eff->providers, 100, "e,action,launch,done",       _e_mod_effect_cb_launch,               eff);
+   E_LIST_HANDLER_APPEND(eff->event_hdlrs,          E_EVENT_COMPOSITOR_ENABLE,    _eff_cb_comp_enabled,         eff);
+   E_LIST_HANDLER_APPEND(eff->event_hdlrs,          E_EVENT_CLIENT_BUFFER_CHANGE, _eff_cb_client_buffer_change, eff);
+   E_LIST_HANDLER_APPEND(eff->event_hdlrs,          E_EVENT_CLIENT_STACK,         _eff_cb_client_restack,       eff);
+   E_CLIENT_HOOK_APPEND(eff->hooks_ec,              E_CLIENT_HOOK_NEW_CLIENT,     _eff_cb_hook_client_new,      eff);
+   E_CLIENT_HOOK_APPEND(eff->hooks_ec,              E_CLIENT_HOOK_DEL,            _eff_cb_hook_client_del,      eff);
+   E_COMP_OBJ_EFF_MOVER_APPEND(eff->providers, 100, "e,state,visible",            _eff_cb_visible,              eff);
+   E_COMP_OBJ_EFF_MOVER_APPEND(eff->providers, 100, "e,state,hidden",             _eff_cb_hidden,               eff);
+   E_COMP_OBJ_EFF_MOVER_APPEND(eff->providers, 100, "e,action,iconify",           _eff_cb_iconify,              eff);
+   E_COMP_OBJ_EFF_MOVER_APPEND(eff->providers, 100, "e,action,uniconify",         _eff_cb_uniconify,            eff);
+   E_COMP_OBJ_EFF_MOVER_APPEND(eff->providers, 100, "e,action,restack*",          _eff_cb_restack,              eff);
+   E_COMP_OBJ_EFF_MOVER_APPEND(eff->providers, 100, "e,action,launch,done",       _eff_cb_launch,               eff);
 
    _eff = eff;