1 files changed, 35 insertions, 47 deletions

diff --git a/src/bin/e_bg.c b/src/bin/e_bg.c
index 6b1619d..3139157 100644
--- a/src/bin/e_bg.c
+++ b/src/bin/e_bg.c
@@ -76,7 +76,7 @@ e_bg_shutdown(void)
  * The most specific match will be returned
  */
 EAPI const E_Config_Desktop_Background *
-e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y)
+e_bg_config_get(int manager_num, int zone_num, int desk_x, int desk_y)
 {
    Eina_List *l, *entries;
    E_Config_Desktop_Background *bg = NULL, *cfbg = NULL;
@@ -85,7 +85,7 @@ e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y)
    int current_spec = 0; /* how specific the setting is - we want the least general one that applies */
 
    /* look for desk specific background. */
-   if (container_num >= 0 || zone_num >= 0 || desk_x >= 0 || desk_y >= 0)
+   if (manager_num >= 0 || zone_num >= 0 || desk_x >= 0 || desk_y >= 0)
      {
         EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cfbg)
           {
@@ -93,8 +93,8 @@ e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y)
 
              if (!cfbg) continue;
              spec = 0;
-             if (cfbg->container == container_num) spec++;
-             else if (cfbg->container >= 0)
+             if (cfbg->manager == manager_num) spec++;
+             else if (cfbg->manager >= 0)
                continue;
              if (cfbg->zone == zone_num) spec++;
              else if (cfbg->zone >= 0)
@@ -144,13 +144,13 @@ e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y)
 }
 
 EAPI Eina_Stringshare *
-e_bg_file_get(int container_num, int zone_num, int desk_x, int desk_y)
+e_bg_file_get(int manager_num, int zone_num, int desk_x, int desk_y)
 {
    const E_Config_Desktop_Background *cfbg;
    const char *bgfile = NULL;
    int ok = 0;
 
-   cfbg = e_bg_config_get(container_num, zone_num, desk_x, desk_y);
+   cfbg = e_bg_config_get(manager_num, zone_num, desk_x, desk_y);
 
    /* fall back to default */
    if (cfbg)
@@ -208,9 +208,9 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
 
    desk = e_desk_current_get(zone);
    if (desk)
-     bgfile = e_bg_file_get(zone->container->num, zone->num, desk->x, desk->y);
+     bgfile = e_bg_file_get(zone->comp->num, zone->num, desk->x, desk->y);
    else
-     bgfile = e_bg_file_get(zone->container->num, zone->num, -1, -1);
+     bgfile = e_bg_file_get(zone->comp->num, zone->num, -1, -1);
 
    if (zone->bg_object)
      {
@@ -233,39 +233,43 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
              zone->bg_object = NULL;
              E_FREE_FUNC(zone->transition_object, evas_object_del);
           }
-        o = edje_object_add(zone->container->bg_evas);
+        o = edje_object_add(zone->comp->evas);
         evas_object_repeat_events_set(o, 1);
         zone->transition_object = o;
+        evas_object_name_set(zone->transition_object, "zone->transition_object");
         /* FIXME: segv if zone is deleted while up??? */
         evas_object_data_set(o, "e_zone", zone);
         snprintf(buf, sizeof(buf), "e/transitions/%s", trans);
         e_theme_edje_object_set(o, "base/theme/transitions", buf);
         edje_object_signal_callback_add(o, "e,state,done", "*", _e_bg_signal, zone);
-        evas_object_layer_set(o, E_COMP_CANVAS_LAYER_BG);
+        evas_object_move(o, zone->x, zone->y);
+        evas_object_resize(o, zone->w, zone->h);
+        evas_object_layer_set(o, E_LAYER_BG);
         evas_object_clip_set(o, zone->bg_clip_object);
         evas_object_show(o);
      }
    if (eina_str_has_extension(bgfile, ".edj"))
      {
-        o = edje_object_add(zone->container->bg_evas);
+        o = edje_object_add(zone->comp->evas);
         edje_object_file_set(o, bgfile, "e/desktop/background");
         if (edje_object_data_get(o, "noanimation"))
           edje_object_animation_set(o, EINA_FALSE);
      }
    else
      {
-        o = e_icon_add(zone->container->bg_evas);
+        o = e_icon_add(zone->comp->evas);
         e_icon_file_key_set(o, bgfile, NULL);
         e_icon_fill_inside_set(o, 0);
      }
    evas_object_data_set(o, "e_zone", zone);
    evas_object_repeat_events_set(o, 1);
    zone->bg_object = o;
+   evas_object_name_set(zone->bg_object, "zone->bg_object");
    if (transition == E_BG_TRANSITION_NONE)
      {
         evas_object_move(o, zone->x, zone->y);
         evas_object_resize(o, zone->w, zone->h);
-        evas_object_layer_set(o, E_COMP_CANVAS_LAYER_BG);
+        evas_object_layer_set(o, E_LAYER_BG);
      }
    evas_object_clip_set(o, zone->bg_clip_object);
    evas_object_show(o);
@@ -285,9 +289,9 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
    if (zone->bg_object) evas_object_name_set(zone->bg_object, "zone->bg_object");
    if (zone->prev_bg_object) evas_object_name_set(zone->prev_bg_object, "zone->prev_bg_object");
    if (zone->transition_object) evas_object_name_set(zone->transition_object, "zone->transition_object");
