e_utils: make an internal header

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

Change-Id: I777cffd8405444a85543881d43ac94c458396dae

diff --git a/src/bin/e.h b/src/bin/e.h
index fdb34fc..c26c331 100644 (file)
--- a/src/bin/e.h
+++ b/src/bin/e.h
@@ -397,14 +397,6 @@ struct _E_Rect
    int x, y, w, h;
 };
 
-extern E_API E_Path *path_data;
-extern E_API E_Path *path_images;
-extern E_API E_Path *path_fonts;
-extern E_API E_Path *path_themes;
-extern E_API E_Path *path_icons;
-extern E_API E_Path *path_modules;
-extern E_API E_Path *path_backgrounds;
-extern E_API E_Path *path_messages;
 extern E_API Eina_Bool starting;
 extern E_API Eina_Bool stopping;
 

diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index 0db21cd..da984b9 100644 (file)
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_actions_intern.h"
+#include "e_utils_intern.h"
 
 #define INITS
 

diff --git a/src/bin/e_bg.c b/src/bin/e_bg.c
index 1a39177..b89b6cd 100644 (file)
--- a/src/bin/e_bg.c
+++ b/src/bin/e_bg.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_bg_intern.h"
+#include "e_utils_intern.h"
 
 /* local subsystem functions */
 static void _e_bg_event_bg_update_free(void *data, void *event);

diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c
index 15d5cdf..06ccd17 100644 (file)
--- a/src/bin/e_bindings.c
+++ b/src/bin/e_bindings.c
@@ -1,6 +1,7 @@
 #include "e.h"
 #include "e_bindings_intern.h"
 #include "e_actions_intern.h"
+#include "e_utils_intern.h"
 
 /* local subsystem functions */
 static void               _e_bindings_mouse_free(E_Binding_Mouse *bind);

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 1d77600..8f4cad3 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -4,6 +4,7 @@
 #include "e_appinfo_intern.h"
 #include "e_bindings_intern.h"
 #include "e_uuid_store_intern.h"
+#include "e_utils_intern.h"
 
 #define PRI(ec) ((E_Client_Private *)e_object_data_get(E_OBJECT(ec)))
 

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 16568f5..33ecde6 100644 (file)
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_bg_intern.h"
+#include "e_utils_intern.h"
 
 #include <sys/xattr.h>
 #include "services/e_service_quickpanel.h"

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 0af3704..cb7f5f8 100644 (file)
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -3,6 +3,7 @@
 #include "e_comp_object_intern.h"
 #endif
 #include "e_bindings_intern.h"
