e_zone: move E_Zone structure to internal header

Change-Id: If3e30b8038414b6e92d82f9d5e218669c0a020dc

diff --git a/src/bin/core/e_zone_intern.h b/src/bin/core/e_zone_intern.h
index 3c2499f1042860e1dcf4a7692efa93e7a1f1e96b..13e7ee20b2671e8cd146570023d0648a0403a23a 100644 (file)
--- a/src/bin/core/e_zone_intern.h
+++ b/src/bin/core/e_zone_intern.h
@@ -35,6 +35,71 @@ 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_Zone
+{
+   E_Object     e_obj_inherit;
+
+   int          x, y, w, h;
+   const char  *name;
+   /* num matches the id of the xinerama screen
+    * this zone belongs to. */
+   int num;
+
+   E_DEPRECATED Evas_Object *bg_event_object;
+   E_DEPRECATED Evas_Object *bg_clip_object;
+
+   E_DEPRECATED int          desk_x_count, desk_y_count;
+   E_DEPRECATED int          desk_x_current, desk_y_current;
+   E_DEPRECATED int          desk_x_prev, desk_y_prev;
+   E_DEPRECATED E_Desk     **desks;
+
+   Eina_List   *handlers;
+
+   /* formerly E_Comp_Zone */
+   E_DEPRECATED E_View *base;
+   E_DEPRECATED E_View *over;
+   //double       bl;    // backlight level
+   //Eina_Bool    bloff; // backlight is off
+
+   E_Action      *cur_mouse_action;
+
+   int            id;
+
+   struct
+   {
+      int       prev, curr, next, sub, act;
+      int       block_count; /* deprecated. use rot.block.mod_count instead */
+      struct
+      {
+         Eina_Bool app_hint; /* true: rotation is NOT blocked for the specific app which set special hint */
+      } unblock;
+      struct
+      {
+         Eina_Bool sys_auto_rot; /* true: system auto rotation is disabled */
+         int       mod_count;    /* 1 or higher: temporary block count for the E sub-modules */
+      } block;
+      Eina_Bool wait_for_done : 1;
+      Eina_Bool pending : 1;
+      Eina_Bool unknown_state : 1;
+   } rot;
+
+   struct
+   {
+      E_Zone_Cb_Orientation_Block_Set block_set;
+      E_Zone_Cb_Orientation_Force_Update_Add force_update_add;
+      E_Zone_Cb_Orientation_Force_Update_Del force_update_del;
+   } orientation;
+
+   E_Zone_Display_State display_state;
+   char                 *output_id; // same id we get from comp_screen so look it up there
+
+   Eina_List *obstacles;
+
+   E_DEPRECATED Eina_List *ec_hooks;
+
+   E_Focus *focus;
+};
+
 struct _E_Event_Pointer_Warp
 {
    struct

diff --git a/src/bin/displaymgr/e_hwc_window.c b/src/bin/displaymgr/e_hwc_window.c
index a278eeaea633c0b14fa70b158557695e1275e54c..f3a696b1be722e67e93faf383a8b5b9139a6fe0d 100644 (file)
--- a/src/bin/displaymgr/e_hwc_window.c
+++ b/src/bin/displaymgr/e_hwc_window.c
@@ -20,6 +20,7 @@
 #include "e_view_intern.h"
 #include "e_view_client_intern.h"
 #include "e_output_intern.h"
+#include "e_zone_intern.h"
 
 #include <pixman.h>
 #include <wayland-tbm-server.h>

diff --git a/src/bin/displaymgr/e_hwc_windows.c b/src/bin/displaymgr/e_hwc_windows.c
index 25ef152a18e01e038f20f150c9e688c62467beda..2e01e87395a207255ba6f96a52c0b9d65f278eae 100644 (file)
--- a/src/bin/displaymgr/e_hwc_windows.c
+++ b/src/bin/displaymgr/e_hwc_windows.c
@@ -20,6 +20,7 @@
 #include "e_view_intern.h"
 #include "e_view_client_intern.h"
 #include "e_canvas_intern.h"
+#include "e_zone_intern.h"
 
 # include <Evas_Engine_GL_Tbm.h>
 # include <Evas_Engine_Software_Tbm.h>

diff --git a/src/bin/server/e_comp_wl_tizen_hwc.c b/src/bin/server/e_comp_wl_tizen_hwc.c
index 52dfb7d306b607288b4fe0c990a15e93bfce9b6a..7cc7443b275792da3562b756036661988f73bb56 100644 (file)
--- a/src/bin/server/e_comp_wl_tizen_hwc.c
+++ b/src/bin/server/e_comp_wl_tizen_hwc.c
@@ -9,6 +9,7 @@
 #include "e_compositor_intern.h"
 #include "e_output_intern.h"
 #include "e_client_video_intern.h"
+#include "e_zone_intern.h"
 
 #include <libds-tizen/hwc.h>
 

diff --git a/src/bin/server/e_comp_wl_viewport.c b/src/bin/server/e_comp_wl_viewport.c
index fa76277731b3152c915c2dcf2c54765103305f8c..02cd406d2ed03270ac828a43141fc905c34340ba 100644 (file)
--- a/src/bin/server/e_comp_wl_viewport.c
+++ b/src/bin/server/e_comp_wl_viewport.c
@@ -9,6 +9,7 @@
 #include "e_info_server_input_intern.h"
 #include "e_info_server_intern.h"
 #include "e_view_client_intern.h"
+#include "e_zone_intern.h"
 
 #include <wayland-server.h>
 #include <wayland-tbm-server.h>

diff --git a/src/bin/windowmgr/e_pointer.c b/src/bin/windowmgr/e_pointer.c
index 4589d5dbf30f4aa77fa5acbe89bb49c4fe3da8d0..fe9886f86d170986e114e49f463167c5aa85c170 100644 (file)
--- a/src/bin/windowmgr/e_pointer.c
+++ b/src/bin/windowmgr/e_pointer.c
@@ -11,6 +11,7 @@
 #include "e_canvas_intern.h"
 #include "e_seat_intern.h"
 #include "e_config_intern.h"
+#include "e_zone_intern.h"
 
 /* local variables */
 static Eina_List *_ptrs = NULL;

diff --git a/src/bin/windowmgr/services/e_service_cbhm.c b/src/bin/windowmgr/services/e_service_cbhm.c
index db62062fa3712ef210bd1dcd7e7099d4a1bbae38..0c36e0c2b539c4dc3f8e0387eb1a6a9f80d282fc 100644 (file)
--- a/src/bin/windowmgr/services/e_service_cbhm.c
+++ b/src/bin/windowmgr/services/e_service_cbhm.c
@@ -4,6 +4,7 @@
 #include "e_policy_conformant.h"
 #include "e_tizen_clipboard_intern.h"
 #include "e_view_client_intern.h"
+#include "e_zone_intern.h"
 
 typedef struct _E_Policy_Cbhm E_Policy_Cbhm;
 

diff --git a/src/bin/windowmgr/services/e_service_quickpanel.c b/src/bin/windowmgr/services/e_service_quickpanel.c
index ef0e81adea86bfe52e9e07574c952ce866cfab88..a7176d04b497d88d7a7bb29c3897a5dc37fa32b1 100644 (file)
--- a/src/bin/windowmgr/services/e_service_quickpanel.c
+++ b/src/bin/windowmgr/services/e_service_quickpanel.c
@@ -19,6 +19,7 @@
 #include "e_desk_intern.h"
 #include "e_desk_area_intern.h"
 #include "e_policy_desk_area_intern.h"
+#include "e_zone_intern.h"
 
 #define SMART_NAME            "quickpanel_object"
 

diff --git a/src/bin/windowmgr/services/e_service_softkey.c b/src/bin/windowmgr/services/e_service_softkey.c
index 76438b59c68eafd5ca61bcfe2253a6939a7208b7..77205f74d1a5238cb807b07241fc37cfcd9aef47 100644 (file)
--- a/src/bin/windowmgr/services/e_service_softkey.c
+++ b/src/bin/windowmgr/services/e_service_softkey.c
@@ -12,6 +12,7 @@
 #include "e_desk_intern.h"
 #include "e_desk_area_intern.h"
 #include "e_policy_desk_area_intern.h"
+#include "e_zone_intern.h"
 
 #include <tzsh_server.h>
 

diff --git a/src/include/e_zone.h b/src/include/e_zone.h
index 9ba2673983e1e3ececf42e7a7a34187c733d1358..5b179217ecde14727f0c35b0efc6143af36cfa8e 100644 (file)
--- a/src/include/e_zone.h
+++ b/src/include/e_zone.h
@@ -52,71 +52,6 @@ struct _E_Zone_Hook
    unsigned char     delete_me : 1;
 };
 