-   if (zone->comp_zone) e_comp_zone_update(zone->comp_zone);
    evas_object_move(zone->transition_object, zone->x, zone->y);
    evas_object_resize(zone->transition_object, zone->w, zone->h);
+   e_comp_canvas_zone_update(zone);
 end:
    eina_stringshare_del(bgfile);
 }
@@ -322,7 +326,7 @@ e_bg_default_set(const char *file)
      e_config->desktop_default_background = NULL;
 
    ev = E_NEW(E_Event_Bg_Update, 1);
-   ev->container = -1;
+   ev->manager = -1;
    ev->zone = -1;
    ev->desk_x = -1;
    ev->desk_y = -1;
@@ -330,7 +334,7 @@ e_bg_default_set(const char *file)
 }
 
 EAPI void
-e_bg_add(int container, int zone, int desk_x, int desk_y, const char *file)
+e_bg_add(int manager, int zone, int desk_x, int desk_y, const char *file)
 {
    const Eina_List *l;
    E_Config_Desktop_Background *cfbg;
@@ -341,7 +345,7 @@ e_bg_add(int container, int zone, int desk_x, int desk_y, const char *file)
    EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cfbg)
      {
         if ((cfbg) &&
-            (cfbg->container == container) &&
+            (cfbg->manager == manager) &&
             (cfbg->zone == zone) &&
             (cfbg->desk_x == desk_x) &&
             (cfbg->desk_y == desk_y) &&
@@ -352,9 +356,9 @@ e_bg_add(int container, int zone, int desk_x, int desk_y, const char *file)
           }
      }
 
-   e_bg_del(container, zone, desk_x, desk_y);
+   e_bg_del(manager, zone, desk_x, desk_y);
    cfbg = E_NEW(E_Config_Desktop_Background, 1);
-   cfbg->container = container;
+   cfbg->manager = manager;
    cfbg->zone = zone;
    cfbg->desk_x = desk_x;
    cfbg->desk_y = desk_y;
@@ -364,7 +368,7 @@ e_bg_add(int container, int zone, int desk_x, int desk_y, const char *file)
    e_filereg_register(cfbg->file);
 
    ev = E_NEW(E_Event_Bg_Update, 1);
-   ev->container = container;
+   ev->manager = manager;
    ev->zone = zone;
    ev->desk_x = desk_x;
    ev->desk_y = desk_y;
@@ -372,7 +376,7 @@ e_bg_add(int container, int zone, int desk_x, int desk_y, const char *file)
 }
 
 EAPI void
-e_bg_del(int container, int zone, int desk_x, int desk_y)
+e_bg_del(int manager, int zone, int desk_x, int desk_y)
 {
    Eina_List *l;
    E_Config_Desktop_Background *cfbg;
@@ -381,7 +385,7 @@ e_bg_del(int container, int zone, int desk_x, int desk_y)
    EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cfbg)
      {
         if (!cfbg) continue;
-        if ((cfbg->container == container) && (cfbg->zone == zone) &&
+        if ((cfbg->manager == manager) && (cfbg->zone == zone) &&
             (cfbg->desk_x == desk_x) && (cfbg->desk_y == desk_y))
           {
              e_config->desktop_backgrounds = eina_list_remove_list(e_config->desktop_backgrounds, l);
@@ -393,7 +397,7 @@ e_bg_del(int container, int zone, int desk_x, int desk_y)
      }
 
    ev = E_NEW(E_Event_Bg_Update, 1);
-   ev->container = container;
+   ev->manager = manager;
    ev->zone = zone;
    ev->desk_x = desk_x;
    ev->desk_y = desk_y;
@@ -403,21 +407,13 @@ e_bg_del(int container, int zone, int desk_x, int desk_y)
 EAPI void
 e_bg_update(void)
 {
-   Eina_List *l, *ll, *lll;
-   E_Manager *man;
-   E_Container *con;
+   const Eina_List *l, *ll;
+   E_Comp *c;
    E_Zone *zone;
 
-   EINA_LIST_FOREACH(e_manager_list(), l, man)
-     {
-        EINA_LIST_FOREACH(man->containers, ll, con)
-          {
-             EINA_LIST_FOREACH(con->zones, lll, zone)
-               {
-                  e_zone_bg_reconfigure(zone);
-               }
-          }
-     }
+   EINA_LIST_FOREACH(e_comp_list(), l, c)
+     EINA_LIST_FOREACH(c->zones, ll, zone)
+       e_zone_bg_reconfigure(zone);
 }
 
 /* local subsystem functions */
@@ -507,19 +503,11 @@ _e_bg_signal(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNU
 {
    E_Zone *zone = data;
 
-   if (zone->prev_bg_object)
-     {
-        evas_object_del(zone->prev_bg_object);
-        zone->prev_bg_object = NULL;
-     }
-   if (zone->transition_object)
-     {
-        evas_object_del(zone->transition_object);
-        zone->transition_object = NULL;
-     }
+   E_FREE_FUNC(zone->prev_bg_object, evas_object_del);
+   E_FREE_FUNC(zone->transition_object, evas_object_del);
    evas_object_move(zone->bg_object, zone->x, zone->y);
    evas_object_resize(zone->bg_object, zone->w, zone->h);
-   evas_object_layer_set(zone->bg_object, E_COMP_CANVAS_LAYER_BG);
+   evas_object_layer_set(zone->bg_object, E_LAYER_BG);
    evas_object_clip_set(zone->bg_object, zone->bg_clip_object);
    evas_object_show(zone->bg_object);
 }