+#include "e_utils_intern.h"
 
 /* data keys:
 

diff --git a/src/bin/e_comp_screen.c b/src/bin/e_comp_screen.c
index 3558c69..a2a59a5 100644 (file)
--- a/src/bin/e_comp_screen.c
+++ b/src/bin/e_comp_screen.c
@@ -1,12 +1,13 @@
 #include "e.h"
+#include "e_client_intern.h"
+#include "e_utils_intern.h"
+
 #include "Eeze.h"
 #include <tizen-extension-server-protocol.h>
 #include <device/board-internal.h>
 #include <tbm_drm_helper.h>
 #include <gbm.h>
 
-#include "e_client_intern.h"
-
 #define PATH "/org/enlightenment/wm"
 #define IFACE "org.enlightenment.wm.screen_rotation"
 

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 2a1feba..4df76fa 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -5,6 +5,7 @@
 #include "e_client_intern.h"
 #include "e_appinfo_intern.h"
 #include "e_blender_intern.h"
+#include "e_utils_intern.h"
 
 #include <tizen-extension-server-protocol.h>
 

diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h
index 18b7e5c..8237d40 100644 (file)
--- a/src/bin/e_comp_wl.h
+++ b/src/bin/e_comp_wl.h
@@ -33,6 +33,7 @@ typedef struct _E_Comp_Wl_Pid_Hook E_Comp_Wl_Pid_Hook;
    })
 
 #include <tbm_surface.h>
+#include "e_device.h"
 
 typedef struct _E_Comp_Wl_Aux_Hint  E_Comp_Wl_Aux_Hint;
 typedef struct _E_Comp_Wl_Buffer E_Comp_Wl_Buffer;

diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c
index 2fd9e0d..51e9025 100644 (file)
--- a/src/bin/e_comp_wl_input.c
+++ b/src/bin/e_comp_wl_input.c
@@ -1,5 +1,7 @@
 #define EXECUTIVE_MODE_ENABLED
 #include "e.h"
+#include "e_utils_intern.h"
+
 #include <sys/mman.h>
 #include <pixman.h>
 

diff --git a/src/bin/e_comp_wl_tbm.c b/src/bin/e_comp_wl_tbm.c
index be3e262..cfb9aa8 100644 (file)
--- a/src/bin/e_comp_wl_tbm.c
+++ b/src/bin/e_comp_wl_tbm.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_tbm_gbm_server_intern.h"
+#include "e_utils_intern.h"
 
 #include <wayland-tbm-server.h>
 #include <tbm_bufmgr.h>

diff --git a/src/bin/e_comp_wl_tizen_hwc.c b/src/bin/e_comp_wl_tizen_hwc.c
index 71a3a61..910a306 100644 (file)
--- a/src/bin/e_comp_wl_tizen_hwc.c
+++ b/src/bin/e_comp_wl_tizen_hwc.c
@@ -1,5 +1,7 @@
 #include "e.h"
-#include "tizen-hwc-server-protocol.h"
+#include "e_utils_intern.h"
+
+#include <tizen-hwc-server-protocol.h>
 
 #define E_COMP_WL_TIZEN_HWC_TIMEOUT 5.0
 

diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 1469ce0..d14ace2 100644 (file)
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_user_intern.h"
+#include "e_utils_intern.h"
 
 E_API E_Config *e_config = NULL;
 

diff --git a/src/bin/e_dbus_conn.c b/src/bin/e_dbus_conn.c
index a95de81..2656418 100644 (file)
--- a/src/bin/e_dbus_conn.c
+++ b/src/bin/e_dbus_conn.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_dbus_conn.h"
+#include "e_utils_intern.h"
 
 int _e_dbus_conn_init_count = 0;
 int _e_dbus_conn_log_dom = -1;

diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index abb2fad..f380975 100644 (file)
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -4,6 +4,7 @@
 #ifdef REFACTOR_DESK_AREA
 #include "e_client_intern.h"
 #endif
+#include "e_utils_intern.h"
 
 #include <libds-tizen/screen.h>
 

diff --git a/src/bin/e_env.c b/src/bin/e_env.c
index b7a0e36..7768aa8 100644 (file)
--- a/src/bin/e_env.c
+++ b/src/bin/e_env.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_utils_intern.h"
 
 /* local subsystem functions */
 

diff --git a/src/bin/e_hwc.c b/src/bin/e_hwc.c
index df6d8b6..0cf629a 100644 (file)
--- a/src/bin/e_hwc.c
+++ b/src/bin/e_hwc.c
@@ -1,5 +1,7 @@
 #include "e.h"
+#include "e_utils_intern.h"
 #include "services/e_service_quickpanel.h"
+
 #include <Evas_GL.h>
 #include <gbm.h>
 

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index 22c0961..e90c77a 100644 (file)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -1,19 +1,21 @@
 #include "e.h"
+#include "e_utils_intern.h"
+#include "e_comp_wl.h"
+#include "e_policy_wl.h"
+#include "e_comp_object.h"
+#include "e_info_protocol.h"
 #include "e_info_server.h"
+#include "e_info_server_input.h"
+#include "services/e_service_quickpanel.h"
+#include "services/e_service_kvm.h"
+
 #include <tbm_bufmgr.h>
 #include <tbm_surface.h>
 #include <tbm_surface_internal.h>
 #include <tdm_helper.h>
 #include <wayland-tbm-server.h>
-#include "e_comp_wl.h"
-#include "e_info_protocol.h"
 #include <dlfcn.h>
-#include "e_comp_object.h"
-#include "e_info_server_input.h"
 #include <mcheck.h>
