e_desk_area: disable the desk_area functions

Before refactoring the desk_area, disable the desk_area functions
which are not used after refactoring.

Change-Id: I7650d0e9792d231ed7cd6754d4ac4469dd3532d8

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 468c970..9b8e0a8 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -5977,6 +5977,8 @@ e_client_layer_set(E_Client *ec,
    if (e_comp_canvas_client_layer_map(layer) == 9999)
      return EINA_FALSE; //invalid layer is not allowed
 
+#ifdef REFACTOR_DESK_AREA
+#else
    if (ec->desk_area.enable)
      {
         if (e_client_layer_set_by_desk_area(ec, layer))
@@ -5987,6 +5989,7 @@ e_client_layer_set(E_Client *ec,
           }
      }
    ec->desk_area.layer_backup = layer;
+#endif
 
    evas_object_layer_set(ec->frame, layer);
    if (ec->layer != layer)
@@ -6043,6 +6046,8 @@ e_client_layer_get(E_Client *ec)
    return ec->layer;
 }
 
+#ifdef REFACTOR_DESK_AREA
+#else
 static void
 _e_client_desk_area_original_layer_save(E_Client *ec, E_Layer layer)
 {
@@ -6164,6 +6169,7 @@ e_client_desk_area_set(E_Client *ec, E_Desk_Area *eda)
 
    return EINA_TRUE;
 }
+#endif
 
 static void
 _raise_between_sibling_under_parent(E_Client *ec)
@@ -6208,6 +6214,8 @@ e_client_raise(E_Client *ec)
 {
    if (!ec) return;
 
+#ifdef REFACTOR_DESK_AREA
+#else
    if (ec->desk_area.enable)
      {
         E_Desk_Area *eda;
@@ -6218,6 +6226,7 @@ e_client_raise(E_Client *ec)
              return;
           }
      }
+#endif
 
    if (ec->parent && e_client_is_belong_to_parent(ec))
      _raise_belong_to_parent(ec);
@@ -6328,6 +6337,8 @@ e_client_lower(E_Client *ec)
 {
    if (!ec) return;
 
+#ifdef REFACTOR_DESK_AREA
+#else
    if (ec->desk_area.enable)
      {
         E_Desk_Area *eda;
@@ -6340,6 +6351,7 @@ e_client_lower(E_Client *ec)
              return;
           }
      }
+#endif
 
    if (ec->parent && e_client_is_belong_to_parent(ec))
      _lower_belong_to_parent(ec);
@@ -6357,6 +6369,8 @@ e_client_stack_above(E_Client *ec, E_Client *above)
    if (!above) return;
    if (!above->frame) return;
 
+#ifdef REFACTOR_DESK_AREA
+#else
    if (ec->desk_area.enable)
      {
         E_Desk_Area *eda;
@@ -6367,6 +6381,7 @@ e_client_stack_above(E_Client *ec, E_Client *above)
              return;
           }
      }
+#endif
 
    evas_object_stack_above(ec->frame, above->frame);
 
@@ -6381,6 +6396,8 @@ e_client_stack_below(E_Client *ec, E_Client *below)
    if (!below) return;
    if (!below->frame) return;
 
+#ifdef REFACTOR_DESK_AREA
+#else
    if (ec->desk_area.enable)
      {
         E_Desk_Area *eda;
@@ -6391,6 +6408,7 @@ e_client_stack_below(E_Client *ec, E_Client *below)
              return;
           }
      }
+#endif
 
    evas_object_stack_below(ec->frame, below->frame);
 

diff --git a/src/bin/e_client.h b/src/bin/e_client.h
index 1586e2c..efdccaf 100644 (file)
--- a/src/bin/e_client.h
+++ b/src/bin/e_client.h
@@ -961,9 +961,12 @@ struct E_Client
    struct
    {
       Eina_Bool     enable;
-      E_Desk_Area *desk_area;
+      E_Desk_Area  *desk_area;
+//#ifdef REFACTOR_DESK_AREA
+//#else
       E_Desk_Area_Client_Layer edgc_layer; // used by desk_area mode
       E_Layer       layer_backup; // original layer (used by no desk_area mode)
+//#endif
       E_Util_Transform *transform;
    } desk_area;
 
