e_focus: remove the unused hooks for e_focus

There are the new hooks for e_focus refactoring, but
it is not used anymore because the hooks are replaced by
wl_signals and listeners.

Change-Id: I72e0042556abed2311ae3587ce3c4b604c9af898

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index b2a6756..f948815 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -194,15 +194,6 @@ static Eina_Inlist *_e_client_hooks[] =
    [E_CLIENT_HOOK_TRANSFORM_CHANGE] = NULL,
    [E_CLIENT_HOOK_ACTIVATE_DONE] = NULL,
    [E_CLIENT_HOOK_EVAL_VISIBILITY_END] = NULL,
-//#ifdef REFACTOR_FOCUS_POLICY
-   [E_CLIENT_HOOK_MOUSE_IN] = NULL,
-   [E_CLIENT_HOOK_MOUSE_OUT] = NULL,
-   [E_CLIENT_HOOK_MOUSE_DOWN] = NULL,
-   [E_CLIENT_HOOK_LOWER] = NULL,
-   [E_CLIENT_HOOK_MOVE] = NULL,
-   [E_CLIENT_HOOK_FOCUS_DEFER_SET] = NULL,
-   [E_CLIENT_HOOK_FOCUS_LATEST_SET] = NULL,
-//#endif
 //#ifdef REFACTOR_ZONE_DESK
    [E_CLIENT_HOOK_STICK] = NULL,
    [E_CLIENT_HOOK_UNSTICK] = NULL,
@@ -2450,7 +2441,6 @@ _e_client_cb_evas_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN
    // at e_focus_policy_topmost.c and at e_focus_policy_history.c
 
    wl_signal_emit_mutable(&PRI(ec)->events.move, NULL);
-   _e_client_hook_call(E_CLIENT_HOOK_MOVE, ec);
 #else
    if (ec->focused)
      {
@@ -4585,7 +4575,6 @@ e_client_mouse_in(E_Client *ec, int x, int y)
 
 #ifdef REFACTOR_FOCUS_POLICY
    wl_signal_emit_mutable(&PRI(ec)->events.mouse_in, NULL);
-   _e_client_hook_call(E_CLIENT_HOOK_MOUSE_IN, ec);
 #else
    if ((!ec->iconic) && (!e_client_util_ignored_get(ec)))
      e_focus_event_mouse_in(ec);
@@ -4609,7 +4598,6 @@ e_client_mouse_out(E_Client *ec, int x, int y)
 
 #ifdef REFACTOR_FOCUS_POLICY
    wl_signal_emit_mutable(&PRI(ec)->events.mouse_out, NULL);
-   _e_client_hook_call(E_CLIENT_HOOK_MOUSE_OUT, ec);
 #else
    if ((!ec->iconic) && (!e_client_util_ignored_get(ec)))
      e_focus_event_mouse_out(ec);
@@ -4674,7 +4662,6 @@ e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Binding_Even
 
 #ifdef REFACTOR_FOCUS_POLICY
    wl_signal_emit_mutable(&PRI(ec)->events.mouse_down, NULL);
-   _e_client_hook_call(E_CLIENT_HOOK_MOUSE_DOWN, ec);
 #else
    focused = e_client_focused_get();
    if ((focused) && (ec != focused))
@@ -5282,7 +5269,6 @@ e_client_focus_latest_set(E_Client *ec)
 
 #ifdef REFACTOR_FOCUS_POLICY
    wl_signal_emit_mutable(&PRI(ec)->events.focus_latest_set, NULL);
-   _e_client_hook_call(E_CLIENT_HOOK_FOCUS_LATEST_SET, ec);
 #else
    focus_stack = eina_list_remove(focus_stack, ec);
    focus_stack = eina_list_prepend(focus_stack, ec);
@@ -5320,7 +5306,6 @@ e_client_focus_defer_set(E_Client *ec)
    EINA_SAFETY_ON_NULL_RETURN(ec);
 #ifdef REFACTOR_FOCUS_POLICY
    wl_signal_emit_mutable(&PRI(ec)->events.focus_defer_set, NULL);
-   _e_client_hook_call(E_CLIENT_HOOK_FOCUS_DEFER_SET, ec);
 #else
    if (e_config->focus_policy_ext == E_FOCUS_EXT_TOP_STACK) return;
 
@@ -8676,7 +8661,6 @@ e_client_lower(E_Client *ec)
              e_desk_area_ec_lower(eda, ec);
 #ifdef REFACTOR_FOCUS_POLICY
             wl_signal_emit_mutable(&PRI(ec)->events.lower, NULL);
-             _e_client_hook_call(E_CLIENT_HOOK_LOWER, ec);
 #endif
              return;
           }
