e_output: Remove redundancy code

Change-Id: Id391bee40f633881291d9a260e6c85287f278a51
Signed-off-by: Junkyeong Kim <jk0430.kim@samsung.com>

diff --git a/src/bin/e_output.c b/src/bin/e_output.c
index 434977c..894c741 100644 (file)
--- a/src/bin/e_output.c
+++ b/src/bin/e_output.c
@@ -190,7 +190,7 @@ _e_output_intercept_hook_call(E_Output_Intercept_Hook_Point hookpoint, E_Output
 }
 
 static E_Client *
-_e_output_zoom_top_visible_ec_get()
+_e_output_top_visible_ec_get()
 {
    E_Client *ec;
    Evas_Object *o;
@@ -217,16 +217,15 @@ _e_output_zoom_top_visible_ec_get()
 }
 
 static int
-_e_output_zoom_get_angle(E_Output *output)
+_e_output_top_ec_angle_get(void)
 {
    E_Client *ec = NULL;
-   int ec_angle = 0;
 
-   ec = _e_output_zoom_top_visible_ec_get();
+   ec = _e_output_top_visible_ec_get();
    if (ec)
-     ec_angle = ec->e.state.rot.ang.curr;
+     return ec->e.state.rot.ang.curr;
 
-   return ec_angle;
+   return 0;
 }
 
 static void
@@ -539,45 +538,6 @@ _e_output_force_render_unset(E_Output *output)
    EOINF("force render unset", output);
 }
 
-static E_Client *
-_e_output_top_visible_ec_get()
-{
-   E_Client *ec;
-   Evas_Object *o;
-
-   for (o = evas_object_top_get(e_comp->evas); o; o = evas_object_below_get(o))
-     {
-        ec = evas_object_data_get(o, "E_Client");
-
-        /* check e_client and skip e_clients not intersects with zone */
-        if (!ec) continue;
-        if (e_object_is_del(E_OBJECT(ec))) continue;
-        if (e_client_util_ignored_get(ec)) continue;
-        if (ec->iconic) continue;
-        if (ec->visible == 0) continue;
-        if (!(e_client_visibility_get(ec) == 0 || e_client_visibility_get(ec) == 1)) continue;
-        if (!ec->frame) continue;
-        if (!evas_object_visible_get(ec->frame)) continue;
-        if (e_comp_wl_subsurface_check(ec)) continue;
-
-        return ec;
-     }
-
-   return NULL;
-}
-
-static int
-_e_output_top_ec_angle_get(void)
-{
-   E_Client *ec = NULL;
-
-   ec = _e_output_top_visible_ec_get();
-   if (ec)
-     return ec->e.state.rot.ang.curr;
-
-   return 0;
-}
-
 static void
 _e_output_zoom_touch_rect_get(E_Output *output)
 {
@@ -664,7 +624,7 @@ e_output_zoom_rotating_check(E_Output *output)
 {
    int angle = 0;
 
-   angle = _e_output_zoom_get_angle(output);
+   angle = _e_output_top_ec_angle_get();
    if ((output->zoom_conf.current_angle != angle) ||
       (output->zoom_conf.current_screen_rotation != output->config.rotation))
      {
@@ -3471,7 +3431,7 @@ e_output_zoom_set(E_Output *output, double zoomx, double zoomy, int cx, int cy)
           return EINA_FALSE;
      }
 
-   angle = _e_output_zoom_get_angle(output);
+   angle = _e_output_top_ec_angle_get();
 
    output->zoom_conf.zoomx = zoomx;
    output->zoom_conf.zoomy = zoomy;