@@ -1227,6 +1230,8 @@ E_API Eina_Bool e_client_layer_set(E_Client *ec, E_Layer layer);
  */
 E_API E_Layer   e_client_layer_get(E_Client *ec);
 
+//#ifdef REFACTOR_DESK_AREA
+//#else
 EINTERN Eina_Bool e_client_layer_set_by_desk_area(E_Client *ec, E_Layer layer);
 EINTERN void e_client_desk_area_original_layer_restore(E_Client *ec);
 EINTERN E_Layer e_client_desk_area_original_layer_get(E_Client *ec);
@@ -1234,6 +1239,7 @@ EINTERN Eina_Bool e_client_desk_area_client_layer_set(E_Client *ec, E_Desk_Area_
 EINTERN E_Desk_Area_Client_Layer e_client_desk_area_client_layer_get(E_Client *ec);
 
 E_API Eina_Bool e_client_desk_area_set(E_Client *ec, E_Desk_Area *eda);
+//#endif
 
 E_API void      e_client_raise(E_Client *ec);
 E_API void      e_client_lower(E_Client *ec);

diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index dbed5de..336d499 100644 (file)
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -817,7 +817,6 @@ e_desk_client_add(E_Desk *desk, E_Client *ec)
 #ifdef REFACTOR_DESK_AREA
    eda = e_desk_desk_area_base_get(desk);
    e_desk_area_ec_add(eda, ec);
-   e_desk_area_ec_enable_set(desk->desk_area.base, ec, EINA_TRUE);
 
    _e_desk_smart_client_add(desk->smart_obj, ec);
 
@@ -861,7 +860,6 @@ e_desk_client_del(E_Desk *desk, E_Client *ec)
 
    eda = e_desk_desk_area_base_get(desk);
    e_desk_area_ec_remove(eda, ec);
-   e_desk_area_ec_enable_set(desk->desk_area.base, ec, EINA_FALSE);
 
    _e_desk_client_data_del(desk, ec);
 #else
@@ -2048,6 +2046,8 @@ e_desk_desk_area_active_get(E_Desk *desk)
    return desk->desk_area.active;
 }
 
+#ifdef REFACTOR_DESK_AREA
+#else
 static void
 _e_desk_desk_area_check_ec_in_desk_area(E_Desk *desk)
 {
@@ -2126,6 +2126,7 @@ e_desk_desk_area_disable(E_Desk *desk)
      }
    return EINA_TRUE;
 }
+#endif
 
 EINTERN void
 e_desk_desk_area_raise(E_Desk *desk, E_Desk_Area *eda)

diff --git a/src/bin/e_desk.h b/src/bin/e_desk.h
index 7a3db7a..7e60e36 100644 (file)
--- a/src/bin/e_desk.h
+++ b/src/bin/e_desk.h
@@ -146,8 +146,11 @@ EINTERN E_Desk_Area *e_desk_desk_area_get_by_id(E_Desk *desk, int id);
 EINTERN E_Desk_Area *e_desk_desk_area_base_get(E_Desk *desk);
 EINTERN void        e_desk_desk_area_active_set(E_Desk *desk, E_Desk_Area *eda);
 EINTERN E_Desk_Area *e_desk_desk_area_active_get(E_Desk *desk);
+//#ifdef REFACTOR_DESK_AREA
+//#else
 E_API Eina_Bool     e_desk_desk_area_enable(E_Desk *desk);
 E_API Eina_Bool     e_desk_desk_area_disable(E_Desk *desk);
+//#endif
 EINTERN void        e_desk_desk_area_raise(E_Desk *desk, E_Desk_Area *eda);
 EINTERN void        e_desk_desk_area_lower(E_Desk *desk, E_Desk_Area *eda);
 EINTERN E_Desk_Area *e_desk_desk_area_above_get(E_Desk *desk, E_Desk_Area *eda);

diff --git a/src/bin/e_desk_area.c b/src/bin/e_desk_area.c
index 95e22ea..9765ab0 100644 (file)
--- a/src/bin/e_desk_area.c
+++ b/src/bin/e_desk_area.c
@@ -94,6 +94,8 @@ EVAS_SMART_SUBCLASS_NEW(E_DESK_AREA_SMART_OBJ_TYPE, _e_desk_area,
                         evas_object_smart_clipped_class_get, NULL)
 #endif
 