@@ -8689,7 +8673,6 @@ e_client_lower(E_Client *ec)
 
 #ifdef REFACTOR_FOCUS_POLICY
    wl_signal_emit_mutable(&PRI(ec)->events.lower, NULL);
-   _e_client_hook_call(E_CLIENT_HOOK_LOWER, ec);
 #endif
 }
 

diff --git a/src/bin/e_client.h b/src/bin/e_client.h
index 2411672..e38b41f 100644 (file)
--- a/src/bin/e_client.h
+++ b/src/bin/e_client.h
@@ -286,15 +286,6 @@ typedef enum _E_Client_Hook_Point
    E_CLIENT_HOOK_TRANSFORM_CHANGE,
    E_CLIENT_HOOK_ACTIVATE_DONE,
    E_CLIENT_HOOK_EVAL_VISIBILITY_END,
-//#ifdef REFACTOR_FOCUS_POLICY
-   E_CLIENT_HOOK_MOUSE_IN,
-   E_CLIENT_HOOK_MOUSE_OUT,
-   E_CLIENT_HOOK_MOUSE_DOWN,
-   E_CLIENT_HOOK_LOWER,
-   E_CLIENT_HOOK_MOVE,
-   E_CLIENT_HOOK_FOCUS_DEFER_SET,
-   E_CLIENT_HOOK_FOCUS_LATEST_SET,
-//#endif
 //#ifdef REFACTOR_ZONE_DESK
    E_CLIENT_HOOK_STICK,
    E_CLIENT_HOOK_UNSTICK,

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index e21a26a..19765da 100644 (file)
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -231,11 +231,6 @@ static Eina_Inlist *_e_comp_object_hooks[] =
    [E_COMP_OBJECT_HOOK_MASK_OBJECT_SET] = NULL,
    [E_COMP_OBJECT_HOOK_MASK_OBJECT_UNSET] = NULL,
    [E_COMP_OBJECT_HOOK_RENDER_UPDATE_LOCK_SET] = NULL,
-//#ifdef REFACTOR_FOCUS_POLICY
-   [E_COMP_OBJECT_HOOK_LOWER] = NULL,
-   [E_COMP_OBJECT_HOOK_SHOW] = NULL,
-   [E_COMP_OBJECT_HOOK_HIDE] = NULL,
-//#endif
 };
 
 #ifdef _F_E_COMP_OBJECT_INTERCEPT_HOOK_
@@ -304,11 +299,6 @@ _e_comp_object_hook_call(E_Comp_Object_Hook_Point hookpoint, E_Client *ec)
             (hookpoint != E_COMP_OBJECT_HOOK_MASK_OBJECT_SET) &&
             (hookpoint != E_COMP_OBJECT_HOOK_MASK_OBJECT_UNSET) &&
             (hookpoint != E_COMP_OBJECT_HOOK_RENDER_UPDATE_LOCK_SET)
-#ifdef REFACTOR_FOCUS_POLICY
-            && (hookpoint != E_COMP_OBJECT_HOOK_LOWER) &&
-            (hookpoint != E_COMP_OBJECT_HOOK_SHOW) &&
-            (hookpoint != E_COMP_OBJECT_HOOK_HIDE)
-#endif
             )
           {
              return ret;
@@ -2620,7 +2610,6 @@ _e_comp_intercept_show_helper(E_Comp_Object *cw)
      }
 
 #ifdef REFACTOR_FOCUS_POLICY
-   _e_comp_object_hook_call(E_COMP_OBJECT_HOOK_SHOW, cw->ec);
    wl_signal_emit_mutable(&cw->events.show, NULL);
 #endif
 }

diff --git a/src/bin/e_comp_object.h b/src/bin/e_comp_object.h
index 4c5002f..dc786f8 100644 (file)
--- a/src/bin/e_comp_object.h
+++ b/src/bin/e_comp_object.h
@@ -45,11 +45,6 @@ typedef enum _E_Comp_Object_Hook_Point
    E_COMP_OBJECT_HOOK_MASK_OBJECT_SET,
    E_COMP_OBJECT_HOOK_MASK_OBJECT_UNSET,
    E_COMP_OBJECT_HOOK_RENDER_UPDATE_LOCK_SET,
