add client-notification-level to E_Layer

Change-Id: I5781943db2440c1e5dc268287420b3fd3122da09

diff --git a/src/bin/e_comp.h b/src/bin/e_comp.h
index 442eeeaf8a92d4eccfe926ff954a06f065acbc28..6f5af9297bb511c5466845016c00caaef7134ad8 100644 (file)
--- a/src/bin/e_comp.h
+++ b/src/bin/e_comp.h
@@ -20,8 +20,8 @@ typedef struct _E_Comp_Demo_Style_Item E_Comp_Demo_Style_Item;
 
 # define E_COMP_TYPE (int) 0xE0b01003
 
-# define E_LAYER_COUNT 19
-# define E_CLIENT_LAYER_COUNT 11
+# define E_LAYER_COUNT 22
+# define E_CLIENT_LAYER_COUNT 14
 
 typedef enum _E_Layer
 {
@@ -40,6 +40,9 @@ typedef enum _E_Layer
    E_LAYER_CLIENT_TOP = 500,
    E_LAYER_CLIENT_DRAG = 550,
    E_LAYER_CLIENT_PRIO = 600,
+   E_LAYER_CLIENT_NOTIFICATION_LOW = 700,
+   E_LAYER_CLIENT_NOTIFICATION_NORMAL = 750,
+   E_LAYER_CLIENT_NOTIFICATION_HIGH = 800,
    E_LAYER_POPUP = 999, // popups
    E_LAYER_MENU = 5000, // menus
    E_LAYER_DESKLOCK = 9999, // desklock

diff --git a/src/bin/e_comp_canvas.c b/src/bin/e_comp_canvas.c
index 5e494ac9dba534332f0a905c9f0f2607463735c6..ca044bfcbfe359f6430e5313042ecbaf9af0e0f2 100644 (file)
--- a/src/bin/e_comp_canvas.c
+++ b/src/bin/e_comp_canvas.c
@@ -518,10 +518,13 @@ e_comp_canvas_layer_map_to(unsigned int layer)
       case 12: return E_LAYER_CLIENT_TOP;
       case 13: return E_LAYER_CLIENT_DRAG;
       case 14: return E_LAYER_CLIENT_PRIO;
-      case 15: return E_LAYER_POPUP;
-      case 16: return E_LAYER_MENU;
-      case 17: return E_LAYER_DESKLOCK;
-      case 18: return E_LAYER_MAX;
+      case 15: return E_LAYER_CLIENT_NOTIFICATION_LOW;
+      case 16: return E_LAYER_CLIENT_NOTIFICATION_NORMAL;
+      case 17: return E_LAYER_CLIENT_NOTIFICATION_HIGH;
+      case 18: return E_LAYER_POPUP;
+      case 19: return E_LAYER_MENU;
+      case 20: return E_LAYER_DESKLOCK;
+      case 21: return E_LAYER_MAX;
       default: break;
      }
    return -INT_MAX;
@@ -547,10 +550,13 @@ e_comp_canvas_layer_map(E_Layer layer)
       case E_LAYER_CLIENT_TOP: return 12;
       case E_LAYER_CLIENT_DRAG: return 13;
       case E_LAYER_CLIENT_PRIO: return 14;
-      case E_LAYER_POPUP: return 15;
-      case E_LAYER_MENU: return 16;
-      case E_LAYER_DESKLOCK: return 17;
-      case E_LAYER_MAX: return 18;
+      case E_LAYER_CLIENT_NOTIFICATION_LOW: return 15;
+      case E_LAYER_CLIENT_NOTIFICATION_NORMAL: return 16;
+      case E_LAYER_CLIENT_NOTIFICATION_HIGH: return 17;
+      case E_LAYER_POPUP: return 18;
+      case E_LAYER_MENU: return 19;
+      case E_LAYER_DESKLOCK: return 20;
+      case E_LAYER_MAX: return 21;
       default: break;
      }
    return 9999;
@@ -572,6 +578,9 @@ e_comp_canvas_client_layer_map(E_Layer layer)
       case E_LAYER_CLIENT_TOP: return 8;
       case E_LAYER_CLIENT_DRAG: return 9;
       case E_LAYER_CLIENT_PRIO: return 10;
+      case E_LAYER_CLIENT_NOTIFICATION_LOW: return 11;
+      case E_LAYER_CLIENT_NOTIFICATION_NORMAL: return 12;
+      case E_LAYER_CLIENT_NOTIFICATION_HIGH: return 13;
       default: break;
      }
    return 9999;
@@ -593,5 +602,8 @@ e_comp_canvas_client_layer_map_nearest(int layer)
    LAYER_MAP(E_LAYER_CLIENT_POPUP);
    LAYER_MAP(E_LAYER_CLIENT_TOP);
    LAYER_MAP(E_LAYER_CLIENT_DRAG);
-   return E_LAYER_CLIENT_PRIO;
+   LAYER_MAP(E_LAYER_CLIENT_PRIO);
+   LAYER_MAP(E_LAYER_CLIENT_NOTIFICATION_LOW);
+   LAYER_MAP(E_LAYER_CLIENT_NOTIFICATION_NORMAL);
+   return E_LAYER_CLIENT_NOTIFICATION_HIGH;
 }