e_desk: make an internal header

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

Change-Id: I2a1b62c0da457c4b34fee14a054ab1b819b9a5e5

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

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 78c1e7e..d139b4f 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -33,6 +33,7 @@
 #include "e_client_video_intern.h"
 #include "e_comp_wl_video_intern.h"
 #include "e_comp_object_intern.h"
+#include "e_desk_intern.h"
 
 #include <tizen-extension-server-protocol.h>
 #include <relative-pointer-unstable-v1-server-protocol.h>

diff --git a/src/bin/e_comp_wl_shell.c b/src/bin/e_comp_wl_shell.c
index 056605f..23a2fd8 100644 (file)
--- a/src/bin/e_comp_wl_shell.c
+++ b/src/bin/e_comp_wl_shell.c
@@ -10,6 +10,7 @@
 #include "e_policy_intern.h"
 #include "e_policy_visibility_intern.h"
 #include "e_comp_object_intern.h"
+#include "e_desk_intern.h"
 
 #include <xdg-shell-unstable-v5-server-protocol.h>
 #include <xdg-shell-unstable-v6-server-protocol.h>

diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 9cf7b76..2587886 100644 (file)
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_desk_intern.h"
 #include "e_desk_area_intern.h"
 #include "e_client_intern.h"
 #include "e_utils_intern.h"

diff --git a/src/bin/e_desk.h b/src/bin/e_desk.h
index 4406f86..7c28923 100644 (file)
--- a/src/bin/e_desk.h
+++ b/src/bin/e_desk.h
@@ -104,65 +104,31 @@ struct _E_Event_Desk_Geometry_Change
    int x, y, w, h;
 };
 
-EINTERN int          e_desk_init(void);
-EINTERN int          e_desk_shutdown(void);
-EINTERN E_Desk      *e_desk_new(E_Zone *zone, int x, int y);
-EINTERN void         e_desk_name_set(E_Desk *desk, const char *name);
-EINTERN void         e_desk_name_add(int zone, int desk_x, int desk_y, const char *name);
-EINTERN void         e_desk_name_del(int zone, int desk_x, int desk_y);
-EINTERN void         e_desk_name_update(void);
-EINTERN void         e_desk_show(E_Desk *desk);
-EINTERN void         e_desk_deskshow(E_Zone *zone);
-EINTERN E_Client    *e_desk_client_top_visible_get(E_Desk *desk);
 E_API E_Desk      *e_desk_current_get(E_Zone *zone);
-EINTERN E_Desk      *e_desk_at_xy_get(E_Zone *zone, int x, int y);
-EINTERN E_Desk      *e_desk_at_pos_get(E_Zone *zone, int pos);
-EINTERN void         e_desk_xy_get(E_Desk *desk, int *x, int *y);
-EINTERN void         e_desk_next(E_Zone *zone);
-EINTERN void         e_desk_prev(E_Zone *zone);
-EINTERN void         e_desk_row_add(E_Zone *zone);
-EINTERN void         e_desk_row_remove(E_Zone *zone);
-EINTERN void         e_desk_col_add(E_Zone *zone);
-EINTERN void         e_desk_col_remove(E_Zone *zone);
-
-EINTERN unsigned int e_desks_count(void);
+
 
 E_API void         e_desk_geometry_set(E_Desk *desk, int x, int y, int w, int h);
 E_API void         e_desk_zoom_set(E_Desk *desk, double zoomx, double zoomy, int cx, int cy);
 E_API Eina_Bool    e_desk_zoom_get(E_Desk *desk, double *zoomx, double *zoomy, int *cx, int *cy);
-EINTERN Eina_Bool    e_desk_zoom_get_center_coordinate(E_Desk *desk, double zoomx, double zoomy, int rectx, int recty, int *cx, int *cy);
 E_API void         e_desk_zoom_unset(E_Desk *desk);
+E_API Eina_Bool    e_desk_client_zoom_skip_set(E_Desk *desk, E_Client *ec);
+E_API Eina_Bool    e_desk_client_zoom_skip_unset(E_Desk *desk, E_Client *ec);
 
 E_API void         e_desk_smart_member_add(E_Desk *desk, Evas_Object *obj);
 E_API void         e_desk_smart_member_del(Evas_Object *obj);
-EINTERN void         e_desk_client_add(E_Desk *desk, E_Client *ec);
 E_API void         e_desk_client_del(E_Desk *desk, E_Client *ec);
 
