e_zone: move the structure definition to internal header

Some definition which the e20 does not use move the zone_internal.h file.

Change-Id: Icdb4c76abe7a225a118b2c4fb622f618428a4fdc

diff --git a/src/bin/core/e_zone.c b/src/bin/core/e_zone.c
index 734b84c7208c5caa7e797e9d7378c0dc6cfdfa4a..ceefe199bf507b39329250d56a0df9e63b081947 100644 (file)
--- a/src/bin/core/e_zone.c
+++ b/src/bin/core/e_zone.c
@@ -79,7 +79,7 @@ static void        _e_zone_hooks_clean(void);
 static Eina_Bool   _e_zone_hook_call(E_Zone_Hook_Point hookpoint, E_Zone *zone);
 
 EINTERN int E_EVENT_ZONE_DESK_COUNT_SET = 0;
-E_API int E_EVENT_ZONE_MOVE_RESIZE = 0;
+EINTERN int E_EVENT_ZONE_MOVE_RESIZE = 0;
 EINTERN int E_EVENT_ZONE_ADD = 0;
 EINTERN int E_EVENT_ZONE_DEL = 0;
 

diff --git a/src/bin/core/e_zone_intern.h b/src/bin/core/e_zone_intern.h
index e86708dc8c3d061c94fa16140bcc2cb684d65787..1bf652561daa1755dddd7df49475720fee50f36e 100644 (file)
--- a/src/bin/core/e_zone_intern.h
+++ b/src/bin/core/e_zone_intern.h
@@ -6,11 +6,43 @@
 
 #include <wayland-server.h>
 
+typedef struct _E_Zone_Obstacle             E_Zone_Obstacle;
+
+typedef struct _E_Event_Zone_Generic        E_Event_Zone_Desk_Count_Set;
+typedef struct _E_Event_Zone_Generic        E_Event_Zone_Move_Resize;
+typedef struct _E_Event_Zone_Generic        E_Event_Zone_Useful_Geometry_Change;
+typedef struct _E_Event_Zone_Generic        E_Event_Zone_Add;
+typedef struct _E_Event_Zone_Generic        E_Event_Zone_Del;
+
+typedef struct _E_Event_Pointer_Warp        E_Event_Pointer_Warp;
+typedef struct _E_Event_Zone_Generic        E_Event_Zone_Stow;
+typedef struct _E_Event_Zone_Generic        E_Event_Zone_Unstow;
+
 extern EINTERN int E_EVENT_ZONE_DESK_COUNT_SET;
 extern EINTERN int E_EVENT_ZONE_ADD;
 extern EINTERN int E_EVENT_ZONE_DEL;
 extern EINTERN int E_EVENT_ZONE_DISPLAY_STATE_CHANGE;
 extern EINTERN int E_EVENT_ZONE_USEFUL_GEOMETRY_CHANGE;
+extern EINTERN int E_EVENT_ZONE_MOVE_RESIZE;
+
+struct _E_Event_Pointer_Warp
+{
+   struct
+   {
+      int x, y;
+   } prev;
+   struct
+   {
+      int x, y;
+   } curr;
+};
+
+struct _E_Zone_Obstacle
+{
+   E_Client *ec;
+   int x, y, w, h; // obstacle area, this can not be same to ec's geometry
+   Eina_Bool vertical;
+};
 
 typedef struct _E_Zone_Data_Move_Resize
 {

diff --git a/src/include/e_zone.h b/src/include/e_zone.h
index 35d7ea8922b7b0dd6d39474fe4c39ada05ef678f..030731991241f8fd29bb50ccd7793e0a284794ec 100644 (file)
--- a/src/include/e_zone.h
+++ b/src/include/e_zone.h
@@ -10,17 +10,7 @@
 
 #define E_ZONE_TYPE (int)0xE0b0100d
 
-typedef struct _E_Zone_Obstacle             E_Zone_Obstacle;
-
-typedef struct _E_Event_Zone_Generic        E_Event_Zone_Desk_Count_Set;
-typedef struct _E_Event_Zone_Generic        E_Event_Zone_Move_Resize;
-typedef struct _E_Event_Zone_Generic        E_Event_Zone_Useful_Geometry_Change;
-typedef struct _E_Event_Zone_Generic        E_Event_Zone_Add;
-typedef struct _E_Event_Zone_Generic        E_Event_Zone_Del;
 /* TODO: Move this to a general place? */
-typedef struct _E_Event_Pointer_Warp        E_Event_Pointer_Warp;
-typedef struct _E_Event_Zone_Generic        E_Event_Zone_Stow;
-typedef struct _E_Event_Zone_Generic        E_Event_Zone_Unstow;
 typedef struct _E_Event_Zone_Rotation_Change_Begin  E_Event_Zone_Rotation_Change_Begin;
 typedef struct _E_Event_Zone_Rotation_Change_Cancel E_Event_Zone_Rotation_Change_Cancel;
 typedef struct _E_Event_Zone_Rotation_Change_End    E_Event_Zone_Rotation_Change_End;
@@ -123,11 +113,9 @@ struct _E_Zone
    E_Focus *focus;
 };
 
-struct _E_Zone_Obstacle
+struct _E_Event_Zone_Display_State_Change
 {
-   E_Client *ec;
-   int x, y, w, h; // obstacle area, this can not be same to ec's geometry
-   Eina_Bool vertical;
+   E_Zone *zone;
 };
 
 struct _E_Event_Zone_Generic
@@ -135,18 +123,6 @@ struct _E_Event_Zone_Generic
    E_Zone *zone;
 };
 
-struct _E_Event_Pointer_Warp
-{
-   struct
-   {
-      int x, y;
-   } prev;
-   struct
-   {
-      int x, y;
-   } curr;
-};
-
 struct _E_Event_Zone_Rotation_Change_Begin
 {
    E_Zone     *zone;
@@ -162,12 +138,6 @@ struct _E_Event_Zone_Rotation_Change_End
    E_Zone     *zone;
 };
 
-struct _E_Event_Zone_Display_State_Change
-{
-   E_Zone *zone;
-};
-
-extern E_API int E_EVENT_ZONE_MOVE_RESIZE;
 extern E_API int E_EVENT_ZONE_ROTATION_CHANGE_BEGIN;
 extern E_API int E_EVENT_ZONE_ROTATION_CHANGE_CANCEL;
 extern E_API int E_EVENT_ZONE_ROTATION_CHANGE_END;