+#ifdef REFACTOR_DESK_AREA
+#else
 static Eina_Bool
 _check_desk_area_client_layer_validation(E_Desk_Area_Client_Layer edgc_layer)
 {
@@ -187,6 +189,7 @@ _e_desk_area_ec_append_relative(E_Desk_Area *eda, E_Client *ec, E_Client *below)
 
    e_client_desk_area_client_layer_set(ec, below_edgc_layer);
 }
+#endif
 
 static void
 _e_desk_geometry_info_set(E_Desk_Area *eda, int x, int y, int w, int h)
@@ -292,6 +295,8 @@ _e_desk_area_private_finish(E_Desk_Area *eda)
 static void
 _e_desk_area_free(E_Desk_Area *eda)
 {
+#ifdef REFACTOR_DESK_AREA
+#else
    for (int i = 0; i < E_DESK_AREA_CLIENT_LAYER_MAX; i++)
      {
         eina_list_free(eda->ec_lists[i]);
@@ -299,6 +304,7 @@ _e_desk_area_free(E_Desk_Area *eda)
 
    if (eda->active)
      _e_desk_area_active_change(NULL, eda->desk);
+#endif
 
    E_FREE_FUNC(eda->hook_subsurf_create, e_comp_wl_hook_del);
 
@@ -486,6 +492,8 @@ e_desk_area_new(E_Desk *desk, int id, int x, int y, int w, int h, E_Desk_Area_La
    return eda;
 }
 
+#ifdef REFACTOR_DESK_AREA
+#else
 void _e_desk_area_ec_geometry_apply(E_Desk_Area *eda, E_Client *ec)
 {
    E_Maximize max;
@@ -598,6 +606,7 @@ e_desk_area_enable_set(E_Desk_Area *eda, Eina_Bool enable)
 
    return EINA_TRUE;
 }
+#endif
 
 E_API Eina_Bool
 e_desk_area_geometry_set(E_Desk_Area *eda, int x, int y, int w, int h)
@@ -695,7 +704,8 @@ e_desk_area_lower(E_Desk_Area *eda)
      }
 }
 
-
+#ifdef REFACTOR_DESK_AREA
+#else
 static E_Desk_Area_Client_Layer
 _e_desk_area_client_layer_convert_from_layer(E_Layer layer)
 {
@@ -722,6 +732,7 @@ _e_desk_area_client_layer_convert_from_layer(E_Layer layer)
 
    return edg_layer;
 }
+#endif
 
 #ifdef REFACTOR_DESK_AREA
 static E_Desk_Area_Private_Client *
@@ -743,8 +754,11 @@ _e_desk_area_ec_find_client(E_Desk_Area *eda, E_Client *ec)
 E_API Eina_Bool
 e_desk_area_ec_add(E_Desk_Area *eda, E_Client *ec)
 {
+#ifdef REFACTOR_DESK_AREA
+#else
    E_Desk_Area_Client_Layer edgc_layer;
    E_Layer layer;
+#endif
 
 #ifdef REFACTOR_DESK_AREA
    E_Desk_Area_Private_Client *eda_client;
@@ -787,14 +801,14 @@ e_desk_area_ec_add(E_Desk_Area *eda, E_Client *ec)
    eda->clients = eina_list_append(eda->clients, eda_client);
 
    _e_desk_area_smart_client_add(eda->smart_obj, ec);
-#endif
-
+#else
    layer = e_client_desk_area_original_layer_get(ec);
    edgc_layer = _e_desk_area_client_layer_convert_from_layer(layer);
 
    eda->ec_lists[edgc_layer] = eina_list_prepend(eda->ec_lists[edgc_layer], ec);
 
    e_client_desk_area_client_layer_set(ec, edgc_layer);
+#endif
 
    return EINA_TRUE;
 }
