remove the use of ec->zone

Use e_comp_zone_find_by_ec() function instead.

Change-Id: If5227ac82dcf4af759a266927b99d9674383b5a5

diff --git a/src/e_mod_effect.c b/src/e_mod_effect.c
index 2db2795149ac5797a85739d035f2f1f2b6902c99..e66e71e72c0f15e5901e166dd050b9f0919f8499 100644 (file)
--- a/src/e_mod_effect.c
+++ b/src/e_mod_effect.c
@@ -47,11 +47,15 @@ _eff_object_underlayer_get(E_Client *ec)
    E_Comp_Screen *e_comp_screen;
    Eina_List *l;
    Under_Layer *ulayer;
+   E_Zone *zone;
 
    e_comp_screen = e_comp->e_comp_screen;
    if (!e_comp_screen)
      return NULL;
 
+   zone = e_comp_zone_find_by_ec(ec);
+   if (!zone) return NULL;
+
    if (e_client_video_client_has(ec))
      {
         if ((!_eff->under_layers) && (!_eff->under_checked))
@@ -61,9 +65,7 @@ _eff_object_underlayer_get(E_Client *ec)
              E_Plane *plane;
              const Eina_List *planes, *l;
 
-             if (!ec->zone) return NULL;
-
-             eoutput = e_output_find(ec->zone->output_id);
+             eoutput = e_output_find(zone->output_id);
              if (eoutput) return NULL;
 
              planes = e_output_planes_get(eoutput);
@@ -147,14 +149,14 @@ _eff_object_underlayer_get(E_Client *ec)
                     }
 
                   evas_object_name_set(underlay, "effect-under-layout");
-                  e_layout_virtual_size_set(underlay, ec->zone->w, ec->zone->h);
-                  evas_object_move(underlay, ec->zone->x, ec->zone->y);
+                  e_layout_virtual_size_set(underlay, zone->w, zone->h);
+                  evas_object_move(underlay, zone->x, zone->y);
 
                   bg = evas_object_rectangle_add(e_comp->evas);
                   evas_object_color_set(bg, 0, 0, 0, 255);
                   e_layout_pack(underlay, bg);
                   e_layout_child_move(bg, 0, 0);
-                  e_layout_child_resize(bg, ec->zone->w, ec->zone->h);
+                  e_layout_child_resize(bg, zone->w, zone->h);
                   evas_object_show(bg);
                }
 
@@ -467,6 +469,7 @@ _eff_object_background_below_clients_get(E_Client *ec, E_Effect_Type type, Eina_
 {
    Eina_List *stack = NULL, *list, *next;
    E_Client *below = NULL;
+   E_Zone *zone, *below_ec_zone;
 
    if (!_eff) return;
 
@@ -477,6 +480,9 @@ _eff_object_background_below_clients_get(E_Client *ec, E_Effect_Type type, Eina_
 
    if (!stack) return;
 
+   zone = e_comp_zone_find_by_ec(ec);
+   if (!zone) return;
+
    list = eina_list_data_find_list(stack, ec);
    if (!list) return;
 
@@ -491,8 +497,11 @@ _eff_object_background_below_clients_get(E_Client *ec, E_Effect_Type type, Eina_
              return;
           }
 
+        below_ec_zone = e_comp_zone_find_by_ec(below);
+        if (!below_ec_zone) continue;
+
         if (e_object_is_del(E_OBJECT(below))) continue;
-        if (ec->zone != below->zone) continue;
+        if (zone != below_ec_zone) continue;
         if (e_client_util_ignored_get(below) ||
             (!evas_object_visible_get(below->frame))) continue;
 

diff --git a/src/e_mod_effect_rotation.c b/src/e_mod_effect_rotation.c
index b8e52804f211242eb17dc88bc4453bf54f8f2c97..a8edda41597584d81ef5e0c8fd3cedb0850c8ce5 100644 (file)
--- a/src/e_mod_effect_rotation.c
+++ b/src/e_mod_effect_rotation.c
@@ -162,6 +162,7 @@ _rotation_effect_targets_get(Rotation_Effect *effect, E_Desk *desk)
    const int edge = 1;
    Eina_List *l = NULL;
    E_Client *ec;
+   E_Zone *zone;
 
    if (!effect) return NULL;
 
@@ -192,7 +193,9 @@ _rotation_effect_targets_get(Rotation_Effect *effect, E_Desk *desk)
              if (ec->desk != desk) continue;
              if (e_object_is_del(E_OBJECT(ec))) continue;
              if (ec->is_cursor) continue;
-             if (!E_INTERSECTS(ec->x, ec->y, ec->w, ec->h, ec->zone->x, ec->zone->y, ec->zone->w, ec->zone->h))
+             zone = e_comp_zone_find_by_ec(ec);
+             if (!zone) continue;
+             if (!E_INTERSECTS(ec->x, ec->y, ec->w, ec->h, zone->x, zone->y, zone->w, zone->h))
                continue;
              if ((ec->visibility.obscured != E_VISIBILITY_UNOBSCURED) &&
                  (ec->iconic))
@@ -997,12 +1000,16 @@ _rotation_effect_cb_buffer_change(void *data, int ev_type, void *event)
 {
    E_Event_Client *ev = event;
    E_Client *ec;
+   E_Zone *zone;
    E_Desk *desk;
    Rotation_Effect *effect;
 
    ec = ev->ec;
    if (!ec) return ECORE_CALLBACK_PASS_ON;
 
+   zone = e_comp_zone_find_by_ec(ec);
+   if (!zone) return ECORE_CALLBACK_PASS_ON;
+
    effect = (Rotation_Effect *)data;
    if (!effect) return ECORE_CALLBACK_PASS_ON;
    if (!effect->ctx_begin) return ECORE_CALLBACK_PASS_ON;
@@ -1015,7 +1022,7 @@ _rotation_effect_cb_buffer_change(void *data, int ev_type, void *event)
 
    if (!effect->ctx_end)
      {
-        desk = e_desk_current_get(ec->zone);
+        desk = e_desk_current_get(zone);
         _rotation_effect_animator_end_prepare(effect, desk);
      }
    if (effect->ctx_end) _rotation_effect_start(effect);
@@ -1029,11 +1036,15 @@ _rotation_effect_cb_client_hide(void *data, int ev_type, void *event)
    E_Event_Client *ev = event;
    E_Client *ec;
    Rotation_Effect *effect;
+   E_Zone *zone;
    E_Desk *desk;
 
    ec = ev->ec;
    if (!ec) return ECORE_CALLBACK_PASS_ON;
 
+   zone = e_comp_zone_find_by_ec(ec);
+   if (!zone) return ECORE_CALLBACK_PASS_ON;
+
    effect = (Rotation_Effect *)data;
    if (!effect) return ECORE_CALLBACK_PASS_ON;
    if (!effect->ctx_begin) return ECORE_CALLBACK_PASS_ON;
@@ -1046,7 +1057,7 @@ _rotation_effect_cb_client_hide(void *data, int ev_type, void *event)
 
    if (!effect->ctx_end)
      {
-        desk = e_desk_current_get(ec->zone);
+        desk = e_desk_current_get(zone);
         _rotation_effect_animator_end_prepare(effect, desk);
      }
    if (effect->ctx_end) _rotation_effect_start(effect);