-struct _E_Zone
-{
-   E_Object     e_obj_inherit;
-
-   int          x, y, w, h;
-   const char  *name;
-   /* num matches the id of the xinerama screen
-    * this zone belongs to. */
-   int num;
-
-   E_DEPRECATED Evas_Object *bg_event_object;
-   E_DEPRECATED Evas_Object *bg_clip_object;
-
-   E_DEPRECATED int          desk_x_count, desk_y_count;
-   E_DEPRECATED int          desk_x_current, desk_y_current;
-   E_DEPRECATED int          desk_x_prev, desk_y_prev;
-   E_DEPRECATED E_Desk     **desks;
-
-   Eina_List   *handlers;
-
-   /* formerly E_Comp_Zone */
-   E_DEPRECATED E_View *base;
-   E_DEPRECATED E_View *over;
-   //double       bl;    // backlight level
-   //Eina_Bool    bloff; // backlight is off
-
-   E_Action      *cur_mouse_action;
-
-   int            id;
-
-   struct
-   {
-      int       prev, curr, next, sub, act;
-      int       block_count; /* deprecated. use rot.block.mod_count instead */
-      struct
-      {
-         Eina_Bool app_hint; /* true: rotation is NOT blocked for the specific app which set special hint */
-      } unblock;
-      struct
-      {
-         Eina_Bool sys_auto_rot; /* true: system auto rotation is disabled */
-         int       mod_count;    /* 1 or higher: temporary block count for the E sub-modules */
-      } block;
-      Eina_Bool wait_for_done : 1;
-      Eina_Bool pending : 1;
-      Eina_Bool unknown_state : 1;
-   } rot;
-
-   struct
-   {
-      E_Zone_Cb_Orientation_Block_Set block_set;
-      E_Zone_Cb_Orientation_Force_Update_Add force_update_add;
-      E_Zone_Cb_Orientation_Force_Update_Del force_update_del;
-   } orientation;
-
-   E_Zone_Display_State display_state;
-   char                 *output_id; // same id we get from comp_screen so look it up there
-
-   Eina_List *obstacles;
-
-   E_DEPRECATED Eina_List *ec_hooks;
-
-   E_Focus *focus;
-};
-
 struct _E_Event_Zone_Display_State_Change
 {
    E_Zone *zone;