e_desk_area: make an internal header

Move the internal resources and the function declaration
to the internal header

Change-Id: Id6e413a4def3775313a25b3bc0f6064ef854aa6c

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 2bcb20f..6723e16 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -14,6 +14,7 @@
 #include "e_map_intern.h"
 #include "e_policy_visibility_intern.h"
 #include "e_comp_object_intern.h"
+#include "e_desk_area_intern.h"
 
 #define PRI(ec) ((E_Client_Private *)e_object_data_get(E_OBJECT(ec)))
 

diff --git a/src/bin/e_desk_area.c b/src/bin/e_desk_area.c
index c229d6f..b9698fb 100644 (file)
--- a/src/bin/e_desk_area.c
+++ b/src/bin/e_desk_area.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_desk_area_intern.h"
 #include "e_client_intern.h"
 #ifdef REFACTOR_DESK_AREA
 #include "e_comp_object_intern.h"

diff --git a/src/bin/e_desk_area.h b/src/bin/e_desk_area.h
index 3e0354b..23400a2 100644 (file)
--- a/src/bin/e_desk_area.h
+++ b/src/bin/e_desk_area.h
@@ -75,44 +75,23 @@ struct _E_Event_Desk_Area
    E_Desk_Area   *eda;
 };
 
-EINTERN int e_desk_area_init(void);
-EINTERN int e_desk_area_shutdown(void);
-
-EINTERN E_Desk_Area *e_desk_area_new(E_Desk *desk, int id, int x, int y, int w, int h, E_Desk_Area_Layer eda_layer);
-
-//#ifdef REFACTOR_DESK_AREA
-//#else
-EINTERN Eina_Bool     e_desk_area_enable_set(E_Desk_Area *eda, Eina_Bool enable);
-//#endif
-
-//#ifdef REFACTOR_DESK_AREA
-EINTERN const char      *e_desk_area_name_get(E_Desk_Area *eda);
-//#endif
-
 E_API   Eina_Bool     e_desk_area_geometry_set(E_Desk_Area *eda, int x, int y, int w, int h);
 E_API   Eina_Bool     e_desk_area_geometry_get(E_Desk_Area *eda, int *x, int *y, int *w, int *h);
 
-EINTERN Eina_Bool     e_desk_area_layer_set(E_Desk_Area *eda, E_Desk_Area_Layer layer);
 E_API   E_Desk_Area_Layer e_desk_area_layer_get(E_Desk_Area *eda);
-
-E_API   void          e_desk_area_activate(E_Desk_Area *eda);
-E_API   Eina_Bool     e_desk_area_is_activate(E_Desk_Area *eda);
-
-E_API   void          e_desk_area_raise(E_Desk_Area *eda);
-E_API   void          e_desk_area_lower(E_Desk_Area *eda);
+E_API   void              e_desk_area_activate(E_Desk_Area *eda);
+E_API   Eina_Bool         e_desk_area_is_activate(E_Desk_Area *eda);
+E_API   void              e_desk_area_raise(E_Desk_Area *eda);
+E_API   void              e_desk_area_lower(E_Desk_Area *eda);
 
 E_API   Eina_Bool     e_desk_area_ec_add(E_Desk_Area *eda, E_Client *ec);
 E_API   void          e_desk_area_ec_remove(E_Desk_Area *eda, E_Client *ec);
+
+E_API E_Desk_Area_Hook *e_desk_area_hook_add(E_Desk_Area_Hook_Point hookpoint, E_Desk_Area_Hook_Cb func, const void *data);
+E_API void              e_desk_area_hook_del(E_Desk_Area_Hook *dgh);
+
 //#ifdef REFACTOR_DESK_AREA
 //#else
-EINTERN void          e_desk_area_ec_raise(E_Desk_Area *eda, E_Client *ec);
-EINTERN void          e_desk_area_ec_lower(E_Desk_Area *eda, E_Client *ec);
-EINTERN void          e_desk_area_ec_stack_above(E_Desk_Area *eda, E_Client *ec, E_Client *above);
-EINTERN void          e_desk_area_ec_stack_below(E_Desk_Area *eda, E_Client *ec, E_Client *below);
-EINTERN void          e_desk_area_ec_edg_layer_set(E_Desk_Area *eda, E_Client *ec, E_Layer layer);
-EINTERN void          e_desk_area_ec_rearrange(E_Desk_Area *eda, E_Client *ec);
-EINTERN void          e_desk_area_ec_stack_change(E_Desk_Area *eda, E_Client *ec);
-
 E_API   void          e_desk_area_ec_update(E_Desk_Area *eda, E_Client *ec);
 E_API   void          e_desk_area_all_ec_update(E_Desk_Area *eda);
 
@@ -120,25 +99,8 @@ E_API   Eina_List    *e_desk_area_ec_list_get(E_Desk_Area *eda);
 
 E_API void            e_desk_area_transform_enable_set(E_Desk_Area *eda, Eina_Bool enable);
 E_API Eina_Bool       e_desk_area_transform_enable_get(E_Desk_Area *eda);