@@ -802,8 +816,6 @@ e_desk_area_ec_add(E_Desk_Area *eda, E_Client *ec)
 E_API void
 e_desk_area_ec_remove(E_Desk_Area *eda, E_Client *ec)
 {
-   E_Desk_Area_Client_Layer edgc_layer;
-
 #ifdef REFACTOR_DESK_AREA
    E_Desk_Area_Private_Client *eda_client;
 
@@ -836,14 +848,16 @@ e_desk_area_ec_remove(E_Desk_Area *eda, E_Client *ec)
    wl_list_remove(&eda_client->client_get_above.link);
 
    E_FREE(eda_client);
-#endif
-
+#else
    edgc_layer = e_client_desk_area_client_layer_get(ec);
    if (!_check_desk_area_client_layer_validation(edgc_layer)) return;
 
    eda->ec_lists[edgc_layer] = eina_list_remove(eda->ec_lists[edgc_layer], ec);
+#endif
 }
 
+#ifdef REFACTOR_DESK_AREA
+#else
 static E_Client *
 _find_above_ec_in_same_edgc_layer(E_Desk_Area *eda, E_Client *ec)
 {
@@ -1315,12 +1329,13 @@ e_desk_area_transform_enable_get(E_Desk_Area *eda)
 
    return eda->transform_enabled;
 }
-
+#endif
 
 // for debug
 EINTERN void
 e_desk_area_info_print(E_Desk_Area *eda)
 {
+#ifdef REFACTOR_DESK_AREA
    Eina_List *l;
    E_Client *ec;
 
@@ -1337,6 +1352,7 @@ e_desk_area_info_print(E_Desk_Area *eda)
           }
      }
    ELOGF("EDG_INFO", "===========================================", NULL);
+#endif
 }
 
 static void
@@ -1417,6 +1433,8 @@ e_desk_area_hook_del(E_Desk_Area_Hook * dgh)
      _e_desk_area_hooks_delete++;
 }
 
+#ifdef REFACTOR_DESK_AREA
+#else
 E_API Eina_Bool
 e_desk_area_ec_reassign(E_Desk_Area *eda, E_Client *ec)
 {
@@ -1478,6 +1496,7 @@ e_desk_area_ec_enable_set(E_Desk_Area *eda, E_Client *ec, Eina_Bool enable)
 
    return EINA_TRUE;
 }
+#endif
 
 static void
 _desk_area_cb_splitscreen_region_destroy(struct wl_listener *listener EINA_UNUSED, void *data EINA_UNUSED)

diff --git a/src/bin/e_desk_area.h b/src/bin/e_desk_area.h
index 54b1d2c..1488e9a 100644 (file)
--- a/src/bin/e_desk_area.h
+++ b/src/bin/e_desk_area.h
@@ -74,7 +74,10 @@ EINTERN int e_desk_area_shutdown(void);
 
 EINTERN E_Desk_Area *e_desk_area_new(E_Desk *desk, int id, int x, int y, int w, int h, E_Desk_Area_Layer layer);
 
+//#ifdef REFACTOR_DESK_AREA
+//#else
 EINTERN Eina_Bool     e_desk_area_enable_set(E_Desk_Area *eda, Eina_Bool enable);
+//#endif
 
 E_API   Eina_Bool     e_desk_area_geometry_set(E_Desk_Area *eda, int x, int y, int w, int h);
 E_API   Eina_Bool     e_desk_area_geometry_get(E_Desk_Area *eda, int *x, int *y, int *w, int *h);
@@ -88,9 +91,10 @@ E_API   Eina_Bool     e_desk_area_is_activate(E_Desk_Area *eda);
 E_API   void          e_desk_area_raise(E_Desk_Area *eda);
 E_API   void          e_desk_area_lower(E_Desk_Area *eda);
 
-
 E_API   Eina_Bool     e_desk_area_ec_add(E_Desk_Area *eda, E_Client *ec);
 E_API   void          e_desk_area_ec_remove(E_Desk_Area *eda, E_Client *ec);
+//#ifdef REFACTOR_DESK_AREA
+//#else
 EINTERN void          e_desk_area_ec_raise(E_Desk_Area *eda, E_Client *ec);
 EINTERN void          e_desk_area_ec_lower(E_Desk_Area *eda, E_Client *ec);
 EINTERN void          e_desk_area_ec_stack_above(E_Desk_Area *eda, E_Client *ec, E_Client *above);
