e_desk_area: remove unused ec list and desk_area_client_layer

Change-Id: I82a3a23208e88a94c64e65d90891eaf9941d65c2

diff --git a/src/bin/core/e_desk_area.c b/src/bin/core/e_desk_area.c
index 23d02e914cc4dad88b2fd73b29026f8ea048519d..6a22f5c590c567b7d053f5a6f2f0f145c712424e 100644 (file)
--- a/src/bin/core/e_desk_area.c
+++ b/src/bin/core/e_desk_area.c
@@ -278,7 +278,6 @@ e_desk_area_ec_remove(E_Desk_Area *eda, E_Client *ec)
 EINTERN void
 e_desk_area_info_print(E_Desk_Area *eda)
 {
-   Eina_List *l;
    E_Client *ec;
 
    if (!eda) return;
@@ -286,12 +285,9 @@ e_desk_area_info_print(E_Desk_Area *eda)
    ELOGF("EDG_INFO", "===========================================", NULL);
    ELOGF("EDG_INFO", "E_Desk_Area(%p), ID(%d), Geo(%d,%d,%d,%d)", NULL, eda, eda->id, eda->x, eda->y, eda->w, eda->h);
    ELOGF("EDG_INFO", "-------------------------------------------", NULL);
-   for (int i=E_DESK_AREA_CLIENT_LAYER_MAX-1; i>=0; i--)
+   E_DESK_AREA_CLIENT_REVERSE_FOREACH(eda, ec)
      {
-        EINA_LIST_FOREACH(eda->ec_lists[i], l, ec)
-          {
-             ELOGF("EDG_INFO", "EDG_Layer[%d] Win:0x%08zx, EC:%p, frame:%p, ec->layer:%d, name:%s", NULL, i, e_client_util_win_get(ec), ec, ec->frame, ec->layer, ec->icccm.title ? ec->icccm.title:"NO NAME");
-          }
+        ELOGF("EDG_INFO", "EDG Win:0x%08zx, EC:%p, frame:%p, ec->layer:%d, name:%s", NULL, e_client_util_win_get(ec), ec, ec->frame, ec->layer, ec->icccm.title ? ec->icccm.title:"NO NAME");
      }
    ELOGF("EDG_INFO", "===========================================", NULL);
 }

diff --git a/src/bin/core/e_desk_area_intern.h b/src/bin/core/e_desk_area_intern.h
index 4056552c5b5f3ed3175c2fedad9a8cf5dbfb0741..014a48aadb173ae1efc1068a5fe3a8d558db881b 100644 (file)
--- a/src/bin/core/e_desk_area_intern.h
+++ b/src/bin/core/e_desk_area_intern.h
@@ -15,19 +15,6 @@
 #define E_DESK_AREA_CLIENT_REVERSE_FOREACH(DESK_AREA, EC) \
    for (EC = e_desk_area_top_ec_get(DESK_AREA); EC; EC = e_desk_area_client_below_get(DESK_AREA, EC))
 
-typedef enum _E_Desk_Area_Client_Layer
-{
-   E_DESK_AREA_CLIENT_LAYER_DESKTOP,
-   E_DESK_AREA_CLIENT_LAYER_BELOW,
-   E_DESK_AREA_CLIENT_LAYER_NORMAL,
-   E_DESK_AREA_CLIENT_LAYER_ABOVE,
-   E_DESK_AREA_CLIENT_LAYER_NOTIFICATION_LOW,
-   E_DESK_AREA_CLIENT_LAYER_NOTIFICATION_NORMAL,
-   E_DESK_AREA_CLIENT_LAYER_NOTIFICATION_HIGH,
-   E_DESK_AREA_CLIENT_LAYER_NOTIFICATION_TOP,
-   E_DESK_AREA_CLIENT_LAYER_ALERT,
-   E_DESK_AREA_CLIENT_LAYER_MAX,
-} E_Desk_Area_Client_Layer;
 
 struct _E_Desk_Area
 {
@@ -44,7 +31,6 @@ struct _E_Desk_Area
    unsigned char        visible : 1;
    unsigned char        active  : 1;
    unsigned char        transform_enabled : 1;
-   Eina_List           *ec_lists[E_DESK_AREA_CLIENT_LAYER_MAX];
 
    Eina_List           *handlers;
 

diff --git a/src/bin/windowmgr/e_policy_desk_area.c b/src/bin/windowmgr/e_policy_desk_area.c
index d79e40dc87bad6f3064f6f59ab10143aa55c024a..e5ed5e99cceda6f2bd89218640b1d968888f26ff 100644 (file)
--- a/src/bin/windowmgr/e_policy_desk_area.c
+++ b/src/bin/windowmgr/e_policy_desk_area.c
@@ -272,20 +272,14 @@ _e_policy_desk_area_cb_raise(struct wl_listener *listener, void *data)
    E_Desk_Area *eda;
    E_Policy_Desk_Area *pda;
 
-   int i;
    E_Client *ec;
-   Eina_List *l = NULL;
-   Eina_List *ll = NULL;
 
    pda = wl_container_of(listener, pda, raise);
    eda = pda->desk_area;
 
-   for (i=0; i<E_DESK_AREA_CLIENT_LAYER_MAX; i++)
+   E_DESK_AREA_CLIENT_FOREACH(eda, ec)
      {
-        EINA_LIST_REVERSE_FOREACH_SAFE(eda->ec_lists[i], l, ll, ec)
-          {
-             e_view_raise_to_top(e_view_client_view_get(e_client_view_get(ec)));
-          }
+        e_view_raise_to_top(e_view_client_view_get(e_client_view_get(ec)));
      }
 }
 
@@ -295,21 +289,14 @@ _e_policy_desk_area_cb_lower(struct wl_listener *listener, void *data)
    E_Desk_Area *eda;
    E_Policy_Desk_Area *pda;
 
-   int i;
    E_Client *ec;
-   Eina_List *l = NULL;
-   Eina_List *ll = NULL;
 
    pda = wl_container_of(listener, pda, lower);
    eda = pda->desk_area;
 
-   for (i=E_DESK_AREA_CLIENT_LAYER_MAX-1; i>=0; i--)
+   E_DESK_AREA_CLIENT_REVERSE_FOREACH(eda, ec)
      {
-        //EINA_LIST_FOREACH(eda->ec_lists[i], l, ec)
-        EINA_LIST_FOREACH_SAFE(eda->ec_lists[i], l, ll, ec)
-          {
-             e_view_lower_to_bottom(e_view_client_view_get(e_client_view_get(ec)));
-          }
+        e_view_lower_to_bottom(e_view_client_view_get(e_client_view_get(ec)));
      }
 }