-#include "e_policy_wl.h"
-#include "services/e_service_quickpanel.h"
-#include "services/e_service_kvm.h"
 
 #define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT
 #include <Edje_Edit.h>

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index d5e5f92..16bffca 100644 (file)
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -2,6 +2,7 @@
 #include "e_actions_intern.h"
 #include "e_test_helper_intern.h"
 #include "e_user_intern.h"
+#include "e_utils_intern.h"
 
 #ifdef __linux__
 # include <sys/prctl.h>

diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index 2950eb0..c7bc752 100644 (file)
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_user_intern.h"
+#include "e_utils_intern.h"
 
 /* TODO List:
  *

diff --git a/src/bin/e_output.c b/src/bin/e_output.c
index 82d0fb0..5108850 100644 (file)
--- a/src/bin/e_output.c
+++ b/src/bin/e_output.c
@@ -1,5 +1,7 @@
 #include "e.h"
 #include "e_client_intern.h"
+#include "e_utils_intern.h"
+
 #include <device/board-internal.h>
 
 #define EOERR(f, output, x...)             \

diff --git a/src/bin/e_prefix.c b/src/bin/e_prefix.c
index 5dcaea4..dd72e00 100644 (file)
--- a/src/bin/e_prefix.c
+++ b/src/bin/e_prefix.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_utils_intern.h"
 
 static Eina_Prefix *pfx = NULL;
 

diff --git a/src/bin/e_scale.c b/src/bin/e_scale.c
index ffc8ec7..7096337 100644 (file)
--- a/src/bin/e_scale.c
+++ b/src/bin/e_scale.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_utils_intern.h"
 
 EINTERN double e_scale = 1.0;
 static Eina_Bool _initted = EINA_FALSE;

diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c
index 49540c6..c46402c 100644 (file)
--- a/src/bin/e_utils.c
+++ b/src/bin/e_utils.c
@@ -1,14 +1,16 @@
 #include "e.h"
-
-E_API E_Path * path_data = NULL;
-E_API E_Path * path_images = NULL;
-E_API E_Path * path_fonts = NULL;
-E_API E_Path * path_icons = NULL;
-E_API E_Path * path_modules = NULL;
-E_API E_Path * path_backgrounds = NULL;
-E_API E_Path * path_messages = NULL;
-
-E_API int E_EVENT_FILE_MONITOR_CREATED = -1;
+#include "e_utils_intern.h"
+#include "e_input.h"
+
+EINTERN E_Path * path_data = NULL;
+EINTERN E_Path * path_images = NULL;
+EINTERN E_Path * path_fonts = NULL;
+EINTERN E_Path * path_icons = NULL;
+EINTERN E_Path * path_modules = NULL;
+EINTERN E_Path * path_backgrounds = NULL;
+EINTERN E_Path * path_messages = NULL;
+
+EINTERN int E_EVENT_FILE_MONITOR_CREATED = -1;
 
 /* local subsystem functions */
 static Eina_Bool    _e_util_cb_delayed_del(void *data);

diff --git a/src/bin/e_utils.h b/src/bin/e_utils.h
index fbb0503..075c5df 100644 (file)
--- a/src/bin/e_utils.h
+++ b/src/bin/e_utils.h
@@ -1,88 +1,11 @@
 #ifdef E_TYPEDEFS
 
-extern E_API int E_EVENT_FILE_MONITOR_CREATED;
-
 #else
 #ifndef E_UTILS_H
 #define E_UTILS_H
 
-#include "e_input.h"
-
-#define E_UTIL_DBUS_READY_PATH "/run/enlightenment/dbus_ready"
-#define E_UTIL_SENSORD_READY_PATH "/run/enlightenment/sensord_ready"
-
-typedef struct _E_Util_File_Monitor E_Util_File_Monitor;
-typedef struct _E_Util_Event_File_Monitor E_Util_Event_File_Monitor;
-
-struct _E_Util_File_Monitor
-{
-   const char *path;
-   Ecore_File_Monitor *em;
-   Eina_Bool is_dir;
-   void *user_data;
-};
-
-struct _E_Util_Event_File_Monitor
-{
-   const char *path;
-   void *data;
-};
-
-/* These macros are used to just mark strings for translation, this is useful
- * for string lists which are not dynamically allocated
- */
-#define _(str) (str)
-#define P_(str, str_p, n) (str_p)
-#define N_(str) (str)
-
-EINTERN void         e_util_wakeup(void);
-EINTERN void         e_util_env_set(const char *var, const char *val);
 E_API char        *e_util_env_get(const char *name);