@@ -106,6 +110,7 @@ E_API   Eina_List    *e_desk_area_ec_list_get(E_Desk_Area *eda);
 
 E_API void            e_desk_area_transform_enable_set(E_Desk_Area *eda, Eina_Bool enable);
 E_API Eina_Bool       e_desk_area_transform_enable_get(E_Desk_Area *eda);
+//#endif
 
 // for debug
 EINTERN void          e_desk_area_info_print(E_Desk_Area *eda);
@@ -114,10 +119,13 @@ EINTERN Eina_Bool        e_desk_area_hook_call(E_Desk_Area *eda, E_Desk_Area_Hoo
 E_API E_Desk_Area_Hook *e_desk_area_hook_add(E_Desk_Area_Hook_Point hookpoint, E_Desk_Area_Hook_Cb func, const void *data);
 E_API void               e_desk_area_hook_del(E_Desk_Area_Hook *dgh);
 
+//#ifdef REFACTOR_DESK_AREA
+//#else
 E_API Eina_Bool       e_desk_area_ec_reassign(E_Desk_Area *eda, E_Client *ec);
 EINTERN Eina_Bool     e_desk_area_ec_enable_set(E_Desk_Area *eda, E_Client *ec, Eina_Bool enable);
 
 extern E_API int E_EVENT_DESK_AREA_CHANGE;
+//#endif
 
 #endif
 #endif

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index 8b50e4a..e25f5d8 100644 (file)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -3851,6 +3851,8 @@ static Eldbus_Message *
 _e_info_server_cb_desk_area_enable(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
 {
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
+#ifdef REFACTOR_DESK_AREA
+#else
    uint32_t enable;
 
    if (!eldbus_message_arguments_get(msg, "i", &enable))
@@ -3867,10 +3869,12 @@ _e_info_server_cb_desk_area_enable(const Eldbus_Service_Interface *iface EINA_UN
      {
         e_desk_desk_area_disable(e_desk_current_get(e_zone_current_get()));
      }
-
+#endif
    return reply;
 }
 
+#ifdef REFACTOR_DESK_AREA
+#else
 static void _desk_area_new(int sub_edg_id, int x, int y, int w, int h, int layer)
 {
    E_Zone *zone;
@@ -3913,11 +3917,15 @@ static void _desk_area_new(int sub_edg_id, int x, int y, int w, int h, int layer
           }
      }
 }
+#endif
 
 static Eldbus_Message *
 _e_info_server_cb_desk_area_new_sub1(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
 {
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
+
+#ifdef REFACTOR_DESK_AREA
+#else
    E_Client *ec;
    int x, y, w, h;
    int layer;
@@ -3943,6 +3951,7 @@ _e_info_server_cb_desk_area_new_sub1(const Eldbus_Service_Interface *iface EINA_
      }
 
    //e_desk_area_all_ec_update(_edg_sub1);
+#endif
 
    return reply;
 }
@@ -3951,6 +3960,9 @@ static Eldbus_Message *
 _e_info_server_cb_desk_area_new_sub2(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
 {
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
+
+#ifdef REFACTOR_DESK_AREA
+#else
    int x, y, w, h;
    int layer;
    E_Client *ec;
@@ -3970,6 +3982,7 @@ _e_info_server_cb_desk_area_new_sub2(const Eldbus_Service_Interface *iface EINA_
         else if (e_policy_client_is_quickpanel(ec))
           e_desk_area_ec_reassign(_edg_sub2, ec);
      }
+#endif
 
    return reply;
 }

diff --git a/src/bin/e_policy_stack.c b/src/bin/e_policy_stack.c
index 9b7fc77..1043d73 100644 (file)
--- a/src/bin/e_policy_stack.c
+++ b/src/bin/e_policy_stack.c
@@ -50,6 +50,8 @@ _e_policy_stack_transient_for_apply(E_Client *ec)
               ec->icccm.transient_for, e_client_util_win_get(ec->parent));
      }
 
+#ifdef REFACTOR_DESK_AREA
+#else
    if (parent)
      {
         if (ec->desk_area.desk_area && parent->desk_area.desk_area)
@@ -60,6 +62,7 @@ _e_policy_stack_transient_for_apply(E_Client *ec)
                }
           }
      }
+#endif
 
    intercepted = e_policy_interceptor_call(E_POLICY_INTERCEPT_STACK_TRANSIENT_FOR,
                                            ec);