-//#endif
-
-//#ifdef REFACTOR_DESK_AREA
-EINTERN E_Client *       e_desk_area_top_ec_get(E_Desk_Area *eda);
-EINTERN E_Client *       e_desk_area_bottom_ec_get(E_Desk_Area *eda);
-EINTERN Eina_Bool e_desk_area_has_ec(E_Desk_Area *eda, E_Client *ec);
-//#endif
-
-// for debug
-EINTERN void          e_desk_area_info_print(E_Desk_Area *eda);
-
-EINTERN Eina_Bool        e_desk_area_hook_call(E_Desk_Area *eda, E_Desk_Area_Hook_Point hookpoint, void *data);
-E_API E_Desk_Area_Hook *e_desk_area_hook_add(E_Desk_Area_Hook_Point hookpoint, E_Desk_Area_Hook_Cb func, const void *data);
-E_API void               e_desk_area_hook_del(E_Desk_Area_Hook *dgh);
 
-//#ifdef REFACTOR_DESK_AREA
-//#else
 E_API Eina_Bool       e_desk_area_ec_reassign(E_Desk_Area *eda, E_Client *ec);
-EINTERN Eina_Bool     e_desk_area_ec_enable_set(E_Desk_Area *eda, E_Client *ec, Eina_Bool enable);
 
 extern E_API int E_EVENT_DESK_AREA_CHANGE;
 //#endif

diff --git a/src/bin/e_desk_area_intern.h b/src/bin/e_desk_area_intern.h
index 5c04abe..f52bc65 100644 (file)
--- a/src/bin/e_desk_area_intern.h
+++ b/src/bin/e_desk_area_intern.h
@@ -4,6 +4,33 @@
 #include <wayland-server.h>
 #include <libds-tizen/screen.h>
 
-EINTERN Eina_Bool e_desk_area_splitscreen_region_enable(E_Desk_Area *eda, struct ds_tizen_splitscreen_region *splitscreen_region);
+EINTERN int e_desk_area_init(void);
+EINTERN int e_desk_area_shutdown(void);
+
+EINTERN E_Desk_Area *e_desk_area_new(E_Desk *desk, int id, int x, int y, int w, int h, E_Desk_Area_Layer eda_layer);
+EINTERN Eina_Bool    e_desk_area_layer_set(E_Desk_Area *eda, E_Desk_Area_Layer layer);
+EINTERN Eina_Bool    e_desk_area_splitscreen_region_enable(E_Desk_Area *eda, struct ds_tizen_splitscreen_region *splitscreen_region);
+
+//#ifdef REFACTOR_DESK_AREA
+EINTERN const char  *e_desk_area_name_get(E_Desk_Area *eda);
+EINTERN E_Client    *e_desk_area_top_ec_get(E_Desk_Area *eda);
+EINTERN E_Client    *e_desk_area_bottom_ec_get(E_Desk_Area *eda);
+EINTERN Eina_Bool    e_desk_area_has_ec(E_Desk_Area *eda, E_Client *ec);
+//#else
+EINTERN Eina_Bool     e_desk_area_enable_set(E_Desk_Area *eda, Eina_Bool enable);
+EINTERN void          e_desk_area_ec_raise(E_Desk_Area *eda, E_Client *ec);
+EINTERN void          e_desk_area_ec_lower(E_Desk_Area *eda, E_Client *ec);
+EINTERN void          e_desk_area_ec_stack_above(E_Desk_Area *eda, E_Client *ec, E_Client *above);
+EINTERN void          e_desk_area_ec_stack_below(E_Desk_Area *eda, E_Client *ec, E_Client *below);
+EINTERN void          e_desk_area_ec_edg_layer_set(E_Desk_Area *eda, E_Client *ec, E_Layer layer);
+EINTERN void          e_desk_area_ec_rearrange(E_Desk_Area *eda, E_Client *ec);
+EINTERN void          e_desk_area_ec_stack_change(E_Desk_Area *eda, E_Client *ec);
+EINTERN Eina_Bool     e_desk_area_ec_enable_set(E_Desk_Area *eda, E_Client *ec, Eina_Bool enable);
+//#endif
+
+// for debug
+EINTERN void          e_desk_area_info_print(E_Desk_Area *eda);
+
+EINTERN Eina_Bool        e_desk_area_hook_call(E_Desk_Area *eda, E_Desk_Area_Hook_Point hookpoint, void *data);
 
 #endif

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index 90bfba5..1614ce4 100644 (file)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -29,6 +29,7 @@
 #include "e_video_debug_intern.h"
 #include "e_client_intern.h"
 #include "e_comp_object_intern.h"
+#include "e_desk_area_intern.h"
 
 #include <tbm_bufmgr.h>
 #include <tbm_surface.h>