-EINTERN int          e_util_glob_match(const char *str, const char *glob);
-EINTERN int          e_util_glob_case_match(const char *str, const char *glob);
-EINTERN int          e_util_strcasecmp(const char *s1, const char *s2);
 E_API int          e_util_strcmp(const char *s1, const char *s2);
-EINTERN int          e_util_both_str_empty(const char *s1, const char *s2);
-EINTERN unsigned int e_util_icon_size_normalize(unsigned int desired);
-EINTERN E_Client    *e_util_desk_client_above(E_Client *ec);
-EINTERN E_Client    *e_util_desk_client_below(E_Client *ec);
-EINTERN int          e_util_edje_collection_exists(const char *file, const char *coll);
-EINTERN const char  *e_util_filename_escape(const char *filename);
-EINTERN char        *e_util_size_string_get(off_t size);
-EINTERN char        *e_util_file_time_get(time_t ftime);
-EINTERN Eina_Bool    e_util_file_realpath_check(const char* path, Eina_Bool del_link);
-
-EINTERN Evas_Object *e_util_icon_add(const char *path, Evas *evas);
-EINTERN Evas_Object *e_util_icon_theme_icon_add(const char *icon_name, unsigned int size, Evas *evas);
-EINTERN int          e_util_dir_check(const char *dir);
-EINTERN void         e_util_defer_object_del(E_Object *obj);
-EINTERN void         e_util_win_auto_resize_fill(Evas_Object *win);
-/* check if loaded config version matches the current version, show a
-   dialog warning if loaded version is older or newer than current */
-EINTERN Eina_Bool    e_util_module_config_check(const char *module_name, int loaded, int current);
-
-EINTERN const char *e_util_time_str_get(long int seconds);
-EINTERN void e_util_size_debug_set(Evas_Object *obj, Eina_Bool enable);
-
-EINTERN char *e_util_string_append_char(char *str, size_t *size, size_t *len, char c);
-EINTERN char *e_util_string_append_quoted(char *str, size_t *size, size_t *len, const char *src);
-EINTERN Eina_Bool e_util_string_to_uint(const char *str, unsigned int *num, int base);
-EINTERN Eina_Bool e_util_string_to_int(const char *str, int *num, int base);
-EINTERN Eina_Bool e_util_string_to_int_token(const char *str, char **next, int *num, int base);
-EINTERN Eina_Bool e_util_string_to_double(const char *str, double *num);
-EINTERN Eina_Bool e_util_string_to_ulong(const char *str, unsigned long *num, int base);
-
-EINTERN void e_util_evas_objects_above_print(Evas_Object *o);
-EINTERN void e_util_evas_objects_above_print_smart(Evas_Object *o);
-
-EINTERN void e_util_string_list_free(Eina_List *l);
-
-EINTERN void e_util_memclear(void *s, size_t n);
-
-EINTERN void e_util_file_monitor_init(void);
-EINTERN int e_util_file_monitor_shutdown(void);
-EINTERN int e_util_file_monitor_add(const char *path, void *data);
-
 E_API unsigned int e_util_timestamp_get(void);
 
 #endif

