e_utils: make e_util_client_layer_map

and use it instead of e_comp_canvas_client_layer_map

Change-Id: If4b9b365c1e25d823b33612897ad573cff4de55d

diff --git a/src/bin/compmgr/e_comp_canvas.c b/src/bin/compmgr/e_comp_canvas.c
index 7ccba5f..6b926df 100644 (file)
--- a/src/bin/compmgr/e_comp_canvas.c
+++ b/src/bin/compmgr/e_comp_canvas.c
@@ -8,6 +8,7 @@
 #include "e_config_intern.h"
 #include "e_tizen_screen_manager_intern.h"
 #include "e_display_intern.h"
+#include "e_utils_intern.h"
 
 static Eina_List *handlers;
 static Eina_Bool _ev_freeze = EINA_FALSE;
@@ -500,30 +501,7 @@ e_comp_canvas_layer_map(E_Layer layer)
 E_API unsigned int
 e_comp_canvas_client_layer_map(E_Layer layer)
 {
-   switch (layer)
-     {
-      case E_LAYER_CLIENT_DESKTOP: return 0;
-      case E_LAYER_CLIENT_BELOW: return 1;
-      case E_LAYER_CLIENT_NORMAL: return 2;
-      case E_LAYER_CLIENT_ABOVE: return 3;
-      case E_LAYER_CLIENT_EDGE: return 4;
-      case E_LAYER_CLIENT_FULLSCREEN: return 5;
-      case E_LAYER_CLIENT_EDGE_FULLSCREEN: return 6;
-      case E_LAYER_CLIENT_POPUP: return 7;
-      case E_LAYER_CLIENT_TOP: return 8;
-      case E_LAYER_CLIENT_PRIO: return 9;
-      case E_LAYER_CLIENT_NOTIFICATION_LOW: return 10;
-      case E_LAYER_CLIENT_NOTIFICATION_NORMAL: return 11;
-      case E_LAYER_CLIENT_NOTIFICATION_HIGH: return 12;
-      case E_LAYER_CLIENT_NOTIFICATION_TOP: return 13;
-      case E_LAYER_CLIENT_ALERT_LOW: return 14;
-      case E_LAYER_CLIENT_ALERT: return 15;
-      case E_LAYER_CLIENT_ALERT_HIGH: return 16;
-      case E_LAYER_CLIENT_DRAG: return 17;
-      case E_LAYER_CLIENT_CURSOR: return 18;
-      default: break;
-     }
-   return 9999;
+   return e_util_client_layer_map(layer);
 }
 
 EINTERN E_Layer

diff --git a/src/bin/core/e_client.c b/src/bin/core/e_client.c
index a370498..ea69b19 100644 (file)
--- a/src/bin/core/e_client.c
+++ b/src/bin/core/e_client.c
@@ -6105,7 +6105,7 @@ e_client_layer_set(E_Client *ec,
    E_OBJECT_TYPE_CHECK_RETURN(ec, E_CLIENT_TYPE, EINA_FALSE);
    if (!ec->frame) return EINA_FALSE;
 
-   if (e_comp_canvas_client_layer_map(layer) == 9999)
+   if (e_util_client_layer_map(layer) == 9999)
      return EINA_FALSE; //invalid layer is not allowed
 
    evas_object_layer_set(ec->frame, layer);
@@ -6158,7 +6158,7 @@ e_client_layer_get(E_Client *ec)
         ELOGF("LAYER", "layer dismatch ec->layer %d | evas obj layer %d ",
               ec, ec->layer, layer);
 
-        if (e_comp_canvas_client_layer_map(layer) == 9999)
+        if (e_util_client_layer_map(layer) == 9999)
           return E_LAYER_BOTTOM; //not on E_LAYER_CLIENT
      }
 

diff --git a/src/bin/core/e_desk_area.c b/src/bin/core/e_desk_area.c
index a2dbde2..48a215b 100644 (file)
--- a/src/bin/core/e_desk_area.c
+++ b/src/bin/core/e_desk_area.c
@@ -813,7 +813,7 @@ _desk_area_cb_client_get_above(struct wl_listener *listener, void *data)
      }
 
    if (ec->layer == E_LAYER_CLIENT_CURSOR) return;
-   if (e_comp_canvas_client_layer_map(ec->layer) == 9999) return;
+   if (e_util_client_layer_map(ec->layer) == 9999) return;
 
    g_rec_mutex_lock(&e_comp->ec_list_mutex);
 
@@ -894,7 +894,7 @@ _desk_area_cb_client_get_below(struct wl_listener *listener, void *data)
      }
 
    if (ec_layer == E_LAYER_CLIENT_DESKTOP) return;
-   if (e_comp_canvas_client_layer_map(ec_layer) == 9999) return;
+   if (e_util_client_layer_map(ec_layer) == 9999) return;
 
    /* go down the layers until we find one */
    x = e_comp_canvas_layer_map(ec_layer);
@@ -956,7 +956,7 @@ _desk_area_cb_client_get_visible_above(struct wl_listener *listener, void *data)
      }
 
    if (ec->layer == E_LAYER_CLIENT_CURSOR) return;
