e_policy_desk_area: remove clamping of client layer

The clamping is meaningless because of the client layer already
validated at above e_util_client_layer_validate

Change-Id: Ie5e80d5a84f73983fe5a4b1788418e9a3cffd8ed

diff --git a/src/bin/compmgr/e_comp_canvas.c b/src/bin/compmgr/e_comp_canvas.c
index cb78b2cba1408fb5cadc232a869471e304a6bdac..84b4828374e9a8c389269dbe1bc034147ff5b158 100644 (file)
--- a/src/bin/compmgr/e_comp_canvas.c
+++ b/src/bin/compmgr/e_comp_canvas.c
@@ -535,33 +535,6 @@ e_comp_canvas_client_layer_map(E_Layer layer)
    return e_util_client_layer_map(layer);
 }
 
-EINTERN E_Layer
-e_comp_canvas_client_layer_map_nearest(int layer)
-{
-#define LAYER_MAP(X) \
-   if (layer <= X) return X
-
-   LAYER_MAP(E_LAYER_CLIENT_DESKTOP);
-   LAYER_MAP(E_LAYER_CLIENT_BELOW);
-   LAYER_MAP(E_LAYER_CLIENT_NORMAL);
-   LAYER_MAP(E_LAYER_CLIENT_ABOVE);
-   LAYER_MAP(E_LAYER_CLIENT_EDGE);
-   LAYER_MAP(E_LAYER_CLIENT_FULLSCREEN);
-   LAYER_MAP(E_LAYER_CLIENT_EDGE_FULLSCREEN);
-   LAYER_MAP(E_LAYER_CLIENT_POPUP);
-   LAYER_MAP(E_LAYER_CLIENT_TOP);
-   LAYER_MAP(E_LAYER_CLIENT_PRIO);
-   LAYER_MAP(E_LAYER_CLIENT_NOTIFICATION_LOW);
-   LAYER_MAP(E_LAYER_CLIENT_NOTIFICATION_NORMAL);
-   LAYER_MAP(E_LAYER_CLIENT_NOTIFICATION_HIGH);
-   LAYER_MAP(E_LAYER_CLIENT_NOTIFICATION_TOP);
-   LAYER_MAP(E_LAYER_CLIENT_ALERT_LOW);
-   LAYER_MAP(E_LAYER_CLIENT_ALERT);
-   LAYER_MAP(E_LAYER_CLIENT_ALERT_HIGH);
-   LAYER_MAP(E_LAYER_CLIENT_DRAG);
-   return E_LAYER_CLIENT_CURSOR;
-}
-
 EINTERN void
 e_comp_post_update_add(E_Client *ec)
 {

diff --git a/src/bin/compmgr/e_comp_canvas_intern.h b/src/bin/compmgr/e_comp_canvas_intern.h
index 362fc5e8f0305f578e5c80f59cc505f2be8298f7..7c49af8831cc19dcc1818e4120a438dc0e96169a 100644 (file)
--- a/src/bin/compmgr/e_comp_canvas_intern.h
+++ b/src/bin/compmgr/e_comp_canvas_intern.h
@@ -11,7 +11,6 @@ EINTERN void       e_comp_all_thaw(void);
 EINTERN E_Zone    *e_comp_zone_number_get(int num);
 EINTERN E_Zone    *e_comp_zone_id_get(int id);
 EINTERN void       e_comp_canvas_fps_toggle(void);
-EINTERN E_Layer    e_comp_canvas_client_layer_map_nearest(int layer);
 EINTERN void       e_comp_canvas_keys_grab(void);
 EINTERN void       e_comp_canvas_keys_ungrab(void);
 EINTERN void       e_comp_canvas_feed_mouse_up(unsigned int activate_time);

diff --git a/src/bin/windowmgr/e_policy_desk_area.c b/src/bin/windowmgr/e_policy_desk_area.c
index e2af4e9f5842209057707ba3ddd08745518f4558..277e7cfb680ee5a74ffe966a50aed0a00d80c150 100644 (file)
--- a/src/bin/windowmgr/e_policy_desk_area.c
+++ b/src/bin/windowmgr/e_policy_desk_area.c
@@ -2623,9 +2623,6 @@ layer_set:
         return;
      }
    oldraise = e_config->transient.raise;
-
-   /* clamp to valid client layer */
-   layer = e_comp_canvas_client_layer_map_nearest(layer);
    cw->ec->layer = layer;
    e_client_input_thread_layer_set(cw->ec, layer);
    if (e_config->transient.layer)