@@ -86,6 +89,26 @@ _e_policy_stack_transient_for_apply(E_Client *ec)
         return;
      }
 
+#ifdef REFACTOR_DESK_AREA
+   if (ec->parent->layer != ec->layer)
+     {
+        raise = e_config->transient.raise;
+
+        ec->saved.layer = ec->layer;
+        if (e_config->transient.layer)
+          {
+             e_config->transient.raise = 1;
+             EINA_LIST_FOREACH(ec->transients, l, child)
+               {
+                  if (!child) continue;
+                  child->saved.layer = child->layer;
+               }
+          }
+
+        e_client_layer_set(ec, ec->parent->layer);
+        e_config->transient.raise = raise;
+     }
+#else
    if (ec->desk_area.enable)
      {
         E_Layer layer;
@@ -134,6 +157,7 @@ _e_policy_stack_transient_for_apply(E_Client *ec)
              e_config->transient.raise = raise;
           }
      }
+#endif
 
    E_Transient transient_policy = e_client_transient_policy_get(ec);
    if (transient_policy == E_TRANSIENT_ABOVE)

diff --git a/src/bin/e_policy_wl.c b/src/bin/e_policy_wl.c
index ca84262..17de7a7 100644 (file)
--- a/src/bin/e_policy_wl.c
+++ b/src/bin/e_policy_wl.c
@@ -1991,10 +1991,14 @@ _tzpol_notilv_set(E_Client *ec, int lv)
       default: ly = E_LAYER_CLIENT_NOTIFICATION_LOW;    break;
      }
 
+#ifdef REFACTOR_DESK_AREA
+   cur_ly = e_client_layer_get(ec);
+#else
    if (e_config->use_desk_area)
      cur_ly = e_client_desk_area_original_layer_get(ec);
    else
      cur_ly = e_client_layer_get(ec);