-   if (e_comp_canvas_client_layer_map(ec->layer) == 9999) return;
+   if (e_util_client_layer_map(ec->layer) == 9999) return;
 
    g_rec_mutex_lock(&e_comp->ec_list_mutex);
 
@@ -2001,7 +2001,7 @@ _desk_area_cb_comp_object_set_layer(struct wl_listener *listener, void *data)
 
 layer_set:
    if (cw->layer == l) return;
-   if (e_comp_canvas_client_layer_map(layer) == 9999)
+   if (e_util_client_layer_map(layer) == 9999)
      return; //invalid layer for clients not doing comp effects
    if (cw->ec->fullscreen)
      {

diff --git a/src/bin/inputmgr/e_input_thread_client.c b/src/bin/inputmgr/e_input_thread_client.c
index eace90d..12bd932 100644 (file)
--- a/src/bin/inputmgr/e_input_thread_client.c
+++ b/src/bin/inputmgr/e_input_thread_client.c
@@ -1,6 +1,7 @@
 #include "e_input_thread_client_intern.h"
 #include "e_comp_canvas.h"
 #include "e_comp_input_intern.h"
+#include "e_utils_intern.h"
 
 struct _E_Input_Thread_Client
 {
@@ -274,7 +275,7 @@ E_API E_Input_Thread_Client *e_input_thread_client_above_get(E_Input_Thread_Clie
           }
      }
    if (iec->layer == E_LAYER_CLIENT_CURSOR) return NULL;
-   if (e_comp_canvas_client_layer_map(iec->layer) == 9999) return NULL;
+   if (e_util_client_layer_map(iec->layer) == 9999) return NULL;
 
    for (x = e_comp_canvas_layer_map(iec->layer) + 1; x <= e_comp_canvas_layer_map(E_LAYER_CLIENT_CURSOR); x++)
      {
@@ -337,7 +338,7 @@ E_API E_Input_Thread_Client *e_input_thread_client_below_get(E_Input_Thread_Clie
      }
 
    if (iec_layer == E_LAYER_CLIENT_DESKTOP) return NULL;
-   if (e_comp_canvas_client_layer_map(iec_layer) == 9999) return NULL;
+   if (e_util_client_layer_map(iec_layer) == 9999) return NULL;
 
    /* go down the layers until we find one */
    x = e_comp_canvas_layer_map(iec_layer);

diff --git a/src/bin/utils/e_utils.c b/src/bin/utils/e_utils.c
index 2a66966..4b32f45 100644 (file)
--- a/src/bin/utils/e_utils.c
+++ b/src/bin/utils/e_utils.c
@@ -1047,4 +1047,34 @@ E_API unsigned int e_util_timestamp_get(void)
    clock_gettime(CLOCK_MONOTONIC, &ts);
 
    return (ts.tv_sec * 1000) + (ts.tv_nsec / 1000000);
-}
\ No newline at end of file
+}
+
+EINTERN unsigned int
+e_util_client_layer_map(E_Layer layer)
+{
+   switch (layer)
+     {
+      case E_LAYER_CLIENT_DESKTOP: return 0;
+      case E_LAYER_CLIENT_BELOW: return 1;
+      case E_LAYER_CLIENT_NORMAL: return 2;
+      case E_LAYER_CLIENT_ABOVE: return 3;
+      case E_LAYER_CLIENT_EDGE: return 4;
+      case E_LAYER_CLIENT_FULLSCREEN: return 5;
+      case E_LAYER_CLIENT_EDGE_FULLSCREEN: return 6;
+      case E_LAYER_CLIENT_POPUP: return 7;
+      case E_LAYER_CLIENT_TOP: return 8;
+      case E_LAYER_CLIENT_PRIO: return 9;
+      case E_LAYER_CLIENT_NOTIFICATION_LOW: return 10;
+      case E_LAYER_CLIENT_NOTIFICATION_NORMAL: return 11;
+      case E_LAYER_CLIENT_NOTIFICATION_HIGH: return 12;
+      case E_LAYER_CLIENT_NOTIFICATION_TOP: return 13;
+      case E_LAYER_CLIENT_ALERT_LOW: return 14;
+      case E_LAYER_CLIENT_ALERT: return 15;
+      case E_LAYER_CLIENT_ALERT_HIGH: return 16;
+      case E_LAYER_CLIENT_DRAG: return 17;
+      case E_LAYER_CLIENT_CURSOR: return 18;
+      default: break;
+     }
+
+   return 9999;
+}

diff --git a/src/bin/utils/e_utils_intern.h b/src/bin/utils/e_utils_intern.h
index a8da6dc..a052b4e 100644 (file)
--- a/src/bin/utils/e_utils_intern.h
+++ b/src/bin/utils/e_utils_intern.h
@@ -92,4 +92,6 @@ EINTERN void e_util_file_monitor_init(void);
 EINTERN int e_util_file_monitor_shutdown(void);
 EINTERN int e_util_file_monitor_add(const char *path, void *data);
 
+EINTERN unsigned int e_util_client_layer_map(E_Layer layer);
+
 #endif