-E_API Eina_Bool    e_desk_client_zoom_skip_set(E_Desk *desk, E_Client *ec);
-E_API Eina_Bool    e_desk_client_zoom_skip_unset(E_Desk *desk, E_Client *ec);
-
-EINTERN void       e_desk_client_zoom_apply(E_Desk *desk, E_Client *ec);
-
 E_API E_Desk_Area *e_desk_desk_area_add(E_Desk *desk, int x, int y, int w, int h, E_Desk_Area_Layer layer);
 E_API void          e_desk_desk_area_del(E_Desk *desk, E_Desk_Area *eda);
-EINTERN E_Desk_Area *e_desk_desk_area_base_get(E_Desk *desk);
-EINTERN void        e_desk_desk_area_active_set(E_Desk *desk, E_Desk_Area *eda);
-EINTERN E_Desk_Area *e_desk_desk_area_active_get(E_Desk *desk);
+
 //#ifdef REFACTOR_DESK_AREA
 //#else
 E_API Eina_Bool     e_desk_desk_area_enable(E_Desk *desk);
 E_API Eina_Bool     e_desk_desk_area_disable(E_Desk *desk);
 //#endif
-EINTERN void        e_desk_desk_area_raise(E_Desk *desk, E_Desk_Area *eda);
-EINTERN void        e_desk_desk_area_lower(E_Desk *desk, E_Desk_Area *eda);
-EINTERN E_Desk_Area *e_desk_desk_area_above_get(E_Desk *desk, E_Desk_Area *eda);
-EINTERN E_Desk_Area *e_desk_desk_area_below_get(E_Desk *desk, E_Desk_Area *eda);
 
 E_API E_Desk_Hook *e_desk_hook_add(E_Desk_Hook_Point hookpoint, E_Desk_Hook_Cb func, const void *data);
-E_API void e_desk_hook_del(E_Desk_Hook *dh);
-
-EINTERN void        e_desk_desk_area_info_print(E_Desk *desk);
-EINTERN Eina_Bool   e_desk_zoom_is_animating(E_Desk *desk);
+E_API void         e_desk_hook_del(E_Desk_Hook *dh);
 
 E_API void e_desk_visible_client_iconify_all(E_Desk *desk);
 E_API void e_desk_visible_client_restore_all(E_Desk *desk);
