e_desk: depreacte desk configure

Change-Id: I1821d54efd5ea2bb2929ede0251cd1c1ddd2fea3

diff --git a/src/bin/e_comp_screen.c b/src/bin/e_comp_screen.c
index 29480a7a8ea9ca34f5dc7aff59f7c21d71e76689..5536d998354334c8f61196989121332d74e2bbd7 100644 (file)
--- a/src/bin/e_comp_screen.c
+++ b/src/bin/e_comp_screen.c
@@ -642,9 +642,7 @@ _e_comp_screen_screen_policy_update(void)
          {
             scr->zone = e_zone_new(scr->screen, scr->escreen, scr->x, scr->y, scr->w, scr->h);
             scr->policy_zone = e_policy_zone_new(scr->zone);
-            e_policy_zone_desk_count_set(scr->policy_zone,
-                  e_config->zone_desks_x_count,
-                  e_config->zone_desks_y_count);
+            e_policy_zone_desk_count_set(scr->policy_zone, 1, 1);
 
             scr->tz_screen = e_tizen_screen_create(scr->zone);
             scr->tizen_screen_destroy.notify = _e_comp_screen_tizen_screen_cb_destroy;
@@ -751,8 +749,7 @@ _e_comp_screen_screen_policy_setup(void)
               return EINA_FALSE;
            }
          scr->policy_zone = policy_zone;
-         e_policy_zone_desk_count_set(policy_zone,
-            e_config->zone_desks_x_count, e_config->zone_desks_y_count);
+         e_policy_zone_desk_count_set(policy_zone, 1, 1);
 
          tizen_screen = e_tizen_screen_create(zone);
          if (!tizen_screen)

diff --git a/src/bin/windowmgr/e_policy.c b/src/bin/windowmgr/e_policy.c
index 37953b3fb407220ca3d95f9b004c478385827393..605ee6256a0c982d0273a5e55fce234e4040fedd 100644 (file)
--- a/src/bin/windowmgr/e_policy.c
+++ b/src/bin/windowmgr/e_policy.c
@@ -510,24 +510,6 @@ _e_policy_client_floating_policy_cancel(E_Policy_Client *pc)
    pc->flt_policy_state = EINA_FALSE;
 }
 