+#endif
 
    if (cur_ly != ly)
      {

diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index fd91fb6..844f012 100644 (file)
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -175,6 +175,12 @@ _e_zone_client_maximize(E_Zone *zone, E_Desk *desk, E_Client *ec, E_Maximize max
    zx = zy = zw = zh = 0;
    ec->maximize_override = 1;
 
+#ifdef REFACTOR_DESK_AREA
+   desk_x = desk->geom.x;
+   desk_y = desk->geom.y;
+   desk_w = desk->geom.w;
+   desk_h = desk->geom.h;
+#else
    if (ec->desk_area.enable && ec->desk_area.desk_area)
      {
         desk_x = ec->desk_area.desk_area->x;
@@ -189,6 +195,7 @@ _e_zone_client_maximize(E_Zone *zone, E_Desk *desk, E_Client *ec, E_Maximize max
         desk_w = desk->geom.w;
         desk_h = desk->geom.h;
      }
+#endif
 
    switch (max & E_MAXIMIZE_TYPE)
      {
@@ -846,6 +853,10 @@ _zone_cb_client_maximize(struct wl_listener *listener, void *data)
    desk = e_zone_desk_find_by_ec(zone, ec);
    EINA_SAFETY_ON_NULL_RETURN(desk);
 
+#ifdef REFACTOR_DESK_AREA
+   desk_x = desk->geom.x;
+   desk_y = desk->geom.y;
+#else
    if (ec->desk_area.enable && ec->desk_area.desk_area)
      {
         desk_x = ec->desk_area.desk_area->x;
@@ -856,7 +867,7 @@ _zone_cb_client_maximize(struct wl_listener *listener, void *data)
         desk_x = desk->geom.x;
         desk_y = desk->geom.y;
      }
-
+#endif
    ec->pre_res_change.valid = 0;
 
    if (!ec->fullscreen)

diff --git a/src/bin/services/e_service_lockscreen.c b/src/bin/services/e_service_lockscreen.c
index de484f2..70fd090 100644 (file)
--- a/src/bin/services/e_service_lockscreen.c
+++ b/src/bin/services/e_service_lockscreen.c
@@ -13,11 +13,16 @@ e_service_lockscreen_client_set(E_Client *ec)
 
    e_client_window_role_set(ec, "lockscreen");
 
+#ifdef REFACTOR_DESK_AREA
+   // set lockscreen layer
+   layer = e_client_layer_get(ec);
+#else
    // set lockscreen layer
    if (e_config->use_desk_area)
      layer = e_client_desk_area_original_layer_get(ec);
    else
      layer = e_client_layer_get(ec);
+#endif
 
    if (E_LAYER_CLIENT_NOTIFICATION_LOW > layer)
      {

diff --git a/src/bin/services/e_service_quickpanel.c b/src/bin/services/e_service_quickpanel.c
index 5d2c7c4..0d09c82 100644 (file)
--- a/src/bin/services/e_service_quickpanel.c
+++ b/src/bin/services/e_service_quickpanel.c
@@ -2282,11 +2282,16 @@ e_service_quickpanel_client_add(E_Client *ec, E_Service_Quickpanel_Type type)
         e_client_window_role_set(ec, "quickpanel_apps_menu");
      }
 
+#ifdef REFACTOR_DESK_AREA
+   // set quickpanel layer
+   layer = e_client_layer_get(ec);
+#else
    // set quickpanel layer
    if (e_config->use_desk_area)
      layer = e_client_desk_area_original_layer_get(ec);
    else
      layer = e_client_layer_get(ec);
+#endif
 
    if (E_POLICY_QUICKPANEL_LAYER != layer)
      e_client_layer_set(ec, E_POLICY_QUICKPANEL_LAYER);

diff --git a/src/bin/services/e_service_scrsaver.c b/src/bin/services/e_service_scrsaver.c
index 0eeb6f0..80b8bd7 100644 (file)
--- a/src/bin/services/e_service_scrsaver.c
+++ b/src/bin/services/e_service_scrsaver.c
@@ -11,11 +11,16 @@ e_service_scrsaver_client_set(E_Client *ec)
 
    ELOGF("SCRSAVER","Set Client", ec);
 
+#ifdef REFACTOR_DESK_AREA
+   // set screensaver layer
+   layer = e_client_layer_get(ec);
+#else
    // set screensaver layer
    if (e_config->use_desk_area)
      layer = e_client_desk_area_original_layer_get(ec);
    else
      layer = e_client_layer_get(ec);
+#endif
 
    if (E_POLICY_SCRSAVER_LAYER != layer)
      {

diff --git a/src/bin/services/e_service_taskbar.c b/src/bin/services/e_service_taskbar.c
index a42dd48..dc1b9ca 100644 (file)
--- a/src/bin/services/e_service_taskbar.c
+++ b/src/bin/services/e_service_taskbar.c
@@ -98,11 +98,16 @@ e_service_taskbar_client_set(E_Client *ec)
       e_client_hook_add(E_CLIENT_HOOK_DEL, _taskbar_hook_client_del, NULL);
    E_LIST_HANDLER_APPEND(taskbar_service->events, E_EVENT_CLIENT_ZONE_SET, _taskbar_cb_client_zone_set, taskbar_service);
 
+#ifdef REFACTOR_DESK_AREA
+   // set taskbar layer
+   layer = e_client_layer_get(ec);
+#else
    // set taskbar layer
    if (e_config->use_desk_area)
      layer = e_client_desk_area_original_layer_get(ec);
    else
      layer = e_client_layer_get(ec);
+#endif
 
    if (E_POLICY_TASKBAR_LAYER != layer)
      {

diff --git a/src/bin/services/e_service_volume.c b/src/bin/services/e_service_volume.c
index db6908b..9911b15 100644 (file)
--- a/src/bin/services/e_service_volume.c
+++ b/src/bin/services/e_service_volume.c
@@ -292,11 +292,16 @@ e_service_volume_client_set(E_Client *ec)
    _volume_del_hook =
       e_client_hook_add(E_CLIENT_HOOK_DEL, _volume_hook_client_del, NULL);
 
+#ifdef REFACTOR_DESK_AREA
+   // set volume layer
+   layer = e_client_layer_get(ec);
+#else
    // set volume layer
    if (e_config->use_desk_area)
      layer = e_client_desk_area_original_layer_get(ec);
    else
      layer = e_client_layer_get(ec);
+#endif
 
    if (E_POLICY_VOLUME_LAYER != layer)
      {