e_client: move enum symbols to internal header

Change-Id: I5ad001cf79bda7763a85105e29499ee869b081db

diff --git a/src/bin/core/e_client_intern.h b/src/bin/core/e_client_intern.h
index 2dba06d847e6d0f1a57790071cd5bc909db2a0f7..a15df36389fe9c1a67693b922d2f93918cfdb406 100644 (file)
--- a/src/bin/core/e_client_intern.h
+++ b/src/bin/core/e_client_intern.h
@@ -17,6 +17,84 @@
 
 typedef struct _E_Client_Pending_Geometry E_Client_Pending_Geometry;
 
+typedef enum _E_Client_Screen_Limit
+{
+    E_CLIENT_OFFSCREEN_LIMIT_ALLOW_PARTIAL = 0,
+    E_CLIENT_OFFSCREEN_LIMIT_ALLOW_FULL = 1,
+    E_CLIENT_OFFSCREEN_LIMIT_ALLOW_NONE = 2
+} E_Client_Screen_Limit;
+
+typedef enum _E_Focus_Policy
+{
+   E_FOCUS_CLICK,
+   E_FOCUS_MOUSE,
+   E_FOCUS_SLOPPY,
+   E_FOCUS_LAST,
+} E_Focus_Policy;
+
+// TODO: should be removed - yigl
+typedef enum _E_Fullscreen
+{
+   /* Resize window */
+   E_FULLSCREEN_RESIZE,
+   /* Change screen resolution and resize window */
+   E_FULLSCREEN_ZOOM
+} E_Fullscreen;
+
+typedef enum E_Client_Property
+{
+   E_CLIENT_PROPERTY_NONE = 0,
+   E_CLIENT_PROPERTY_SIZE = (1 << 0),
+   E_CLIENT_PROPERTY_POS = (1 << 1),
+   E_CLIENT_PROPERTY_TITLE = (1 << 2),
+   E_CLIENT_PROPERTY_ICON = (1 << 3),
+   E_CLIENT_PROPERTY_URGENCY = (1 << 4),
+   E_CLIENT_PROPERTY_GRAVITY = (1 << 5),
+   E_CLIENT_PROPERTY_NETWM_STATE = (1 << 6),
+   E_CLIENT_PROPERTY_STICKY = (1 << 7),
+   E_CLIENT_PROPERTY_CLIENT_TYPE = (1 << 8),
+} E_Client_Property;
+
+#ifdef _F_E_VIRTUAL_KEYBOARD_TYPE_
+typedef enum _E_Virtual_Keyboard_Window_Type
+{
+   E_VIRTUAL_KEYBOARD_WINDOW_TYPE_NONE = 0,
+   E_VIRTUAL_KEYBOARD_WINDOW_TYPE_KEYPAD = 1,
+   E_VIRTUAL_KEYBOARD_WINDOW_TYPE_PREDICTION = 2,
+   E_VIRTUAL_KEYBOARD_WINDOW_TYPE_MAGNIFIER = 3,
+   E_VIRTUAL_KEYBOARD_WINDOW_TYPE_POPUP = 4,
+} E_Virtual_Keyboard_Window_Type;
+#endif
+
+typedef enum _E_Changable_Layer_Type
+{
+   E_CHANGABLE_LAYER_TYPE_TRANSIENT = 0,
+   E_CHANGABLE_LAYER_TYPE_ABOVE_NOTIFICATION = 1,
+   E_CHANGABLE_LAYER_TYPE_MAX
+} E_Changable_Layer_Type;
+
+typedef enum _E_Indicator_Visible_Type
+{
+   E_INDICATOR_VISIBLE_TYPE_HIDDEN = 0,
+   E_INDICATOR_VISIBLE_TYPE_SHOWN,
+} E_Indicator_Visible_Type;
+
+typedef enum _E_Indicator_State
+{
+   E_INDICATOR_STATE_UNKNOWN = 0,
+   E_INDICATOR_STATE_OFF,
+   E_INDICATOR_STATE_ON
+} E_Indicator_State;
+
+typedef enum _E_Indicator_Opacity_Mode
+{
+   E_INDICATOR_OPACITY_MODE_UNKNOWN = 0,
+   E_INDICATOR_OPACITY_MODE_OPAQUE,
+   E_INDICATOR_OPACITY_MODE_TRANSLUCENT,
+   E_INDICATOR_OPACITY_MODE_TRANSPARENT,
+   E_INDICATOR_OPACITY_MODE_BG_TRANSPARENT,
+} E_Indicator_Opacity_Mode;
+
 struct _E_Client_Pending_Geometry
 {
    int                           x, y, w, h;

diff --git a/src/include/e_client.h b/src/include/e_client.h
index bb853a6ff3971283d92a6b9ac718018f905acb24..63904b7d7df13e6c9755d329049556500a5cb75c 100644 (file)
--- a/src/include/e_client.h
+++ b/src/include/e_client.h
@@ -24,13 +24,6 @@ typedef struct E_Event_Client_Desk_Set E_Event_Client_Desk_Set;
 
 typedef struct _E_Client_Intercept_Hook E_Client_Intercept_Hook;
 
-typedef enum _E_Client_Screen_Limit
-{
-    E_CLIENT_OFFSCREEN_LIMIT_ALLOW_PARTIAL = 0,
-    E_CLIENT_OFFSCREEN_LIMIT_ALLOW_FULL = 1,
-    E_CLIENT_OFFSCREEN_LIMIT_ALLOW_NONE = 2
-} E_Client_Screen_Limit;
-
 typedef enum _E_Focus_Policy_Ext
 {
    E_FOCUS_EXT_TOP_STACK,
@@ -69,20 +62,6 @@ typedef enum _E_Maximize_Type
    E_MAXIMIZE_TYPE_FILL       = E_MAXIMIZE_FILL,
 } E_Maximize_Type;
 
-// TODO: should be removed - yigl
-typedef enum _E_Fullscreen
-{
-   /* Resize window */
-   E_FULLSCREEN_RESIZE,
-   /* Change screen resolution and resize window */
-   E_FULLSCREEN_ZOOM
-} E_Fullscreen;
-
-typedef enum _E_Transient
-{
-   E_TRANSIENT_ABOVE,
-   E_TRANSIENT_BELOW,
-} E_Transient;
 
 typedef enum _E_Window_Placement
 {
@@ -92,31 +71,6 @@ typedef enum _E_Window_Placement
    E_WINDOW_PLACEMENT_MANUAL
 } E_Window_Placement;
 
-typedef enum E_Client_Property
-{
-   E_CLIENT_PROPERTY_NONE = 0,
-   E_CLIENT_PROPERTY_SIZE = (1 << 0),
-   E_CLIENT_PROPERTY_POS = (1 << 1),
-   E_CLIENT_PROPERTY_TITLE = (1 << 2),
-   E_CLIENT_PROPERTY_ICON = (1 << 3),
-   E_CLIENT_PROPERTY_URGENCY = (1 << 4),
-   E_CLIENT_PROPERTY_GRAVITY = (1 << 5),
-   E_CLIENT_PROPERTY_NETWM_STATE = (1 << 6),
-   E_CLIENT_PROPERTY_STICKY = (1 << 7),
-   E_CLIENT_PROPERTY_CLIENT_TYPE = (1 << 8),
-} E_Client_Property;
-
-#ifdef _F_E_VIRTUAL_KEYBOARD_TYPE_
-typedef enum _E_Virtual_Keyboard_Window_Type
-{
-   E_VIRTUAL_KEYBOARD_WINDOW_TYPE_NONE = 0,
-   E_VIRTUAL_KEYBOARD_WINDOW_TYPE_KEYPAD = 1,
-   E_VIRTUAL_KEYBOARD_WINDOW_TYPE_PREDICTION = 2,
-   E_VIRTUAL_KEYBOARD_WINDOW_TYPE_MAGNIFIER = 3,
-   E_VIRTUAL_KEYBOARD_WINDOW_TYPE_POPUP = 4,
-} E_Virtual_Keyboard_Window_Type;
-#endif
-
 typedef enum _E_Client_Rotation_Type
 {
    E_CLIENT_ROTATION_TYPE_NORMAL = 0,
@@ -148,34 +102,11 @@ typedef enum _E_Alpha_Opaque
    E_ALPHA_OPAQUE_SET = 1,
 } E_Alpha_Opaque;
 
-typedef enum _E_Changable_Layer_Type
-{
-   E_CHANGABLE_LAYER_TYPE_TRANSIENT = 0,
-   E_CHANGABLE_LAYER_TYPE_ABOVE_NOTIFICATION = 1,
-   E_CHANGABLE_LAYER_TYPE_MAX
-} E_Changable_Layer_Type;
-
-typedef enum _E_Indicator_Visible_Type
-{
-   E_INDICATOR_VISIBLE_TYPE_HIDDEN = 0,
-   E_INDICATOR_VISIBLE_TYPE_SHOWN,
-} E_Indicator_Visible_Type;
-
-typedef enum _E_Indicator_State
-{
-   E_INDICATOR_STATE_UNKNOWN = 0,
-   E_INDICATOR_STATE_OFF,
-   E_INDICATOR_STATE_ON
-} E_Indicator_State;
-
-typedef enum _E_Indicator_Opacity_Mode
+typedef enum _E_Transient
 {
-   E_INDICATOR_OPACITY_MODE_UNKNOWN = 0,
-   E_INDICATOR_OPACITY_MODE_OPAQUE,
-   E_INDICATOR_OPACITY_MODE_TRANSLUCENT,
-   E_INDICATOR_OPACITY_MODE_TRANSPARENT,
-   E_INDICATOR_OPACITY_MODE_BG_TRANSPARENT,
-} E_Indicator_Opacity_Mode;
+   E_TRANSIENT_ABOVE,
+   E_TRANSIENT_BELOW,
+} E_Transient;
 
 typedef enum _E_Iconified_Type
 {