e_focus_policy: replace the function

which is e_client_check_fully_contain_by_above to e_policy_client_fully_covering_above_ec_get.

focus_policy

Change-Id: Ie666483048a681d7cedae740efd8be7c32671e02

diff --git a/src/bin/windowmgr/e_focus_policy_history.c b/src/bin/windowmgr/e_focus_policy_history.c
index ac908220a7df77b22bf16433d2aa43b04e111e6f..05b6f76610a792e6f53729577c55b548c7f9bfef 100644 (file)
--- a/src/bin/windowmgr/e_focus_policy_history.c
+++ b/src/bin/windowmgr/e_focus_policy_history.c
@@ -8,6 +8,7 @@
 #include "e_view_client_intern.h"
 #include "e_policy_zone_intern.h"
 #include "e_comp_canvas_intern.h"
+#include "e_policy_intern.h"
 
 typedef struct _E_Focus_Policy_History_Impl E_Focus_Policy_History;
 typedef struct _E_Focus_Policy_History_Client E_Focus_Policy_History_Client;
@@ -214,7 +215,7 @@ _e_focus_policy_history_candidate_focus_get(E_Focus_Policy_History *history_poli
             e_client_check_really_iconified(cec))
           {
              if (e_client_visibility_get(ec) != E_VISIBILITY_UNOBSCURED) continue;
-             if (e_client_check_fully_contain_by_above(ec, EINA_FALSE)) continue;
+             if (e_policy_client_fully_covering_above_ec_get(ec)) continue;
           }
 
         if (focused_ec && (focused_ec->layer > ec->layer)) continue;
@@ -298,7 +299,7 @@ _e_focus_policy_history_focus_can_take(E_Focus_Policy_History *history_policy, E
           return EINA_FALSE;
      }
 
-   above_ec = e_client_check_fully_contain_by_above(ec, EINA_FALSE);
+   above_ec = e_policy_client_fully_covering_above_ec_get(ec);
    if (above_ec)
      {
         child_ec = e_client_check_obscured_by_children_group(ec);
@@ -307,7 +308,7 @@ _e_focus_policy_history_focus_can_take(E_Focus_Policy_History *history_policy, E
 
         if (_e_focus_policy_history_focus_can_take(history_policy, child_ec))
           return EINA_FALSE;
-        else if (e_client_check_fully_contain_by_above(child_ec, EINA_FALSE))
+        else if (e_policy_client_fully_covering_above_ec_get(child_ec))
           return EINA_FALSE;
      }
 
@@ -756,7 +757,7 @@ _focus_policy_history_cb_client_activate_done(struct wl_listener *listener, void
         _e_focus_policy_history_focus_defer_unset(history_policy, ec);
      }
 
-    obscured_above = e_client_check_fully_contain_by_above(focus_ec, EINA_FALSE);
+    obscured_above = e_policy_client_fully_covering_above_ec_get(focus_ec);
     if (!obscured_above)
       {
          if (!e_policy_visibility_client_is_uniconic(ec) ||

diff --git a/src/bin/windowmgr/e_focus_policy_topmost.c b/src/bin/windowmgr/e_focus_policy_topmost.c
index e1633817d813fb70fb0af3631c56742fc7fbc9b0..38190d4e149bfd7edc0942173e6c611a3c8ab271 100644 (file)
--- a/src/bin/windowmgr/e_focus_policy_topmost.c
+++ b/src/bin/windowmgr/e_focus_policy_topmost.c
@@ -4,9 +4,9 @@
 #include "e_desk_intern.h"
 #include "e_config_intern.h"
 #include "e_view_client_intern.h"
-
 #include "e_comp_canvas_intern.h"
 #include "e_policy_zone_intern.h"
+#include "e_policy_intern.h"
 
 typedef struct _E_Focus_Policy_Topmost_Impl E_Focus_Policy_Topmost;
 typedef struct _E_Focus_Policy_Topmost_Client E_Focus_Policy_Topmost_Client;
@@ -110,7 +110,7 @@ _e_focus_policy_topmost_focus_can_take(E_Focus_Policy_Topmost *topmost_policy, E
           return EINA_FALSE;
      }
 
-   above_ec = e_client_check_fully_contain_by_above(ec, EINA_FALSE);
+   above_ec = e_policy_client_fully_covering_above_ec_get(ec);
    if (above_ec)
      {
          if (!e_view_client_visible_get(e_client_view_get(above_ec)))
@@ -122,7 +122,7 @@ _e_focus_policy_topmost_focus_can_take(E_Focus_Policy_Topmost *topmost_policy, E
 
         if (_e_focus_policy_topmost_focus_can_take(topmost_policy, child_ec))
           return EINA_FALSE;
-        else if (e_client_check_fully_contain_by_above(child_ec, EINA_FALSE))
+        else if (e_policy_client_fully_covering_above_ec_get(child_ec))
           return EINA_FALSE;
      }