-EINTERN E_Config_Policy_Desk *
-_e_policy_desk_get_by_num(unsigned int zone_num, int x, int y)
-{
-   Eina_List *l;
-   E_Config_Policy_Desk *d2;
-
-   EINA_LIST_FOREACH(e_config->policy_desks, l, d2)
-     {
-        if ((d2->zone_num == zone_num) &&
-            (d2->x == x) && (d2->y == y))
-          {
-             return d2;
-          }
-     }
-
-   return NULL;
-}
-
 static void
 _e_policy_cb_hook_client_del(void *d EINA_UNUSED, E_Client *ec)
 {
@@ -908,7 +890,6 @@ _e_policy_cb_zone_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
 {
    E_Event_Zone_Add *ev;
    E_Zone *zone;
-   E_Config_Policy_Desk *d;
    int i, n;
 
    ev = event;
@@ -916,22 +897,8 @@ _e_policy_cb_zone_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
    n = zone->desk_y_count * zone->desk_x_count;
    for (i = 0; i < n; i++)
      {
-        if (e_config->use_configured_desks)
-          {
-             d = _e_policy_desk_get_by_num(zone->num,
-                                           zone->desks[i]->x,
-                                           zone->desks[i]->y);
-             if (d)
-               {
-                  e_policy_desk_add(zone->desks[i]);
-                  e_desk_show(zone->desks[i]);
-               }
-          }
-        else
-          {
-             e_policy_desk_add(zone->desks[i]);
-             e_desk_show(zone->desks[i]);
-          }
+        e_policy_desk_add(zone->desks[i]);
+        e_desk_show(zone->desks[i]);
      }
 
    return ECORE_CALLBACK_PASS_ON;
@@ -965,7 +932,6 @@ _e_policy_cb_zone_desk_count_set(void *data EINA_UNUSED, int type EINA_UNUSED, v
    E_Zone *zone;
    E_Desk *desk;
    E_Policy_Desk *pd;
-   E_Config_Policy_Desk *d;
    int i, n;
    Eina_List *desks_del = NULL;
 
@@ -994,22 +960,8 @@ _e_policy_cb_zone_desk_count_set(void *data EINA_UNUSED, int type EINA_UNUSED, v
    n = zone->desk_y_count * zone->desk_x_count;
    for (i = 0; i < n; i++)
      {
-        if (e_config->use_configured_desks)
-          {
-             d = _e_policy_desk_get_by_num(zone->num,
-                                           zone->desks[i]->x,
-                                           zone->desks[i]->y);
-             if (d)
-               {
-                  e_policy_desk_add(zone->desks[i]);
-                  e_desk_show(zone->desks[i]);
-               }
-          }
-        else
-          {
-             e_policy_desk_add(zone->desks[i]);
-             e_desk_show(zone->desks[i]);
-          }
+        e_policy_desk_add(zone->desks[i]);
+        e_desk_show(zone->desks[i]);
      }
 
    return ECORE_CALLBACK_PASS_ON;

diff --git a/src/bin/windowmgr/e_policy_intern.h b/src/bin/windowmgr/e_policy_intern.h
index 91153c32e61e6fbe8cd18777395e9de0056dac37..316963a45fb58c6161b4cbc81d027d8f4a334711 100644 (file)
--- a/src/bin/windowmgr/e_policy_intern.h
+++ b/src/bin/windowmgr/e_policy_intern.h
@@ -148,6 +148,4 @@ EINTERN void             e_policy_keyboard_layout_apply(E_Client *ec);
 EINTERN void             e_policy_interceptors_clean(void);
 EINTERN Eina_Bool        e_policy_interceptor_call(E_Policy_Intercept_Point ipoint, E_Client *ec, ...);
 
-EINTERN E_Config_Policy_Desk *_e_policy_desk_get_by_num(unsigned int zone_num, int x, int y);
-
 #endif

diff --git a/src/bin/windowmgr/e_policy_zone.c b/src/bin/windowmgr/e_policy_zone.c
index 702c00562cd17cd98a2316e810d74ce58b6de9aa..2f09f63676a744fad245a102b4fd98a6edf692ea 100644 (file)
--- a/src/bin/windowmgr/e_policy_zone.c
+++ b/src/bin/windowmgr/e_policy_zone.c
@@ -484,9 +484,6 @@ _e_policy_zone_cb_desk_count_set(struct wl_listener *listener, void *data)
 
    zone->desk_x_count = xx;
    zone->desk_y_count = yy;
-   e_config->zone_desks_x_count = xx;
-   e_config->zone_desks_y_count = yy;
-   e_config_save_queue();
 
    /* Cannot call desk_current_get until the zone desk counts have been set
     * or else we end up with a "white background" because desk_current_get will
@@ -1793,22 +1790,8 @@ e_policy_zone_new(E_Zone *zone)
    n = zone->desk_y_count * zone->desk_x_count;
    for (i = 0; i < n; i++)
      {
-        if (e_config->use_configured_desks)
-          {
-             d = _e_policy_desk_get_by_num(zone->num,
-                                           zone->desks[i]->x,
-                                           zone->desks[i]->y);
-             if (d)
-               {
-                  e_policy_desk_add(zone->desks[i]);
-                  e_desk_show(zone->desks[i]);
-               }
-          }
-        else
-          {
-             e_policy_desk_add(zone->desks[i]);
-             e_desk_show(zone->desks[i]);
-          }
+        e_policy_desk_add(zone->desks[i]);
+        e_desk_show(zone->desks[i]);
      }
 
    // TODO: adjust each focus poicy to each zone.

diff --git a/src/include/e_config.h b/src/include/e_config.h
index e20b74481e029edb19e5c2697fe7c2c119140ed4..3089a2e03b8b424ac252f35cdab786eb8c50db76 100644 (file)
--- a/src/include/e_config.h
+++ b/src/include/e_config.h
@@ -35,8 +35,8 @@ struct _E_Config
    Eina_List  *desktop_names;
    double      framerate;
    int         priority;
-   int         zone_desks_x_count;
-   int         zone_desks_y_count;
+   E_DEPRECATED int         zone_desks_x_count;
+   E_DEPRECATED int         zone_desks_y_count;
    Eina_List  *modules;
    int         use_e_policy;
    struct
@@ -45,8 +45,8 @@ struct _E_Config
         const char   *clas;
         unsigned int  type;
      } launcher;
-   Eina_List  *policy_desks;
-   int         use_configured_desks;
+   E_DEPRECATED Eina_List  *policy_desks;
+   E_DEPRECATED int         use_configured_desks;
    int         use_softkey_service;
    E_DEPRECATED int         use_softkey;
    int         softkey_size;