diff --git a/src/bin/e_utils_intern.h b/src/bin/e_utils_intern.h
new file mode 100644 (file)
index 0000000..e526d4d
--- /dev/null
+++ b/src/bin/e_utils_intern.h
@@ -0,0 +1,89 @@
+#ifndef E_UTILS_INTERN_H
+#define E_UTILS_INTERN_H
+
+#define E_UTIL_DBUS_READY_PATH "/run/enlightenment/dbus_ready"
+#define E_UTIL_SENSORD_READY_PATH "/run/enlightenment/sensord_ready"
+
+extern EINTERN int E_EVENT_FILE_MONITOR_CREATED;
+extern EINTERN E_Path *path_data;
+extern EINTERN E_Path *path_images;
+extern EINTERN E_Path *path_fonts;
+extern EINTERN E_Path *path_themes;
+extern EINTERN E_Path *path_icons;
+extern EINTERN E_Path *path_modules;
+extern EINTERN E_Path *path_backgrounds;
+extern EINTERN E_Path *path_messages;
+
+typedef struct _E_Util_File_Monitor E_Util_File_Monitor;
+typedef struct _E_Util_Event_File_Monitor E_Util_Event_File_Monitor;
+
+struct _E_Util_File_Monitor
+{
+   const char *path;
+   Ecore_File_Monitor *em;
+   Eina_Bool is_dir;
+   void *user_data;
+};
+
+struct _E_Util_Event_File_Monitor
+{
+   const char *path;
+   void *data;
+};
+
+/* These macros are used to just mark strings for translation, this is useful
+ * for string lists which are not dynamically allocated
+ */
+#define _(str) (str)
+#define P_(str, str_p, n) (str_p)
+#define N_(str) (str)
+
+EINTERN void         e_util_wakeup(void);
+EINTERN void         e_util_env_set(const char *var, const char *val);
+EINTERN int          e_util_glob_match(const char *str, const char *glob);
+EINTERN int          e_util_glob_case_match(const char *str, const char *glob);
+EINTERN int          e_util_strcasecmp(const char *s1, const char *s2);
+EINTERN int          e_util_both_str_empty(const char *s1, const char *s2);
+EINTERN unsigned int e_util_icon_size_normalize(unsigned int desired);
+EINTERN E_Client    *e_util_desk_client_above(E_Client *ec);
+EINTERN E_Client    *e_util_desk_client_below(E_Client *ec);
+EINTERN int          e_util_edje_collection_exists(const char *file, const char *coll);
+EINTERN const char  *e_util_filename_escape(const char *filename);
+EINTERN char        *e_util_size_string_get(off_t size);
+EINTERN char        *e_util_file_time_get(time_t ftime);
+EINTERN Eina_Bool    e_util_file_realpath_check(const char* path, Eina_Bool del_link);
+
+EINTERN Evas_Object *e_util_icon_add(const char *path, Evas *evas);
+EINTERN Evas_Object *e_util_icon_theme_icon_add(const char *icon_name, unsigned int size, Evas *evas);
+EINTERN int          e_util_dir_check(const char *dir);
+EINTERN void         e_util_defer_object_del(E_Object *obj);
+EINTERN void         e_util_win_auto_resize_fill(Evas_Object *win);
+/* check if loaded config version matches the current version, show a
+   dialog warning if loaded version is older or newer than current */
+EINTERN Eina_Bool    e_util_module_config_check(const char *module_name, int loaded, int current);
+
+EINTERN Eina_Bool e_util_fullscreen_current_any(void);
+EINTERN Eina_Bool e_util_fullscreen_any(void);
+EINTERN const char *e_util_time_str_get(long int seconds);
+EINTERN void e_util_size_debug_set(Evas_Object *obj, Eina_Bool enable);
+
+EINTERN char *e_util_string_append_char(char *str, size_t *size, size_t *len, char c);
+EINTERN char *e_util_string_append_quoted(char *str, size_t *size, size_t *len, const char *src);
+EINTERN Eina_Bool e_util_string_to_uint(const char *str, unsigned int *num, int base);
+EINTERN Eina_Bool e_util_string_to_int(const char *str, int *num, int base);
+EINTERN Eina_Bool e_util_string_to_int_token(const char *str, char **next, int *num, int base);
+EINTERN Eina_Bool e_util_string_to_double(const char *str, double *num);
+EINTERN Eina_Bool e_util_string_to_ulong(const char *str, unsigned long *num, int base);
+
+EINTERN void e_util_evas_objects_above_print(Evas_Object *o);
+EINTERN void e_util_evas_objects_above_print_smart(Evas_Object *o);
+
+EINTERN void e_util_string_list_free(Eina_List *l);
+
+EINTERN void e_util_memclear(void *s, size_t n);
+
+EINTERN void e_util_file_monitor_init(void);
+EINTERN int e_util_file_monitor_shutdown(void);
+EINTERN int e_util_file_monitor_add(const char *path, void *data);
+
+#endif