-//#ifdef REFACTOR_FOCUS_POLICY
-   E_COMP_OBJECT_HOOK_LOWER,
-   E_COMP_OBJECT_HOOK_SHOW,
-   E_COMP_OBJECT_HOOK_HIDE,
-//#endif
    E_COMP_OBJECT_HOOK_LAST,
 } E_Comp_Object_Hook_Point;
 

diff --git a/src/bin/e_policy.c b/src/bin/e_policy.c
index c6134a6..f433652 100644 (file)
--- a/src/bin/e_policy.c
+++ b/src/bin/e_policy.c
@@ -48,9 +48,6 @@ static Eina_Inlist *_e_policy_hooks[] =
    [E_POLICY_HOOK_CLIENT_ROTATION_GEOMETRY_SET] = NULL,
    [E_POLICY_HOOK_CLIENT_STACK_MODE_SET] = NULL,
    [E_POLICY_HOOK_CLIENT_AUX_HINT_CHANGED] = NULL,
-//#ifdef REFACTOR_FOCUS_POLICY
-   [E_POLICY_HOOK_CLIENT_STACK_TRANSIENT_FOR_DONE] = NULL,
-//#endif
 };
 
 E_API int E_EVENT_POLICY_QUICKPANEL_VISIBLE_STATE_CHANGE = -1;

diff --git a/src/bin/e_policy.h b/src/bin/e_policy.h
index fa9980a..194a281 100644 (file)
--- a/src/bin/e_policy.h
+++ b/src/bin/e_policy.h
@@ -43,9 +43,6 @@ typedef enum _E_Policy_Hook_Point
    E_POLICY_HOOK_CLIENT_ROTATION_GEOMETRY_SET,
    E_POLICY_HOOK_CLIENT_STACK_MODE_SET,
    E_POLICY_HOOK_CLIENT_AUX_HINT_CHANGED,
-//#ifdef REFACTOR_FOCUS_POLICY
-   E_POLICY_HOOK_CLIENT_STACK_TRANSIENT_FOR_DONE,
-//#endif
    E_POLICY_HOOK_LAST
 } E_Policy_Hook_Point;
 

diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 47ad610..b289e5f 100644 (file)
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -75,10 +75,6 @@ static Eina_Inlist *_e_zone_hooks[] =
    [E_ZONE_HOOK_DISPLAY_STATE_CHANGE] = NULL,
    [E_ZONE_HOOK_SPLISCREEN_ACTIVATE] = NULL,
    [E_ZONE_HOOK_SPLISCREEN_DEACTIVATE] = NULL,
-//#ifdef REFACTOR_FOCUS_POLICY
-   [E_ZONE_HOOK_FOCUS_CLEAR] = NULL,
-   [E_ZONE_HOOK_FOCUS_RESET] = NULL,
-//#endif
 };
 
 static Eina_Bool
@@ -2952,7 +2948,6 @@ e_zone_focus_clear(E_Zone *zone)
    EINA_SAFETY_ON_NULL_RETURN(zone);
 
    wl_signal_emit_mutable(&PRI(zone)->events.focus_clear, NULL);
-   _e_zone_hook_call(E_ZONE_HOOK_FOCUS_CLEAR, zone);
 }
 
 EINTERN void
@@ -2961,7 +2956,6 @@ e_zone_focus_reset(E_Zone *zone)
    EINA_SAFETY_ON_NULL_RETURN(zone);
 
    wl_signal_emit_mutable(&PRI(zone)->events.focus_reset, NULL);
-   _e_zone_hook_call(E_ZONE_HOOK_FOCUS_RESET, zone);
 }
 #endif
 

diff --git a/src/bin/e_zone.h b/src/bin/e_zone.h
index cd76c20..a6dafaf 100644 (file)
--- a/src/bin/e_zone.h
+++ b/src/bin/e_zone.h
@@ -43,10 +43,6 @@ typedef enum _E_Zone_Hook_Point
    E_ZONE_HOOK_DISPLAY_STATE_CHANGE,
    E_ZONE_HOOK_SPLISCREEN_ACTIVATE,
    E_ZONE_HOOK_SPLISCREEN_DEACTIVATE,
-//#ifdef REFACTOR_FOCUS_POLICY
-   E_ZONE_HOOK_FOCUS_CLEAR,
-   E_ZONE_HOOK_FOCUS_RESET,
-//#endif
    E_ZONE_HOOK_LAST
 } E_Zone_Hook_Point;