e_desk_area: move the E_Desk_Area structure to internal header

The E_Desk_Area structure moves to e_desk_area_intern.h file.
Do not access the member var of E_Desk_Area from E20 modules.

Change-Id: I32a6786da4430f471f68e68e188f0f95350a1b90

diff --git a/src/bin/core/e_desk_area.c b/src/bin/core/e_desk_area.c
index 2870b1fbb38eb9abaf9adafc08b02572d77709a7..1facb36e7ee893a0f49a2cd90412a96963f239d6 100644 (file)
--- a/src/bin/core/e_desk_area.c
+++ b/src/bin/core/e_desk_area.c
@@ -23,6 +23,9 @@
 typedef struct _E_Desk_Area_Private         E_Desk_Area_Private;
 typedef struct _E_Desk_Area_Private_Client  E_Desk_Area_Private_Client;
 
+#define E_DESK_AREA_TYPE 0xE0b01006
+#define E_DESK_AREA_SMART_OBJ_TYPE "E_Desk_Area_Smart_Object"
+
 #define DESK_AREA_EC_DATA_KEY  "E_Desk_Area_Client"
 
 #define PRI(eda) ((E_Desk_Area_Private *)e_object_data_get(E_OBJECT(eda)))

diff --git a/src/bin/core/e_desk_area_intern.h b/src/bin/core/e_desk_area_intern.h
index be1fffac9125121e4391d62f716d1a5bbbe626d9..1c3592b15f9f4769ec37e0889a117919b6fb33d9 100644 (file)
--- a/src/bin/core/e_desk_area_intern.h
+++ b/src/bin/core/e_desk_area_intern.h
@@ -7,6 +7,41 @@
 #include <wayland-server.h>
 #include <libds-tizen/screen.h>
 
+struct _E_Desk_Area
+{
+   E_Object             e_obj_inherit;
+
+   E_Desk              *desk;
+   int                  id;
+   E_Desk_Area_Layer   layer;
+   Eina_Stringshare    *name;
+
+   int                  x, y, w, h;
+   double               scale_w, scale_h;
+
+   unsigned char        enable  : 1;
+   unsigned char        visible : 1;
+   unsigned char        active  : 1;
+   unsigned char        transform_enabled : 1;
+   Eina_List           *ec_lists[E_DESK_AREA_CLIENT_LAYER_MAX];
+
+   Eina_List           *handlers;
+
+   struct {
+      Evas_Object *obj;
+      Eina_Inlist *clients; /* E_Client, bottom to top */
+      unsigned int clients_count;
+   } layers[E_LAYER_COUNT];
+
+   Evas_Object         *smart_obj;
+   Eina_List           *fullscreen_clients;
+
+   E_Comp_Wl_Hook      *hook_subsurf_create;
+#ifdef CLIENT_DEL_STACK_ISSUE
+   E_Client_Hook       *hook_client_free;
+#endif // CLIENT_DEL_STACK_ISSUE
+};
+
 EINTERN int e_desk_area_init(void);
 EINTERN int e_desk_area_shutdown(void);
 

diff --git a/src/include/e_desk_area.h b/src/include/e_desk_area.h
index 4ee52429268aa78f40eb17b355354066fc70cb9d..8d409ed5199fd7d07b0ccdd6986f471490ef10c6 100644 (file)
--- a/src/include/e_desk_area.h
+++ b/src/include/e_desk_area.h
@@ -6,12 +6,10 @@
 #include <e_comp.h>
 #include <e_comp_wl.h>
 
-#define E_DESK_AREA_TYPE 0xE0b01006
-#define E_DESK_AREA_SMART_OBJ_TYPE "E_Desk_Area_Smart_Object"
+typedef struct _E_Desk_Area E_Desk_Area;
 
 typedef struct _E_Desk_Area_Hook E_Desk_Area_Hook;
 
-typedef struct _E_Desk_Area E_Desk_Area;
 typedef struct _E_Event_Desk_Area E_Event_Desk_Area;
 
 typedef enum _E_Desk_Area_Client_Layer
@@ -37,41 +35,6 @@ typedef enum _E_Desk_Area_Hook_Point
 
 typedef void (*E_Desk_Area_Hook_Cb)(void *data, E_Desk_Area *desk_area, void *hook_data);
 
-struct _E_Desk_Area
-{
-   E_Object             e_obj_inherit;
-
-   E_Desk              *desk;
-   int                  id;
-   E_Desk_Area_Layer   layer;
-   Eina_Stringshare    *name;
-
-   int                  x, y, w, h;
-   double               scale_w, scale_h;
-
-   unsigned char        enable  : 1;
-   unsigned char        visible : 1;
-   unsigned char        active  : 1;
-   unsigned char        transform_enabled : 1;
-   Eina_List           *ec_lists[E_DESK_AREA_CLIENT_LAYER_MAX];
-
-   Eina_List           *handlers;
-
-   struct {
-      Evas_Object *obj;
-      Eina_Inlist *clients; /* E_Client, bottom to top */
-      unsigned int clients_count;
-   } layers[E_LAYER_COUNT];
-
-   Evas_Object         *smart_obj;
-   Eina_List           *fullscreen_clients;
-
-   E_Comp_Wl_Hook      *hook_subsurf_create;
-#ifdef CLIENT_DEL_STACK_ISSUE
-   E_Client_Hook       *hook_client_free;
-#endif // CLIENT_DEL_STACK_ISSUE
-};
-
 struct _E_Event_Desk_Area
 {
    E_Desk_Area   *eda;