@@ -170,20 +136,10 @@ E_API void e_desk_visible_client_iconified_list_remove(E_Desk *desk, E_Client *e
 E_API void e_desk_visible_client_iconified_list_remove_all(E_Desk *desk);
 E_API Eina_List * e_desk_visible_client_iconified_list_get(E_Desk *desk);
 
-EINTERN Eina_Bool e_desk_splitscreen_regions_all_generate(E_Desk *desk, struct wl_client *client, struct wl_resource *ss_res, uint32_t id);
-
-EINTERN Eina_Bool e_desk_has_ec(E_Desk *desk, E_Client *ec);
 //#ifdef REFACTOR_DESK_AREA
-EINTERN E_Client *e_desk_top_ec_get(E_Desk *desk);
-EINTERN E_Client *e_desk_bottom_ec_get(E_Desk *desk);
 E_API E_Desk_Area *e_desk_desk_area_find_by_ec(E_Desk *desk, E_Client *ec);
 //#endif
 
-extern EINTERN int E_EVENT_DESK_SHOW;
-extern EINTERN int E_EVENT_DESK_BEFORE_SHOW;
-extern EINTERN int E_EVENT_DESK_AFTER_SHOW;
-extern EINTERN int E_EVENT_DESK_DESKSHOW;
-extern EINTERN int E_EVENT_DESK_NAME_CHANGE;
 extern E_API int E_EVENT_DESK_GEOMETRY_CHANGE;
 extern E_API int E_EVENT_DESK_ZOOM_SET;
 extern E_API int E_EVENT_DESK_ZOOM_UNSET;

diff --git a/src/bin/e_desk_area.c b/src/bin/e_desk_area.c
index b9698fb..1d68aad 100644 (file)
--- a/src/bin/e_desk_area.c
+++ b/src/bin/e_desk_area.c
@@ -10,6 +10,7 @@
 #include "e_policy_visibility_intern.h"
 #endif
 #include "e_comp_wl_subsurface_intern.h"
+#include "e_desk_intern.h"
 
 #include <libds-tizen/screen.h>
 

diff --git a/src/bin/e_desk_intern.h b/src/bin/e_desk_intern.h
index b3c2fdb..a8d4e30 100644 (file)
--- a/src/bin/e_desk_intern.h
+++ b/src/bin/e_desk_intern.h
@@ -4,8 +4,57 @@
 #include <wayland-server.h>
 #include <libds-tizen/screen.h>
 
+extern EINTERN int E_EVENT_DESK_SHOW;
+extern EINTERN int E_EVENT_DESK_BEFORE_SHOW;
+extern EINTERN int E_EVENT_DESK_AFTER_SHOW;
+extern EINTERN int E_EVENT_DESK_DESKSHOW;
+extern EINTERN int E_EVENT_DESK_NAME_CHANGE;
+
+EINTERN int          e_desk_init(void);
+EINTERN int          e_desk_shutdown(void);
+EINTERN E_Desk      *e_desk_new(E_Zone *zone, int x, int y);
+EINTERN void         e_desk_name_set(E_Desk *desk, const char *name);
+EINTERN void         e_desk_name_add(int zone, int desk_x, int desk_y, const char *name);
+EINTERN void         e_desk_name_del(int zone, int desk_x, int desk_y);
+EINTERN void         e_desk_name_update(void);
+EINTERN void         e_desk_show(E_Desk *desk);
+EINTERN void         e_desk_deskshow(E_Zone *zone);
+EINTERN E_Client    *e_desk_client_top_visible_get(E_Desk *desk);
+EINTERN E_Desk      *e_desk_at_xy_get(E_Zone *zone, int x, int y);
+EINTERN E_Desk      *e_desk_at_pos_get(E_Zone *zone, int pos);
+EINTERN void         e_desk_xy_get(E_Desk *desk, int *x, int *y);
+EINTERN void         e_desk_next(E_Zone *zone);
+EINTERN void         e_desk_prev(E_Zone *zone);
+EINTERN void         e_desk_row_add(E_Zone *zone);
+EINTERN void         e_desk_row_remove(E_Zone *zone);
+EINTERN void         e_desk_col_add(E_Zone *zone);
+EINTERN void         e_desk_col_remove(E_Zone *zone);
+EINTERN Eina_Bool    e_desk_has_ec(E_Desk *desk, E_Client *ec);
+//#ifdef REFACTOR_DESK_AREA
+EINTERN E_Client    *e_desk_top_ec_get(E_Desk *desk);
+EINTERN E_Client    *e_desk_bottom_ec_get(E_Desk *desk);
+//#endif
+EINTERN unsigned int e_desks_count(void);
+
+EINTERN Eina_Bool    e_desk_zoom_get_center_coordinate(E_Desk *desk, double zoomx, double zoomy, int rectx, int recty, int *cx, int *cy);
+EINTERN Eina_Bool    e_desk_zoom_is_animating(E_Desk *desk);
+
+EINTERN void         e_desk_client_add(E_Desk *desk, E_Client *ec);
+EINTERN void         e_desk_client_zoom_apply(E_Desk *desk, E_Client *ec);
+
+EINTERN E_Desk_Area *e_desk_desk_area_base_get(E_Desk *desk);
+EINTERN void         e_desk_desk_area_active_set(E_Desk *desk, E_Desk_Area *eda);
+EINTERN E_Desk_Area *e_desk_desk_area_active_get(E_Desk *desk);
+EINTERN void         e_desk_desk_area_raise(E_Desk *desk, E_Desk_Area *eda);
+EINTERN void         e_desk_desk_area_lower(E_Desk *desk, E_Desk_Area *eda);
+EINTERN E_Desk_Area *e_desk_desk_area_above_get(E_Desk *desk, E_Desk_Area *eda);
+EINTERN E_Desk_Area *e_desk_desk_area_below_get(E_Desk *desk, E_Desk_Area *eda);
+EINTERN void         e_desk_desk_area_info_print(E_Desk *desk);
+
 EINTERN Eina_Bool e_desk_splitscreen_enable(E_Desk *desk, struct ds_tizen_splitscreen *splitscreen);
+EINTERN Eina_Bool e_desk_splitscreen_regions_all_generate(E_Desk *desk, struct wl_client *client, struct wl_resource *ss_res, uint32_t id);
 
+// listeners
 EINTERN void e_desk_client_add_listener_add(E_Desk *desk, struct wl_listener *listener);
 EINTERN void e_desk_desk_area_enable_listener_add(E_Desk *desk, struct wl_listener *listener);
 EINTERN void e_desk_desk_area_disable_listener_add(E_Desk *desk, struct wl_listener *listener);

diff --git a/src/bin/e_focus_policy_history.c b/src/bin/e_focus_policy_history.c
index 118f35c..2e18bf9 100644 (file)
--- a/src/bin/e_focus_policy_history.c
+++ b/src/bin/e_focus_policy_history.c
@@ -5,6 +5,7 @@
 #include "e_comp_object_intern.h"
 #include "e_comp_intern.h"
 #include "e_policy_visibility_intern.h"
+#include "e_desk_intern.h"
 
 typedef struct _E_Focus_Policy_History_Impl E_Focus_Policy_History;
 typedef struct _E_Focus_Policy_History_Client E_Focus_Policy_History_Client;

diff --git a/src/bin/e_focus_policy_topmost.c b/src/bin/e_focus_policy_topmost.c
index 44a1fd6..be02db3 100644 (file)
--- a/src/bin/e_focus_policy_topmost.c
+++ b/src/bin/e_focus_policy_topmost.c
@@ -2,6 +2,7 @@
 #include "e_focus_policy_iface.h"
 #include "e_zone_intern.h"
 #include "e_client_intern.h"
+#include "e_desk_intern.h"
 
 typedef struct _E_Focus_Policy_Topmost_Impl E_Focus_Policy_Topmost;
 typedef struct _E_Focus_Policy_Topmost_Client E_Focus_Policy_Topmost_Client;

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

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 67c1e7f..ef7defa 100644 (file)
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -30,6 +30,7 @@
 #include "e_dpms_intern.h"
 #include "e_dnd_intern.h"
 #include "e_client_intern.h"
+#include "e_desk_intern.h"
 
 #ifdef __linux__
 # include <sys/prctl.h>

diff --git a/src/bin/e_maximize.c b/src/bin/e_maximize.c
index cce8ac1..4349434 100644 (file)
--- a/src/bin/e_maximize.c
+++ b/src/bin/e_maximize.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_maximize_intern.h"
+#include "e_desk_intern.h"
 
 typedef struct _E_Maximize_Rect E_Maximize_Rect;
 

diff --git a/src/bin/e_place.c b/src/bin/e_place.c
index 00ff894..bc65c6b 100644 (file)
--- a/src/bin/e_place.c
+++ b/src/bin/e_place.c
@@ -1,6 +1,7 @@
 #include "e.h"
 #include "e_place_intern.h"
 #include "e_input_intern.h"
+#include "e_desk_intern.h"
 
 EINTERN void
 e_place_zone_region_smart_cleanup(E_Zone *zone)

diff --git a/src/bin/e_policy.c b/src/bin/e_policy.c
index 3e502e3..284efdd 100644 (file)
--- a/src/bin/e_policy.c
+++ b/src/bin/e_policy.c
@@ -9,6 +9,7 @@
 #include "e_comp_intern.h"
 #include "e_pixmap_intern.h"
 #include "e_client_intern.h"
+#include "e_desk_intern.h"
 
 E_Policy *e_policy = NULL;
 Eina_Hash *hash_policy_desks = NULL;

diff --git a/src/bin/e_policy_softkey.c b/src/bin/e_policy_softkey.c
index eabd27b..008d2fc 100644 (file)
--- a/src/bin/e_policy_softkey.c
+++ b/src/bin/e_policy_softkey.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_policy_intern.h"
+#include "e_desk_intern.h"
 
 static void         _e_policy_cb_softkey(void *data, Evas_Object *obj EINA_UNUSED, const char *emission, const char *source EINA_UNUSED);
 static void         _e_policy_softkey_iconify(E_Zone *zone, Eina_Bool all);

diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c
index a175427..8029ca1 100644 (file)
--- a/src/bin/e_utils.c
+++ b/src/bin/e_utils.c
@@ -2,6 +2,7 @@
 #include "e_utils_intern.h"
 #include "e_icon_intern.h"
 #include "e_input.h"
+#include "e_desk_intern.h"
 
 EINTERN E_Path * path_data = NULL;
 EINTERN E_Path * path_images = NULL;