e: do not include e.h 76/305176/1
authorSooChan Lim <sc1.lim@samsung.com>
Thu, 25 Jan 2024 10:55:23 +0000 (19:55 +0900)
committerJunseok Kim <juns.kim@samsung.com>
Mon, 29 Jan 2024 11:51:14 +0000 (20:51 +0900)
enlightenment does not include e.h file. The definitions and symbols
in e.h file are spread in each related files.

Change-Id: Ia6a6a71d58532fe9557a61532d9aed742717b000

330 files changed:
src/bin/Makefile.mk
src/bin/e_actions.c
src/bin/e_actions_intern.h
src/bin/e_appinfo.c
src/bin/e_appinfo_intern.h
src/bin/e_bg.c
src/bin/e_bg_intern.h
src/bin/e_bindings.c
src/bin/e_bindings_intern.h
src/bin/e_blender.c
src/bin/e_blender_intern.h
src/bin/e_client.c
src/bin/e_client_intern.h
src/bin/e_comp.c
src/bin/e_comp_canvas.c
src/bin/e_comp_canvas_intern.h
src/bin/e_comp_cfdata.c
src/bin/e_comp_cfdata_intern.h
src/bin/e_comp_intern.h
src/bin/e_comp_object.c
src/bin/e_comp_object_intern.h
src/bin/e_comp_screen.c
src/bin/e_comp_screen_intern.h
src/bin/e_comp_wl.c
src/bin/e_comp_wl_buffer.c
src/bin/e_comp_wl_buffer_intern.h
src/bin/e_comp_wl_capture.c
src/bin/e_comp_wl_capture_intern.h
src/bin/e_comp_wl_data.c
src/bin/e_comp_wl_data_intern.h
src/bin/e_comp_wl_input.c
src/bin/e_comp_wl_input_intern.h
src/bin/e_comp_wl_intern.h
src/bin/e_comp_wl_renderer.c
src/bin/e_comp_wl_renderer_intern.h
src/bin/e_comp_wl_rsm.c
src/bin/e_comp_wl_rsm_intern.h
src/bin/e_comp_wl_screenshooter.c
src/bin/e_comp_wl_screenshooter_intern.h
src/bin/e_comp_wl_shell.c
src/bin/e_comp_wl_subsurface.c
src/bin/e_comp_wl_subsurface_intern.h
src/bin/e_comp_wl_tbm.c
src/bin/e_comp_wl_tbm_intern.h
src/bin/e_comp_wl_tizen_hwc.c
src/bin/e_comp_wl_tizen_hwc_intern.h
src/bin/e_comp_wl_viewport.c
src/bin/e_comp_wl_viewport_intern.h
src/bin/e_compositor.c
src/bin/e_compositor_intern.h
src/bin/e_config.c
src/bin/e_config_data.c
src/bin/e_config_intern.h
src/bin/e_dbus_conn.c
src/bin/e_dbus_conn_intern.h
src/bin/e_desk.c
src/bin/e_desk_area.c
src/bin/e_desk_area_intern.h
src/bin/e_desk_intern.h
src/bin/e_device.c
src/bin/e_device_intern.h
src/bin/e_devicemgr.c
src/bin/e_devicemgr_block.c
src/bin/e_devicemgr_conf.c
src/bin/e_devicemgr_input.c
src/bin/e_devicemgr_inputgen.c
src/bin/e_devicemgr_intern.h
src/bin/e_devicemgr_keyboard_grab.c
src/bin/e_devicemgr_wl.c
src/bin/e_dnd.c
src/bin/e_dnd_intern.h
src/bin/e_dpms.c
src/bin/e_dpms_intern.h
src/bin/e_egl_sync.c
src/bin/e_egl_sync_intern.h
src/bin/e_env.c
src/bin/e_env_intern.h
src/bin/e_eom.c
src/bin/e_eom_intern.h [new file with mode: 0644]
src/bin/e_error.c
src/bin/e_error_intern.h
src/bin/e_explicit_sync.c
src/bin/e_explicit_sync_intern.h
src/bin/e_focus.c
src/bin/e_focus_intern.h
src/bin/e_focus_policy_history.c
src/bin/e_focus_policy_iface.c
src/bin/e_focus_policy_iface.h
src/bin/e_focus_policy_topmost.c
src/bin/e_foreign.c
src/bin/e_foreign_intern.h
src/bin/e_foreign_shell.c
src/bin/e_gesture.c
src/bin/e_gesture_intern.h
src/bin/e_grabinput.c
src/bin/e_grabinput_intern.h
src/bin/e_hints.c
src/bin/e_hints_intern.h
src/bin/e_hwc.c
src/bin/e_hwc_intern.h
src/bin/e_hwc_planes.c
src/bin/e_hwc_planes_intern.h [new file with mode: 0644]
src/bin/e_hwc_window.c
src/bin/e_hwc_window_intern.h
src/bin/e_hwc_window_queue.c
src/bin/e_hwc_window_queue_intern.h [moved from src/include/e_hwc_window_queue.h with 53% similarity]
src/bin/e_hwc_windows.c
src/bin/e_hwc_windows_intern.h
src/bin/e_icon.c
src/bin/e_icon_intern.h
src/bin/e_info_client.c
src/bin/e_info_protocol.c
src/bin/e_info_protocol_intern.h
src/bin/e_info_server.c
src/bin/e_info_server_input.c
src/bin/e_info_server_input_intern.h
src/bin/e_info_server_intern.h
src/bin/e_input.c
src/bin/e_input_device.c
src/bin/e_input_evdev.c
src/bin/e_input_event.c
src/bin/e_input_event_intern.h
src/bin/e_input_inputs.c
src/bin/e_input_intern.h
src/bin/e_input_log.h
src/bin/e_intern.h [new file with mode: 0644]
src/bin/e_keyrouter.c
src/bin/e_keyrouter_conf.c
src/bin/e_keyrouter_events.c
src/bin/e_keyrouter_intern.h
src/bin/e_keyrouter_list.c
src/bin/e_keyrouter_wl.c
src/bin/e_layout.c
src/bin/e_layout_intern.h
src/bin/e_log.c
src/bin/e_log_intern.h [new file with mode: 0644]
src/bin/e_magnifier.c
src/bin/e_magnifier_intern.h
src/bin/e_main.c
src/bin/e_main_intern.h [new file with mode: 0644]
src/bin/e_map.c
src/bin/e_map_intern.h
src/bin/e_maximize.c
src/bin/e_maximize_intern.h
src/bin/e_module.c
src/bin/e_module_intern.h
src/bin/e_mouse.c
src/bin/e_mouse_intern.h
src/bin/e_msg.c
src/bin/e_msg_intern.h
src/bin/e_object.c
src/bin/e_output.c
src/bin/e_output_intern.h
src/bin/e_path.c
src/bin/e_path_intern.h
src/bin/e_pixmap.c
src/bin/e_pixmap_intern.h
src/bin/e_place.c
src/bin/e_place_intern.h
src/bin/e_plane.c
src/bin/e_plane_renderer.c
src/bin/e_pointer.c
src/bin/e_pointer_intern.h
src/bin/e_policy.c
src/bin/e_policy_conformant.c
src/bin/e_policy_conformant_intern.h
src/bin/e_policy_intern.h
src/bin/e_policy_softkey.c
src/bin/e_policy_stack.c
src/bin/e_policy_visibility.c
src/bin/e_policy_visibility_intern.h
src/bin/e_policy_wl.c
src/bin/e_policy_wl_display.c
src/bin/e_policy_wl_display_intern.h
src/bin/e_policy_wl_intern.h
src/bin/e_prefix.c
src/bin/e_prefix_intern.h
src/bin/e_presentation_time.c
src/bin/e_presentation_time_intern.h
src/bin/e_privilege.c
src/bin/e_privilege_intern.h
src/bin/e_process.c
src/bin/e_process_intern.h
src/bin/e_scale.c
src/bin/e_scale_intern.h
src/bin/e_screensaver.c
src/bin/e_screensaver_intern.h
src/bin/e_security.c
src/bin/e_security_intern.h
src/bin/e_signals.c
src/bin/e_signals_intern.h
src/bin/e_subsurface_watcher.c
src/bin/e_subsurface_watcher_intern.h
src/bin/e_tbm_gbm_server.c
src/bin/e_tbm_gbm_server_intern.h
src/bin/e_test_helper.c
src/bin/e_test_helper_intern.h
src/bin/e_theme.c
src/bin/e_theme_intern.h
src/bin/e_user.c
src/bin/e_user_intern.h
src/bin/e_util_transform.c
src/bin/e_util_transform_intern.h [new file with mode: 0644]
src/bin/e_utils.c
src/bin/e_utils_intern.h
src/bin/e_uuid_store.c
src/bin/e_uuid_store_intern.h
src/bin/e_wtz_shell.c
src/bin/e_wtz_shell_intern.h
src/bin/e_xdg_shell_v6.c
src/bin/e_xdg_shell_v6_intern.h
src/bin/e_zone.c
src/bin/e_zone_intern.h
src/bin/services/e_service_cbhm.c
src/bin/services/e_service_cbhm_intern.h
src/bin/services/e_service_gesture.c
src/bin/services/e_service_gesture_intern.h [new file with mode: 0644]
src/bin/services/e_service_indicator.c
src/bin/services/e_service_indicator_intern.h
src/bin/services/e_service_kvm.c
src/bin/services/e_service_kvm_intern.h
src/bin/services/e_service_launcher.c
src/bin/services/e_service_launcher_intern.h
src/bin/services/e_service_lockscreen.c
src/bin/services/e_service_lockscreen_intern.h
src/bin/services/e_service_quickpanel.c
src/bin/services/e_service_quickpanel_intern.h
src/bin/services/e_service_region.c
src/bin/services/e_service_region_intern.h
src/bin/services/e_service_scrsaver.c
src/bin/services/e_service_scrsaver_intern.h
src/bin/services/e_service_softkey.c
src/bin/services/e_service_softkey_intern.h
src/bin/services/e_service_taskbar.c
src/bin/services/e_service_taskbar_intern.h
src/bin/services/e_service_volume.c
src/bin/services/e_service_volume_intern.h
src/bin/video/e_client_video.c
src/bin/video/e_client_video_intern.h
src/bin/video/e_comp_wl_video.c
src/bin/video/e_comp_wl_video_buffer.c
src/bin/video/e_comp_wl_video_buffer_intern.h
src/bin/video/e_comp_wl_video_intern.h
src/bin/video/e_util_video.c
src/bin/video/e_util_video_intern.h
src/bin/video/e_video_comp_iface.h
src/bin/video/e_video_debug.c
src/bin/video/e_video_debug_intern.h
src/bin/video/e_zone_video.c
src/bin/video/e_zone_video_intern.h
src/bin/video/iface/e_video_external.c
src/bin/video/iface/e_video_external_intern.h
src/bin/video/iface/e_video_fallback.c
src/bin/video/iface/e_video_fallback_intern.h
src/bin/video/iface/e_video_hwc.c
src/bin/video/iface/e_video_hwc_intern.h
src/bin/video/iface/e_video_hwc_planes.c
src/bin/video/iface/e_video_hwc_windows.c
src/include/e.h
src/include/e_actions.h
src/include/e_appinfo.h
src/include/e_bindings.h
src/include/e_client.h
src/include/e_comp.h
src/include/e_comp_canvas.h
src/include/e_comp_cfdata.h
src/include/e_comp_object.h
src/include/e_comp_screen.h
src/include/e_comp_wl.h
src/include/e_comp_wl_capture.h
src/include/e_comp_wl_input.h
src/include/e_comp_wl_rsm.h
src/include/e_comp_wl_tbm.h
src/include/e_comp_wl_video_buffer.h
src/include/e_comp_wl_viewport.h
src/include/e_config.h
src/include/e_config_data.h
src/include/e_dbus_conn.h
src/include/e_desk.h
src/include/e_desk_area.h
src/include/e_device.h
src/include/e_devicemgr.h
src/include/e_dnd.h
src/include/e_egl_sync.h
src/include/e_eom.h
src/include/e_explicit_sync.h
src/include/e_gesture.h
src/include/e_hints.h
src/include/e_hwc.h
src/include/e_hwc_planes.h [deleted file]
src/include/e_hwc_window.h
src/include/e_hwc_windows.h
src/include/e_includes.h
src/include/e_info_server.h
src/include/e_info_shared_types.h
src/include/e_input.h
src/include/e_keyrouter.h
src/include/e_keyrouter_private.h
src/include/e_layout.h
src/include/e_log.h
src/include/e_log_client.h [new file with mode: 0644]
src/include/e_main.h
src/include/e_map.h
src/include/e_module.h
src/include/e_object.h
src/include/e_output.h
src/include/e_pixmap.h
src/include/e_plane.h
src/include/e_plane_renderer.h
src/include/e_pointer.h
src/include/e_policy.h
src/include/e_policy_private_data.h
src/include/e_policy_visibility.h
src/include/e_policy_wl.h
src/include/e_prefix.h
src/include/e_presentation_time.h
src/include/e_privilege.h
src/include/e_process.h
src/include/e_screensaver.h
src/include/e_security.h
src/include/e_service_gesture.h
src/include/e_service_quickpanel.h
src/include/e_service_softkey.h
src/include/e_theme.h
src/include/e_types.h [new file with mode: 0644]
src/include/e_util_transform.h
src/include/e_utils.h
src/include/e_zone.h
src/modules/bufferqueue/e_mod_main.c
tests/Makefile.am

index b2a34c9..3b67e47 100644 (file)
@@ -67,10 +67,8 @@ src/include/e_comp_screen.h \
 src/include/e_comp_wl_input.h \
 src/include/e_comp_wl.h \
 src/include/e_hwc.h \
-src/include/e_hwc_planes.h \
 src/include/e_hwc_windows.h \
 src/include/e_hwc_window.h \
-src/include/e_hwc_window_queue.h \
 src/include/e_explicit_sync.h \
 src/include/e_egl_sync.h \
 src/include/e_info_server_input.h \
@@ -97,14 +95,14 @@ src/include/e_process.h \
 src/include/e_privilege.h \
 src/include/e_security.h \
 src/include/e_keyrouter.h \
-src/include/e_keyrouter_private.h \
 src/include/e_gesture.h \
 src/include/e_input.h \
 src/include/e_dbus_conn.h \
 src/include/e_devicemgr.h \
 src/include/e_map.h \
 src/include/e_input_event.h \
-src/include/e_device.h
+src/include/e_device.h \
+src/include/e_types.h
 
 enlightenment_src = \
 src/bin/e_actions.c \
index 3a4de64..88d59fa 100644 (file)
@@ -1,10 +1,29 @@
-#include "e.h"
 #include "e_actions_intern.h"
 #include "e_utils_intern.h"
 #include "e_client_intern.h"
+#include "e_object.h"
 
+#define E_ACTION_TYPE 0xE0b01010
 #define INITS
 
+typedef struct _E_Action_Description E_Action_Description;
+typedef struct _E_Action_Group       E_Action_Group;
+
+struct _E_Action_Description
+{
+   const char *act_name;
+   const char *act_cmd;
+   const char *act_params;
+   const char *param_example;
+   int         editable;
+};
+
+struct _E_Action_Group
+{
+   const char *act_grp;
+   Eina_List  *acts;
+};
+
 /* local subsystem functions */
 static void       _e_action_free(E_Action *act);
 static int        _action_groups_sort_cb(const void *d1, const void *d2);
index a63ad11..83fc9da 100644 (file)
@@ -1,43 +1,8 @@
 #ifndef E_ACTIONS_INTERN_H
 #define E_ACTIONS_INTERN_H
 
-#define E_ACTION_TYPE 0xE0b01010
-
-typedef struct _E_Action_Description E_Action_Description;
-typedef struct _E_Action_Group       E_Action_Group;
-
-struct _E_Action
-{
-   E_Object    e_obj_inherit;
-
-   const char *name;
-   struct
-   {
-      void (*go)(E_Object *obj, const char *params);
-      void (*go_mouse)(E_Object *obj, const char *params, E_Binding_Event_Mouse_Button *ev);
-      void (*go_wheel)(E_Object *obj, const char *params, E_Binding_Event_Wheel *ev);
-      void (*go_key)(E_Object *obj, const char *params, Ecore_Event_Key *ev);
-      void (*go_signal)(E_Object *obj, const char *params, const char *sig, const char *src);
-      void (*end)(E_Object *obj, const char *params);
-      void (*end_mouse)(E_Object *obj, const char *params, E_Binding_Event_Mouse_Button *ev);
-      void (*end_key)(E_Object *obj, const char *params, Ecore_Event_Key *ev);
-   } func;
-};
-
-struct _E_Action_Description
-{
-   const char *act_name;
-   const char *act_cmd;
-   const char *act_params;
-   const char *param_example;
-   int         editable;
-};
-
-struct _E_Action_Group
-{
-   const char *act_grp;
-   Eina_List  *acts;
-};
+#include "e_intern.h"
+#include "e_actions.h"
 
 EINTERN int      e_actions_init(void);
 EINTERN int      e_actions_shutdown(void);
index 07e2fb6..70fcc1f 100644 (file)
@@ -1,6 +1,5 @@
-#include "e.h"
-#include "e_appinfo.h"
 #include "e_appinfo_intern.h"
+#include "e_utils_intern.h"
 
 static Eina_List *appinfo_list;
 
index e7198f5..9f754a3 100644 (file)
@@ -1,6 +1,9 @@
 # ifndef E_APPINFO_INTERN_H
 # define E_APPINFO_INTERN_H
 
+#include "e_intern.h"
+#include "e_appinfo.h"
+
 struct _E_Appinfo_Hook
 {
    EINA_INLIST;
index b7b81ac..7863252 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_bg_intern.h"
 #include "e_utils_intern.h"
 #include "e_theme_intern.h"
index 74da12b..1c99b37 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_BG_INTERN_H
 #define E_BG_INTERN_H
 
+#include "e_intern.h"
+#include "e_config_intern.h"
+
 typedef enum {
    E_BG_TRANSITION_NONE,
    E_BG_TRANSITION_START,
index 67f9ea1..7e4c65c 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_bindings_intern.h"
 #include "e_actions_intern.h"
 #include "e_utils_intern.h"
index 071d762..830a263 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_BINDINGS_INTERN_H
 #define E_BINDINGS_INTERN_H
 
+#include "e_intern.h"
+#include "e_bindings.h"
+
 typedef enum _E_Binding_Context
 {
    E_BINDING_CONTEXT_NONE,
@@ -34,9 +37,6 @@ typedef struct _E_Binding_Key    E_Binding_Key;
 typedef struct _E_Binding_Signal E_Binding_Signal;
 typedef struct _E_Binding_Wheel  E_Binding_Wheel;
 
-typedef struct E_Binding_Event_Mouse_Button E_Binding_Event_Mouse_Button;
-typedef struct E_Binding_Event_Wheel E_Binding_Event_Wheel;
-
 struct E_Binding_Event_Mouse_Button
 {
    int               button; /**< Mouse button number that was raised (1 - 32) */
index 0e4face..d2d3a25 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_blender_intern.h"
 #include "e_client_intern.h"
 #include "e_comp_object_intern.h"
index d9b96e3..c916f99 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_BLENDER_INTERN_H
 #define E_BLENDER_INTERN_H
 
+#include "e_intern.h"
+
 typedef struct _E_Blender E_Blender;
 typedef struct _E_Blend E_Blend;
 
index 1db2113..3951166 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_client_intern.h"
 #include "e_actions_intern.h"
 #include "e_appinfo_intern.h"
@@ -17,6 +16,7 @@
 #include "e_desk_area_intern.h"
 #include "e_desk_intern.h"
 #include "e_zone_intern.h"
+#include "e_config_intern.h"
 
 #define PRI(ec) ((E_Client_Private *)e_object_data_get(E_OBJECT(ec)))
 
index b4609cb..cac1a90 100644 (file)
@@ -1,12 +1,13 @@
 #ifndef E_CLIENT_INTERN_H
 #define E_CLIENT_INTERN_H
 
+#include "e_intern.h"
+#include "e_client.h"
 #include "e_pixmap_intern.h"
+#include "e_comp_wl_capture_intern.h"
 
 #include <wayland-server.h>
 
-typedef struct E_Client E_Client;
-
 //#ifdef REFACTOR_DESK_AREA
 typedef struct _E_Client_Data_Get_Above
 {
index 529bb75..cc9f2f1 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_comp_intern.h"
 #include "e_bg_intern.h"
 #include "e_utils_intern.h"
 #include "e_focus_intern.h"
 #include "e_comp_object_intern.h"
 #include "e_zone_intern.h"
+#include "e_config_intern.h"
+#include "e_screensaver_intern.h"
+#include "e_hwc_planes_intern.h"
 
 #include <sys/xattr.h>
+#include <sys/types.h>
+#include <grp.h>
+#include <pwd.h>
 
 #define OVER_FLOW 1
 //////////////////////////////////////////////////////////////////////////
index e447ab4..66d807e 100644 (file)
@@ -1,10 +1,11 @@
-#include "e.h"
 #include "e_comp_canvas_intern.h"
 #include "e_comp_screen_intern.h"
 #include "e_comp_intern.h"
 #include "e_output_intern.h"
 #include "e_client_intern.h"
 #include "e_zone_intern.h"
+#include "e_theme_intern.h"
+#include "e_config_intern.h"
 
 static Eina_List *handlers;
 static Eina_Bool _ev_freeze = EINA_FALSE;
index bd96b16..e969f7b 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_COMP_CANVAS_INTERN_H
 #define E_COMP_CANVAS_INTERN_H
 
+#include "e_intern.h"
+#include "e_comp_canvas.h"
+
 EINTERN Eina_Bool  e_comp_canvas_init(int w, int h);
 EINTERN void       e_comp_canvas_clear(void);
 EINTERN void       e_comp_all_freeze(void);
index 12a8967..6b4d3f0 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_comp_cfdata_intern.h"
 
 EINTERN void
index 8b336bc..c2361e8 100644 (file)
@@ -1,6 +1,10 @@
 #ifndef E_COMP_CFDATA_INTERN_H
 #define E_COMP_CFDATA_INTERN_H
 
+#include "e_intern.h"
+#include "e_comp_cfdata.h"
+#include "e_config_intern.h"
+
 #define E_COMP_VERSION 1
 
 EINTERN void           e_comp_cfdata_edd_init(E_Config_DD **conf_edd, E_Config_DD **match_edd);
index cd84802..c79a7bb 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_COMP_INTERN_H
 #define E_COMP_INTERN_H
 
+#include "e_intern.h"
+#include "e_comp.h"
+
 EINTERN Eina_Bool     e_comp_init(void);
 EINTERN int           e_comp_shutdown(void);
 
index 53f715c..17d7e68 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_comp_object_intern.h"
 #include "e_bindings_intern.h"
 #include "e_utils_intern.h"
@@ -18,6 +17,8 @@
 #include "e_client_video_intern.h"
 #include "e_client_intern.h"
 #include "e_zone_intern.h"
+#include "e_theme_intern.h"
+#include "e_config_intern.h"
 
 /* data keys:
 
index 2894d22..b7f128c 100644 (file)
@@ -1,6 +1,10 @@
 #ifndef E_COMP_OBJECT_INTERN_H
 #define E_COMP_OBJECT_INTERN_H
 
+#include "e_intern.h"
+#include "e_comp_object.h"
+#include "e_object.h"
+
 #include <wayland-server.h>
 
 //#ifdef REFACTOR_DESK_AREA
index f99591a..ed5e07b 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_client_intern.h"
 #include "e_utils_intern.h"
 #include "e_scale_intern.h"
 #include "e_hwc_window_intern.h"
 #include "e_hwc_windows_intern.h"
 #include "e_egl_sync_intern.h"
+#include "e_config_intern.h"
+#include "e_dbus_conn_intern.h"
+#include "e_main_intern.h"
+#include "e_hwc_planes_intern.h"
 
 #include "Eeze.h"
 #include <tizen-extension-server-protocol.h>
index 632dbc4..62f3987 100644 (file)
@@ -1,6 +1,10 @@
 #ifndef E_COMP_SCREEN_INTER_H
 #define E_COMP_SCREEN_INTER_H
 
+#include "e_intern.h"
+#include "e_comp_screen.h"
+
+#include <Eldbus.h>
 #include <tdm.h>
 
 typedef struct _E_Screen        E_Screen;
index 0ce5c74..17f0e95 100644 (file)
@@ -1,4 +1,4 @@
-#include "e.h"
+
 #include "e_comp_wl_intern.h"
 #include "e_foreign_intern.h"
 #include "e_wtz_shell_intern.h"
@@ -35,6 +35,7 @@
 #include "e_comp_object_intern.h"
 #include "e_desk_intern.h"
 #include "e_zone_intern.h"
+#include "e_hints_intern.h"
 
 #include <tizen-extension-server-protocol.h>
 #include <relative-pointer-unstable-v1-server-protocol.h>
@@ -46,6 +47,9 @@
 #include <libds/single_pixel_buffer_v1.h>
 #include <Evas_GL.h>
 
+ #include <ctype.h>
+ #include <sys/resource.h>
+
 /* handle include for printing uint64_t */
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
index 7f3d3ca..1ba0c4a 100644 (file)
@@ -1,10 +1,12 @@
-#include "e.h"
+
 #include "e_comp_wl_buffer_intern.h"
 #include "e_tbm_gbm_server_intern.h"
 #include "e_explicit_sync_intern.h"
 
 #include <libds/single_pixel_buffer_v1.h>
 
+#include <wayland-tbm-server.h>
+
 typedef struct _E_Buffer E_Buffer;
 
 struct _E_Buffer
index 027da2c..9d07f0d 100644 (file)
@@ -1,12 +1,14 @@
 #ifndef E_COMP_WL_BUFFER_INTERN_H
 #define E_COMP_WL_BUFFER_INTERN_H
 
+#include "e_intern.h"
+
 #include <libds/types/ds_buffer.h>
 #include <tbm_surface.h>
 
 EINTERN E_Comp_Wl_Buffer *e_comp_wl_buffer_get(struct ds_buffer *ds_buffer);
 EINTERN E_Comp_Wl_Buffer *e_comp_wl_buffer_create_with_tbm_surface(tbm_surface_h tbm_surface);
-EINTERN void e_comp_wl_buffer_destroy(E_Comp_Wl_Buffer *comp_buffer);
-EINTERN void *e_comp_wl_buffer_single_pixel_buffer_data_get(E_Comp_Wl_Buffer *buffer);
+EINTERN void              e_comp_wl_buffer_destroy(E_Comp_Wl_Buffer *comp_buffer);
+EINTERN void             *e_comp_wl_buffer_single_pixel_buffer_data_get(E_Comp_Wl_Buffer *buffer);
 
 #endif
index 9628455..1419c58 100644 (file)
@@ -1,8 +1,11 @@
-#include "e.h"
 #include "e_comp_wl_capture_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_tbm_intern.h"
 #include "e_util_video_intern.h"
+#include "e_client_video_intern.h"
+#include "e_config_intern.h"
+
+#include <Ecore_File.h>
 
 #include <tbm_surface.h>
 #include <tbm_surface_internal.h>
index 7ad26e9..8049e6b 100644 (file)
@@ -1,7 +1,10 @@
 # ifndef E_COMP_WL_CAPTURE_INTERN_H
 # define E_COMP_WL_CAPTURE_INTERN_H
 
-EINTERN void                 e_comp_wl_capture_init(void);
-EINTERN void                 e_comp_wl_capture_shutdown(void);
+#include "e_intern.h"
+#include "e_comp_wl_capture.h"
+
+EINTERN void e_comp_wl_capture_init(void);
+EINTERN void e_comp_wl_capture_shutdown(void);
 
 #endif
index b64532a..4f95263 100644 (file)
@@ -1,11 +1,14 @@
-#define EXECUTIVE_MODE_ENABLED
-#include "e.h"
 #include "e_comp_wl_data_intern.h"
 #include "e_comp_wl_input_intern.h"
 #include "e_comp_canvas_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_dnd_intern.h"
 
+#include <fcntl.h>
+#include <unistd.h>
+
+#define EXECUTIVE_MODE_ENABLED
+
 typedef struct {
    int src_fd;
    int dst_fd;
@@ -385,7 +388,7 @@ _e_comp_wl_data_offer_cb_source_destroy(struct wl_listener *listener, void *data
    E_Comp_Wl_Data_Offer *offer;
 
    DBG("Data Offer Source Destroy");
-   offer = container_of(listener, E_Comp_Wl_Data_Offer, 
+   offer = container_of(listener, E_Comp_Wl_Data_Offer,
                         source_destroy_listener);
    if (!offer) return;
 
@@ -635,7 +638,7 @@ _e_comp_wl_data_device_data_offer_create(E_Comp_Wl_Data_Source *source, struct w
    offer = E_NEW(E_Comp_Wl_Data_Offer, 1);
    if (!offer) return NULL;
 
-   offer->resource = 
+   offer->resource =
        wl_resource_create(wl_resource_get_client(data_device_res),
                           &wl_data_offer_interface, 3, 0);
    if (!offer->resource)
@@ -644,11 +647,11 @@ _e_comp_wl_data_device_data_offer_create(E_Comp_Wl_Data_Source *source, struct w
         return NULL;
      }
 
-   wl_resource_set_implementation(offer->resource, 
-                                  &_e_data_offer_interface, offer, 
+   wl_resource_set_implementation(offer->resource,
+                                  &_e_data_offer_interface, offer,
                                   _e_comp_wl_data_offer_cb_resource_destroy);
    offer->source = source;
-   offer->source_destroy_listener.notify = 
+   offer->source_destroy_listener.notify =
      _e_comp_wl_data_offer_cb_source_destroy;
    wl_signal_add(&source->destroy_signal, &offer->source_destroy_listener);
 
@@ -840,9 +843,9 @@ _e_comp_wl_data_device_selection_set(void *data EINA_UNUSED, E_Comp_Wl_Data_Sour
 
    if (source)
      {
-        e_comp_wl->selection.data_source_listener.notify = 
+        e_comp_wl->selection.data_source_listener.notify =
           _e_comp_wl_data_device_destroy_selection_data_source;
-        wl_signal_add(&source->destroy_signal, 
+        wl_signal_add(&source->destroy_signal,
                       &e_comp_wl->selection.data_source_listener);
      }
 }
@@ -1001,7 +1004,7 @@ _e_comp_wl_data_device_cb_selection_set(struct wl_client *client EINA_UNUSED, st
    _e_comp_wl_data_device_selection_set(e_comp->wl_comp_data, source, serial);
 }
 
-static void 
+static void
 _e_comp_wl_data_device_cb_release(struct wl_client *client EINA_UNUSED, struct wl_resource *resource)
 {
    DBG("Data Device Release");
@@ -1025,7 +1028,7 @@ _e_comp_wl_data_device_cb_unbind(struct wl_resource *resource)
    eina_hash_del_by_key(e_comp_wl->mgr.data_resources, &wc);
 }
 
-static void 
+static void
 _e_comp_wl_data_manager_cb_device_get(struct wl_client *client, struct wl_resource *manager_resource, uint32_t id, struct wl_resource *seat_resource EINA_UNUSED)
 {
    struct wl_resource *res;
@@ -1043,17 +1046,17 @@ _e_comp_wl_data_manager_cb_device_get(struct wl_client *client, struct wl_resour
      }
 
    eina_hash_add(e_comp_wl->mgr.data_resources, &client, res);
-   wl_resource_set_implementation(res, &_e_data_device_interface, e_comp->wl_comp_data, 
+   wl_resource_set_implementation(res, &_e_data_device_interface, e_comp->wl_comp_data,
                                   _e_comp_wl_data_device_cb_unbind);
 }
 
-static const struct wl_data_device_manager_interface _e_manager_interface = 
+static const struct wl_data_device_manager_interface _e_manager_interface =
 {
    (void*)e_comp_wl_data_manager_source_create,
    _e_comp_wl_data_manager_cb_device_get
 };
 
-static void 
+static void
 _e_comp_wl_data_cb_bind_manager(struct wl_client *client, void *data EINA_UNUSED, uint32_t version EINA_UNUSED, uint32_t id)
 {
    struct wl_resource *res;
@@ -1431,7 +1434,7 @@ e_comp_wl_data_manager_init(void)
    return EINA_TRUE;
 }
 
-EINTERN void 
+EINTERN void
 e_comp_wl_data_manager_shutdown(void)
 {
    /* destroy the global manager resource */
index 4a56d4c..93f626b 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_COMP_WL_DATA_INTERN_H
 #define E_COMP_WL_DATA_INTERN_H
 
+#include "e_intern.h"
+
 #  ifdef PIPE_BUF
 #   define CLIPBOARD_CHUNK PIPE_BUF
 #  else
@@ -88,22 +90,28 @@ struct _E_Comp_Wl_Manual_Data_Offer
     size_t offset;
 };
 
-EINTERN void e_comp_wl_data_device_send_enter(E_Client *ec);
-EINTERN void e_comp_wl_data_device_send_leave(E_Client *ec);
-EINTERN void *e_comp_wl_data_device_send_offer(E_Client *ec);
-EINTERN void e_comp_wl_data_device_keyboard_focus_set(void);
 EINTERN Eina_Bool e_comp_wl_data_manager_init(void);
-EINTERN void e_comp_wl_data_manager_shutdown(void);
-EINTERN struct wl_resource *e_comp_wl_data_find_for_client(struct wl_client *client);
+EINTERN void      e_comp_wl_data_manager_shutdown(void);
+
+EINTERN void  e_comp_wl_data_device_send_enter(E_Client *ec);
+EINTERN void  e_comp_wl_data_device_send_leave(E_Client *ec);
+EINTERN void *e_comp_wl_data_device_send_offer(E_Client *ec);
+
+EINTERN struct wl_resource    *e_comp_wl_data_find_for_client(struct wl_client *client);
 EINTERN E_Comp_Wl_Data_Source *e_comp_wl_data_manager_source_create(struct wl_client *client, struct wl_resource *resource, uint32_t id);
-EINTERN int e_comp_wl_clipboard_source_ref(E_Comp_Wl_Clipboard_Source *source);
-EINTERN int e_comp_wl_clipboard_source_unref(E_Comp_Wl_Clipboard_Source *source);
+EINTERN void                   e_comp_wl_data_offer_mimetype_action_accept(E_Comp_Wl_Data_Offer *offer);
+
 EINTERN E_Comp_Wl_Clipboard_Source *e_comp_wl_clipboard_source_create(const char *mime_type, uint32_t serial, int *fd);
-EINTERN void e_comp_wl_data_device_only_set(struct wl_resource *data_device_res, Eina_Bool set);
+EINTERN int                         e_comp_wl_clipboard_source_ref(E_Comp_Wl_Clipboard_Source *source);
+EINTERN int                         e_comp_wl_clipboard_source_unref(E_Comp_Wl_Clipboard_Source *source);
+
+EINTERN void      e_comp_wl_data_device_only_set(struct wl_resource *data_device_res, Eina_Bool set);
 EINTERN Eina_Bool e_comp_wl_data_device_manual_selection_set(void *data, size_t size, Eina_List *mime_list);
+EINTERN void      e_comp_wl_data_device_keyboard_focus_set(void);
+
 EINTERN void e_comp_wl_data_current_device_id_set(int id);
-EINTERN int e_comp_wl_data_current_device_id_get(void);
-EINTERN void e_comp_wl_data_offer_mimetype_action_accept(E_Comp_Wl_Data_Offer *offer);
+EINTERN int  e_comp_wl_data_current_device_id_get(void);
+
 EINTERN void e_comp_wl_data_secondary_add(E_Client *ec);
 EINTERN void e_comp_wl_data_secondary_remove(E_Client *ec);
 
index 0a1a9f5..352c0a6 100644 (file)
@@ -1,5 +1,3 @@
-#define EXECUTIVE_MODE_ENABLED
-#include "e.h"
 #include "e_comp_wl_input_intern.h"
 #include "e_utils_intern.h"
 #include "e_comp_wl_intern.h"
@@ -8,11 +6,14 @@
 #include "e_comp_object_intern.h"
 
 #include <sys/mman.h>
+#include <fcntl.h>
 #include <pixman.h>
 
 #include <relative-pointer-unstable-v1-server-protocol.h>
 #include <pointer-constraints-unstable-v1-server-protocol.h>
 
+#define EXECUTIVE_MODE_ENABLED
+
 typedef struct _E_Comp_Wl_Pointer_Constraint E_Comp_Wl_Pointer_Constraint;
 
 typedef enum _E_Comp_Wl_Pointer_Constraint_Type
index ccdbaaa..8f362f7 100644 (file)
@@ -1,31 +1,34 @@
 #ifndef E_COMP_WL_INPUT_INTERN_H
 #define E_COMP_WL_INPUT_INTERN_H
 
+#include "e_intern.h"
+#include "e_comp_wl_input.h"
+
 EINTERN Eina_Bool e_comp_wl_input_init(void);
-EINTERN void e_comp_wl_input_shutdown(void);
-EINTERN Eina_Bool e_comp_wl_input_pointer_check(struct wl_resource *res);
-EINTERN Eina_Bool e_comp_wl_input_relative_pointer_check(struct wl_resource *res);
-EINTERN Eina_Bool e_comp_wl_input_keyboard_check(struct wl_resource *res);
-EINTERN Eina_Bool e_comp_wl_input_touch_check(struct wl_resource *res);
+EINTERN void      e_comp_wl_input_shutdown(void);
 
-EINTERN Eina_Bool e_comp_wl_input_keyboard_modifiers_serialize(void);
-EINTERN void e_comp_wl_input_keyboard_modifiers_update(void);
-EINTERN void e_comp_wl_input_keyboard_state_update(uint32_t keycode, Eina_Bool pressed);
-EINTERN void e_comp_wl_input_keyboard_enter_send(E_Client *client);
+EINTERN void      e_comp_wl_input_seat_caps_set(unsigned int caps);
+EINTERN Eina_Bool e_comp_wl_input_relative_pointer_check(struct wl_resource *res);
 
+EINTERN Eina_Bool e_comp_wl_input_pointer_check(struct wl_resource *res);
 EINTERN void e_comp_wl_input_pointer_enabled_set(Eina_Bool enabled);
-EINTERN void e_comp_wl_input_keyboard_enabled_set(Eina_Bool enabled);
-EINTERN void e_comp_wl_input_touch_enabled_set(Eina_Bool enabled);
-EINTERN void e_comp_wl_input_seat_caps_set(unsigned int caps);
 
-EINTERN struct xkb_keymap *e_comp_wl_input_keymap_compile(struct xkb_context *ctx, struct xkb_rule_names names, char **keymap_path);
+EINTERN Eina_Bool e_comp_wl_input_touch_check(struct wl_resource *res);
+EINTERN void      e_comp_wl_input_touch_enabled_set(Eina_Bool enabled);
 
-EINTERN const char *e_comp_wl_input_keymap_default_rules_get(void);
-EINTERN const char *e_comp_wl_input_keymap_default_model_get(void);
-EINTERN const char *e_comp_wl_input_keymap_default_layout_get(void);
-EINTERN const char *e_comp_wl_input_keymap_default_variant_get(void);
-EINTERN const char *e_comp_wl_input_keymap_default_options_get(void);
+EINTERN Eina_Bool e_comp_wl_input_keyboard_check(struct wl_resource *res);
+EINTERN Eina_Bool e_comp_wl_input_keyboard_modifiers_serialize(void);
+EINTERN void      e_comp_wl_input_keyboard_modifiers_update(void);
+EINTERN void      e_comp_wl_input_keyboard_state_update(uint32_t keycode, Eina_Bool pressed);
+EINTERN void      e_comp_wl_input_keyboard_enter_send(E_Client *client);
+EINTERN void      e_comp_wl_input_keyboard_enabled_set(Eina_Bool enabled);
 
-EINTERN char *e_comp_wl_input_keymap_keycode_to_keyname(int keycode);
+EINTERN struct xkb_keymap *e_comp_wl_input_keymap_compile(struct xkb_context *ctx, struct xkb_rule_names names, char **keymap_path);
+EINTERN const char        *e_comp_wl_input_keymap_default_rules_get(void);
+EINTERN const char        *e_comp_wl_input_keymap_default_model_get(void);
+EINTERN const char        *e_comp_wl_input_keymap_default_layout_get(void);
+EINTERN const char        *e_comp_wl_input_keymap_default_variant_get(void);
+EINTERN const char        *e_comp_wl_input_keymap_default_options_get(void);
+EINTERN char              *e_comp_wl_input_keymap_keycode_to_keyname(int keycode);
 
 #endif
index c8e38b5..97e94bd 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_COMP_WL_INTERN_H
 #define E_COMP_WL_INTERN_H
 
+#include "e_intern.h"
+#include "e_comp_wl.h"
+#include "e_policy_wl.h"
 #include "e_device_intern.h"
 
 EINTERN Eina_Bool e_comp_wl_init(void);
index f769851..cf23d5d 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_comp_wl_renderer_intern.h"
 
 #include <tizen-extension-server-protocol.h>
index 4f70f7f..59e4e1b 100644 (file)
@@ -1,8 +1,11 @@
 #ifndef E_COMP_WL_RENDERER_INTERN_H
 #define E_COMP_WL_RENDERER_INTERN_H
 
+#include "e_intern.h"
+
 EINTERN Eina_Bool e_comp_wl_renderer_init(void);
 EINTERN void      e_comp_wl_renderer_shutdown(void);
+
 EINTERN Eina_Bool e_comp_wl_renderer_client_redraw_request_send(E_Client *ec);
 
 #endif
index 68d1a8b..afb5b27 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_comp_wl_rsm_intern.h"
 #include "e_device_intern.h"
 #include "e_client_intern.h"
@@ -10,6 +9,8 @@
 #include "e_policy_intern.h"
 #include "e_comp_object_intern.h"
 #include "e_zone_intern.h"
+#include "e_utils_intern.h"
+#include "e_security_intern.h"
 
 #include <tizen-remote-surface-server-protocol.h>
 #include <tbm_surface.h>
@@ -17,7 +18,9 @@
 #include <wayland-tbm-server.h>
 #include <tizen-extension-server-protocol.h>
 
+#include <fcntl.h>
 #include <pixman.h>
+#include <Ecore_File.h>
 
 #define RSMINF(f, ec, str, obj, x...)    \
    do                                    \
index 56ca17b..31b6035 100644 (file)
@@ -1,8 +1,14 @@
 #ifndef E_COMP_WL_RSM_INTERN_H
 #define E_COMP_WL_RSM_INTERN_H
 
+#include "e_intern.h"
+#include "e_comp_wl_rsm.h"
+
+#include <Eldbus.h>
+
 EINTERN void       e_comp_wl_remote_surface_init(void);
 EINTERN void       e_comp_wl_remote_surface_shutdown(void);
+
 EINTERN Eina_Bool  e_comp_wl_remote_surface_commit(E_Client *ec);
 EINTERN void       e_comp_wl_remote_surface_image_save(E_Client *ec);
 EINTERN void       e_comp_wl_remote_surface_image_save_cancel(E_Client *ec);
index 0ebf310..3b800c5 100644 (file)
@@ -1,13 +1,9 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "e.h"
 #include "e_comp_wl_screenshooter_intern.h"
 #include "e_privilege_intern.h"
 #include "e_output_intern.h"
 #include "e_comp_wl_video_buffer_intern.h"
 #include "e_util_video_intern.h"
+#include "e_security_intern.h"
 
 #include <wayland-server.h>
 #include <screenshooter-server-protocol.h>
index aff47d2..5bbed81 100644 (file)
@@ -1,7 +1,9 @@
 #ifndef E_COMP_WL_SCREENSHOOTER_INTERN_H
 #define E_COMP_WL_SCREENSHOOTER_INTERN_H
 
-EINTERN int e_comp_wl_screenshooter_init(void);
+#include "e_intern.h"
+
+EINTERN int  e_comp_wl_screenshooter_init(void);
 EINTERN void e_comp_wl_screenshooter_shutdown(void);
 
 #endif
index 23a2fd8..22a16d4 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_client_intern.h"
 #include "e_actions_intern.h"
 #include "e_bindings_intern.h"
@@ -11,6 +10,7 @@
 #include "e_policy_visibility_intern.h"
 #include "e_comp_object_intern.h"
 #include "e_desk_intern.h"
+#include "e_config_intern.h"
 
 #include <xdg-shell-unstable-v5-server-protocol.h>
 #include <xdg-shell-unstable-v6-server-protocol.h>
index ec6a779..55fd572 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_comp_wl_subsurface_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_viewport_intern.h"
index 9f8cb90..07af4ef 100644 (file)
@@ -1,21 +1,23 @@
 #ifndef _E_COMP_WL_SUBSURFACE_H_
 #define _E_COMP_WL_SUBSURFACE_H_
 
+#include "e_intern.h"
+
 #ifndef WL_HIDE_DEPRECATED
 # define WL_HIDE_DEPRECATED
 #endif
 
 #include <wayland-server.h>
 
+EINTERN Eina_Bool     e_comp_wl_subsurfaces_init(void);
+EINTERN void          e_comp_wl_subsurfaces_shutdown(void);
+
 /* To support tizen_policy interface related to wl_subsurface.
  * tizen_policy.place_subsurface_below_parent
  * tizen_policy.set_subsurface_stand_alone */
 EINTERN void          e_comp_wl_subsurface_resource_stand_alone_mode_set(struct wl_resource *subsurface_resource);
 EINTERN void          e_comp_wl_subsurface_resource_place_below_parent(struct wl_resource *subsurface_resource);
 
-EINTERN Eina_Bool     e_comp_wl_subsurfaces_init(void);
-EINTERN void          e_comp_wl_subsurfaces_shutdown(void);
-
 EINTERN Eina_Bool     e_comp_wl_subsurface_add(struct wl_resource *resource, uint32_t id, struct wl_resource *surface_resource, struct wl_resource *parent_resource);
 EINTERN Eina_Bool     e_comp_wl_subsurface_order_commit(E_Client *ec);
 EINTERN Eina_Bool     e_comp_wl_subsurface_commit(E_Client *ec);
index 2e38b82..4dbe698 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_comp_wl_tbm_intern.h"
 #include "e_tbm_gbm_server_intern.h"
 #include "e_utils_intern.h"
index 7f7de23..c9ece7e 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_COMP_WL_TBM_INTERN_H
 #define E_COMP_WL_TBM_INTERN_H
 
+#include "e_intern.h"
+#include "e_comp_wl_tbm.h"
+
 EINTERN Eina_Bool e_comp_wl_tbm_init(void);
 
 EINTERN struct wl_resource *e_comp_wl_tbm_remote_buffer_get(struct wl_resource *wl_tbm, struct wl_resource *wl_buffer);
index b317cd2..f45652e 100644 (file)
@@ -1,8 +1,8 @@
-#include "e.h"
 #include "e_comp_wl_tizen_hwc_intern.h"
 #include "e_utils_intern.h"
 #include "e_error_intern.h"
 #include "e_hwc_window_intern.h"
+#include "e_hwc_window_queue_intern.h"
 
 #include <tizen-hwc-server-protocol.h>
 
index 56a3908..017bfa9 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_COMP_WL_TIZEN_HWC_H
 #define E_COMP_WL_TIZEN_HWC_H
 
+#include "e_intern.h"
+
 typedef struct _E_Comp_Wl_Tizen_Hwc_Feedback_List E_Comp_Wl_Tizen_Hwc_Feedback_List;
 
 struct _E_Comp_Wl_Tizen_Hwc_Feedback_List
@@ -10,6 +12,7 @@ struct _E_Comp_Wl_Tizen_Hwc_Feedback_List
 
 EINTERN Eina_Bool e_comp_wl_tizen_hwc_init(void);
 EINTERN void      e_comp_wl_tizen_hwc_shutdown(void);
+
 EINTERN void      e_comp_wl_tizen_hwc_committed(void);
 EINTERN void      e_comp_wl_tizen_hwc_discarded(void);
 
index d657d41..4e61966 100644 (file)
@@ -1,13 +1,11 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "e.h"
 #include "e_compositor_intern.h"
 #include "e_comp_wl_viewport_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_subsurface_intern.h"
 #include "e_comp_wl_video_buffer_intern.h"
+#include "e_comp_canvas_intern.h"
+#include "e_info_server_input_intern.h"
+#include "e_info_server_intern.h"
 
 #include <wayland-server.h>
 #include <wayland-tbm-server.h>
index 23ce719..8cd6fa4 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_COMP_WL_VIEWPORT_INTERN_H
 #define E_COMP_WL_VIEWPORT_INTERN_H
 
+#include "e_intern.h"
+#include "e_comp_wl_viewport.h"
+
 EINTERN int e_comp_wl_viewport_init(void);
 EINTERN void e_comp_wl_viewport_shutdown(void);
 
index 5735787..5c43227 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_compositor_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_buffer_intern.h"
index 15ca29d..786ea2f 100644 (file)
@@ -1,6 +1,11 @@
 #ifndef E_COMPOSITOR_INTERN_H
 #define E_COMPOSITOR_INTERN_H
 
+#include "e_intern.h"
+#include "e_client_intern.h"
+
+#include <wayland-server.h>
+
 typedef struct _E_Surface E_Surface;
 typedef struct _E_Subsurface E_Subsurface;
 
index e6608d3..f720a24 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_config_intern.h"
 #include "e_user_intern.h"
 #include "e_utils_intern.h"
index 8dd9033..591efc7 100644 (file)
@@ -1,4 +1,4 @@
-#include "e.h"
+#include "e_config_intern.h"
 
 static Eina_Hash *config_hash = NULL;
 
index af5193a..b29afb4 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_CONFIG_INTERN_H
 #define E_CONFIG_INTERN_H
 
+#include "e_intern.h"
+#include "e_config.h"
+
 EINTERN int         e_config_init(void);
 EINTERN int         e_config_shutdown(void);
 
index 151b1d0..98f4aa1 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_dbus_conn_intern.h"
 #include "e_utils_intern.h"
 
index e49c9ea..372521d 100644 (file)
@@ -1,5 +1,8 @@
-#ifndef E_DBUS_CONN_H
-#define E_DBUS_CONN_H
+#ifndef E_DBUS_CONN_INTERN_H
+#define E_DBUS_CONN_INTERN_H
+
+#include "e_intern.h"
+#include "e_dbus_conn.h"
 
 EINTERN Eldbus_Connection *e_dbus_conn_connection_get(void);
 EINTERN Eina_Bool          e_dbus_conn_sync_init(E_DBus_Conn *ed);
index c681a10..b58d8e6 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_desk_intern.h"
 #include "e_desk_area_intern.h"
 #include "e_client_intern.h"
@@ -8,6 +7,9 @@
 #include "e_output_intern.h"
 #include "e_comp_object_intern.h"
 #include "e_zone_intern.h"
+#include "e_config_intern.h"
+#include "e_policy_wl_intern.h"
+#include "e_policy_intern.h"
 
 #include <libds-tizen/screen.h>
 
index 1d68aad..e97b5a0 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_desk_area_intern.h"
 #include "e_client_intern.h"
 #ifdef REFACTOR_DESK_AREA
@@ -2820,7 +2819,7 @@ e_desk_area_ec_rearrange(E_Desk_Area *eda, E_Client *ec)
 
    prev_edgc_layer = e_client_desk_area_client_layer_get(ec);
    if (!_check_desk_area_client_layer_validation(prev_edgc_layer)) return;
-   
+
    eda->ec_lists[prev_edgc_layer] = eina_list_remove(eda->ec_lists[prev_edgc_layer], ec);
 
    layer = e_client_desk_area_original_layer_get(ec);
index f52bc65..eccfcfb 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_DESK_AREA_INTERN_H
 #define E_DESK_AREA_INTERN_H
 
+#include "e_intern.h"
+#include "e_desk_area.h"
+
 #include <wayland-server.h>
 #include <libds-tizen/screen.h>
 
index a8d4e30..ae65928 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_DESK_INTERN_H
 #define E_DESK_INTERN_H
 
+#include "e_intern.h"
+#include "e_desk.h"
+
 #include <wayland-server.h>
 #include <libds-tizen/screen.h>
 
index 87338db..7e40d38 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_device_intern.h"
 
 typedef struct {
index 4bec527..96311b0 100644 (file)
@@ -1,6 +1,7 @@
 #ifndef E_DEVICE_INTERN_H
 #define E_DEVICE_INTERN_H
 
+#include "e_intern.h"
 #include "e_device.h"
 
 EINTERN E_Device             *e_device_new(void);
index 20229bd..0c48339 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_devicemgr_intern.h"
 
 #include <tizen-extension-server-protocol.h>
index 89ecb92..d0e7276 100644 (file)
@@ -1,4 +1,4 @@
-#include "e.h"
+
 #include "e_devicemgr_intern.h"
 #include "e_input_intern.h"
 
index db60a69..0525c29 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_devicemgr_intern.h"
 
 #define E_DEVICEMGR_INPUT_DFLT_BACK_KEYCODE 166
index 878e061..fad3e48 100644 (file)
@@ -1,7 +1,10 @@
-#include "e.h"
+
 #include "e_devicemgr_intern.h"
+#include "e_keyrouter_intern.h"
+#include "e_input_intern.h"
 #include "e_input_event.h"
 #include "e_comp_wl_intern.h"
+#include "e_utils_intern.h"
 
 #include <tizen-extension-server-protocol.h>
 
index e80027f..a8252ed 100644 (file)
@@ -1,12 +1,16 @@
-#include "e.h"
 #include "e_devicemgr_intern.h"
+#include "e_keyrouter_intern.h"
 #include "e_input_intern.h"
+#include "e_comp_wl_input_intern.h"
+#include "e_utils_intern.h"
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include <glib.h>
 #include <linux/uinput.h>
 #include <tizen-extension-server-protocol.h>
 
-
 static Ecore_Device_Class
 _e_devicemgr_inputgen_class_to_ecore_device_class(unsigned int clas)
 {
index 8f5c615..71032ba 100644 (file)
@@ -1,6 +1,10 @@
 #ifndef E_DEVICEMGR_INTERN_H
 #define E_DEVICEMGR_INTERN_H
 
+#include "e_intern.h"
+#include "e_devicemgr.h"
+#include "e_config_intern.h"
+
 #ifdef ENABLE_TTRACE
 #include <ttrace.h>
 #endif
index 4dc6ad2..76ec5d4 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_devicemgr_intern.h"
 #include "e_input_intern.h"
 #include "e_comp_wl_intern.h"
index 641b76c..a3687d9 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_devicemgr_intern.h"
 #include "e_input_intern.h"
 #include "e_comp_wl_intern.h"
index 0432376..9160380 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_dnd_intern.h"
 #include "e_comp_wl_data_intern.h"
 #include "e_grabinput_intern.h"
index 9c17ac2..89f0589 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_DND_INTERN_H
 #define E_DND_INTERN_H
 
+#include "e_intern.h"
+#include "e_dnd.h"
+
 #define E_DRAG_TYPE 0xE0b0100f
 
 typedef struct _E_Drag_Hook     E_Drag_Hook;
index a87d2ba..347aa97 100644 (file)
@@ -1,10 +1,6 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "e.h"
 #include "e_dpms_intern.h"
 #include "e_output_intern.h"
+#include "e_dbus_conn_intern.h"
 
 #include <tizen-dpms-server-protocol.h>
 
index 06f1b7d..eed9b92 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_DPMS_INTERN_H
 #define E_DPMS_INTERN_H
 
+#include "e_intern.h"
+
 EINTERN int e_dpms_init(void);
 EINTERN int e_dpms_shutdown(void);
 
index e141c68..5736718 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_egl_sync_intern.h"
 #include "e_comp_intern.h"
 
index 5b235dc..ae7bc07 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_EGL_SYNC_INTERN_H
 #define E_EGL_SYNC_INTERN_H
 
+#include "e_intern.h"
+#include "e_egl_sync.h"
+
 EINTERN Eina_Bool    e_egl_sync_init(void);
 EINTERN void         e_egl_sync_deinit(void);
 
index 2eb976b..5a5f586 100644 (file)
@@ -1,6 +1,6 @@
-#include "e.h"
 #include "e_env_intern.h"
 #include "e_utils_intern.h"
+#include "e_config_intern.h"
 
 /* local subsystem functions */
 
index 4239729..490ac8a 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_ENV_INTERN_H
 #define E_ENV_INTERN_H
 
+#include "e_intern.h"
+
 /* init and setup */
 EINTERN int  e_env_init(void);
 EINTERN int  e_env_shutdown(void);
index 609b58e..a1f65e8 100644 (file)
@@ -1,8 +1,4 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "e.h"
+#include "e_eom_intern.h"
 #include "e_client_intern.h"
 #include "e_xdg_shell_v6_intern.h"
 #include "e_comp_screen_intern.h"
diff --git a/src/bin/e_eom_intern.h b/src/bin/e_eom_intern.h
new file mode 100644 (file)
index 0000000..9791b85
--- /dev/null
@@ -0,0 +1,10 @@
+#ifndef E_EOM_INTERN_H
+#define E_EOM_INTERN_H
+
+#include "e_intern.h"
+#include "e_eom.h"
+
+EINTERN Eina_Bool e_eom_init(void);
+EINTERN int       e_eom_shutdown(void);
+
+#endif
index edbee20..d034d70 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_error_intern.h"
 
 /* local subsystem functions */
index f1c12fe..d74618b 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_ERROR_INTERN_H
 #define E_ERROR_INTERN_H
 
+#include "e_intern.h"
+
 #define e_error_message_show(args...) do \
 { \
    char __tmpbuf[4096]; \
index c0d1112..2fe0f5f 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_explicit_sync_intern.h"
 #include "e_comp_screen_intern.h"
 #include "e_comp_intern.h"
index b0e39d3..efdebc6 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_EXPLICIT_SYNC_INTERN_H
 #define E_EXPLICIT_SYNC_INTERN_H
 
+#include "e_intern.h"
+#include "e_explicit_sync.h"
+
 typedef struct _E_Explicit_Sync E_Explicit_Sync;
 typedef struct _E_Explicit_Sync_Surface E_Explicit_Sync_Surface;
 typedef struct _E_Explicit_Sync_Buffer_Release E_Explicit_Sync_Buffer_Release;
index 46eeef8..8de9bd4 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_focus_intern.h"
 #include "e_focus_policy_iface.h"
 
index d415409..648a740 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_FOCUS_INTERN_H
 #define E_FOCUS_INTERN_H
 
+#include "e_intern.h"
+
 typedef struct _E_Focus E_Focus;
 
 EINTERN E_Focus   *e_focus_new(E_Zone* zone, E_Focus_Policy_Ext policy_type);
index 2e18bf9..0629e5a 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_focus_policy_iface.h"
 #include "e_zone_intern.h"
 #include "e_client_intern.h"
@@ -6,6 +5,7 @@
 #include "e_comp_intern.h"
 #include "e_policy_visibility_intern.h"
 #include "e_desk_intern.h"
+#include "e_config_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;
index 48fb00f..1508c01 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_focus_policy_iface.h"
 
 EINTERN void
index e6cccdc..ed27b8d 100644 (file)
@@ -1,8 +1,8 @@
-#ifdef E_TYPEDEFS
-#else
 #ifndef E_FOCUS_POLICY_IFACE_H
 #define E_FOCUS_POLICY_IFACE_H
 
+#include "e_intern.h"
+
 typedef struct _E_Focus_Policy_Iface E_Focus_Policy_Iface;
 typedef void                         E_Focus_Policy_Impl;
 
@@ -22,4 +22,3 @@ EINTERN E_Focus_Policy_Iface *e_focus_policy_iface_history_new(E_Zone* zone);
 EINTERN void            e_focus_policy_iface_del(E_Focus_Policy_Iface *policy_iface);
 
 #endif
-#endif
index be02db3..f90ebf5 100644 (file)
@@ -1,8 +1,8 @@
-#include "e.h"
 #include "e_focus_policy_iface.h"
 #include "e_zone_intern.h"
 #include "e_client_intern.h"
 #include "e_desk_intern.h"
+#include "e_config_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;
index 965a887..a04dda1 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_foreign_intern.h"
 
 #include <uuid.h>
index 7b3f7c7..005bf79 100644 (file)
@@ -1,11 +1,7 @@
 #ifndef E_FOREIGN_INTERN_H
 #define E_FOREIGN_INTERN_H
 
-#if 0
-#include "e.h"
-#include <wayland-server.h>
-#include <Eina.h>
-#endif
+#include "e_intern.h"
 
 #ifdef FERR
 # undef FERR
index 3312567..a3d6190 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_foreign_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_subsurface_intern.h"
index a8d4871..44d325e 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_gesture_intern.h"
 
 E_API E_Gesture_Info *e_gesture = NULL;
index 082d7fa..8e9a02b 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_GESTURE_INTERN_H
 #define E_GESTURE_INTERN_H
 
+#include "e_intern.h"
+#include "e_gesture.h"
+
 EINTERN void e_gesture_init(void);
 EINTERN int  e_gesture_shutdown(void);
 
index b4db144..0a02a80 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_grabinput_intern.h"
 
 /* local subsystem functions */
index 3134473..ebfecdc 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_GRABINPUT_INTERN_H
 #define E_GRABINPUT_INTERN_H
 
+#include "e_intern.h"
+
 typedef enum _E_Focus_Method
 {
    E_FOCUS_METHOD_NO_INPUT,
index e537190..3d6bb16 100644 (file)
@@ -1,6 +1,6 @@
-#include "e.h"
 #include "e_hints_intern.h"
 #include "e_scale_intern.h"
+#include "e_utils_intern.h"
 
 static Eina_List *aux_hints_supported = NULL;
 
index 0daa961..5144f0c 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_HINTS_INTERN_H
 #define E_HINTS_INTERN_H
 
+#include "e_intern.h"
+#include "e_hints.h"
+
 EINTERN void             e_hints_scale_update(void);
 EINTERN const Eina_List *e_hints_aux_hint_supported_get(void);
 EINTERN Eina_Bool        e_hints_aux_hint_change(E_Client *ec, int32_t id, const char *val);
index efaf658..575377a 100644 (file)
@@ -1,11 +1,12 @@
-#include "e.h"
 #include "e_hwc_window_intern.h"
 #include "e_hwc_windows_intern.h"
+#include "e_hwc_planes_intern.h"
 #include "e_hwc_intern.h"
 #include "e_utils_intern.h"
 #include "e_comp_screen_intern.h"
 #include "e_comp_intern.h"
 #include "e_error_intern.h"
+#include "e_hwc_window_queue_intern.h"
 
 #include <Evas_GL.h>
 #include <gbm.h>
index df14bb6..0fe2558 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_HWC_INTERN_H
 #define E_HWC_INTERN_H
 
+#include "e_intern.h"
+#include "e_hwc.h"
+
 struct _E_Hwc_Hook
 {
    EINA_INLIST;
index a654f4f..2a33df2 100644 (file)
@@ -1,4 +1,4 @@
-#include "e.h"
+#include "e_hwc_planes_intern.h"
 #include "e_comp_screen_intern.h"
 #include "e_comp_intern.h"
 #include "services/e_service_quickpanel_intern.h"
@@ -7,6 +7,7 @@
 #include "e_policy_private_data.h"
 #include "e_client_intern.h"
 #include "e_comp_object_intern.h"
+#include "e_utils_intern.h"
 
 #include <wayland-tbm-server.h>
 
diff --git a/src/bin/e_hwc_planes_intern.h b/src/bin/e_hwc_planes_intern.h
new file mode 100644 (file)
index 0000000..12b4d99
--- /dev/null
@@ -0,0 +1,24 @@
+#ifndef E_HWC_PLANES_INTERN_H
+#define E_HWC_PLANES_INTERN_H
+
+#include "e_intern.h"
+
+/* used by e_hwc */
+EINTERN Eina_Bool  e_hwc_planes_init(void);
+EINTERN void       e_hwc_planes_deinit(void);
+
+EINTERN void       e_hwc_planes_end(E_Hwc *hwc, const char *location);
+EINTERN void       e_hwc_planes_client_end(E_Hwc *hwc, E_Client *ec, const char *location);
+EINTERN void       e_hwc_planes_apply(E_Hwc *hwc);
+
+EINTERN void       e_hwc_planes_multi_plane_set(E_Hwc *hwc, Eina_Bool set);
+EINTERN Eina_Bool  e_hwc_planes_multi_plane_get(E_Hwc *hwc);
+
+EINTERN Eina_Bool  e_hwc_planes_mirror_set(E_Hwc *hwc, E_Hwc *src_hwc, Eina_Rectangle *rect);
+EINTERN void       e_hwc_planes_mirror_unset(E_Hwc *hwc);
+EINTERN Eina_Bool  e_hwc_planes_presentation_update(E_Hwc *hwc, E_Client *ec);
+EINTERN Eina_Bool  e_hwc_planes_external_commit(E_Hwc *hwc);
+
+EINTERN Eina_Bool  e_hwc_planes_ecore_evas_set(E_Hwc *hwc, Ecore_Evas *ee);
+
+#endif
index aa15b23..b31638e 100644 (file)
@@ -1,7 +1,7 @@
-#include "e.h"
 #include "e_hwc_window_intern.h"
 #include "e_hwc_windows_intern.h"
 #include "e_hwc_intern.h"
+#include "e_hwc_window_queue_intern.h"
 #include "e_comp_wl_buffer_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_subsurface_intern.h"
 #include "e_client_video_intern.h"
 #include "e_client_intern.h"
 #include "e_comp_object_intern.h"
+#include "e_utils_intern.h"
 
-# include <pixman.h>
-# include <wayland-tbm-server.h>
+#include <pixman.h>
+#include <wayland-tbm-server.h>
 #include <presentation-time-server-protocol.h>
 
 #ifndef CLEAR
index 88c05ef..759c619 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_HWC_WINDOW_INTERN_H
 #define E_HWC_WINDOW_INTERN_H
 
+#include "e_intern.h"
+#include "e_hwc_window.h"
+
 #define E_HWC_WINDOW_TYPE (int)0xE0b11003
 #define E_HWC_WINDOW_ZPOS_NONE -999
 
index 9dfe552..c2da681 100644 (file)
@@ -1,4 +1,4 @@
-#include "e.h"
+#include "e_hwc_window_queue_intern.h"
 #include "e_comp_wl_buffer_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_renderer_intern.h"
similarity index 53%
rename from src/include/e_hwc_window_queue.h
rename to src/bin/e_hwc_window_queue_intern.h
index b3ec776..7425297 100644 (file)
@@ -1,12 +1,21 @@
-#ifdef E_TYPEDEFS
+#ifndef E_HWC_WINDOW_QUEUE_INTERN_H
+#define E_HWC_WINDOW_QUEUE_INTERN_H
 
+#include "e_intern.h"
+#include "e_hwc_window_intern.h"
+
+#include <Eldbus.h>
 #include <wayland-server.h>
 
-# define E_HWC_WINDOW_QUEUE_BUFFER_FLAGS 7777
+#define E_HWC_WINDOW_QUEUE_TYPE (int)0xE0b11004
+#define E_HWC_WINDOW_QUEUE_BUFFER_FLAGS 7777
 
-typedef struct _E_Hwc_Window_Queue               E_Hwc_Window_Queue;
-typedef struct _E_Hwc_Window_Queue_Buffer        E_Hwc_Window_Queue_Buffer;
-typedef struct _E_Hwc_Window_Queue_Buffer_Ref    E_Hwc_Window_Queue_Buffer_Ref;
+typedef enum _E_Hwc_Window_Queue_Type
+{
+   E_HWC_WINDOW_QUEUE_TYPE_NONE = 0,
+   E_HWC_WINDOW_QUEUE_TYPE_TBM_SURFACE_QUEUE,
+   E_HWC_WINDOW_QUEUE_TYPE_GBM_SURFACE,
+} E_Hwc_Window_Queue_Type;
 
 typedef enum _E_Hwc_Window_Queue_State
 {
@@ -19,25 +28,6 @@ typedef enum _E_Hwc_Window_Queue_State
    E_HWC_WINDOW_QUEUE_STATE_SET_INVALID,
 } E_Hwc_Window_Queue_State;
 
-typedef enum _E_Hwc_Window_Queue_Type
-{
-   E_HWC_WINDOW_QUEUE_TYPE_NONE = 0,
-   E_HWC_WINDOW_QUEUE_TYPE_TBM_SURFACE_QUEUE,
-   E_HWC_WINDOW_QUEUE_TYPE_GBM_SURFACE,
-} E_Hwc_Window_Queue_Type;
-
-struct _E_Hwc_Window_Queue_Buffer_Ref
-{
-   E_Hwc_Window_Queue_Buffer     *buffer;
-   struct wl_listener             destroy_listener;
-};
-
-#else
-#ifndef E_HWC_WINDOW_QUEUE_H
-#define E_HWC_WINDOW_QUEUE_H
-
-#define E_HWC_WINDOW_QUEUE_TYPE (int)0xE0b11004
-
 struct _E_Hwc_Window_Queue
 {
    E_Object                          e_obj_inherit;
@@ -84,32 +74,31 @@ struct _E_Hwc_Window_Queue_Buffer
    struct wl_signal               destroy_signal;
 };
 
-EINTERN Eina_Bool            e_hwc_window_queue_init(void);
-EINTERN void                 e_hwc_window_queue_deinit(void);
+EINTERN Eina_Bool e_hwc_window_queue_init(void);
+EINTERN void      e_hwc_window_queue_deinit(void);
 
-EINTERN E_Hwc_Window_Queue * e_hwc_window_queue_target_tbm_surface_queue_set(E_Hwc_Window *hwc_window, tbm_surface_queue_h tqueue);
-EINTERN E_Hwc_Window_Queue * e_hwc_window_queue_target_gbm_surface_set(E_Hwc_Window *hwc_window, void *gbm_surface, int width, int height, int format);
+EINTERN E_Hwc_Window_Queue *e_hwc_window_queue_target_tbm_surface_queue_set(E_Hwc_Window *hwc_window, tbm_surface_queue_h tqueue);
+EINTERN E_Hwc_Window_Queue *e_hwc_window_queue_target_gbm_surface_set(E_Hwc_Window *hwc_window, void *gbm_surface, int width, int height, int format);
 
-EINTERN E_Hwc_Window_Queue * e_hwc_window_queue_user_set(E_Hwc_Window *hwc_window);
-EINTERN void                 e_hwc_window_queue_user_unset(E_Hwc_Window_Queue *queue, E_Hwc_Window *hwc_window);
+EINTERN E_Hwc_Window_Queue *e_hwc_window_queue_user_set(E_Hwc_Window *hwc_window);
+EINTERN void                e_hwc_window_queue_user_unset(E_Hwc_Window_Queue *queue, E_Hwc_Window *hwc_window);
 
-EINTERN E_Hwc_Window_Queue * e_hwc_window_queue_get(tbm_surface_queue_h tqueue);
+EINTERN E_Hwc_Window_Queue *e_hwc_window_queue_get(tbm_surface_queue_h tqueue);
 
-EINTERN E_Hwc_Window_Queue_Buffer * e_hwc_window_queue_buffer_find(E_Hwc_Window_Queue *queue, tbm_surface_h tsurface);
-EINTERN Eina_Bool                   e_hwc_window_queue_buffer_can_dequeue(E_Hwc_Window_Queue *queue);
-EINTERN E_Hwc_Window_Queue_Buffer * e_hwc_window_queue_buffer_dequeue(E_Hwc_Window_Queue *queue);
-EINTERN Eina_Bool                   e_hwc_window_queue_buffer_enqueue(E_Hwc_Window_Queue *queue, E_Hwc_Window_Queue_Buffer *queue_buffer);
-EINTERN E_Hwc_Window_Queue_Buffer * e_hwc_window_queue_buffer_acquire(E_Hwc_Window_Queue *queue);
-EINTERN Eina_Bool                   e_hwc_window_queue_buffer_release(E_Hwc_Window_Queue *queue, E_Hwc_Window_Queue_Buffer *queue_buffer);
-EINTERN void                        e_hwc_window_queue_buffer_reference(E_Hwc_Window_Queue_Buffer_Ref *ref, E_Hwc_Window_Queue_Buffer *buffer);
+EINTERN E_Hwc_Window_Queue_Buffer *e_hwc_window_queue_buffer_find(E_Hwc_Window_Queue *queue, tbm_surface_h tsurface);
+EINTERN Eina_Bool                  e_hwc_window_queue_buffer_can_dequeue(E_Hwc_Window_Queue *queue);
+EINTERN E_Hwc_Window_Queue_Buffer *e_hwc_window_queue_buffer_dequeue(E_Hwc_Window_Queue *queue);
+EINTERN Eina_Bool                  e_hwc_window_queue_buffer_enqueue(E_Hwc_Window_Queue *queue, E_Hwc_Window_Queue_Buffer *queue_buffer);
+EINTERN E_Hwc_Window_Queue_Buffer *e_hwc_window_queue_buffer_acquire(E_Hwc_Window_Queue *queue);
+EINTERN Eina_Bool                  e_hwc_window_queue_buffer_release(E_Hwc_Window_Queue *queue, E_Hwc_Window_Queue_Buffer *queue_buffer);
+EINTERN void                       e_hwc_window_queue_buffer_reference(E_Hwc_Window_Queue_Buffer_Ref *ref, E_Hwc_Window_Queue_Buffer *buffer);
 
-EINTERN Eina_List *                 e_hwc_window_queue_acquirable_buffers_get(E_Hwc_Window_Queue *queue);
-EINTERN int                         e_hwc_window_queue_size_get(E_Hwc_Window_Queue *queue);
+EINTERN Eina_List *e_hwc_window_queue_acquirable_buffers_get(E_Hwc_Window_Queue *queue);
+EINTERN int        e_hwc_window_queue_size_get(E_Hwc_Window_Queue *queue);
 
 EINTERN E_Hwc_Window_Queue_Type     e_hwc_window_queue_type_get(E_Hwc_Window_Queue *queue);
 
 EINTERN void                        e_hwc_window_queue_trace_debug(Eina_Bool onoff);
 EINTERN void                        e_hwc_window_queue_debug_info_get(Eldbus_Message_Iter *iter);
 
-#endif // E_HWC_WINDOW_QUEUE_H
 #endif
index 5d6bd53..59f2f2b 100644 (file)
@@ -1,7 +1,7 @@
-#include "e.h"
 #include "e_hwc_window_intern.h"
 #include "e_hwc_windows_intern.h"
 #include "e_hwc_intern.h"
+#include "e_hwc_window_queue_intern.h"
 #include "e_comp_screen_intern.h"
 #include "e_explicit_sync_intern.h"
 #include "e_comp_wl_tbm_intern.h"
@@ -13,6 +13,7 @@
 #include "e_client_video_intern.h"
 #include "e_client_intern.h"
 #include "e_comp_object_intern.h"
+#include "e_utils_intern.h"
 
 # include <Evas_Engine_GL_Tbm.h>
 # include <Evas_Engine_Software_Tbm.h>
index 25da759..45a088b 100644 (file)
@@ -1,6 +1,11 @@
 #ifndef E_HWC_WINDOWS_INTERN_H
 #define E_HWC_WINDOWS_INTERN_H
 
+#include "e_intern.h"
+#include "e_hwc_windows.h"
+
+#include <Eldbus.h>
+
 typedef struct _E_Hwc_Windows_Commit_Data  E_Hwc_Windows_Commit_Data;
 
 typedef enum
index f7fc2ff..6a980ac 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_icon_intern.h"
 
 //#define USE_ICON_CACHE
index d2bc87d..46a5330 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_ICON_INTERN_H
 #define E_ICON_INTERN_H
 
+#include "e_intern.h"
+
 EINTERN int e_icon_init(void);
 EINTERN int e_icon_shutdown(void);
 
index 91cfe5e..97ed76f 100644 (file)
@@ -1,11 +1,14 @@
-#include "e.h"
 #include "e_info_shared_types.h"
 #include "e_hwc_window_intern.h"
 #include "e_hwc_windows_intern.h"
+#include "e_input_intern.h"
 
 #include <time.h>
 #include <dirent.h>
 #include <sys/mman.h>
+#include <ctype.h>
+
+#include <Eldbus.h>
 
 typedef void (*E_Info_Message_Cb)(const Eldbus_Message *msg);
 
index d8e21fc..ca7439e 100644 (file)
@@ -1,6 +1,8 @@
-#include "e.h"
 #include "e_info_protocol_intern.h"
 
+#include <ctype.h>
+# include <fcntl.h>
+
 static E_Info_Rule_Checker *rc = NULL;
 
 // should be increasing order for binary search
index 46ba8eb..279b6c8 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef _E_INFO_PROTOCOL_H_
 #define _E_INFO_PROTOCOL_H_
 
+#include "e_intern.h"
+
 #define STRING_MAX 64
 #define MAX_RULE   64
 
index 8a10fd3..43fe9ec 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_info_server_intern.h"
 #include "e_utils_intern.h"
 #include "e_comp_object.h"
 #include "e_desk_area_intern.h"
 #include "e_desk_intern.h"
 #include "e_zone_intern.h"
+#include "e_screensaver_intern.h"
+#include "e_comp_wl_input_intern.h"
+#include "e_main_intern.h"
+#include "e_dbus_conn_intern.h"
+#include "e_hints_intern.h"
 
 #include <tbm_bufmgr.h>
 #include <tbm_surface.h>
index c8913f0..2ab2521 100644 (file)
@@ -1,10 +1,13 @@
-#include "e.h"
 #include "e_info_server_input_intern.h"
 #include "e_info_shared_types.h"
 #include "e_input_log.h"
 #include "e_comp_screen_intern.h"
 #include "e_output_intern.h"
+#include "e_input_intern.h"
+#include "e_comp_wl_input_intern.h"
+#include "e_utils_intern.h"
 
+# include <fcntl.h>
 #include <linux/uinput.h>
 
 #ifndef KEY_LIGHTS_TOGGLE
index d407f81..ef0cd28 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_INFO_SERVER_INPUT_INTERN_H
 #define E_INFO_SERVER_INPUT_INTERN_H
 
+#include "e_intern.h"
+#include "e_info_server_input.h"
+
 #define INPUT_ARG_NAME    "input"
 
 EINTERN char *e_info_server_input_log_enable_set(int state);
index 8571d22..6a464fb 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_INFO_SERVER_INTERN_H
 #define E_INFO_SERVER_INTERN_H
 
+#include "e_intern.h"
+#include "e_info_server.h"
+
 #define WL_HIDE_DEPRECATED
 #include <wayland-server.h>
 
index 470017b..7ffb9e4 100644 (file)
@@ -1,9 +1,9 @@
-#include "e.h"
 #include "e_input_intern.h"
 #include "e_input_log.h"
 #include "e_comp_screen_intern.h"
 #include "e_comp_wl_input_intern.h"
 #include "e_comp_wl_intern.h"
+#include "e_utils_intern.h"
 
 #include <Ecore_Input_Evas.h>
 #include <cpu-boosting.h>
index 9fd71b7..6f1b108 100644 (file)
@@ -1,10 +1,13 @@
-#include "e.h"
 #include "e_input_intern.h"
 #include "e_input_log.h"
 #include "e_comp_screen_intern.h"
 #include "e_output_intern.h"
+#include "e_utils_intern.h"
 
 #include <Eeze.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 
 /* e_input_device private variable */
 static Eina_List *einput_devices;
index 1aa2ca1..b313af1 100644 (file)
@@ -1,15 +1,15 @@
-#include "e.h"
 #include "e_input_intern.h"
 #include "e_input_log.h"
-#include "e_device_intern.h"
-#include "e_keyrouter_private.h"
 #include "e_input_event.h"
+#include "e_keyrouter_intern.h"
 #include "e_devicemgr_intern.h"
+#include "e_device_intern.h"
 #include "e_comp_screen_intern.h"
 #include "e_output_intern.h"
 
-#include <glib.h>
 #include <Eeze.h>
+#include <glib.h>
+#include <ctype.h>
 
 #define G_LIST_GET_DATA(list) ((list) ? (((GList *)(list))->data) : NULL)
 
index 0e2f711..b2e5ec3 100755 (executable)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_input_event_intern.h"
 
 #include <stdio.h>
index 4f3e2b7..bc0beba 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_INPUT_EVENT_INTERN_H
 #define E_INPUT_EVENT_INTERN_H
 
+#include "e_intern.h"
+#include "e_input_event.h"
+
 EINTERN E_Input_Event_Source *e_input_event_source_create();
 EINTERN void                  e_input_event_source_destroy(E_Input_Event_Source *source);
 
index b8bb279..f22f200 100644 (file)
@@ -1,10 +1,10 @@
-#include "e.h"
 #include "e_devicemgr_intern.h"
 #include "e_input_intern.h"
 #include "e_input_log.h"
 #include "e_input_event_intern.h"
 #include "e_keyrouter_intern.h"
 #include "e_comp_wl_intern.h"
+#include "e_config_intern.h"
 
 #include <glib.h>
 
index 8a45e67..9383782 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_INPUT_INTERN_H
 #define E_INPUT_INTERN_H
 
+#include "e_intern.h"
+#include "e_input.h"
 #include "e_device_intern.h"
 
 #include <libinput.h>
index bdaf143..fdbfef5 100644 (file)
@@ -1,7 +1,3 @@
-#ifdef E_TYPEDEFS
-
-#else
-
 #ifndef E_INPUT_PRIVIATES_H
 #define E_INPUT_PRIVIATES_H
 
@@ -27,4 +23,3 @@ extern int _e_input_log_dom;
 #define EIDBG(msg, ARG...) DBG("[%s:%d] "msg, __FUNCTION__, __LINE__, ##ARG)
 
 #endif
-#endif
diff --git a/src/bin/e_intern.h b/src/bin/e_intern.h
new file mode 100644 (file)
index 0000000..895aa80
--- /dev/null
@@ -0,0 +1,264 @@
+#ifndef E_INTERN_H
+#define E_INTERN_H
+
+# ifdef HAVE_CONFIG_H
+#  include "config.h"
+# endif
+
+#include "e_types.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <assert.h>
+
+#ifdef ENABLE_TTRACE
+#include <ttrace.h>
+#endif
+
+#include <Ecore.h>
+#include <Eina.h>
+
+#ifdef ENABLE_TTRACE
+#undef TRACE_DS_BEGIN
+#undef TRACE_DS_END
+#undef TRACE_INPUT_BEGIN
+#undef TRACE_INPUT_END
+#define TRACE_DS_BEGIN(NAME, ...) traceBegin(TTRACE_TAG_WINDOW_MANAGER, "DS:"#NAME, ##__VA_ARGS__)
+#define TRACE_DS_END()            traceEnd(TTRACE_TAG_WINDOW_MANAGER)
+#define TRACE_DS_ASYNC_BEGIN(KEY, NAME, ...) traceAsyncBegin(TTRACE_TAG_WINDOW_MANAGER, KEY, "DS:"#NAME, ##__VA_ARGS__)
+#define TRACE_DS_ASYNC_END(KEY, NAME, ...)   traceAsyncEnd(TTRACE_TAG_WINDOW_MANAGER, KEY, "DS:"#NAME,  ##__VA_ARGS__)
+#define TRACE_DS_MARK(NAME, ...) traceMark(TTRACE_TAG_WINDOW_MANAGER, "DS:"#NAME, ##__VA_ARGS__)
+#define TRACE_INPUT_BEGIN(NAME, ...) traceBegin(TTRACE_TAG_INPUT, "INPUT:SERVER:"#NAME, ##__VA_ARGS__)
+#define TRACE_INPUT_END()            traceEnd(TTRACE_TAG_INPUT)
+#else
+#define TRACE_DS_BEGIN(NAME, ...)
+#define TRACE_DS_END()
+#define TRACE_DS_ASYNC_BEGIN(KEY, NAME, ...)
+#define TRACE_DS_ASYNC_END(KEY, NAME, ...)
+#define TRACE_DS_MARK(NAME, ...)
+#define TRACE_INPUT_BEGIN(NAME, ...)
+#define TRACE_INPUT_END()
+#endif
+
+# ifdef E_API
+#  undef E_API
+# endif
+# ifdef WIN32
+#  ifdef BUILDING_DLL
+#   define E_API __declspec(dllexport)
+#  else
+#   define E_API __declspec(dllimport)
+#  endif
+# else
+#  ifdef __GNUC__
+#   if __GNUC__ >= 4
+/* BROKEN in gcc 4 on amd64 */
+#    if 0
+#     pragma GCC visibility push(hidden)
+#    endif
+#    define E_API __attribute__ ((visibility("default")))
+#   else
+#    define E_API
+#   endif
+#  else
+#   define E_API
+#  endif
+# endif
+
+# ifdef EINTERN
+#  undef EINTERN
+# endif
+# ifdef __GNUC__
+#  if __GNUC__ >= 4
+#   define EINTERN __attribute__ ((visibility("hidden")))
+#  else
+#   define EINTERN
+#  endif
+# else
+#  define EINTERN
+# endif
+
+#include "e_log_intern.h"
+
+/* convenience macro to compress code and avoid typos */
+#ifndef MAX
+# define MAX(x, y) (((x) > (y)) ? (x) : (y))
+#endif
+
+#ifndef MIN
+# define MIN(x, y) (((x) < (y)) ? (x) : (y))
+#endif
+
+# define E_FREE_FUNC(_h, _fn) do { if (_h) { _fn((void*)_h); _h = NULL; } } while (0)
+# define E_INTERSECTS(x, y, w, h, xx, yy, ww, hh) \
+  (((x) < ((xx) + (ww))) && ((y) < ((yy) + (hh))) && (((x) + (w)) > (xx)) && (((y) + (h)) > (yy)))
+# define E_INSIDE(x, y, xx, yy, ww, hh) \
+  (((x) < ((xx) + (ww))) && ((y) < ((yy) + (hh))) && ((x) >= (xx)) && ((y) >= (yy)))
+# define E_CONTAINS(x, y, w, h, xx, yy, ww, hh) \
+  (((xx) >= (x)) && (((x) + (w)) >= ((xx) + (ww))) && ((yy) >= (y)) && (((y) + (h)) >= ((yy) + (hh))))
+# define E_SPANS_COMMON(x1, w1, x2, w2) \
+  (!((((x2) + (w2)) <= (x1)) || ((x2) >= ((x1) + (w1)))))
+# define E_REALLOC(p, s, n)   p = (s *)realloc(p, sizeof(s) * n)
+# define E_NEW(s, n)          (s *)calloc(n, sizeof(s))
+# define E_NEW_RAW(s, n)      (s *)malloc(n * sizeof(s))
+# define E_FREE(p)            do { free(p); p = NULL; } while (0)
+# define E_FREE_LIST(list, free)    \
+  do                                \
+    {                               \
+       void *_tmp_;                 \
+       EINA_LIST_FREE(list, _tmp_) \
+         {                          \
+            free(_tmp_);            \
+         }                          \
+    }                               \
+  while (0)
+
+# define E_LIST_REVERSE_FREE(list, data)         \
+  for (data = eina_list_last_data_get(list);          \
+       list;                                     \
+       list = eina_list_remove_list(list, eina_list_last(list)), \
+       data = eina_list_last_data_get(list))
+
+# define E_LIST_FOREACH(list, func)    \
+  do                                \
+    {                               \
+       void *_tmp_;                 \
+       const Eina_List *_list, *_list2;  \
+       EINA_LIST_FOREACH_SAFE(list, _list, _list2, _tmp_) \
+         {                          \
+            func(_tmp_);            \
+         }                          \
+    }                               \
+  while (0)
+
+# define E_LIST_HANDLER_APPEND(list, type, callback, data) \
+  do \
+    { \
+       Ecore_Event_Handler *_eh; \
+       _eh = ecore_event_handler_add(type, (Ecore_Event_Handler_Cb)callback, data); \
+       assert(_eh); \
+       list = eina_list_append(list, _eh); \
+    } \
+  while (0)
+
+# define E_LIST_HANDLER_PREPEND(list, type, callback, data) \
+  do \
+    { \
+       Ecore_Event_Handler *_eh; \
+       _eh = ecore_event_handler_prepend(type, (Ecore_Event_Handler_Cb)callback, data); \
+       assert(_eh); \
+       list = eina_list_append(list, _eh); \
+    } \
+  while (0)
+
+#define E_LIST_HOOK_APPEND(list, type, callback, data) \
+  do \
+    { \
+       E_Client_Hook *_ch; \
+       _ch = e_client_hook_add(type, callback, data); \
+       assert(_ch); \
+       list = eina_list_append(list, _ch); \
+    } \
+  while (0)
+
+# define E_COMP_WL_HOOK_APPEND(list, type, callback, data) \
+  do \
+    { \
+       E_Comp_Wl_Hook *_cwh; \
+       _cwh = e_comp_wl_hook_add(type, callback, data); \
+       assert(_cwh); \
+       list = eina_list_append(list, _cwh); \
+    } \
+  while (0)
+
+# define E_COMP_COMP_HOOK_APPEND(list, type, callback, data) \
+  do \
+    { \
+       E_Comp_Object_Hook *_coh; \
+       _coh = e_comp_object_hook_add(type, callback, data); \
+       assert(_coh); \
+       list = eina_list_append(list, _coh); \
+    } \
+  while (0)
+
+#define E_COMP_OBJECT_INTERCEPT_HOOK_APPEND(list, type, callback, data) \
+  do \
+    { \
+       E_Comp_Object_Intercept_Hook *_coih; \
+       _coih = e_comp_object_intercept_hook_add(type, callback, data); \
+       assert(_coih); \
+       list = eina_list_append(list, _coih); \
+    } \
+  while (0)
+
+#define E_CLIENT_HOOK_APPEND(list, type, callback, data) \
+  do \
+    { \
+       E_Client_Hook *_ch; \
+       _ch = e_client_hook_add(type, callback, data); \
+       assert(_ch); \
+       list = eina_list_append(list, _ch); \
+    } \
+  while (0)
+
+#define E_OUTPUT_HOOK_APPEND(list, type, callback, data) \
+  do \
+    { \
+       E_Output_Hook *_oh; \
+       _oh = e_output_hook_add(type, callback, data); \
+       assert(_oh); \
+       list = eina_list_append(list, _oh); \
+    } \
+  while (0)
+
+#define E_PIXMAP_HOOK_APPEND(list, type, callback, data) \
+  do \
+    { \
+       E_Pixmap_Hook *_ph; \
+       _ph = e_pixmap_hook_add(type, callback, data); \
+       assert(_ph); \
+       list = eina_list_append(list, _ph); \
+    } \
+  while (0)
+
+#define E_DESK_HOOK_APPEND(list, type, callback, data) \
+  do \
+    { \
+       E_Desk_Hook *_ph; \
+       _ph = e_desk_hook_add(type, callback, data); \
+       assert(_ph); \
+       list = eina_list_append(list, _ph); \
+    } \
+  while (0)
+
+# define E_CLAMP(x, min, max) (x < min ? min : (x > max ? max : x))
+# define E_RECTS_CLIP_TO_RECT(_x, _y, _w, _h, _cx, _cy, _cw, _ch) \
+  {                                                               \
+     if (E_INTERSECTS(_x, _y, _w, _h, _cx, _cy, _cw, _ch))        \
+       {                                                          \
+          if ((int)_x < (int)(_cx))                               \
+            {                                                     \
+               _w += _x - (_cx);                                  \
+               _x = (_cx);                                        \
+               if ((int)_w < 0) _w = 0;                           \
+            }                                                     \
+          if ((int)(_x + _w) > (int)((_cx) + (_cw)))              \
+            _w = (_cx) + (_cw) - _x;                              \
+          if ((int)_y < (int)(_cy))                               \
+            {                                                     \
+               _h += _y - (_cy);                                  \
+               _y = (_cy);                                        \
+               if ((int)_h < 0) _h = 0;                           \
+            }                                                     \
+          if ((int)(_y + _h) > (int)((_cy) + (_ch)))              \
+            _h = (_cy) + (_ch) - _y;                              \
+       }                                                          \
+     else                                                         \
+       {                                                          \
+          _w = 0; _h = 0;                                         \
+       }                                                          \
+  }
+
+#endif
index 44ae9d8..5fb34d6 100644 (file)
@@ -1,9 +1,9 @@
-#include "e.h"
-#include "e_keyrouter.h"
-#include "e_keyrouter_private.h"
-#include "e_input_event.h"
+#include "e_keyrouter_intern.h"
+#include "e_input_intern.h"
+#include "e_input_event_intern.h"
 #include "e_comp_wl_input_intern.h"
 #include "e_comp_wl_intern.h"
+#include "e_info_server_intern.h"
 
 #include <glib.h>
 
index 8e4b7be..43be589 100644 (file)
@@ -1,4 +1,5 @@
-#include "e_keyrouter_private.h"
+#include "e_keyrouter_intern.h"
+#include "e_config_intern.h"
 
 void
 e_keyrouter_conf_init(E_Keyrouter_Config_Data *kconfig)
index 2a24d38..b73bdcb 100644 (file)
@@ -1,7 +1,10 @@
-#include "e_keyrouter_private.h"
 #include "e_keyrouter_intern.h"
+#include "e_input_intern.h"
 #include "e_comp_wl_input_intern.h"
 #include "e_comp_wl_intern.h"
+#include "e_utils_intern.h"
+#include "e_screensaver_intern.h"
+#include "e_config_intern.h"
 
 static void _e_keyrouter_send_key_events(int type, Ecore_Event_Key *ev, E_Device *dev);
 static void _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev, E_Device *dev);
index 3f9f315..8335b77 100644 (file)
@@ -1,6 +1,16 @@
 #ifndef E_KEYROUTER_INTERN_H
 #define E_KEYROUTER_INTERN_H
 
+#include "e_intern.h"
+#include "e_keyrouter.h"
+
+#ifdef HAVE_CYNARA
+#include <cynara-session.h>
+#include <cynara-client.h>
+#include <cynara-creds-socket.h>
+#include <sys/smack.h>
+#endif
+
 extern EINTERN int E_KEYROUTER_EVENT_KEY_LONG;
 extern EINTERN int E_KEYROUTER_EVENT_KEY_COMPOSITION_PRESS;
 extern EINTERN int E_KEYROUTER_EVENT_KEY_COMPOSITION_RELEASE;
index 865bf64..be01265 100644 (file)
@@ -1,4 +1,4 @@
-#include "e_keyrouter_private.h"
+#include "e_keyrouter_intern.h"
 
 static int _e_keyrouter_find_duplicated_client(struct wl_resource *surface, struct wl_client *wc, uint32_t key, uint32_t mode);
 static Eina_Bool _e_keyrouter_find_key_in_list(struct wl_resource *surface, struct wl_client *wc, int key, int mode);
index 83f2a19..f823226 100644 (file)
@@ -1,7 +1,9 @@
-#include "e_keyrouter_private.h"
+#include "e_keyrouter_intern.h"
+#include "e_input_intern.h"
 #include "e_comp_wl_input_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_client_intern.h"
+#include "e_config_intern.h"
 
 void
 e_keyrouter_wl_event_surface_send(struct wl_resource *surface, int key, int mode)
index 5d4d20d..34ce13a 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_layout_intern.h"
 
 /* FIXME: something is weird here - i had to reverse all stacking logic to make
index 0c8b953..ba75294 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_LAYOUT_INTERN_H
 #define E_LAYOUT_INTERN_H
 
+#include "e_intern.h"
+#include "e_layout.h"
+
 EINTERN int          e_layout_freeze            (Evas_Object *obj);
 EINTERN int          e_layout_thaw              (Evas_Object *obj);
 EINTERN void         e_layout_virtual_size_get  (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
index 2bec230..9f081b3 100644 (file)
@@ -1,4 +1,4 @@
-#include "e.h"
+#include "e_log_intern.h"
 
 E_API int e_log_dom = -1;
 
diff --git a/src/bin/e_log_intern.h b/src/bin/e_log_intern.h
new file mode 100644 (file)
index 0000000..4924ea7
--- /dev/null
@@ -0,0 +1,15 @@
+#ifndef E_LOG_INTERN_H
+#define E_LOG_INTERN_H
+
+#include "e_intern.h"
+#include "e_log.h"
+
+EINTERN int e_log_init(void);
+EINTERN int e_log_shutdown(void);
+
+#ifdef HAVE_DLOG
+EINTERN void e_log_dlog_enable(Eina_Bool enable);
+#endif
+EINTERN Eina_Bool e_log_path_set(const char *path);
+
+#endif
index 626e737..be479fb 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_magnifier_intern.h"
 
 #define E_MAGNIFIER_SMART_DATA_GET(obj, ptr)                        \
index 7223f89..b52a9fa 100644 (file)
@@ -1,6 +1,12 @@
 # ifndef E_MAGNIFIER_INTERN_H
 # define E_MAGNIFIER_INTERN_H
 
+#include "e_intern.h"
+#include "e_client_intern.h"
+#include "e_desk_intern.h"
+
+#include <Evas.h>
+
 #define E_MAGNIFIER_SMART_OBJ_TYPE "E_Magnifier_Smart_Object"
 
 typedef enum _E_Magnifier_Zoom_Ratio
index d65428a..a458831 100644 (file)
@@ -1,4 +1,4 @@
-#include "e.h"
+#include "e_main_intern.h"
 #include "e_actions_intern.h"
 #include "e_test_helper_intern.h"
 #include "e_user_intern.h"
@@ -32,6 +32,9 @@
 #include "e_client_intern.h"
 #include "e_desk_intern.h"
 #include "e_zone_intern.h"
+#include "e_eom_intern.h"
+
+#include <Eio.h>
 
 #ifdef __linux__
 # include <sys/prctl.h>
diff --git a/src/bin/e_main_intern.h b/src/bin/e_main_intern.h
new file mode 100644 (file)
index 0000000..72343cc
--- /dev/null
@@ -0,0 +1,7 @@
+#ifndef E_MAIN_INTERN_H
+#define E_MAIN_INTERN_H
+
+#include "e_intern.h"
+#include "e_main.h"
+
+#endif
index b875dee..8f3c725 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_map_intern.h"
 
 #define E_MAP_INDEX_IN_RANGE(MAP, X) ((X >= 0) && (X < MAP->count))
index 71370aa..bd63e89 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_MAP_INTERN_H
 #define E_MAP_INTERN_H
 
+#include "e_intern.h"
+#include "e_map.h"
+
 EINTERN Eina_Bool  e_map_set_to_comp_object(E_Map *em, Evas_Object *obj);
 EINTERN E_Map     *e_map_get_from_comp_object(const Evas_Object *obj);
 
index 3e5ab4d..3eec974 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_maximize_intern.h"
 #include "e_desk_intern.h"
 #include "e_zone_intern.h"
index bdc4d61..3c48ab3 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_MAXIMIZE_INTERN_H
 #define E_MAXIMIZE_INTERN_H
 
+#include "e_intern.h"
+
 EINTERN void e_maximize_client_shelf_fit(E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir);
 EINTERN void e_maximize_client_dock_fit(E_Client *ec, int *x1, int *y1, int *x2, int *y2);
 EINTERN void e_maximize_client_shelf_fill(E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir);
index dc84cb4..e0cc652 100644 (file)
@@ -1,7 +1,10 @@
-#include "e.h"
 #include "e_module_intern.h"
 #include "e_user_intern.h"
 #include "e_utils_intern.h"
+#include "e_main_intern.h"
+
+#include <Eio.h>
+#include <dlfcn.h>
 
 /* TODO List:
  *
index 8ce9cf5..eed7d17 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_MODULE_INTERN_H
 #define E_MODULE_INTERN_H
 
+#include "e_intern.h"
+#include "e_module.h"
+
 #define E_MODULE_TYPE 0xE0b0100b
 
 extern EINTERN int E_EVENT_MODULE_UPDATE;
index fb778d4..2f32f50 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_mouse_intern.h"
 #include "e_input_intern.h"
 
index 30f174a..8da802d 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_MOUSE_INTERN_H
 #define E_MOUSE_INTERN_H
 
+#include "e_intern.h"
+
 EINTERN int e_mouse_update(void);
 
 #endif
index bae7e3f..43bf7fd 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_msg_intern.h"
 
 typedef struct _E_Msg_Event E_Msg_Event;
index 93792e8..0b2a93f 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_MSG_INTERN_H
 #define E_MSG_INTERN_H
 
+#include "e_intern.h"
+
 typedef struct _E_Msg_Handler E_Msg_Handler;
 
 EINTERN int            e_msg_init(void);
index eae48b2..dfa5639 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_error_intern.h"
 
 /* yes - i know. glibc specific... but i like being able to do my own */
index 7caec92..81fa25a 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_output_intern.h"
 #include "e_client_intern.h"
 #include "e_utils_intern.h"
 #include "e_error_intern.h"
 #include "e_hwc_window_intern.h"
 #include "e_hwc_windows_intern.h"
+#include "e_hwc_planes_intern.h"
 #include "e_hwc_intern.h"
 #include "e_comp_wl_video_buffer_intern.h"
 #include "e_zone_intern.h"
+#include "e_video_debug_intern.h"
 
 #include <device/board-internal.h>
 
index be80c12..f171eff 100644 (file)
@@ -1,10 +1,13 @@
 #ifndef E_OUTPUT_INTERN_H
 #define E_OUTPUT_INTERN_H
 
-#define E_OUTPUT_TYPE (int)0xE0b11002
+#include "e_intern.h"
+#include "e_output.h"
 
 #include <tbm_surface.h>
 
+#define E_OUTPUT_TYPE (int)0xE0b11002
+
 typedef struct _E_Output_Hook           E_Output_Hook;
 typedef struct _E_Output_Intercept_Hook E_Output_Intercept_Hook;
 
index 09e71b8..0dc0b95 100644 (file)
@@ -1,7 +1,8 @@
-#include "e.h"
 #include "e_path_intern.h"
 #include "e_user_intern.h"
 
+#include <Ecore_File.h>
+
 /* local subsystem functions */
 static void      _e_path_free(E_Path *ep);
 static void      _e_path_cache_free(E_Path *ep);
index 528a0de..7890abf 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_PATH_INTERN_H
 #define E_PATH_INTERN_H
 
+#include "e_intern.h"
+
 #define E_PATH_TYPE 0xE0b0100c
 
 typedef struct _E_Path E_Path;
index a89c600..cc8100d 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_pixmap_intern.h"
 #include "e_comp_wl_buffer_intern.h"
 #include "e_comp_wl_tbm_intern.h"
index 7502e4c..edf2fe5 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_PIXMAP_INTERN_H
 #define E_PIXMAP_INTERN_H
 
+#include "e_intern.h"
+#include "e_pixmap.h"
+
 struct _E_Pixmap_Hook
 {
    EINA_INLIST;
index bc65c6b..98bcfe8 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_place_intern.h"
 #include "e_input_intern.h"
 #include "e_desk_intern.h"
index 8e7739a..f3ce2fe 100644 (file)
@@ -1,13 +1,12 @@
-#ifdef E_TYPEDEFS
-#else
 #ifndef E_PLACE_H
 #define E_PLACE_H
 
+#include "e_intern.h"
+
 EINTERN void e_place_zone_region_smart_cleanup(E_Zone *zone);
-EINTERN int e_place_zone_region_smart(E_Zone *zone, Eina_List *skiplist, int x, int y, int w, int h, int *rx, int *ry);
-EINTERN int e_place_desk_region_smart(E_Desk *desk, Eina_List *skiplist, int x, int y, int w, int h, int *rx, int *ry);
-EINTERN int e_place_zone_cursor(E_Zone *zone, int x, int y, int w, int h, int it, int *rx, int *ry);
-EINTERN int e_place_zone_manual(E_Zone *zone, int w, int h, int *rx, int *ry);
+EINTERN int  e_place_zone_region_smart(E_Zone *zone, Eina_List *skiplist, int x, int y, int w, int h, int *rx, int *ry);
+EINTERN int  e_place_desk_region_smart(E_Desk *desk, Eina_List *skiplist, int x, int y, int w, int h, int *rx, int *ry);
+EINTERN int  e_place_zone_cursor(E_Zone *zone, int x, int y, int w, int h, int it, int *rx, int *ry);
+EINTERN int  e_place_zone_manual(E_Zone *zone, int w, int h, int *rx, int *ry);
 
 #endif
-#endif
index cf2c298..987155e 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_comp_canvas_intern.h"
 #include "e_comp_screen_intern.h"
 #include "e_comp_wl_intern.h"
@@ -7,6 +6,7 @@
 #include "e_comp_wl_video_buffer_intern.h"
 #include "e_client_intern.h"
 #include "e_comp_object_intern.h"
+#include "e_utils_intern.h"
 
 #include <device/board-internal.h>
 # include <tdm.h>
index f2462a8..0421ca0 100644 (file)
@@ -1,4 +1,4 @@
-#include "e.h"
+
 #include "e_comp_wl_buffer_intern.h"
 #include "e_comp_canvas_intern.h"
 #include "e_comp_screen_intern.h"
index 214e0cd..180d257 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_pointer_intern.h"
 #include "e_input_intern.h"
 #include "e_client_intern.h"
index ad4e748..b641dc9 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_POINTER_INTERN_H
 #define E_POINTER_INTERN_H
 
+#include "e_intern.h"
+#include "e_pointer.h"
+
 #define E_POINTER_TYPE 0xE0b01013
 
 EINTERN int        e_pointer_init(void);
index 90dff9f..fefc5bb 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_policy_intern.h"
 #include "e_policy_wl_intern.h"
 #include "e_policy_conformant_intern.h"
@@ -11,6 +10,8 @@
 #include "e_client_intern.h"
 #include "e_desk_intern.h"
 #include "e_zone_intern.h"
+#include "e_config_intern.h"
+#include "e_utils_intern.h"
 
 E_Policy *e_policy = NULL;
 Eina_Hash *hash_policy_desks = NULL;
index 07b99ab..9609eb1 100644 (file)
@@ -1,6 +1,6 @@
-#include "e.h"
 #include "e_policy_intern.h"
 #include "e_comp_wl_intern.h"
+#include "e_config_intern.h"
 
 #include <wayland-server.h>
 #include <tizen-extension-server-protocol.h>
index 39745c9..0965955 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_POLICY_CONFORMANT_INTERN_H
 #define E_POLICY_CONFORMANT_INTERN_H
 
+#include "e_intern.h"
+#include "e_policy_conformant.h"
+
 EINTERN Eina_Bool  e_policy_conformant_init(void);
 EINTERN void       e_policy_conformant_shutdown(void);
 
index 310ea6a..567ad74 100644 (file)
@@ -1,6 +1,9 @@
 # ifndef E_POLICY_INTERN_H
 # define E_POLICY_INTERN_H
 
+#include "e_intern.h"
+#include "e_policy.h"
+
 struct _E_Policy_Interceptor
 {
    E_Policy_Intercept_Point ipoint;
index 008d2fc..028bd39 100644 (file)
@@ -1,6 +1,9 @@
-#include "e.h"
 #include "e_policy_intern.h"
 #include "e_desk_intern.h"
+#include "e_utils_intern.h"
+#include "e_prefix_intern.h"
+#include "e_theme_intern.h"
+#include "e_config_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);
index 887d87e..18c3a54 100644 (file)
@@ -1,7 +1,7 @@
-#include "e.h"
 #include "e_policy_intern.h"
 #include "e_pixmap_intern.h"
 #include "e_client_intern.h"
+#include "e_config_intern.h"
 
 Eina_Bool
 _e_policy_stack_transient_for_check_descendant(E_Client *ec, E_Client *ancestor, E_Transient policy)
index ba926d9..e8a5a7a 100644 (file)
@@ -4,7 +4,6 @@
  * background  : The client which is fully obscured by others.
  */
 
-#include "e.h"
 #include "e_policy_visibility_intern.h"
 #include "e_policy_intern.h"
 #include "e_comp_wl_rsm_intern.h"
@@ -12,6 +11,7 @@
 #include "e_policy_wl_intern.h"
 #include "e_client_intern.h"
 #include "e_comp_object_intern.h"
+#include "e_config_intern.h"
 
 #ifdef ENABLE_TTRACE
 # include <ttrace.h>
index 38d8274..eb063e7 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef _E_POLICY_VISIBILITY_INTEN_H_
 #define _E_POLICY_VISIBILITY_INTEN_H_
 
+#include "e_intern.h"
+#include "e_policy_visibility.h"
+
 #define E_CLEAR_GRAB_TIMEOUT   0.01
 
 #define NAME(ec)        ec->icccm.name ? ec->icccm.name : ""
index c272282..f0c780f 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_policy_wl_intern.h"
 #include "e_policy_intern.h"
 #include "e_appinfo_intern.h"
 #include "e_hints_intern.h"
 #include "e_comp_object_intern.h"
 #include "e_zone_intern.h"
+#include "e_config_intern.h"
+#include "e_security_intern.h"
+#include "e_utils_intern.h"
+#include "e_screensaver_intern.h"
 
 #include <device/display.h>
 #include <wayland-server.h>
index 35e43f8..de27e30 100644 (file)
@@ -1,5 +1,5 @@
-#include "e.h"
 #include "e_policy_wl_display_intern.h"
+#include "e_dbus_conn_intern.h"
 
 typedef struct _E_Display_Dbus_Info
 {
index 591fe03..ebb58e2 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_POLICY_WL_DISPLAY_H
 #define E_POLICY_WL_DISPLAY_H
 
+#include "e_intern.h"
+
 typedef enum _E_Display_Screen_Mode
 {
    E_DISPLAY_SCREEN_MODE_DEFAULT = 0,
index da98dbd..4f5357d 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_POLICY_WL_INTERN_H
 #define E_POLICY_WL_INTERN_H
 
+#include "e_intern.h"
+#include "e_policy_wl.h"
+
 typedef struct wl_resource* (*E_Policy_Wl_Tzsh_Ext_Hook_Cb)(struct wl_client* client, struct wl_resource* res, uint32_t id);
 
 struct _E_Policy_Wl_Hook
index 79b51a7..45b26c3 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_prefix_intern.h"
 #include "e_utils_intern.h"
 
index 0fdc46f..2cd85a2 100644 (file)
@@ -1,6 +1,11 @@
 #ifndef E_PREFIX_INTERN_H
 #define E_PREFIX_INTERN_H
 
+#include "e_intern.h"
+#include "e_prefix.h"
+
+#define e_prefix_data_concat_static(dst, path) e_prefix_data_concat_len(dst, sizeof(dst), path,  (sizeof(path) > 0) ? sizeof(path) - 1 : 0)
+
 EINTERN int         e_prefix_determine(char *argv0);
 EINTERN void     e_prefix_shutdown(void);
 EINTERN void        e_prefix_fallback(void);
@@ -13,6 +18,4 @@ EINTERN const char *e_prefix_lib_get(void);
 EINTERN size_t      e_prefix_data_concat_len(char *dst, size_t size, const char *path, size_t path_len);
 EINTERN size_t      e_prefix_data_concat(char *dst, size_t size, const char *path);
 
-#define e_prefix_data_concat_static(dst, path) e_prefix_data_concat_len(dst, sizeof(dst), path,  (sizeof(path) > 0) ? sizeof(path) - 1 : 0)
-
 #endif
index 68d675e..d51aabd 100644 (file)
@@ -1,6 +1,6 @@
-#include "e.h"
 #include "e_presentation_time_intern.h"
 #include "e_client_intern.h"
+#include "e_utils_intern.h"
 
 #include <presentation-time-server-protocol.h>
 #include <tizen-extension-server-protocol.h>
index c298074..168c8e5 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_PRESENTATION_TIME_INTERN_H
 #define E_PRESENTATION_TIME_INTERN_H
 
+#include "e_intern.h"
+#include "e_presentation_time.h"
+
 typedef struct _E_Presentation_Time E_Presentation_Time;
 typedef struct _E_Presentation_Time_Feedback E_Presentation_Time_Feedback;
 
index 14545e8..8ce77c4 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_privilege_intern.h"
 
 EINTERN const char *E_PRIVILEGE_NOTIFICATION_LEVEL_SET    = "http://tizen.org/privilege/window.priority.set";
index dc6d665..77ce968 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_PRIVILEGE_INTERN_H
 #define E_PRIVILEGE_INTERN_H
 
+#include "e_intern.h"
+#include "e_privilege.h"
+
 extern EINTERN const char *E_PRIVILEGE_NOTIFICATION_LEVEL_SET;
 extern EINTERN const char *E_PRIVILEGE_SCREEN_MODE_SET;
 extern EINTERN const char *E_PRIVILEGE_BRIGHTNESS_SET;
index 0faab64..eaf1dbb 100644 (file)
@@ -1,6 +1,6 @@
-#include "e.h"
 #include "e_process_intern.h"
 #include "e_comp_wl_subsurface_intern.h"
+#include "e_client_intern.h"
 
 static E_Process *_e_process_find(E_Process_Manager *pm, pid_t pid);
 static E_Process *_e_process_new(pid_t pid);
index e7d9ace..688e0a6 100644 (file)
@@ -1,6 +1,9 @@
 # ifndef E_PROCESSMGR_INTERN_H
 # define E_PROCESSMGR_INTERN_H
 
+#include "e_intern.h"
+#include "e_process.h"
+
 struct _E_Process_Hook
 {
    EINA_INLIST;
index 58bc8a4..0a493df 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_scale_intern.h"
 #include "e_utils_intern.h"
 #include "e_hints_intern.h"
index eb8dee7..eb74bb7 100644 (file)
@@ -1,11 +1,13 @@
 #ifndef E_SCALE_INTERN_H
 #define E_SCALE_INTERN_H
 
+#include "e_intern.h"
+
+extern EINTERN double e_scale;
+
 EINTERN int  e_scale_init(void);
 EINTERN int  e_scale_shutdown(void);
 EINTERN void e_scale_update(void);
 EINTERN void e_scale_manual_update(int dpi);
 
-extern EINTERN double e_scale;
-
 #endif
index b5cd798..1db105d 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_screensaver_intern.h"
 
 typedef struct _E_Screensaver
index a8cb232..f291384 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_SCREENSAVER_INTERN_H
 #define E_SCREENSAVER_INTERN_H
 
+#include "e_intern.h"
+#include "e_screensaver.h"
+
 EINTERN void      e_screensaver_preinit(void);
 EINTERN int       e_screensaver_init(void);
 EINTERN int       e_screensaver_shutdown(void);
index c58d4ab..c78a31d 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_security_intern.h"
 
 #ifdef HAVE_CYNARA
index 3729765..24dc7c3 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_SECURITY_INTERN_H
 #define E_SECURITY_INTERN_H
 
+#include "e_intern.h"
+#include "e_security.h"
+
 EINTERN int e_security_init(void);
 EINTERN int e_security_shutdown(void);
 
index e566475..cb44106 100644 (file)
@@ -3,7 +3,6 @@
  * ports/devel/libexecinfo and add -lexecinfo to LDFLAGS
  * to add backtrace support.
  */
-#include "e.h"
 #include "e_signals_intern.h"
 #include "e_input_intern.h"
 
index 4e2630d..b6efbcd 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_SIGNALS_INTERN_H
 #define E_SIGNALS_INTERN_H
 
+#include "e_intern.h"
+
 EINTERN void e_sigseg_act(int x, siginfo_t *info, void *data);
 EINTERN void e_sigill_act(int x, siginfo_t *info, void *data);
 EINTERN void e_sigfpe_act(int x, siginfo_t *info, void *data);
index 0ec059b..7d1c68c 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_subsurface_watcher_intern.h"
 #include "e_compositor_intern.h"
 
index 7396296..f5bf2da 100644 (file)
@@ -1,6 +1,10 @@
 #ifndef E_SUBSURFACE_WATCHER_INTERN_H
 #define E_SUBSURFACE_WATCHER_INTERN_H
 
+#include "e_intern.h"
+
+#include <wayland-server.h>
+
 EINTERN void e_subsurface_watcher_add(struct wl_client *client, uint32_t id, struct wl_resource *surface_resource);
 EINTERN void e_subsurface_watcher_invalid_parent_notify(struct wl_resource *surface_resource);
 
index b84d3aa..13dcdd5 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_tbm_gbm_server_intern.h"
 #include "e_comp_screen_intern.h"
 #include "e_comp_wl_tbm_intern.h"
index b9fdb62..6916119 100644 (file)
@@ -1,14 +1,14 @@
 #ifndef E_TBM_GBM_SERVER_INTERN_H
 #define E_TBM_GBM_SERVER_INTERN_H
 
-#include <Eina.h>
+#include "e_intern.h"
+
 #include <wayland-server.h>
 #include <libds/buffer.h>
-#include <tbm_surface.h>
 
 typedef struct _E_Gbm_Client_Buffer E_Gbm_Client_Buffer;
 
-EINTERN Eina_Bool e_tbm_gbm_server_init(struct wl_display *display);
+EINTERN Eina_Bool     e_tbm_gbm_server_init(struct wl_display *display);
 EINTERN tbm_surface_h e_tbm_gbm_server_tbm_surface_get_from_buffer(struct ds_buffer *ds_buffer);
 
 #endif /* end of include guard: E_TBM_GBM_SERVER_INTERN_H */
index ef6db6b..a0d22ae 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_test_helper_intern.h"
 #include "e_policy_wl_intern.h"
 #include "e_comp_canvas_intern.h"
@@ -8,6 +7,10 @@
 #include "e_policy_intern.h"
 #include "e_client_intern.h"
 #include "e_comp_object_intern.h"
+#include "e_dbus_conn_intern.h"
+#include "e_info_server_intern.h"
+#include "e_utils_intern.h"
+#include "e_hints_intern.h"
 
 #define BUS "org.enlightenment.wm"
 #define PATH "/org/enlightenment/wm"
index 1cf44d2..7246238 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_TEST_HELPER_INTERN_H
 #define E_TEST_HELPER_INTERN_H
 
+#include "e_intern.h"
+
 EINTERN int e_test_helper_init(void);
 EINTERN int e_test_helper_shutdown(void);
 
index 762c3ab..72d3185 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_theme_intern.h"
 
 /* externally accessible functions */
index 7994619..f986530 100644 (file)
@@ -1,8 +1,12 @@
 #ifndef E_THEME_INTERN_H
 #define E_THEME_INTERN_H
 
+#include "e_intern.h"
+#include "e_theme.h"
+
 EINTERN int       e_theme_init(void);
 EINTERN int       e_theme_shutdown(void);
+
 EINTERN const char *e_theme_edje_file_get(const char *category, const char *group);
 
 #endif
index e6773e4..126c1a9 100644 (file)
@@ -1,4 +1,5 @@
-#include "e.h"
+#include "e_user_intern.h"
+#include "e_utils_intern.h"
 
 static char *_e_user_homedir = NULL;
 static size_t _e_user_homedir_len = 0;
@@ -115,7 +116,7 @@ e_user_dir_get(void)
           }
         else
           {
-#ifdef DOXDG             
+#ifdef DOXDG
              d = e_util_env_get("XDG_CONFIG_HOME");
              if (d)
                {
@@ -124,15 +125,15 @@ e_user_dir_get(void)
                   E_FREE(d);
                }
              else
-#endif               
+#endif
                {
-#ifdef DOXDG             
+#ifdef DOXDG
                   _e_user_dir_len = e_user_homedir_concat(dir, sizeof(dir),
                                                           ".config/e");
-#else                  
+#else
                   _e_user_dir_len = e_user_homedir_concat(dir, sizeof(dir),
                                                           ".e/e");
-#endif                  
+#endif
                }
           }
         _e_user_dir = dir;
index c252a0a..9581c63 100644 (file)
@@ -1,6 +1,11 @@
 #ifndef E_USER_INTERN_H
 #define E_USER_INTERN_H
 
+#include "e_intern.h"
+
+#define e_user_homedir_concat_static(dst, path) e_user_homedir_concat_len(dst, sizeof(dst), path, (sizeof(path) > 0) ? sizeof(path) - 1 : 0)
+#define e_user_dir_concat_static(dst, path) e_user_dir_concat_len(dst, sizeof(dst), path,  (sizeof(path) > 0) ? sizeof(path) - 1 : 0)
+
 EINTERN int       e_user_init(void);
 EINTERN int       e_user_shutdown(void);
 
@@ -9,13 +14,9 @@ EINTERN size_t      e_user_homedir_concat_len(char *dst, size_t size, const char
 EINTERN size_t      e_user_homedir_concat(char *dst, size_t size, const char *path);
 EINTERN size_t      e_user_homedir_snprintf(char *dst, size_t size, const char *fmt, ...) EINA_PRINTF(3, 4);
 
-#define e_user_homedir_concat_static(dst, path) e_user_homedir_concat_len(dst, sizeof(dst), path, (sizeof(path) > 0) ? sizeof(path) - 1 : 0)
-
 EINTERN const char *e_user_dir_get(void);
 EINTERN size_t      e_user_dir_concat_len(char *dst, size_t size, const char *path, size_t path_len);
 EINTERN size_t      e_user_dir_concat(char *dst, size_t size, const char *path);
 EINTERN size_t      e_user_dir_snprintf(char *dst, size_t size, const char *fmt, ...) EINA_PRINTF(3, 4);
 
-#define e_user_dir_concat_static(dst, path) e_user_dir_concat_len(dst, sizeof(dst), path,  (sizeof(path) > 0) ? sizeof(path) - 1 : 0)
-
 #endif
index a11482d..0409361 100644 (file)
@@ -1,4 +1,5 @@
-#include "e.h"
+#include "e_util_transform_intern.h"
+
 #define E_UTIL_TRANSFORM_IS_ZERO(p) ((p) > -1e-6 && (p) < 1e-6)
 #define E_UTIL_TRANSFORM_ROUND(x)   ((x) >= 0 ? (int)((x) + 0.5) : (int)((x) - 0.5))
 
diff --git a/src/bin/e_util_transform_intern.h b/src/bin/e_util_transform_intern.h
new file mode 100644 (file)
index 0000000..225a156
--- /dev/null
@@ -0,0 +1,7 @@
+#ifndef E_UTIL_TRANSFORM_INTERN_H
+#define E_UTIL_TRANSFORM_INTERN_H
+
+#include "e_intern.h"
+#include "e_util_transform.h"
+
+#endif
index 8029ca1..e06c1d6 100644 (file)
@@ -1,9 +1,11 @@
-#include "e.h"
 #include "e_utils_intern.h"
 #include "e_icon_intern.h"
 #include "e_input.h"
 #include "e_desk_intern.h"
 
+#include <ctype.h>
+#include <fnmatch.h>
+
 EINTERN E_Path * path_data = NULL;
 EINTERN E_Path * path_images = NULL;
 EINTERN E_Path * path_fonts = NULL;
index d99f055..a8da6dc 100644 (file)
@@ -1,8 +1,12 @@
 #ifndef E_UTILS_INTERN_H
 #define E_UTILS_INTERN_H
 
+#include "e_intern.h"
+#include "e_utils.h"
 #include "e_path_intern.h"
 
+#include <Ecore_File.h>
+
 #define E_UTIL_DBUS_READY_PATH "/run/enlightenment/dbus_ready"
 #define E_UTIL_SENSORD_READY_PATH "/run/enlightenment/sensord_ready"
 
index 49c5c5b..0c73826 100644 (file)
@@ -5,8 +5,6 @@
  * 2. Fill in table and keep it up-to-date
  * 3. (optional) Write the whole blob into a file on disk for later use)
  */
-
-#include "e.h"
 #include "e_uuid_store_intern.h"
 
 #include <sys/types.h>
index 9e6afc9..9534ffb 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_UUID_STORE_INTERN_H
 #define E_UUID_STORE_INTERN_H
 
+#include "e_intern.h"
+
 /* vim:ts=8 sw=3 sts=3 expandtab cino=>5n-3f0^-2{2(0W1st0
  */
 
index dee9f6d..2c01b1c 100644 (file)
@@ -1,4 +1,7 @@
-#include "e.h"
+#include "e_wtz_shell_intern.h"
+#include "e_client_intern.h"
+#include "e_zone_intern.h"
+
 #include <wtz-shell-server-protocol.h>
 
 #ifdef LOG
index 145fb67..5bb0aea 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_WTZ_SHELL_INTERN_H
 #define E_WTZ_SHELL_INTERN_H
 
+#include "e_intern.h"
+
 EINTERN Eina_Bool e_wtz_shell_init(void);
 EINTERN void      e_wtz_shell_shutdown(void);
 
index ccf517b..0c3ec03 100644 (file)
@@ -1,8 +1,8 @@
-#include "e.h"
 #include "e_xdg_shell_v6_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_shell_intern.h"
 #include "e_client_intern.h"
+#include "e_config_intern.h"
 
 #include <libds/surface.h>
 #include <libds/types/ds_xdg_shell_v6.h>
index b318a7a..366a58a 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_XDG_SHELL_V6_INTERN_H
 #define E_XDG_SHELL_V6_INTERN_H
 
+#include "e_intern.h"
+
 EINTERN Eina_Bool e_xdg_shell_v6_init(void);
 EINTERN E_Client *e_xdg_shell_v6_xdg_surface_ec_get(struct wl_resource *resource);
 
index 69c8bfe..5e13294 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_zone_intern.h"
 #include "e_client_intern.h"
 #include "e_desk_intern.h"
@@ -16,6 +15,7 @@
 #include "e_focus_intern.h"
 #include "e_policy_visibility_intern.h"
 #include "e_comp_object_intern.h"
+#include "e_comp_canvas_intern.h"
 
 #include <libds-tizen/screen.h>
 
index e217a62..c2efb72 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_ZONE_INTERN_H
 #define E_ZONE_INTERN_H
 
+#include "e_intern.h"
+#include "e_zone.h"
+
 #include <wayland-server.h>
 
 extern EINTERN int E_EVENT_ZONE_DESK_COUNT_SET;
index b979b0b..8049206 100644 (file)
@@ -1,8 +1,6 @@
-#include "e.h"
 #include "services/e_service_cbhm_intern.h"
 #include "e_policy_conformant.h"
 #include "e_policy_wl_intern.h"
-#include "e_client_intern.h"
 
 typedef struct _E_Policy_Cbhm E_Policy_Cbhm;
 
index ee7e724..e4f9f9d 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_SERVICE_CBHM_INTERN_H
 #define E_SERVICE_CBHM_INTERN_H
 
+#include "e_intern.h"
+#include "e_client_intern.h"
+
 EINTERN void          e_service_cbhm_client_set(E_Client *ec);
 EINTERN E_Client     *e_service_cbhm_client_get(void);
 EINTERN void          e_service_cbhm_show(void);
index c827958..30178b7 100644 (file)
@@ -1,5 +1,5 @@
-#include "e.h"
-#include "e_service_gesture.h"
+#include "e_service_gesture_intern.h"
+#include "e_utils_intern.h"
 
 #define MAX_FINGERS 10
 #define E_SERVICE_GESTURE_KEY "e_service_gesture_enabled"
diff --git a/src/bin/services/e_service_gesture_intern.h b/src/bin/services/e_service_gesture_intern.h
new file mode 100644 (file)
index 0000000..d1de713
--- /dev/null
@@ -0,0 +1,7 @@
+#ifndef E_SERVICE_GESTURE_INTERN_H
+#define E_SERVICE_GESTURE_INTERN_H
+
+#include "e_intern.h"
+#include "e_service_gesture.h"
+
+#endif
index 06d8c93..b1ffbf8 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "services/e_service_indicator_intern.h"
 #include "e_policy_wl_intern.h"
 
index 7a50657..92222fd 100644 (file)
@@ -1,9 +1,10 @@
 #ifndef E_SERVICE_INDICATOR_INTERN_H
 #define E_SERVICE_INDICATOR_INTERN_H
 
+#include "e_intern.h"
+
 EINTERN Eina_Bool     e_mod_indicator_client_set(E_Client *ec);
 EINTERN void          e_mod_indicator_owner_set(E_Client *ec);
 EINTERN E_Client     *e_mod_indicator_owner_get(void);
 
-
 #endif
index 09b482d..bd644b4 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "services/e_service_kvm_intern.h"
 #include "e_comp_wl_data_intern.h"
 #include "e_comp_wl_intern.h"
index 42544d5..5d8b0ed 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_SERVICE_KVM_INTERN_H
 #define E_SERVICE_KVM_INTERN_H
 
+#include "e_intern.h"
+
 typedef struct _E_Service_Kvm E_Service_Kvm;
 
 EINTERN Eina_Bool      e_service_kvm_client_set(E_Client *ec);
index 7d9dabb..914049a 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "services/e_service_launcher_intern.h"
 #include "e_comp_wl_rsm_intern.h"
 #include "e_comp_wl_tbm_intern.h"
@@ -9,6 +8,8 @@
 #include "e_policy_visibility_intern.h"
 #include "e_client_intern.h"
 #include "e_comp_object_intern.h"
+#include "e_utils_intern.h"
+#include "e_appinfo_intern.h"
 
 #include <tzsh_server.h>
 #include <wayland-tbm-server.h>
index f24fbe1..25e3455 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_SERVICE_LAUNCHER_INTERN_H
 #define E_SERVICE_LAUNCHER_INTERN_H
 
+#include "e_intern.h"
+
 EINTERN void              e_service_launcher_resource_set(E_Client *ec, struct wl_resource *res_tws_lc);
 EINTERN void              e_service_launcher_client_set(E_Client *ec);
 EINTERN void              e_service_launcher_client_unset(E_Client *ec);
index 1941386..f21bef4 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "services/e_service_lockscreen_intern.h"
 #include "e_policy_private_data.h"
 #include "e_client_intern.h"
index 12fd7f9..4294645 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_SERVICE_LOCKSCREEN_INTERN_H
 #define E_SERVICE_LOCKSCREEN_INTERN_H
 
+#include "e_intern.h"
+
 EINTERN Eina_Bool     e_service_lockscreen_client_set(E_Client *ec);
 
 #endif
index ebd8d51..b69bf8a 100644 (file)
@@ -1,6 +1,5 @@
-#include "e.h"
 #include "services/e_service_quickpanel_intern.h"
-#include "e_service_gesture.h"
+#include "e_service_gesture_intern.h"
 #include "services/e_service_region_intern.h"
 #include "e_pixmap_intern.h"
 #include "e_policy_intern.h"
@@ -8,6 +7,7 @@
 #include "e_policy_private_data.h"
 #include "e_client_intern.h"
 #include "e_comp_object_intern.h"
+#include "e_layout_intern.h"
 
 #define SMART_NAME            "quickpanel_object"
 #define INTERNAL_ENTRY                       \
index 70bf3b5..9dd995a 100644 (file)
@@ -1,7 +1,9 @@
 #ifndef E_SERVICE_QUICKPANEL_INTERN_H
 #define E_SERVICE_QUICKPANEL_INTERN_H
 
+#include "e_intern.h"
 #include "e_service_quickpanel.h"
+#include "e_policy_intern.h"
 
 EINTERN E_Service_Quickpanel_Type e_service_quickpanel_type_get(E_Client *ec);
 EINTERN void                      e_service_quickpanel_show(E_Client *ec);
index 4c7630d..6e4b511 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "services/e_service_region_intern.h"
 
 #define ENTRY(...)                                 \
index 201dc57..3707143 100644 (file)
@@ -1,12 +1,13 @@
 #ifndef E_SERVICE_REGION_INTERN_H
 #define E_SERVICE_REGION_INTERN_H
 
-#include "e_service_gesture.h"
+#include "e_intern.h"
+#include "e_service_gesture_intern.h"
 #include "e_policy_private_data.h"
 
-EINTERN Evas_Object        *e_service_region_object_new(E_Client *ec);
-EINTERN Eina_Bool           e_service_region_rectangle_set(Evas_Object *ro, E_Policy_Angle_Map ridx, int x, int y, int w, int h);
-EINTERN Eina_Bool           e_service_region_rectangle_get(Evas_Object *ro, E_Policy_Angle_Map ridx, int *x, int *y, int *w, int *h);
-EINTERN Eina_Bool           e_service_region_gesture_set(Evas_Object *ro, E_Policy_Gesture_Type type, int nfingers, E_Policy_Gesture_Start_Cb cb_start, E_Policy_Gesture_Move_Cb cb_move, E_Policy_Gesture_End_Cb cb_end, void *data);
+EINTERN Evas_Object *e_service_region_object_new(E_Client *ec);
+EINTERN Eina_Bool    e_service_region_rectangle_set(Evas_Object *ro, E_Policy_Angle_Map ridx, int x, int y, int w, int h);
+EINTERN Eina_Bool    e_service_region_rectangle_get(Evas_Object *ro, E_Policy_Angle_Map ridx, int *x, int *y, int *w, int *h);
+EINTERN Eina_Bool    e_service_region_gesture_set(Evas_Object *ro, E_Policy_Gesture_Type type, int nfingers, E_Policy_Gesture_Start_Cb cb_start, E_Policy_Gesture_Move_Cb cb_move, E_Policy_Gesture_End_Cb cb_end, void *data);
 
 #endif
index 4c21f52..d83292b 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "services/e_service_scrsaver_intern.h"
 #include "e_policy_private_data.h"
 #include "e_client_intern.h"
index 2467977..9e97dc6 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_SERVICE_SCRSAVER_INTERN_H
 #define E_SERVICE_SCRSAVER_INTERN_H
 
+#include "e_intern.h"
+
 EINTERN Eina_Bool e_service_scrsaver_client_set(E_Client *ec);
 
 #endif
index 11bdcb3..2dc1612 100644 (file)
@@ -1,6 +1,5 @@
-#include "e.h"
 #include "services/e_service_softkey_intern.h"
-#include "e_service_gesture.h"
+#include "e_service_gesture_intern.h"
 #include "services/e_service_region_intern.h"
 #include "e_policy_intern.h"
 #include "e_policy_private_data.h"
index eefa94f..adb280f 100644 (file)
@@ -1,6 +1,7 @@
 #ifndef E_SERVICE_SOFTKEY_INTERN_H
 #define E_SERVICE_SOFTKEY_INTERN_H
 
+#include "e_intern.h"
 #include "e_service_softkey.h"
 
 EINTERN void              e_service_softkey_client_set(E_Client *ec);
index 4d00883..2150c0f 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "services/e_service_taskbar_intern.h"
 #include "e_policy_private_data.h"
 #include "e_client_intern.h"
index 3f9336a..1d4d8a4 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_SERVICE_TASKBAR_INTERN_H
 #define E_SERVICE_TASKBAR_INTERN_H
 
+#include "e_intern.h"
+
 typedef struct _E_Service_Taskbar E_Service_Taskbar;
 
 struct _E_Service_Taskbar
index 80c0cd5..fb01860 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "services/e_service_volume_intern.h"
 #include "e_policy_private_data.h"
 #include "e_client_intern.h"
index e4a5752..ecaee58 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_SERVICE_VOLUME_INTERN_H
 #define E_SERVICE_VOLUME_INTERN_H
 
+#include "e_intern.h"
+
 EINTERN Eina_Bool     e_service_volume_client_set(E_Client *ec);
 EINTERN E_Client     *e_service_volume_client_get(void);
 EINTERN Eina_Bool     e_service_volume_region_set(int region_type, int angle, Eina_Tiler *tiler);
index d70108d..fabde77 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_zone_video_intern.h"
 #include "e_client_video_intern.h"
 #include "e_comp_wl_intern.h"
@@ -8,6 +7,8 @@
 #include "iface/e_video_hwc_intern.h"
 #include "iface/e_video_external_intern.h"
 #include "iface/e_video_fallback_intern.h"
+#include "e_comp_wl_rsm_intern.h"
+#include "e_eom_intern.h"
 
 #define EO_DATA_KEY  "E_Client_Video"
 
index 68f504b..c72aadc 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_CLIENT_VIDEO_INTERN_H
 #define E_CLIENT_VIDEO_INTERN_H
 
+#include "e_intern.h"
+#include "e_client_video.h"
+
 typedef struct _E_Client_Video E_Client_Video;
 typedef struct _E_Client_Video_Info E_Client_Video_Info;
 
index a4af72b..8e18882 100644 (file)
@@ -1,10 +1,10 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "e.h"
 #include "e_client_video_intern.h"
 #include "e_video_debug_intern.h"
+#include "e_info_server_intern.h"
+#include "e_comp_wl_video_buffer_intern.h"
+#include "e_zone_video_intern.h"
+#include "e_comp_wl_viewport_intern.h"
+#include "e_utils_intern.h"
 
 #include <tizen-extension-server-protocol.h>
 
index c990b14..a5d0422 100644 (file)
@@ -1,8 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "e.h"
 #include "e_comp_wl_video_buffer_intern.h"
 #include "e_util_video_intern.h"
 
index f50b8aa..7885be6 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_COMP_WL_VIDEO_BUFFER_INTERN_H
 #define E_COMP_WL_VIDEO_BUFFER_INTERN_H
 
+#include "e_intern.h"
+#include "e_comp_wl_video_buffer.h"
+
 #define VBUF_IS_VALID(b)   e_comp_wl_video_buffer_valid(b)
 #define MSTAMP(b)          ((b)?(b)->stamp:0)
 
index f2fb493..42af907 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_COMP_WL_VIDEO_INTERN_H
 #define E_COMP_WL_VIDEO_INTERN_H
 
+#include "e_intern.h"
+
 EINTERN Eina_Bool  e_comp_wl_video_init(void);
 EINTERN void       e_comp_wl_video_shutdown(void);
 
index feec3ab..70f15c9 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_util_video_intern.h"
 
 #include <tbm_surface.h>
index a1f2057..911c1de 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_UTIL_VIDEO_INTERN_H
 #define E_UTIL_VIDEO_INTERN_H
 
+#include "e_intern.h"
+
 #include <tbm_surface.h>
 
 #define C(b,m)              (((b) >> (m)) & 0xFF)
index fdca057..22412c5 100644 (file)
@@ -1,6 +1,7 @@
 #ifndef E_VIDEO_COMP_IFACE
 #define E_VIDEO_COMP_IFACE
 
+#include "e_intern.h"
 #include "e_client_video_intern.h"
 
 typedef struct _E_Video_Comp_Iface E_Video_Comp_Iface;
index 25b588d..c005a8e 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_video_debug_intern.h"
 
 static Eina_Bool video_to_primary = EINA_FALSE;
index 9525941..8a01d4d 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_VIDEO_DEBUG_INTERN_H
 #define E_VIDEO_DEBUG_INTERN_H
 
+#include "e_intern.h"
+#include "e_video_debug.h"
+
 #ifdef VER
 #undef VER
 #endif
index 931be66..7a19a73 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_zone_video_intern.h"
 #include "e_comp_screen_intern.h"
 
index 473515d..90ca8d8 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_ZONE_VIDEO_INTERN_H
 #define E_ZONE_VIDEO_INTERN_H
 
+#include "e_intern.h"
+#include "e_zone_video.h"
+
 EINTERN E_Hwc_Policy e_zone_video_hwc_policy_get(E_Zone *zone);
 
 #endif
index 0af7464..3be2f65 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "iface/e_video_external_intern.h"
 
 typedef struct _E_Video_External E_Video_External;
index 2e5e3b3..2e95a66 100644 (file)
@@ -1,6 +1,7 @@
 #ifndef E_VIDEO_EXTERNAL_INTERN_H
 #define E_VIDEO_EXTERNAL_INTERN_H
 
+#include "e_intern.h"
 #include "e_video_comp_iface.h"
 
 /* For external interface */
index 30fc083..4dace91 100644 (file)
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_policy_intern.h"
 #include "e_video_debug_intern.h"
 #include "iface/e_video_fallback_intern.h"
index c676d8e..1f6901f 100644 (file)
@@ -1,6 +1,7 @@
 #ifndef E_VIDEO_FALLBACK_INTERN_H
 #define E_VIDEO_FALLBACK_INTERN_H
 
+#include "e_intern.h"
 #include "e_video_comp_iface.h"
 
 /* For fallback interface */
index 65f67c6..8b3fefa 100644 (file)
@@ -1,8 +1,3 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "e.h"
 #include "e_zone_video_intern.h"
 #include "e_client_video_intern.h"
 #include "e_video_hwc_intern.h"
index a67648a..482b41e 100644 (file)
@@ -1,8 +1,10 @@
 #ifndef E_VIDEO_HWC_INTERN_H
 #define E_VIDEO_HWC_INTERN_H
 
+#include "e_intern.h"
 #include "e_video_comp_iface.h"
 #include "e_comp_wl_video_buffer_intern.h"
+#include "e_main_intern.h"
 
 #define BUFFER_MAX_COUNT   5
 
index ba33a0a..b31d263 100644 (file)
@@ -1,8 +1,3 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "e.h"
 #include "e_video_hwc_intern.h"
 #include "e_comp_screen_intern.h"
 #include "e_comp_wl_intern.h"
index b8bc941..f2574aa 100644 (file)
@@ -1,8 +1,3 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "e.h"
 #include "e_video_hwc_intern.h"
 #include "e_comp_screen_intern.h"
 #include "e_hwc_window_intern.h"
index c26c331..6b901f9 100644 (file)
@@ -141,44 +141,6 @@ using namespace std;
 # include <Eio.h>
 # include <uuid.h>
 
-# ifdef E_API
-#  undef E_API
-# endif
-# ifdef WIN32
-#  ifdef BUILDING_DLL
-#   define E_API __declspec(dllexport)
-#  else
-#   define E_API __declspec(dllimport)
-#  endif
-# else
-#  ifdef __GNUC__
-#   if __GNUC__ >= 4
-/* BROKEN in gcc 4 on amd64 */
-#    if 0
-#     pragma GCC visibility push(hidden)
-#    endif
-#    define E_API __attribute__ ((visibility("default")))
-#   else
-#    define E_API
-#   endif
-#  else
-#   define E_API
-#  endif
-# endif
-
-# ifdef EINTERN
-#  undef EINTERN
-# endif
-# ifdef __GNUC__
-#  if __GNUC__ >= 4
-#   define EINTERN __attribute__ ((visibility("hidden")))
-#  else
-#   define EINTERN
-#  endif
-# else
-#  define EINTERN
-# endif
-
 typedef struct _E_Before_Idler E_Before_Idler;
 typedef struct _E_Rect         E_Rect;
 
@@ -388,70 +350,11 @@ typedef struct _E_Rect         E_Rect;
 # undef E_TYPEDEFS
 # include "e_includes.h"
 
-E_API double          e_main_ts(const char *str);
-E_API double          e_main_ts_begin(const char *str);
-E_API double          e_main_ts_end(const char *str);
-
 struct _E_Rect
 {
    int x, y, w, h;
 };
 
-extern E_API Eina_Bool starting;
-extern E_API Eina_Bool stopping;
-
-//#define SMARTERR(args...) abort()
-#define SMARTERRNR() return
-#define SMARTERR(x)  return x
-
-/**
- * @}
- */
-
-/**
- * @defgroup Optional_Modules Optional Modules
- * @{
- *
- * @defgroup Optional_Conf Configurations
- * @defgroup Optional_Control Controls
- * @defgroup Optional_Devices Devices & Hardware
- * @defgroup Optional_Fileman File Managers
- * @defgroup Optional_Gadgets Gadgets
- * @defgroup Optional_Launcher Launchers
- * @defgroup Optional_Layouts Layout Managers
- * @defgroup Optional_Look Look & Feel
- * @defgroup Optional_Monitors Monitors & Notifications
- * @defgroup Optional_Mobile Mobile Specific Extensions
- * @}
- */
-
-#if 0
-#define REFD(obj, num) \
-   do { \
-      printf("%p <- %5i <- ref   | %s-%i\n", \
-             obj, E_OBJECT(obj)->references, \
-             __FILE__, num); \
-   } while (0)
-
-#define UNREFD(obj, num) \
-   do { \
-      printf("%p <- %5i <- unref | %s-%i\n", \
-             obj, E_OBJECT(obj)->references, \
-             __FILE__, num); \
-   } while (0)
-
-#define DELD(obj, num) \
-   do { \
-      printf("%p <- %5i <- del   | %s-%i\n", \
-             obj, E_OBJECT(obj)->references, \
-             __FILE__, num); \
-   } while (0)
-#else
-# define REFD(obj, num)
-# define UNREFD(obj, num)
-# define DELD(obj, num)
-#endif
-
 #ifndef USE_E_APPINFO
  #define e_policy_appinfo_find_with_pid e_appinfo_find_with_pid
  #define e_policy_appinfo_base_output_resolution_set e_appinfo_base_output_resolution_set
index fbf272a..05bb75e 100644 (file)
@@ -1,10 +1,6 @@
-#ifdef E_TYPEDEFS
-
-typedef struct _E_Action             E_Action;
-
-#else
 #ifndef E_ACTIONS_H
 #define E_ACTIONS_H
 
-#endif
+typedef struct _E_Action E_Action;
+
 #endif
index 56c9846..d50ead0 100644 (file)
@@ -1,9 +1,9 @@
-#ifdef E_TYPEDEFS
-typedef struct _E_Appinfo E_Appinfo;
-#else
 # ifndef E_APPINFO_H
 # define E_APPINFO_H
 
+#include <unistd.h>
+
+typedef struct _E_Appinfo E_Appinfo;
 typedef struct _E_Appinfo_Hook E_Appinfo_Hook;
 
 typedef enum _E_Appinfo_Hook_Point
@@ -25,5 +25,4 @@ E_API Eina_Stringshare      *e_appinfo_appid_get(E_Appinfo *eai);
 E_API E_Appinfo_Hook        *e_appinfo_hook_add(E_Appinfo_Hook_Point point, E_Appinfo_Hook_Cb cb, const void *data);
 E_API void                   e_appinfo_hook_del(E_Appinfo_Hook *hook);
 
-# endif
 #endif
index d884e5d..c38c118 100644 (file)
@@ -1,165 +1,7 @@
-#ifdef E_TYPEDEFS
-
-#if 0
-typedef enum _E_Binding_Context
-{
-   E_BINDING_CONTEXT_NONE,
-   E_BINDING_CONTEXT_UNKNOWN,
-   E_BINDING_CONTEXT_WINDOW,
-   E_BINDING_CONTEXT_ZONE,
-   E_BINDING_CONTEXT_COMPOSITOR,
-   E_BINDING_CONTEXT_MANAGER,
-   E_BINDING_CONTEXT_MENU,
-   E_BINDING_CONTEXT_WINLIST,
-   E_BINDING_CONTEXT_POPUP,
-   E_BINDING_CONTEXT_ANY
-} E_Binding_Context;
-
-/* why do we do this? config stored bindings must be fixed. x's modifier masks
- * may change from time to time, xserver to xserver - so we can't do a
- * simple match without translating to fixed values
- */
-typedef enum _E_Binding_Modifier
-{
-   E_BINDING_MODIFIER_NONE = 0,
-   E_BINDING_MODIFIER_SHIFT = (1 << 0),
-   E_BINDING_MODIFIER_CTRL = (1 << 1),
-   E_BINDING_MODIFIER_ALT = (1 << 2),
-   E_BINDING_MODIFIER_WIN = (1 << 3),
-   E_BINDING_MODIFIER_ALTGR = (1 << 4)
-} E_Binding_Modifier;
-
-typedef struct _E_Binding_Mouse  E_Binding_Mouse;
-typedef struct _E_Binding_Key    E_Binding_Key;
-typedef struct _E_Binding_Signal E_Binding_Signal;
-typedef struct _E_Binding_Wheel  E_Binding_Wheel;
-#endif
-
-typedef struct E_Binding_Event_Mouse_Button E_Binding_Event_Mouse_Button;
-typedef struct E_Binding_Event_Wheel E_Binding_Event_Wheel;
-
-#else
 #ifndef E_BINDINGS_H
 #define E_BINDINGS_H
 
-#if 0
-struct E_Binding_Event_Mouse_Button
-{
-   int               button; /**< Mouse button number that was raised (1 - 32) */
-
-   Evas_Coord_Point  canvas; /**< The X/Y location of the cursor */
-
-   unsigned int modifiers; /**< modifier keys pressed during the event */
-   unsigned int timestamp;
-   Eina_Bool double_click : 1;
-   Eina_Bool triple_click : 1;
-   Eina_Bool hold : 1;
-   Eina_Bool scroll : 1;
-};
-
-struct E_Binding_Event_Wheel
-{
-   int direction;
-   int z;
-
-   Evas_Coord_Point  canvas; /**< The X/Y location of the cursor */
-
-   unsigned int modifiers; /**< modifier keys pressed during the event */
-   unsigned int timestamp;
-};
-
-struct _E_Binding_Mouse
-{
-   E_Binding_Context ctxt;
-   int button;
-   E_Binding_Modifier mod;
-   unsigned char any_mod : 1;
-   const char *action;
-   const char *params;
-};
-
-struct _E_Binding_Key
-{
-   E_Binding_Context ctxt;
-   const char *key;
-   E_Binding_Modifier mod;
-   unsigned char any_mod : 1;
-   const char *action;
-   const char *params;
-};
-
-struct _E_Binding_Signal
-{
-   E_Binding_Context ctxt;
-   const char *sig;
-   const char *src;
-   E_Binding_Modifier mod;
-   unsigned char any_mod : 1;
-   const char *action;
-   const char *params;
-};
-
-struct _E_Binding_Wheel
-{
-   E_Binding_Context ctxt;
-   int direction;
-   int z;
-   E_Binding_Modifier mod;
-   unsigned char any_mod : 1;
-   const char *action;
-   const char *params;
-};
-
-EINTERN int         e_bindings_init(void);
-EINTERN int         e_bindings_shutdown(void);
-
-EINTERN void        e_bindings_mouse_reset(void);
-EINTERN void        e_bindings_key_reset(void);
-EINTERN void        e_bindings_wheel_reset(void);
-EINTERN void        e_bindings_signal_reset(void);
-EINTERN void        e_bindings_reset(void);
-
-EINTERN void        e_bindings_mouse_add(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
-EINTERN void        e_bindings_mouse_del(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
-EINTERN E_Action   *e_bindings_mouse_button_find(E_Binding_Context ctxt, E_Binding_Event_Mouse_Button *ev, E_Binding_Mouse **bind_ret);
-EINTERN E_Action   *e_bindings_mouse_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Mouse_Button *ev);
-EINTERN E_Action   *e_bindings_mouse_down_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Down *ev);
-EINTERN E_Action   *e_bindings_mouse_down_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Button *ev);
-EINTERN E_Action   *e_bindings_mouse_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Mouse_Button *ev);
-EINTERN E_Action   *e_bindings_mouse_up_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Up *ev);
-EINTERN E_Action   *e_bindings_mouse_up_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Button *ev);
-
-EINTERN void        e_bindings_key_add(E_Binding_Context ctxt, const char *key, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
-EINTERN void        e_bindings_key_del(E_Binding_Context ctxt, const char *key, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
-EINTERN E_Binding_Key *e_bindings_key_get(const char *action);
-EINTERN E_Binding_Key *e_bindings_key_find(const char *key, E_Binding_Modifier mod, int any_mod);
-EINTERN E_Action   *e_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Key *ev);
-EINTERN E_Action   *e_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Key *ev);
-EINTERN E_Action   *e_bindings_key_down_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev);
-EINTERN E_Action   *e_bindings_key_up_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev);
-
-EINTERN Eina_Bool   e_bindings_key_allowed(const char *key);
-
-EINTERN void        e_bindings_signal_add(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
-EINTERN void        e_bindings_signal_del(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
-EINTERN E_Action   *e_bindings_signal_find(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Signal **bind_ret);
-EINTERN E_Action   *e_bindings_signal_handle(E_Binding_Context ctxt, E_Object *obj, const char *sig, const char *src);
-
-EINTERN void        e_bindings_wheel_add(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
-EINTERN void        e_bindings_wheel_del(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
-EINTERN E_Action   *e_bindings_wheel_find(E_Binding_Context ctxt, E_Binding_Event_Wheel *ev, E_Binding_Wheel **bind_ret);
-EINTERN E_Action   *e_bindings_wheel_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Wheel *ev);
-EINTERN E_Action   *e_bindings_wheel_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Wheel *ev);
-EINTERN E_Action   *e_bindings_wheel_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Wheel *ev);
-
-EINTERN int e_bindings_evas_modifiers_convert(Evas_Modifier *modifiers);
-EINTERN int e_bindings_modifiers_to_ecore_convert(E_Binding_Modifier modifiers);
-EINTERN void e_bindings_evas_event_mouse_down_button_convert(const Evas_Event_Mouse_Down *ev, E_Binding_Event_Mouse_Button *event);
-EINTERN void e_bindings_evas_event_mouse_up_button_convert(const Evas_Event_Mouse_Up *ev, E_Binding_Event_Mouse_Button *event);
-EINTERN void e_bindings_evas_event_mouse_wheel_convert(const Evas_Event_Mouse_Wheel *ev, E_Binding_Event_Wheel *event);
-EINTERN void e_bindings_ecore_event_mouse_button_convert(const Ecore_Event_Mouse_Button *ev, E_Binding_Event_Mouse_Button *event);
-EINTERN void e_bindings_ecore_event_mouse_wheel_convert(const Ecore_Event_Mouse_Wheel *ev, E_Binding_Event_Wheel *event);
-#endif
+typedef struct E_Binding_Event_Mouse_Button E_Binding_Event_Mouse_Button;
+typedef struct E_Binding_Event_Wheel        E_Binding_Event_Wheel;
 
 #endif
-#endif
index 87f8715..1a434a3 100644 (file)
@@ -1,4 +1,35 @@
-#ifdef E_TYPEDEFS
+#ifndef E_CLIENT_H
+#define E_CLIENT_H
+
+#include <e_types.h>
+#include <e_object.h>
+#include <e_comp.h>
+#include <e_pointer.h>
+#include <e_hwc_window.h>
+#include <e_desk.h>
+#include <e_zone.h>
+#include <e_actions.h>
+#include <e_util_transform.h>
+#include <e_plane_renderer.h>
+#include <e_pixmap.h>
+#include <e_bindings.h>
+#include <e_config.h>
+
+#include <uuid.h>
+#include <Ecore.h>
+#include <Evas.h>
+
+typedef struct E_Event_Client E_Event_Client;
+typedef struct _E_Event_Client_Property E_Event_Client_Property;
+typedef struct _E_Event_Client_Focus_Skip E_Event_Client_Focus_Skip_Set;
+typedef struct _E_Event_Client_Focus_Skip E_Event_Client_Focus_Skip_Unset;
+EINA_DEPRECATED typedef struct _E_Client_Pending_Resize E_Client_Pending_Resize;
+typedef struct _E_Client_Pending_Geometry E_Client_Pending_Geometry;
+typedef struct E_Event_Client_Zone_Set E_Event_Client_Zone_Set;
+typedef struct E_Event_Client_Desk_Set E_Event_Client_Desk_Set;
+
+typedef struct _E_Client_Intercept_Hook E_Client_Intercept_Hook;
+
 typedef enum _E_Client_Screen_Limit
 {
     E_CLIENT_OFFSCREEN_LIMIT_ALLOW_PARTIAL = 0,
@@ -57,31 +88,6 @@ typedef enum _E_Focus_Policy_Ext
    E_FOCUS_EXT_HISTORY,
 } E_Focus_Policy_Ext;
 
-typedef enum
-{
-   /* same as ecore-x types */
-   E_WINDOW_TYPE_UNKNOWN = 0,
-   E_WINDOW_TYPE_DESKTOP,
-   E_WINDOW_TYPE_DOCK,
-   E_WINDOW_TYPE_TOOLBAR,
-   E_WINDOW_TYPE_MENU,
-   E_WINDOW_TYPE_UTILITY,
-   E_WINDOW_TYPE_SPLASH,
-   E_WINDOW_TYPE_DIALOG,
-   E_WINDOW_TYPE_NORMAL,
-   E_WINDOW_TYPE_DROPDOWN_MENU,
-   E_WINDOW_TYPE_POPUP_MENU,
-   E_WINDOW_TYPE_TOOLTIP,
-   E_WINDOW_TYPE_NOTIFICATION,
-   E_WINDOW_TYPE_COMBO,
-   E_WINDOW_TYPE_DND,
-   /* since UNKNOWN was used improperly in comp matching,
-    * this value is a placeholder to indicate that we want
-    * only type UNKNOWN windows
-    */
-   E_WINDOW_TYPE_REAL_UNKNOWN = 999
-} E_Window_Type;
-
 typedef enum _E_Focus_Setting
 {
    E_FOCUS_NONE,
@@ -225,19 +231,6 @@ typedef enum _E_Iconified_Type
    E_ICONIFIED_TYPE_PARENT_ICONIFY_BY_CLIENT = 4, // iconified by parent's iconify request
 } E_Iconified_Type;
 
-typedef struct E_Client E_Client;
-
-typedef struct E_Event_Client E_Event_Client;
-typedef struct _E_Event_Client_Property E_Event_Client_Property;
-typedef struct _E_Event_Client_Focus_Skip E_Event_Client_Focus_Skip_Set;
-typedef struct _E_Event_Client_Focus_Skip E_Event_Client_Focus_Skip_Unset;
-EINA_DEPRECATED typedef struct _E_Client_Pending_Resize E_Client_Pending_Resize;
-typedef struct _E_Client_Pending_Geometry E_Client_Pending_Geometry;
-typedef struct E_Event_Client_Zone_Set E_Event_Client_Zone_Set;
-typedef struct E_Event_Client_Desk_Set E_Event_Client_Desk_Set;
-typedef struct _E_Client_Hook E_Client_Hook;
-typedef struct _E_Client_Intercept_Hook E_Client_Intercept_Hook;
-
 #ifdef _F_ZONE_WINDOW_ROTATION_
 typedef struct E_Event_Client E_Event_Client_Rotation_Change_Begin;
 typedef struct E_Event_Client E_Event_Client_Rotation_Change_Cancel;
@@ -294,7 +287,6 @@ typedef void (*E_Client_Move_Intercept_Cb)(E_Client *, int x, int y);
 typedef void (*E_Client_Hook_Cb)(void *data, E_Client *ec);
 typedef Eina_Bool (*E_Client_Intercept_Hook_Cb)(void *data, E_Client *ec);
 typedef Evas_Object* (*E_Client_Resize_Object_Create_Cb)(E_Client *ec);
-#else
 
 #define E_CLIENT_TYPE (int)0xE0b01002
 
@@ -365,7 +357,7 @@ struct _E_Client_Pending_Geometry
    unsigned int                  serial;
 };
 
-struct E_Client
+struct _E_Client
 {
    E_Object e_obj_inherit;
    EINA_INLIST;
index 3bc41d4..f92e36c 100644 (file)
@@ -1,5 +1,23 @@
-#ifdef E_TYPEDEFS
+#ifndef E_COMP_H
+#define E_COMP_H
+
+#include <e_comp_cfdata.h>
+#include <e_client.h>
+#include <e_object.h>
+#include <e_comp_object.h>
+#include <e_comp_screen.h>
+#include <e_pointer.h>
+#include <e_zone.h>
+#include <e_desk.h>
+#include <e_desk_area.h>
+
+#include <stdatomic.h>
 #include <glib.h>
+#include <Ecore.h>
+#include <wayland-server.h>
+
+# define E_COMP_TYPE (int) 0xE0b01003
+# define E_CLIENT_LAYER_COUNT 19
 
 typedef struct _E_Comp                       E_Comp;
 typedef struct _E_Comp_Wl_Client_Data        E_Comp_Client_Data;  // deprecated. use E_Comp_Wl_Client_Data intead of this.
@@ -7,46 +25,6 @@ typedef struct _E_Comp_Wl_Data               E_Comp_Wl_Data;
 typedef struct _E_Comp_Wl_Client_Data        E_Comp_Wl_Client_Data;
 typedef struct _E_Comp_Connected_Client_Info E_Comp_Connected_Client_Info;
 
-# define E_COMP_TYPE (int) 0xE0b01003
-
-# define E_LAYER_COUNT 31
-# define E_CLIENT_LAYER_COUNT 19
-
-typedef enum _E_Layer
-{
-   E_LAYER_BOTTOM = -100,
-   E_LAYER_BG = -1, // zone bg stuff
-   E_LAYER_DESKTOP = 0, // desktop objects: fileman, gadgets, shelves
-   E_LAYER_DESKTOP_TOP = 10, // raised desktop objects: gadgets
-   E_LAYER_CLIENT_DESKTOP = 100, //shelves
-   E_LAYER_CLIENT_BELOW = 150,
-   E_LAYER_CLIENT_NORMAL = 200,
-   E_LAYER_CLIENT_ABOVE = 250,
-   E_LAYER_CLIENT_EDGE = 300,
-   E_LAYER_CLIENT_FULLSCREEN = 350,
-   E_LAYER_CLIENT_EDGE_FULLSCREEN = 400,
-   E_LAYER_CLIENT_POPUP = 450,
-   E_LAYER_CLIENT_TOP = 500,
-   E_LAYER_CLIENT_PRIO = 600,
-   E_LAYER_CLIENT_NOTIFICATION_LOW = 650,
-   E_LAYER_CLIENT_NOTIFICATION_NORMAL = 700,
-   E_LAYER_CLIENT_NOTIFICATION_HIGH = 750,
-   E_LAYER_CLIENT_NOTIFICATION_TOP = 800,
-   E_LAYER_CLIENT_ALERT_LOW = 850,
-   E_LAYER_CLIENT_ALERT = 900,
-   E_LAYER_CLIENT_ALERT_HIGH = 950,
-   E_LAYER_CLIENT_DRAG = 980,
-   E_LAYER_CLIENT_CURSOR = 990,
-   E_LAYER_POPUP = 999, // popups
-   E_LAYER_EFFECT = 1999,
-   E_LAYER_DESK_OBJECT_BELOW = 3000,
-   E_LAYER_DESK_OBJECT = 3100,
-   E_LAYER_DESK_OBJECT_ABOVE = 3200,
-   E_LAYER_MENU = 5000, // menus
-   E_LAYER_DESKLOCK = 9999, // desklock
-   E_LAYER_MAX = 32767 // EVAS_LAYER_MAX
-} E_Layer;
-
 typedef enum _E_Comp_Image_Filter
 {
    E_COMP_IMAGE_FILTER_NONE = 0,
@@ -55,19 +33,6 @@ typedef enum _E_Comp_Image_Filter
    E_COMP_IMAGE_FILTER_INVERSE,
 } E_Comp_Image_Filter;
 
-
-#else
-# ifndef E_COMP_H
-#  define E_COMP_H
-
-# include "e_comp_cfdata.h"
-
-extern E_API int E_EVENT_COMPOSITOR_DISABLE;
-extern E_API int E_EVENT_COMPOSITOR_ENABLE;
-
-extern E_API E_Comp *e_comp;
-extern E_API E_Comp_Wl_Data *e_comp_wl;
-
 typedef void (*E_Comp_Cb)(void);
 
 typedef struct _E_Comp_Hook E_Comp_Hook;
@@ -206,6 +171,12 @@ struct _E_Comp_Connected_Client_Info
    struct wl_listener destroy;
 };
 
+extern E_API int E_EVENT_COMPOSITOR_DISABLE;
+extern E_API int E_EVENT_COMPOSITOR_ENABLE;
+
+extern E_API E_Comp *e_comp;
+extern E_API E_Comp_Wl_Data *e_comp_wl;
+
 E_API E_Comp_Hook    *e_comp_hook_add(E_Comp_Hook_Point hookpoint, E_Comp_Hook_Cb func, const void *data);
 E_API void            e_comp_hook_del(E_Comp_Hook *ph);
 E_API E_Comp_Config  *e_comp_config_get(void);
@@ -229,4 +200,3 @@ E_API E_Desk_Area *e_comp_desk_area_find_by_ec(E_Client *ec);
 //#endif
 
 #endif
-#endif
index e62878b..e613846 100644 (file)
@@ -1,6 +1,3 @@
-#ifdef E_TYPEDEFS
-
-#else
 #ifndef E_COMP_CANVAS_H
 #define E_COMP_CANVAS_H
 
@@ -11,4 +8,3 @@ E_API void          e_comp_canvas_norender_push(void);
 E_API void          e_comp_canvas_norender_pop(void);
 
 #endif
-#endif
index adb6857..bf1a464 100644 (file)
@@ -1,12 +1,10 @@
-#ifdef E_TYPEDEFS
 
-typedef struct _E_Comp_Config E_Comp_Config;
-typedef struct _E_Comp_Match  E_Comp_Match;
-
-#else
 #ifndef E_COMP_CFDATA_H
 #define E_COMP_CFDATA_H
 
+typedef struct _E_Comp_Config E_Comp_Config;
+typedef struct _E_Comp_Match  E_Comp_Match;
+
 struct _E_Comp_Config
 {
    int           version;
@@ -110,4 +108,3 @@ struct _E_Comp_Match
 };
 
 #endif
-#endif
index ee97bbb..37f8f3e 100644 (file)
@@ -1,11 +1,27 @@
-#ifdef E_TYPEDEFS
+#ifndef E_COMP_OBJECT_H
+#define E_COMP_OBJECT_H
+
+#include <e_map.h>
+
+#include <Eina.h>
+#include <Ecore.h>
+#include <Ecore_Input.h>
+#include <Evas.h>
+#include <Edje.h>
+
+#define E_COMP_OBJECT_FRAME_RESHADOW "COMP_RESHADOW"
+
 typedef struct E_Comp_Object_Frame E_Comp_Object_Frame;
 typedef struct E_Event_Comp_Object E_Event_Comp_Object;
+typedef struct E_Comp_Object_Mover E_Comp_Object_Mover;
+
+typedef struct _E_Comp_Object_Hook E_Comp_Object_Hook;
+
 typedef void (*E_Comp_Object_Autoclose_Cb)(void *, Evas_Object *);
 typedef Eina_Bool (*E_Comp_Object_Key_Cb)(void *, Ecore_Event_Key *);
 typedef Eina_Bool (*E_Comp_Object_Mover_Cb) (void *data, Evas_Object *comp_object, const char *signal);
 
-typedef struct E_Comp_Object_Mover E_Comp_Object_Mover;
+typedef Eina_Bool (*E_Comp_Object_Hook_Cb)(void *data, E_Client *ec);
 
 typedef enum
 {
@@ -16,12 +32,6 @@ typedef enum
    E_COMP_OBJECT_CONTENT_TYPE_LAST,
 } E_Comp_Object_Content_Type;
 
-#else
-#ifndef E_COMP_OBJECT_H
-#define E_COMP_OBJECT_H
-
-#define E_COMP_OBJECT_FRAME_RESHADOW "COMP_RESHADOW"
-
 struct E_Event_Comp_Object
 {
    Evas_Object *comp_object;
@@ -33,8 +43,6 @@ struct E_Comp_Object_Frame
    Eina_Bool calc : 1; // inset has been calculated
 };
 
-typedef struct _E_Comp_Object_Hook E_Comp_Object_Hook;
-
 typedef enum _E_Comp_Object_Hook_Point
 {
    E_COMP_OBJECT_HOOK_EFFECT_START,
@@ -48,8 +56,6 @@ typedef enum _E_Comp_Object_Hook_Point
    E_COMP_OBJECT_HOOK_LAST,
 } E_Comp_Object_Hook_Point;
 
-typedef Eina_Bool (*E_Comp_Object_Hook_Cb)(void *data, E_Client *ec);
-
 struct _E_Comp_Object_Hook
 {
    EINA_INLIST;
@@ -146,5 +152,4 @@ E_API void                          e_comp_object_intercept_hook_del(E_Comp_Obje
 #endif
 
 #endif
-#endif
 
index dd84f9f..cfb3244 100644 (file)
@@ -1,14 +1,13 @@
-#ifdef E_TYPEDEFS
-
-typedef struct _E_Comp_Screen   E_Comp_Screen;
-
-#else
 #ifndef E_COMP_SCREEN_H
 #define E_COMP_SCREEN_H
 
+#include <e_client.h>
+
 #include <tdm.h>
 #include <xkbcommon/xkbcommon.h>
 
+typedef struct _E_Comp_Screen   E_Comp_Screen;
+
 struct _E_Comp_Screen
 {
    Eina_List     *outputs; // available screens
@@ -47,5 +46,3 @@ E_API Eina_Bool  e_comp_screen_available_video_formats_get(const tbm_format **fo
 E_API void       e_comp_screen_keymap_set(struct xkb_context **ctx, struct xkb_keymap **map);
 
 #endif /*E_COMP_SCREEN_H*/
-
-#endif
index e375690..2af8bd7 100644 (file)
@@ -1,42 +1,51 @@
-#ifdef E_TYPEDEFS
-typedef struct _E_Comp_Wl_Hook E_Comp_Wl_Hook;
-typedef struct _E_Comp_Wl_Pid_Hook E_Comp_Wl_Pid_Hook;
-#else
-# ifndef E_COMP_WL_H
-#  define E_COMP_WL_H
+#ifndef E_COMP_WL_H
+#define E_COMP_WL_H
+
+#include <e_types.h>
+#include <e_comp.h>
+#include <e_client.h>
+#include <e_explicit_sync.h>
+#include <e_presentation_time.h>
+#include <e_dnd.h>
+#include <e_devicemgr.h>
+#include <e_util_transform.h>
+
+#include <stdatomic.h>
+#include <tbm_surface.h>
+#include <glib.h>
+#include <Evas.h>
 
 /* NB: Turn off shadow warnings for Wayland includes */
-#  pragma GCC diagnostic push
-#  pragma GCC diagnostic ignored "-Wshadow"
-#  define WL_HIDE_DEPRECATED
-#  include <wayland-server.h>
-#  pragma GCC diagnostic pop
-
-#  include <xkbcommon/xkbcommon.h>
-
-#  ifdef __linux__
-#   include <linux/input.h>
-#  else
-#   define BTN_LEFT 0x110
-#   define BTN_RIGHT 0x111
-#   define BTN_MIDDLE 0x112
-#   define BTN_SIDE 0x113
-#   define BTN_EXTRA 0x114
-#   define BTN_FORWARD 0x115
-#   define BTN_BACK 0x116
-#  endif
-
-#  define container_of(ptr, type, member) \
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#define WL_HIDE_DEPRECATED
+#include <wayland-server.h>
+#pragma GCC diagnostic pop
+
+#include <xkbcommon/xkbcommon.h>
+
+#ifdef __linux__
+#include <linux/input.h>
+#else
+#define BTN_LEFT 0x110
+#define BTN_RIGHT 0x111
+#define BTN_MIDDLE 0x112
+#define BTN_SIDE 0x113
+#define BTN_EXTRA 0x114
+#define BTN_FORWARD 0x115
+#define BTN_BACK 0x116
+#endif
+
+#define container_of(ptr, type, member) \
    ({ \
       const __typeof__( ((type *)0)->member ) *__mptr = (ptr); \
       (type *)( (char *)__mptr - offsetof(type,member) ); \
    })
 
-#include <tbm_surface.h>
+typedef struct _E_Comp_Wl_Hook E_Comp_Wl_Hook;
+typedef struct _E_Comp_Wl_Pid_Hook E_Comp_Wl_Pid_Hook;
 
 typedef struct _E_Comp_Wl_Aux_Hint  E_Comp_Wl_Aux_Hint;
-typedef struct _E_Comp_Wl_Buffer E_Comp_Wl_Buffer;
-typedef struct _E_Comp_Wl_Buffer_Ref E_Comp_Wl_Buffer_Ref;
 typedef struct _E_Comp_Wl_Buffer_Viewport E_Comp_Wl_Buffer_Viewport;
 typedef struct _E_Comp_Wl_Subsurf_Data E_Comp_Wl_Subsurf_Data;
 typedef struct _E_Comp_Wl_Surface_State E_Comp_Wl_Surface_State;
@@ -131,12 +140,6 @@ struct _E_Comp_Wl_Buffer
    E_Explicit_Sync_Buffer_Release *buffer_release;
 };
 
-struct _E_Comp_Wl_Buffer_Ref
-{
-   E_Comp_Wl_Buffer *buffer;
-   struct wl_listener destroy_listener;
-};
-
 struct _E_Comp_Wl_Buffer_Viewport {
    struct
      {
@@ -601,5 +604,4 @@ E_API void                      e_comp_wl_pid_hook_del(E_Comp_Wl_Pid_Hook *ch);
 E_API E_Comp_Wl_Intercept_Hook *e_comp_wl_intercept_hook_add(E_Comp_Wl_Intercept_Hook_Point hookpoint, E_Comp_Wl_Intercept_Hook_Cb func, const void *data);
 E_API void                      e_comp_wl_intercept_hook_del(E_Comp_Wl_Intercept_Hook *ch);
 
-# endif
 #endif
index 0a10438..eb1961b 100644 (file)
@@ -1,4 +1,8 @@
-#ifdef E_TYPEDEFS
+# ifndef E_COMP_WL_CAPTURE_H
+# define E_COMP_WL_CAPTURE_H
+
+#include <e_client.h>
+
 typedef enum _E_Capture_Save_State
 {
    E_CAPTURE_SAVE_STATE_START = 0,
@@ -10,12 +14,7 @@ typedef enum _E_Capture_Save_State
 
 typedef void (*E_Capture_Client_Save_End_Cb)(void *data, E_Client *ec, const Eina_Stringshare *dest, E_Capture_Save_State state);
 
-#else
-# ifndef E_COMP_WL_CAPTURE_H
-# define E_COMP_WL_CAPTURE_H
-
 E_API   E_Capture_Save_State e_comp_wl_capture_client_image_save(E_Client *ec, const char* path, const char* name, E_Capture_Client_Save_End_Cb func_end, void *data, Eina_Bool skip_child);
 E_API   void                 e_comp_wl_capture_client_image_save_cancel(E_Client *ec);
 
-# endif
 #endif
index 93dc39d..ac75d7e 100644 (file)
@@ -1,18 +1,15 @@
-#ifdef E_TYPEDEFS
-
-E_API extern int E_EVENT_TEXT_INPUT_PANEL_VISIBILITY_CHANGE;
-
-typedef struct _E_Event_Text_Input_Panel_Visibility_Change E_Event_Text_Input_Panel_Visibility_Change;
-
-#else
 #ifndef E_COMP_WL_INPUT_H
 #define E_COMP_WL_INPUT_H
 
+typedef struct _E_Event_Text_Input_Panel_Visibility_Change E_Event_Text_Input_Panel_Visibility_Change;
+
 struct _E_Event_Text_Input_Panel_Visibility_Change
 {
    Eina_Bool visible;
 };
 
+E_API extern int E_EVENT_TEXT_INPUT_PANEL_VISIBILITY_CHANGE;
+
 E_API Eina_Bool         e_comp_wl_input_keymap_cache_file_use_get(void);
 E_API Eina_Stringshare *e_comp_wl_input_keymap_path_get(struct xkb_rule_names names);
 E_API void              e_comp_wl_input_keymap_set(const char *rules, const char *model, const char *layout, const char *variant, const char *options, struct xkb_context *dflt_ctx, struct xkb_keymap *dflt_map);
@@ -21,5 +18,4 @@ E_API int               e_comp_wl_input_keymap_keyname_to_keycode(const char * n
 E_API void      e_comp_wl_input_keyboard_repeat_set(int delay, int rate);
 E_API Eina_Bool e_comp_wl_input_pointer_constraint_activated_get(void);
 
-# endif
 #endif
index 41477d9..a6a403f 100644 (file)
@@ -1,11 +1,8 @@
-#ifdef E_TYPEDEFS
-
-typedef struct _E_Event_Remote_Surface_Provider E_Event_Remote_Surface_Provider;
-
-#else
 #ifndef E_COMP_WL_RSM_H
 #define E_COMP_WL_RSM_H
 
+typedef struct _E_Event_Remote_Surface_Provider E_Event_Remote_Surface_Provider;
+
 struct _E_Event_Remote_Surface_Provider
 {
    E_Client *ec;
@@ -22,4 +19,3 @@ E_API void       e_comp_wl_remote_surface_image_save_skip_set(E_Client *ec, Eina
 E_API Eina_List *e_comp_wl_remote_surface_providers_get(E_Client *ec);
 
 #endif
-#endif
index 3349772..08e7e07 100644 (file)
@@ -1,14 +1,11 @@
-#ifdef E_TYPEDEFS
-
-typedef struct _E_Comp_Wl_Tbm_Funcs E_Comp_Wl_Tbm_Funcs;
-
-#else
-# ifndef E_COMP_WL_TBM_H
-#  define E_COMP_WL_TBM_H
+#ifndef E_COMP_WL_TBM_H
+#define E_COMP_WL_TBM_H
 
 #include <tbm_surface.h>
 #include <wayland-tbm-server.h>
 
+typedef struct _E_Comp_Wl_Tbm_Funcs E_Comp_Wl_Tbm_Funcs;
+
 struct _E_Comp_Wl_Tbm_Funcs
 {
    char *module_name;
@@ -22,5 +19,4 @@ struct _E_Comp_Wl_Tbm_Funcs
 E_API   Eina_Bool e_comp_wl_tbm_module_func_set(const char *module_name, E_Comp_Wl_Tbm_Funcs *fn);
 E_API   Eina_Bool e_comp_wl_tbm_module_func_unset(void);
 
-# endif
 #endif
index 5664fd8..7659a69 100644 (file)
@@ -1,10 +1,6 @@
-#ifdef E_TYPEDEFS
-
-#else
 #ifndef E_COMP_WL_VIDEO_BUFFER_H
 #define E_COMP_WL_VIDEO_BUFFER_H
 
 E_API   void e_comp_wl_video_buffer_list_print(const char *log_path);
 
 #endif
-#endif
index a59d44b..d16fcb9 100644 (file)
@@ -1,6 +1,3 @@
-#ifdef E_TYPEDEFS
-
-#else
 #ifndef E_COMP_WL_VIEWPORT_H
 #define E_COMP_WL_VIEWPORT_H
 
@@ -9,4 +6,3 @@ E_API Eina_Bool e_comp_wl_viewport_create(struct wl_resource *resource,
                                           struct wl_resource *surface);
 
 #endif
-#endif
index 3e12306..4fa480e 100644 (file)
@@ -1,21 +1,10 @@
-#ifdef E_TYPEDEFS
-
-#define E_CONFIG_LIMIT(v, min, max) {if (v >= max) v = max; else if (v <= min) v = min; }
-
-typedef struct _E_Config                        E_Config;
-typedef struct _E_Config_Module                 E_Config_Module;
-typedef struct _E_Config_Desktop_Name           E_Config_Desktop_Name;
-typedef struct _E_Config_Desktop_Background     E_Config_Desktop_Background;
-typedef struct _E_Config_Env_Var                E_Config_Env_Var;
-typedef struct _E_Config_Client_Type            E_Config_Client_Type;
-typedef struct _E_Config_Policy_Desk            E_Config_Policy_Desk;
-typedef struct _E_Config_Socket_Access          E_Config_Socket_Access;
-typedef struct _E_Config_Aux_Hint_Supported     E_Config_Aux_Hint_Supported;
-
-#else
 #ifndef E_CONFIG_H
 #define E_CONFIG_H
 
+#include <e_config_data.h>
+
+#define E_CONFIG_LIMIT(v, min, max) {if (v >= max) v = max; else if (v <= min) v = min; }
+
 /* increment this whenever we change config enough that you need new
  * defaults for e to work.
  */
@@ -26,6 +15,16 @@ typedef struct _E_Config_Aux_Hint_Supported     E_Config_Aux_Hint_Supported;
 #define E_CONFIG_FILE_GENERATION 19
 #define E_CONFIG_FILE_VERSION    ((E_CONFIG_FILE_EPOCH * 1000000) + E_CONFIG_FILE_GENERATION)
 
+typedef struct _E_Config                        E_Config;
+typedef struct _E_Config_Module                 E_Config_Module;
+typedef struct _E_Config_Desktop_Name           E_Config_Desktop_Name;
+typedef struct _E_Config_Desktop_Background     E_Config_Desktop_Background;
+typedef struct _E_Config_Env_Var                E_Config_Env_Var;
+typedef struct _E_Config_Client_Type            E_Config_Client_Type;
+typedef struct _E_Config_Policy_Desk            E_Config_Policy_Desk;
+typedef struct _E_Config_Socket_Access          E_Config_Socket_Access;
+typedef struct _E_Config_Aux_Hint_Supported     E_Config_Aux_Hint_Supported;
+
 struct _E_Config
 {
    int         config_version; // INTERNAL
@@ -425,4 +424,3 @@ E_API int   e_config_domain_save(const char *domain, E_Config_DD *edd, const voi
 extern E_API E_Config *e_config;
 
 #endif
-#endif
index b52ea32..920992f 100644 (file)
@@ -1,4 +1,7 @@
-#ifdef E_TYPEDEFS
+#ifndef E_CONFIG_DATA_H
+#define E_CONFIG_DATA_H
+
+#include <Eet.h>
 
 /** \def E_CONFIG_DD_NEW(str, typ)
  * is used to create definition of a struct  
 
 typedef Eet_Data_Descriptor                 E_Config_DD;
 
-#else
-#ifndef E_CONFIG_DATA_H
-#define E_CONFIG_DATA_H
-
 E_API E_Config_DD *e_config_descriptor_new(const char *name, int size);
 E_API void e_config_descriptor_free(E_Config_DD *edd);
 E_API E_Config_DD *e_config_descriptor_find(const char *name);
 
 #endif
-#endif
index 9ed86ed..e90a081 100644 (file)
@@ -1,12 +1,14 @@
-#ifdef E_TYPEDEFS
-E_API extern int E_EVENT_DBUS_CONN_INIT_DONE;
-#else
 #ifndef E_DBUS_CONN_H
 #define E_DBUS_CONN_H
 
+#include <Eldbus.h>
+
 #define E_DBUS_CONN_TYPE (int)0xdb00beaf
 #define E_DBUS_CONN_DEFAULT_RETRY_COUNT 5
 
+typedef struct _E_DBus_Conn_Init_Done_Event E_DBus_Conn_Init_Done_Event;
+typedef struct _E_DBus_Conn E_DBus_Conn;
+
 typedef enum _E_DBus_Conn_Init_Status
 {
    E_DBUS_CONN_INIT_FAIL = 0,
@@ -34,8 +36,7 @@ struct _E_DBus_Conn
    unsigned int retry_intervals; /* suspend re-connection for microsecond intervals */
 };
 
-typedef struct _E_DBus_Conn_Init_Done_Event E_DBus_Conn_Init_Done_Event;
-typedef struct _E_DBus_Conn E_DBus_Conn;
+E_API extern int E_EVENT_DBUS_CONN_INIT_DONE;
 
 E_API Eldbus_Connection *e_dbus_conn_connection_ref(Eldbus_Connection_Type type);
 E_API void e_dbus_conn_connection_unref(Eldbus_Connection *conn);
@@ -44,4 +45,3 @@ E_API int e_dbus_conn_init(void);
 E_API int e_dbus_conn_shutdown(void);
 
 #endif
-#endif
index 7c28923..d2a9a52 100644 (file)
@@ -1,6 +1,14 @@
-#ifdef E_TYPEDEFS
+#ifndef E_DESK_H
+#define E_DESK_H
+
+#include <e_desk_area.h>
+#include <e_client.h>
+
+#define E_DESK_TYPE 0xE0b01005
+#define E_DESK_SMART_OBJ_TYPE "E_Desk_Smart_Object"
+#define E_DESK_AREA_LAYER_COUNT 9
 
-typedef struct _E_Desk E_Desk;
+typedef struct _E_Desk_Hook E_Desk_Hook;
 
 typedef struct _E_Event_Desk E_Event_Desk;
 typedef struct _E_Event_Desk E_Event_Desk_Show;
@@ -12,29 +20,6 @@ typedef struct _E_Event_Desk E_Event_Desk_Zoom_Set;
 typedef struct _E_Event_Desk E_Event_Desk_Zoom_Unset;
 typedef struct _E_Event_Desk_Geometry_Change E_Event_Desk_Geometry_Change;
 
-typedef enum _E_Desk_Area_Layer
-{
-   E_DESK_AREA_LAYER_BACKGROUND          = 0,     //E_LAYER_DESKTOP
-   E_DESK_AREA_LAYER_NORMAL_BELOW        = 150,   //E_LAYER_CLIENT_BELOW
-   E_DESK_AREA_LAYER_NORMAL              = 200,   //E_LAYER_CLIENT_NORMAL,
-   E_DESK_AREA_LAYER_NORMAL_ABOVE        = 250,   //E_LAYER_CLIENT_ABOVE,
-   E_DESK_AREA_LAYER_NOTIFICATION_LOW    = 650,   //E_LAYER_CLIENT_NOTIFICATION_LOW,
-   E_DESK_AREA_LAYER_NOTIFICATION_NORMAL = 700,   //E_LAYER_CLIENT_NOTIFICATION_NORMAL,
-   E_DESK_AREA_LAYER_NOTIFICATION_HIGH   = 750,   //E_LAYER_CLIENT_NOTIFICATION_HIGH,
-   E_DESK_AREA_LAYER_NOTIFICATION_TOP    = 800,   //E_LAYER_CLIENT_NOTIFICATION_TOP,
-   E_DESK_AREA_LAYER_SYSTEM              = 900,   //E_LAYER_CLIENT_ALERT,
-} E_Desk_Area_Layer;
-#define E_DESK_AREA_LAYER_COUNT 9
-
-#else
-#ifndef E_DESK_H
-#define E_DESK_H
-
-#define E_DESK_TYPE 0xE0b01005
-#define E_DESK_SMART_OBJ_TYPE "E_Desk_Smart_Object"
-
-typedef struct _E_Desk_Hook E_Desk_Hook;
-
 typedef enum _E_Desk_Hook_Point
 {
    E_DESK_HOOK_CLIENT_ADD,
@@ -145,4 +130,3 @@ extern E_API int E_EVENT_DESK_ZOOM_SET;
 extern E_API int E_EVENT_DESK_ZOOM_UNSET;
 
 #endif
-#endif
index 23400a2..b4141b5 100644 (file)
@@ -1,4 +1,16 @@
-#ifdef E_TYPEDEFS
+#ifndef E_DESK_AREA_H
+#define E_DESK_AREA_H
+
+#include <e_desk.h>
+#include <e_comp.h>
+#include <e_comp_wl.h>
+
+#define E_DESK_AREA_TYPE 0xE0b01006
+//#ifdef REFACTOR_DESK_AREA
+#define E_DESK_AREA_SMART_OBJ_TYPE "E_Desk_Area_Smart_Object"
+//#endif
+
+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;
@@ -17,16 +29,6 @@ typedef enum _E_Desk_Area_Client_Layer
    E_DESK_AREA_CLIENT_LAYER_MAX,
 } E_Desk_Area_Client_Layer;
 
-#else
-#ifndef E_DESK_AREA_H
-#define E_DESK_AREA_H
-
-#define E_DESK_AREA_TYPE 0xE0b01006
-//#ifdef REFACTOR_DESK_AREA
-#define E_DESK_AREA_SMART_OBJ_TYPE "E_Desk_Area_Smart_Object"
-//#endif
-
-typedef struct _E_Desk_Area_Hook E_Desk_Area_Hook;
 
 typedef enum _E_Desk_Area_Hook_Point
 {
@@ -106,4 +108,3 @@ extern E_API int E_EVENT_DESK_AREA_CHANGE;
 //#endif
 
 #endif
-#endif
index 1bd26fc..77a1878 100644 (file)
@@ -1,5 +1,3 @@
-#ifdef E_TYPEDEFS
-#else
 #ifndef E_DEVICE_H
 #define E_DEVICE_H
 
@@ -24,5 +22,4 @@ E_API const GList          *e_device_list_get(void);
 
 G_END_DECLS
 
-#endif
 #endif /* end of include guard: E_DEVICE_INTERN_H */
\ No newline at end of file
index ca41af8..761d727 100644 (file)
@@ -1,8 +1,12 @@
-#ifdef E_TYPEDEFS
+#ifndef E_DEVICEMGR_H
+#define E_DEVICEMGR_H
+
+#include <glib.h>
 
-typedef struct _E_Devicemgr_Conf_Edd E_Devicemgr_Conf_Edd;
+typedef struct _E_Devicemgr             E_Devicemgr;
+typedef struct _E_Devicemgr_Wl_Data     E_Devicemgr_Wl_Data;
+typedef struct _E_Devicemgr_Conf_Edd    E_Devicemgr_Conf_Edd;
 typedef struct _E_Devicemgr_Config_Data E_Devicemgr_Config_Data;
-typedef struct _E_Devicemgr_Wl_Data E_Devicemgr_Wl_Data;
 
 typedef struct _E_Devicemgr_Input_Device
 {
@@ -22,16 +26,9 @@ typedef struct _E_Devicemgr_Input_Device_Multi
    double angle;
 } E_Devicemgr_Input_Device_Multi;
 
-typedef struct _E_Devicemgr E_Devicemgr;
 
 typedef void (*E_Devicemgr_Block_Expire_Cb) (void *data);
 
-#else
-#ifndef E_DEVICEMGR_H
-#define E_DEVICEMGR_H
-
-extern E_API E_Devicemgr *e_devicemgr;
-
 struct _E_Devicemgr
 {
    E_Devicemgr_Config_Data *dconfig;
@@ -87,10 +84,10 @@ struct _E_Devicemgr
    } keyboard_grab;
 };
 
-E_API Eina_Bool e_devicemgr_is_blocking_event(Ecore_Device_Class clas);
+extern E_API E_Devicemgr *e_devicemgr;
 
+E_API Eina_Bool e_devicemgr_is_blocking_event(Ecore_Device_Class clas);
 E_API Eina_Bool e_devicemgr_block_reset(void);
 
 #endif
-#endif
 
index 0aa9920..5b4e460 100644 (file)
@@ -1,10 +1,6 @@
-#ifdef E_TYPEDEFS
-
-typedef struct _E_Drag          E_Drag;
-
-#else
 #ifndef E_DND_H
 #define E_DND_H
 
-#endif
+typedef struct _E_Drag          E_Drag;
+
 #endif
index 057f093..82f594f 100644 (file)
@@ -1,10 +1,6 @@
-#ifdef E_TYPEDEFS
-
-typedef struct _E_Egl_Sync E_Egl_Sync;
-
-#else
 #ifndef E_EGL_SYNC_H
 #define E_EGL_SYNC_H
 
+typedef struct _E_Egl_Sync E_Egl_Sync;
+
 #endif // E_EGL_SYNC_H
-#endif
index a813851..55ce933 100644 (file)
@@ -1,13 +1,8 @@
-#ifdef E_TYPEDEFS
+#ifndef E_EOM_H
+#define E_EOM_H
 
-#else
-#ifndef E_COMP_WL_EOM_H
-#define E_COMP_WL_EOM_H
-
-EINTERN Eina_Bool e_eom_init(void);
-EINTERN int       e_eom_shutdown(void);
+//TODO: This file will be deprecated and will be removed.
 
 E_API   Eina_Bool e_eom_is_ec_external(E_Client *ec);
 
 #endif
-#endif
index e64091e..9cc3fc7 100644 (file)
@@ -1,10 +1,6 @@
-#ifdef E_TYPEDEFS
-
-typedef struct _E_Explicit_Sync_Buffer_Release E_Explicit_Sync_Buffer_Release;
-
-#else
 #ifndef E_EXPLICIT_SYNC_H
 #define E_EXPLICIT_SYNC_H
 
+typedef struct _E_Explicit_Sync_Buffer_Release E_Explicit_Sync_Buffer_Release;
+
 #endif // E_EXPLICIT_SYNC_H
-#endif
index f9cbe42..101cc2e 100644 (file)
@@ -1,4 +1,15 @@
-#ifdef E_TYPEDEFS
+#ifndef E_GESTURE_H
+#define E_GESTURE_H
+
+typedef struct _E_Gesture_Info E_Gesture_Info;
+
+typedef struct _E_Event_Gesture_Edge_Swipe E_Event_Gesture_Edge_Swipe;
+typedef struct _E_Event_Gesture_Edge_Drag E_Event_Gesture_Edge_Drag;
+typedef struct _E_Event_Gesture_Tap E_Event_Gesture_Tap;
+typedef struct _E_Event_Gesture_Palm_Cover E_Event_Gesture_Palm_Cover;
+typedef struct _E_Event_Gesture_Pan E_Event_Gesture_Pan;
+typedef struct _E_Event_Gesture_Pinch E_Event_Gesture_Pinch;
+
 typedef enum _E_Gesture_Error
 {
    E_GESTURE_ERROR_NONE = 0,
@@ -34,28 +45,6 @@ typedef enum _E_Gesture_Edge_Size
    E_GESTURE_EDGE_SIZE_PARTIAL
 } E_Gesture_Edge_Size;
 
-typedef struct _E_Gesture_Info E_Gesture_Info;
-
-typedef struct _E_Event_Gesture_Edge_Swipe E_Event_Gesture_Edge_Swipe;
-typedef struct _E_Event_Gesture_Edge_Drag E_Event_Gesture_Edge_Drag;
-typedef struct _E_Event_Gesture_Tap E_Event_Gesture_Tap;
-typedef struct _E_Event_Gesture_Palm_Cover E_Event_Gesture_Palm_Cover;
-typedef struct _E_Event_Gesture_Pan E_Event_Gesture_Pan;
-typedef struct _E_Event_Gesture_Pinch E_Event_Gesture_Pinch;
-
-#else
-#ifndef E_GESTURE_H
-#define E_GESTURE_H
-
-extern E_API E_Gesture_Info *e_gesture;
-
-extern E_API int E_EVENT_GESTURE_EDGE_SWIPE;
-extern E_API int E_EVENT_GESTURE_EDGE_DRAG;
-extern E_API int E_EVENT_GESTURE_TAP;
-extern E_API int E_EVENT_GESTURE_PALM_COVER;
-extern E_API int E_EVENT_GESTURE_PAN;
-extern E_API int E_EVENT_GESTURE_PINCH;
-
 struct _E_Event_Gesture_Edge_Swipe
 {
    E_Gesture_Mode mode;
@@ -145,6 +134,15 @@ struct _E_Gesture_Info
      } pinch;
 };
 
+extern E_API E_Gesture_Info *e_gesture;
+
+extern E_API int E_EVENT_GESTURE_EDGE_SWIPE;
+extern E_API int E_EVENT_GESTURE_EDGE_DRAG;
+extern E_API int E_EVENT_GESTURE_TAP;
+extern E_API int E_EVENT_GESTURE_PALM_COVER;
+extern E_API int E_EVENT_GESTURE_PAN;
+extern E_API int E_EVENT_GESTURE_PINCH;
+
 E_API int e_gesture_edge_swipe_grab(unsigned int fingers, unsigned int edge, unsigned int edge_size, unsigned int start_point, unsigned int end_point);
 E_API int e_gesture_edge_swipe_ungrab(unsigned int fingers, unsigned int edge, unsigned int edge_size, unsigned int start_point, unsigned int end_point);
 E_API int e_gesture_edge_drag_grab(unsigned int fingers, unsigned int edge, unsigned int edge_size, unsigned int start_point, unsigned int end_point);
@@ -159,4 +157,3 @@ E_API int e_gesture_pinch_grab(unsigned int fingers);
 E_API int e_gesture_pinch_ungrab(unsigned int fingers);
 
 #endif
-#endif
index 7aa2292..71c0c7b 100644 (file)
@@ -1,5 +1,3 @@
-#ifdef E_TYPEDEFS
-#else
 #ifndef E_HINTS_H
 #define E_HINTS_H
 
@@ -12,4 +10,3 @@ E_API const char      *e_hints_aux_hint_value_get(E_Client *ec, const char *name
 E_API Eina_Bool        e_hints_aux_hint_change_with_pixmap(E_Pixmap *cp, int32_t id, const char *val);
 
 #endif
-#endif
index 3583b84..c357f26 100644 (file)
@@ -1,12 +1,18 @@
-#ifdef E_TYPEDEFS
+#ifndef E_HWC_H
+#define E_HWC_H
+
+#include <e_types.h>
+#include <e_output.h>
+#include <e_hwc_window.h>
+
+#include <tdm.h>
+
+#define HWC_NAME_LEN 64
 
-typedef struct _E_Hwc     E_Hwc;
 typedef struct _E_Hwc_Sync_Callback E_Hwc_Sync_Callback;
 typedef struct _E_Hwc_Presentation_Callback E_Hwc_Presentation_Callback;
 typedef struct _E_Hwc_Presentation_Callback_List E_Hwc_Presentation_Callback_List;
 
-#define HWC_NAME_LEN 64
-
 typedef enum _E_Hwc_Mode
 {
    E_HWC_MODE_NONE = 0,
@@ -74,12 +80,6 @@ struct _E_Hwc_Presentation_Callback_List
    Eina_List *callbacks;
 };
 
-#else
-#ifndef E_HWC_H
-#define E_HWC_H
-
-#include <tdm.h>
-
 struct _E_Hwc
 {
    E_Output            *output;
@@ -197,4 +197,3 @@ E_API E_Hwc_Presentation_Callback *e_client_hwc_presentation_callback_add(E_Clie
 E_API void                         e_hwc_presentation_callback_del(E_Hwc_Presentation_Callback *callback);
 
 #endif
-#endif
diff --git a/src/include/e_hwc_planes.h b/src/include/e_hwc_planes.h
deleted file mode 100644 (file)
index 52245a2..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_HWC_PLANES_H
-#define E_HWC_PLANES_H
-
-/* used by e_hwc */
-EINTERN Eina_Bool            e_hwc_planes_init(void);
-EINTERN void                 e_hwc_planes_deinit(void);
-
-EINTERN void                 e_hwc_planes_end(E_Hwc *hwc, const char *location);
-EINTERN void                 e_hwc_planes_client_end(E_Hwc *hwc, E_Client *ec, const char *location);
-EINTERN void                 e_hwc_planes_apply(E_Hwc *hwc);
-
-EINTERN void                 e_hwc_planes_multi_plane_set(E_Hwc *hwc, Eina_Bool set);
-EINTERN Eina_Bool            e_hwc_planes_multi_plane_get(E_Hwc *hwc);
-
-EINTERN Eina_Bool            e_hwc_planes_mirror_set(E_Hwc *hwc, E_Hwc *src_hwc, Eina_Rectangle *rect);
-EINTERN void                 e_hwc_planes_mirror_unset(E_Hwc *hwc);
-EINTERN Eina_Bool            e_hwc_planes_presentation_update(E_Hwc *hwc, E_Client *ec);
-EINTERN Eina_Bool            e_hwc_planes_external_commit(E_Hwc *hwc);
-
-EINTERN Eina_Bool            e_hwc_planes_ecore_evas_set(E_Hwc *hwc, Ecore_Evas *ee);
-
-#endif
-#endif
index 7d5812f..73487ee 100644 (file)
@@ -1,14 +1,18 @@
-#ifdef E_TYPEDEFS
-
-typedef struct _E_Hwc_Window                      E_Hwc_Window;
-typedef struct _E_Hwc_Window_Target               E_Hwc_Window_Target;
-typedef struct _E_Hwc_Window_Buffer               E_Hwc_Window_Buffer;
-typedef struct _E_Hwc_Window_Update_Data          E_Hwc_Window_Update_Data;
-
-#else
 #ifndef E_HWC_WINDOW_H
 #define E_HWC_WINDOW_H
 
+#include <e_object.h>
+#include <e_client.h>
+#include <e_comp_wl.h>
+#include <e_hwc.h>
+#include <e_presentation_time.h>
+#include <e_zone.h>
+#include <e_egl_sync.h>
+
+#include <tbm_surface.h>
+#include <wayland-server.h>
+#include <Ecore.h>
+
 typedef enum _E_Hwc_Window_State
 {
    E_HWC_WINDOW_STATE_NONE,
@@ -42,24 +46,6 @@ typedef enum _E_Hwc_Window_Transition
    E_HWC_WINDOW_TRANSITION_CURSOR_TO_CURSOR
 } E_Hwc_Window_Transition;
 
-struct _E_Hwc_Window_Buffer
-{
-   tbm_surface_h                  tsurface;
-   E_Hwc_Window_Queue            *queue;
-   struct wl_listener             queue_destroy_listener;
-   Eina_Bool                      from_queue;
-   int                            transform;
-};
-
-struct _E_Hwc_Window_Update_Data
-{
-   E_Comp_Wl_Buffer_Ref           buffer_ref;
-   E_Hwc_Window_Queue_Buffer_Ref  queue_buffer_ref;
-   E_Hwc_Window_Buffer            buffer;
-   tdm_hwc_window_info            info;
-   E_Hwc_Window                  *hwc_window;
-};
-
 struct _E_Hwc_Window
 {
    E_Object                       e_obj_inherit;
@@ -181,4 +167,3 @@ struct _E_Hwc_Window_Commit_Data {
 };
 
 #endif // E_HWC_WINDOW_H
-#endif
index d9ea695..640cf50 100644 (file)
@@ -1,11 +1,7 @@
-#ifdef E_TYPEDEFS
-
-#else
 #ifndef E_HWC_WINDOWS_H
 #define E_HWC_WINDOWS_H
 
-E_API   void                 e_hwc_windows_debug_dump_start(void);
-E_API   void                 e_hwc_windows_debug_dump_stop(void);
+E_API void e_hwc_windows_debug_dump_start(void);
+E_API void e_hwc_windows_debug_dump_stop(void);
 
 #endif
-#endif
index c08aead..96607f1 100644 (file)
@@ -1,3 +1,4 @@
+#include "e_types.h"
 #include "e_object.h"
 #include "e_focus.h"
 #include "e_zone.h"
 #include "e_plane.h"
 #include "e_plane_renderer.h"
 #include "e_output.h"
-#include "e_hwc_planes.h"
 #include "e_hwc_windows.h"
 #include "e_hwc_window.h"
-#include "e_hwc_window_queue.h"
 #include "e_hwc.h"
 #include "e_presentation_time.h"
 #include "e_explicit_sync.h"
index a25d86b..9a1d993 100644 (file)
@@ -1,20 +1,14 @@
-#ifdef E_TYPEDEFS
-
-typedef void (*E_Info_Hook_Cb)(void *data, const char *log_path);
-typedef struct _E_Info_Hook E_Info_Hook;
-
-#else
-
 #ifndef E_INFO_SERVER_H
 #define E_INFO_SERVER_H
 
 #include <e_info_shared_types.h>
 
-E_API extern int E_EVENT_INFO_ROTATION_MESSAGE;
-
 typedef struct E_Event_Info_Rotation_Message E_Event_Info_Rotation_Message;
+
 typedef struct _E_Info_Server_Hook E_Info_Server_Hook;
+typedef struct _E_Info_Hook E_Info_Hook;
 
+typedef void (*E_Info_Hook_Cb)(void *data, const char *log_path);
 typedef void (*E_Info_Server_Hook_Cb)(void *data);
 
 typedef enum _E_Info_Server_Hook_Point
@@ -47,9 +41,10 @@ struct _E_Info_Server_Hook
    unsigned char     delete_me : 1;
 };
 
+E_API extern int E_EVENT_INFO_ROTATION_MESSAGE;
+
 E_API void                e_info_server_hook_set(const char *module_name, E_Info_Hook_Cb func, void *data);
 E_API E_Info_Server_Hook *e_info_server_hook_add(E_Info_Server_Hook_Point hookpoint, E_Info_Server_Hook_Cb func, const void *data);
 E_API void                e_info_server_hook_del(E_Info_Server_Hook *ph);
 
 #endif
-#endif
index ea93cd1..1e110ae 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef _E_INFO_SHARED_TYPES_
 #define _E_INFO_SHARED_TYPES_
 
+#include <Eina.h>
+
 typedef enum
 {
    E_INFO_ROTATION_MESSAGE_SET,
index 6f8030f..02bec41 100644 (file)
@@ -1,9 +1,3 @@
-#ifdef E_TYPEDEFS
-
-typedef struct _E_Input E_Input;
-
-#else
-
 #ifndef E_INPUT_H
 #define E_INPUT_H
 
@@ -15,9 +9,16 @@ typedef struct _E_Input E_Input;
 #define E_INPUT_TYPE (int)0xE0b0beaf
 #define E_INPUT_REQUEST_SERVER ((void *)0x1)
 
-EINTERN extern int E_INPUT_EVENT_SEAT_ADD;
-EINTERN extern int E_EVENT_INPUT_ENABLED;
-EINTERN extern int E_EVENT_INPUT_DISABLED;
+typedef struct _E_Input E_Input;
+typedef struct _E_Input_Device E_Input_Device;
+typedef struct _E_Input_Backend E_Input_Backend;
+typedef struct _E_Input_Evdev E_Input_Evdev;
+typedef struct _E_Input_Seat E_Input_Seat;
+typedef struct _E_Input_Coord E_Input_Coord;
+
+typedef void (*e_input_relative_motion_cb)(double dx[2], double dy[2], uint64_t time_us);
+typedef void (*e_input_keyboard_grab_key_cb)(uint32_t keycode, uint32_t state, uint32_t timestamp, void *dev);
+
 
 typedef enum _E_Input_Hook_Point
 {
@@ -51,15 +52,6 @@ typedef enum _E_Input_Libinput_Backend
    E_INPUT_LIBINPUT_BACKEND_PATH
 } E_Input_Libinput_Backend;
 
-typedef struct _E_Input_Device E_Input_Device;
-typedef struct _E_Input_Backend E_Input_Backend;
-typedef struct _E_Input_Evdev E_Input_Evdev;
-typedef struct _E_Input_Seat E_Input_Seat;
-typedef struct _E_Input_Coord E_Input_Coord;
-
-typedef void (*e_input_relative_motion_cb)(double dx[2], double dy[2], uint64_t time_us);
-typedef void (*e_input_keyboard_grab_key_cb)(uint32_t keycode, uint32_t state, uint32_t timestamp, void *dev);
-
 struct _E_Input
 {
    Ecore_Window window;
@@ -93,6 +85,10 @@ struct _E_Input_Device
    unsigned int server_blocked;
 };
 
+EINTERN extern int E_INPUT_EVENT_SEAT_ADD;
+EINTERN extern int E_EVENT_INPUT_ENABLED;
+EINTERN extern int E_EVENT_INPUT_DISABLED;
+
 E_API const Eina_List *e_input_devices_get(void);
 E_API Eina_Bool        e_input_device_pointer_warp(E_Input_Device *dev, int x, int y);
 E_API Eina_Bool        e_input_device_mouse_accel_speed_set(E_Input_Device *dev, double speed);
@@ -110,4 +106,3 @@ E_API pid_t                 e_input_main_thread_id_get();
 E_API E_Input_Event_Source *e_input_event_source_get();
 
 #endif
-#endif
index 2cf4615..66ec713 100644 (file)
@@ -1,4 +1,42 @@
-#ifdef E_TYPEDEFS
+#ifndef E_KEYROUTER_H
+#define E_KEYROUTER_H
+
+#include <e_device_intern.h>
+#include <e_input_event.h>
+#include <e_config_data.h>
+
+#include <Eina.h>
+#include <Ecore_Input.h>
+
+#include <wayland-server.h>
+#include <tizen-extension-server-protocol.h>
+
+#ifdef HAVE_CYNARA
+#include <cynara-client.h>
+#endif
+
+#define CHECK_ERR(val) if (TIZEN_KEYROUTER_ERROR_NONE != val) return;
+#define CHECK_ERR_VAL(val) if (TIZEN_KEYROUTER_ERROR_NONE != val) return val;
+#define CHECK_NULL(val) if (!val) return;
+#define CHECK_NULL_VAL(val) if (!val) return val;
+
+#define KLERR(msg, ARG...) ERR(msg, ##ARG)
+#define KLWRN(msg, ARG...) WRN(msg, ##ARG)
+#define KLINF(msg, ARG...) INF(msg, ##ARG)
+#define KLDBG(msg, ARG...) DBG(msg, ##ARG)
+
+#define TIZEN_KEYROUTER_MODE_PRESSED        TIZEN_KEYROUTER_MODE_REGISTERED+1
+#define TIZEN_KEYROUTER_MODE_PICTURE_OFF        TIZEN_KEYROUTER_MODE_REGISTERED+2
+
+typedef unsigned long Time;
+
+typedef struct _E_Keyrouter E_Keyrouter;
+typedef struct _E_Keyrouter* E_KeyrouterPtr;
+typedef struct _E_Keyrouter_Grab_Request E_Keyrouter_Grab_Request;
+typedef struct _E_Keyrouter_Ungrab_Request E_Keyrouter_Ungrab_Request;
+
+typedef struct _E_Keyrouter_Conf_Edd E_Keyrouter_Conf_Edd;
+typedef struct _E_Keyrouter_Config_Data E_Keyrouter_Config_Data;
 
 typedef struct _E_Keyrouter_Intercept_Hook E_Keyrouter_Intercept_Hook;
 typedef struct _E_Keyrouter_Info E_Keyrouter_Info;
@@ -12,6 +50,77 @@ typedef struct _E_Keyrouter_Event_Data E_Keyrouter_Event_Data;
 typedef struct _E_Keyrouter_Event_Key_Long E_Keyrouter_Event_Key_Long;
 typedef struct _E_Keyrouter_Event_Key_Composition E_Keyrouter_Event_Key_Composition;
 
+typedef Eina_Bool (*E_Keyrouter_Intercept_Hook_Cb) (void *data, int type, Ecore_Event_Key *event);
+
+struct _E_Keyrouter_Conf_Edd
+{
+   int num_keycode;                   // The numbers of keyrouted keycodes defined by xkb-tizen-data
+   int max_keycode;                   // The max value of keycodes
+   int pictureoff_disabled;           // To disable picture_off feature.
+   double composition_key_wait_time;  // The time of waiting to composition key's press events
+   Eina_List *KeyList;                // The list of routed key data: E_Keyrouter_Tizen_HWKey
+};
+
+struct _E_Keyrouter_Config_Data
+{
+   E_Config_DD *conf_edd;
+   E_Config_DD *conf_hwkeys_edd;
+   E_Keyrouter_Conf_Edd *conf;
+};
+
+struct _E_Keyrouter
+{
+   struct wl_global *global;
+   Ecore_Event_Filter *ef_handler;
+   Eina_List *handlers;
+   Eina_List *resources;
+   Eina_List *ignore_list;
+
+   E_Keyrouter_Config_Data *conf;
+
+   E_Keyrouter_Grabbed_Key *HardKeys;
+   Eina_List *grab_surface_list;
+   Eina_List *grab_client_list;
+
+   Eina_Bool isWindowStackChanged;
+   int numTizenHWKeys;
+   int max_tizen_hwkeys;
+#ifdef HAVE_CYNARA
+   cynara *p_cynara;
+#endif
+   int isPictureOffEnabled;
+   Eina_Bool pictureoff_disabled;
+
+   struct
+     {
+        gint waiting_timer;
+        double waiting_time;
+
+        int key[2];
+     } composition_key;
+   struct
+     {
+        gint timer;
+        int key;
+     } longkey;
+
+   E_Input_Event_Handler *_key_down_handler;
+   E_Input_Event_Handler *_key_up_handler;
+   GMutex event_handler_mutex;
+   GRecMutex grab_key_mutex;
+};
+
+struct _E_Keyrouter_Grab_Request {
+   int key;
+   int mode;
+   int err;
+};
+
+struct _E_Keyrouter_Ungrab_Request {
+   int key;
+   int err;
+};
+
 typedef enum _E_Keyrouter_Intercept_Hook_Point
 {
    E_KEYROUTER_INTERCEPT_HOOK_BEFORE_KEYROUTING,
@@ -26,14 +135,6 @@ typedef enum _E_Keyrouter_Client_Status
    E_KRT_CSTAT_UNGRAB
 } E_Keyrouter_Client_Status;
 
-typedef Eina_Bool (*E_Keyrouter_Intercept_Hook_Cb) (void *data, int type, Ecore_Event_Key *event);
-
-#else
-#ifndef E_KEYROUTER_H
-#define E_KEYROUTER_H
-
-extern E_API E_Keyrouter_Info e_keyrouter;
-
 struct _E_Keyrouter_Intercept_Hook
 {
    EINA_INLIST;
@@ -121,6 +222,9 @@ struct _E_Keyrouter_Event_Key_Composition
    void *data;
 };
 
+extern E_API E_KeyrouterPtr krt;
+extern E_API E_Keyrouter_Info e_keyrouter;
+
 E_API E_Keyrouter_Intercept_Hook *e_keyrouter_intercept_hook_add(E_Keyrouter_Intercept_Hook_Point hookpoint, E_Keyrouter_Intercept_Hook_Cb func, const void *data);
 E_API void                        e_keyrouter_intercept_hook_del(E_Keyrouter_Intercept_Hook *ch);
 E_API Eina_Bool                   e_keyrouter_intercept_hook_call(E_Keyrouter_Intercept_Hook_Point hookpoint, int type, Ecore_Event_Key *event);
@@ -128,6 +232,42 @@ E_API Eina_Bool                   e_keyrouter_intercept_hook_call(E_Keyrouter_In
 EAPI void e_keyrouter_keygrab_list_lock();
 EAPI void e_keyrouter_keygrab_list_unlock();
 
+
+int e_keyrouter_set_keygrab_in_list(struct wl_resource *surface, struct wl_client *client, uint32_t key, uint32_t mode);
+int e_keyrouter_prepend_to_keylist(struct wl_resource *surface, struct wl_client *wc, uint32_t key, uint32_t mode, Eina_Bool focused);
+void e_keyrouter_find_and_remove_client_from_list(struct wl_resource *surface, struct wl_client *wc, uint32_t key, uint32_t mode);
+void e_keyrouter_remove_client_from_list(struct wl_resource *surface, struct wl_client *wc);
+int e_keyrouter_find_key_in_list(struct wl_resource *surface, struct wl_client *wc, uint32_t key);
+
+Eina_Bool e_keyrouter_process_key_event(void *event, int type);
+
+struct wl_resource *e_keyrouter_util_get_surface_from_eclient(E_Client *client);
+int e_keyrouter_util_get_pid(struct wl_client *client, struct wl_resource *surface);
+char *e_keyrouter_util_cmd_get_from_pid(int pid);
+char *e_keyrouter_util_process_name_get_from_cmd(char *cmd);
+const char *e_keyrouter_mode_to_string(uint32_t mode);
+
+void e_keyrouter_conf_init(E_Keyrouter_Config_Data *kconfig);
+void e_keyrouter_conf_deinit(E_Keyrouter_Config_Data *kconfig);
+int e_keyrouter_cb_picture_off(const int option, void *data);
+
+Eina_Bool e_keyrouter_wl_init(void);
+void e_keyrouter_wl_shutdown(void);
+int e_keyrouter_wl_add_client_destroy_listener(struct wl_client *client);
+int e_keyrouter_wl_add_surface_destroy_listener(struct wl_resource *surface);
+#ifdef HAVE_CYNARA
+Eina_Bool e_keyrouter_wl_util_do_privilege_check(struct wl_client *client, uint32_t mode, uint32_t keycode);
 #endif
+
+int e_keyrouter_keygrab_set(struct wl_client *client, struct wl_resource *surface, int key, int mode);
+int e_keyrouter_keygrab_unset(struct wl_client *client, struct wl_resource *surface, int key);
+
+Eina_Bool e_keyrouter_event_process(void *event, E_Device *dev, int type);
+
+Eina_Bool e_keyrouter_wl_key_send(Ecore_Event_Key *ev, E_Device *dev, Eina_Bool pressed, struct wl_client *client, struct wl_resource *surface, Eina_Bool focused);
+void e_keyrouter_keycancel_send(struct wl_client *client, struct wl_resource *surface, unsigned int key);
+void e_keyrouter_wl_event_surface_send(struct wl_resource *surface, int key, int mode);
+
+
 #endif
 
index 6b9fd39..e3ff992 100644 (file)
@@ -1,143 +1,9 @@
-#include "e.h"
+
 #include "e_keyrouter.h"
 #include "e_input_event.h"
-#include "e_device_intern.h"
 
-#ifdef HAVE_CYNARA
-#include <cynara-session.h>
-#include <cynara-client.h>
-#include <cynara-creds-socket.h>
-#include <sys/smack.h>
-#endif
 
+#include <wayland-server.h>
 #include <tizen-extension-server-protocol.h>
 
-#define CHECK_ERR(val) if (TIZEN_KEYROUTER_ERROR_NONE != val) return;
-#define CHECK_ERR_VAL(val) if (TIZEN_KEYROUTER_ERROR_NONE != val) return val;
-#define CHECK_NULL(val) if (!val) return;
-#define CHECK_NULL_VAL(val) if (!val) return val;
-
-#define KLERR(msg, ARG...) ERR(msg, ##ARG)
-#define KLWRN(msg, ARG...) WRN(msg, ##ARG)
-#define KLINF(msg, ARG...) INF(msg, ##ARG)
-#define KLDBG(msg, ARG...) DBG(msg, ##ARG)
-
-typedef struct _E_Keyrouter E_Keyrouter;
-typedef struct _E_Keyrouter* E_KeyrouterPtr;
-typedef struct _E_Keyrouter_Grab_Request E_Keyrouter_Grab_Request;
-typedef struct _E_Keyrouter_Ungrab_Request E_Keyrouter_Ungrab_Request;
-
-typedef struct _E_Keyrouter_Conf_Edd E_Keyrouter_Conf_Edd;
-typedef struct _E_Keyrouter_Config_Data E_Keyrouter_Config_Data;
-
-#define TIZEN_KEYROUTER_MODE_PRESSED        TIZEN_KEYROUTER_MODE_REGISTERED+1
-#define TIZEN_KEYROUTER_MODE_PICTURE_OFF        TIZEN_KEYROUTER_MODE_REGISTERED+2
-
-typedef unsigned long Time;
-
-extern E_KeyrouterPtr krt;
-
-struct _E_Keyrouter_Conf_Edd
-{
-   int num_keycode;                   // The numbers of keyrouted keycodes defined by xkb-tizen-data
-   int max_keycode;                   // The max value of keycodes
-   int pictureoff_disabled;           // To disable picture_off feature.
-   double composition_key_wait_time;  // The time of waiting to composition key's press events
-   Eina_List *KeyList;                // The list of routed key data: E_Keyrouter_Tizen_HWKey
-};
-
-struct _E_Keyrouter_Config_Data
-{
-   E_Config_DD *conf_edd;
-   E_Config_DD *conf_hwkeys_edd;
-   E_Keyrouter_Conf_Edd *conf;
-};
-
-struct _E_Keyrouter
-{
-   struct wl_global *global;
-   Ecore_Event_Filter *ef_handler;
-   Eina_List *handlers;
-   Eina_List *resources;
-   Eina_List *ignore_list;
-
-   E_Keyrouter_Config_Data *conf;
-
-   E_Keyrouter_Grabbed_Key *HardKeys;
-   Eina_List *grab_surface_list;
-   Eina_List *grab_client_list;
-
-   Eina_Bool isWindowStackChanged;
-   int numTizenHWKeys;
-   int max_tizen_hwkeys;
-#ifdef HAVE_CYNARA
-   cynara *p_cynara;
-#endif
-   int isPictureOffEnabled;
-   Eina_Bool pictureoff_disabled;
-
-   struct
-     {
-        gint waiting_timer;
-        double waiting_time;
-
-        int key[2];
-     } composition_key;
-   struct
-     {
-        gint timer;
-        int key;
-     } longkey;
-
-   E_Input_Event_Handler *_key_down_handler;
-   E_Input_Event_Handler *_key_up_handler;
-   GMutex event_handler_mutex;
-   GRecMutex grab_key_mutex;
-};
-
-struct _E_Keyrouter_Grab_Request {
-   int key;
-   int mode;
-   int err;
-};
-
-struct _E_Keyrouter_Ungrab_Request {
-   int key;
-   int err;
-};
-
-int e_keyrouter_set_keygrab_in_list(struct wl_resource *surface, struct wl_client *client, uint32_t key, uint32_t mode);
-int e_keyrouter_prepend_to_keylist(struct wl_resource *surface, struct wl_client *wc, uint32_t key, uint32_t mode, Eina_Bool focused);
-void e_keyrouter_find_and_remove_client_from_list(struct wl_resource *surface, struct wl_client *wc, uint32_t key, uint32_t mode);
-void e_keyrouter_remove_client_from_list(struct wl_resource *surface, struct wl_client *wc);
-int e_keyrouter_find_key_in_list(struct wl_resource *surface, struct wl_client *wc, uint32_t key);
-
-Eina_Bool e_keyrouter_process_key_event(void *event, int type);
-
-struct wl_resource *e_keyrouter_util_get_surface_from_eclient(E_Client *client);
-int e_keyrouter_util_get_pid(struct wl_client *client, struct wl_resource *surface);
-char *e_keyrouter_util_cmd_get_from_pid(int pid);
-char *e_keyrouter_util_process_name_get_from_cmd(char *cmd);
-const char *e_keyrouter_mode_to_string(uint32_t mode);
-
-void e_keyrouter_conf_init(E_Keyrouter_Config_Data *kconfig);
-void e_keyrouter_conf_deinit(E_Keyrouter_Config_Data *kconfig);
-int e_keyrouter_cb_picture_off(const int option, void *data);
-
-Eina_Bool e_keyrouter_wl_init(void);
-void e_keyrouter_wl_shutdown(void);
-int e_keyrouter_wl_add_client_destroy_listener(struct wl_client *client);
-int e_keyrouter_wl_add_surface_destroy_listener(struct wl_resource *surface);
-#ifdef HAVE_CYNARA
-Eina_Bool e_keyrouter_wl_util_do_privilege_check(struct wl_client *client, uint32_t mode, uint32_t keycode);
-#endif
-
-int e_keyrouter_keygrab_set(struct wl_client *client, struct wl_resource *surface, int key, int mode);
-int e_keyrouter_keygrab_unset(struct wl_client *client, struct wl_resource *surface, int key);
-
-Eina_Bool e_keyrouter_event_process(void *event, E_Device *dev, int type);
-
-Eina_Bool e_keyrouter_wl_key_send(Ecore_Event_Key *ev, E_Device *dev, Eina_Bool pressed, struct wl_client *client, struct wl_resource *surface, Eina_Bool focused);
-void e_keyrouter_keycancel_send(struct wl_client *client, struct wl_resource *surface, unsigned int key);
-void e_keyrouter_wl_event_surface_send(struct wl_resource *surface, int key, int mode);
 
index 64f9baf..cb15947 100644 (file)
@@ -1,5 +1,3 @@
-#ifdef E_TYPEDEFS
-#else
 #ifndef E_LAYOUT_H
 #define E_LAYOUT_H
 
@@ -13,4 +11,3 @@ E_API void         e_layout_unpack            (Evas_Object *obj);
 E_API Eina_List   *e_layout_children_get(Evas_Object *obj);
 
 #endif
-#endif
index 0b3bbc4..2b04954 100644 (file)
@@ -1,9 +1,9 @@
-#ifdef E_TYPEDEFS
-
-#else
 #ifndef E_LOG_H
 #define E_LOG_H
 
+#include <e_client.h>
+#include <e_pixmap.h>
+
 #ifdef HAVE_DLOG
 # include <dlog.h>
 #  ifdef LOG_TAG
 # define DLOG_BACKTRACE
 #endif
 
+static inline Ecore_Window
+e_log_client_util_win_get(const E_Client *ec)
+{
+   if (!ec) return 0;
+   if (!ec->pixmap) return 0;
+   return e_pixmap_window_get(ec->pixmap);
+}
+
 # if (E_LOGGING >= 2) /* new version */
 #  define ELOG(t, ec)                                       \
    do                                                       \
      {                                                      \
         if (ec)                                             \
           INF("%10.10s|w:0x%08zx|ec:%8p|",                  \
-              (t), (e_client_util_win_get(ec)), (ec));      \
+              (t), (e_log_client_util_win_get(ec)), (ec));      \
         else                                                \
           INF("%10.10s|            |             |",        \
               (t));                                         \
      {                                                      \
         if (ec)                                             \
           INF("%10.10s|w:0x%08zx|ec:%8p|"f,                 \
-              (t), (e_client_util_win_get(ec)), (ec), ##x); \
+              (t), (e_log_client_util_win_get(ec)), (ec), ##x); \
         else                                                \
           INF("%10.10s|            |             |"f,       \
               (t), ##x);                                    \
      {                                                      \
         if (ec)                                             \
           DBG("%10.10s|w:0x%08zx|ec:%8p|"f,                 \
-              (t), (e_client_util_win_get(ec)), (ec), ##x); \
+              (t), (e_log_client_util_win_get(ec)), (ec), ##x); \
         else                                                \
           DBG("%10.10s|            |             |"f,       \
               (t), ##x);                                    \
      {                                                      \
         if (ec)                                             \
           ERR("%10.10s|w:0x%08zx|ec:%8p|"f,                 \
-              (t), (e_client_util_win_get(ec)), (ec), ##x); \
+              (t), (e_log_client_util_win_get(ec)), (ec), ##x); \
         else                                                \
           ERR("%10.10s|            |             |"f,       \
               (t), ##x);                                    \
      {                                                      \
         if (ec)                                             \
           INF("%10.10s|w:0x%08zx|ec:%8p|",                  \
-              (t), (e_client_util_win_get(ec)), (ec));      \
+              (t), (e_log_client_util_win_get(ec)), (ec));      \
         else                                                \
           INF("%10.10s|            |             |",        \
               (t));                                         \
      {                                                      \
         if (ec)                                             \
           INF("%10.10s|w:0x%08zx|ec:%8p|"f,                 \
-              (t), (e_client_util_win_get(ec)), (ec), ##x); \
+              (t), (e_log_client_util_win_get(ec)), (ec), ##x); \
         else                                                \
           INF("%10.10s|            |             |"f,       \
               (t), ##x);                                    \
      {                                                      \
         if (ec)                                             \
           DBG("%10.10s|w:0x%08zx|ec:%8p|"f,                 \
-              (t), (e_client_util_win_get(ec)), (ec), ##x); \
+              (t), (e_log_client_util_win_get(ec)), (ec), ##x); \
         else                                                \
           DBG("%10.10s|            |             |"f,       \
               (t), ##x);                                    \
      {                                                      \
         if (ec)                                             \
           ERR("%10.10s|w:0x%08zx|ec:%8p|"f,                 \
-              (t), (e_client_util_win_get(ec)), (ec), ##x); \
+              (t), (e_log_client_util_win_get(ec)), (ec), ##x); \
         else                                                \
           ERR("%10.10s|            |             |"f,       \
               (t), ##x);                                    \
@@ -183,13 +191,6 @@ typedef enum _E_Log_Type
 
 extern E_API int e_log_dom;
 
-#ifdef HAVE_DLOG
-EINTERN void e_log_dlog_enable(Eina_Bool enable);
-#endif
-EINTERN Eina_Bool e_log_path_set(const char *path);
-
-EINTERN int e_log_init(void);
-EINTERN int e_log_shutdown(void);
 #else
 #undef DBG
 #undef INF
@@ -214,5 +215,36 @@ EINTERN int e_log_shutdown(void);
 #define DLOG_BACKTRACE
 #endif
 
+#if 0
+#define REFD(obj, num) \
+   do { \
+      printf("%p <- %5i <- ref   | %s-%i\n", \
+             obj, E_OBJECT(obj)->references, \
+             __FILE__, num); \
+   } while (0)
+
+#define UNREFD(obj, num) \
+   do { \
+      printf("%p <- %5i <- unref | %s-%i\n", \
+             obj, E_OBJECT(obj)->references, \
+             __FILE__, num); \
+   } while (0)
+
+#define DELD(obj, num) \
+   do { \
+      printf("%p <- %5i <- del   | %s-%i\n", \
+             obj, E_OBJECT(obj)->references, \
+             __FILE__, num); \
+   } while (0)
+#else
+# define REFD(obj, num)
+# define UNREFD(obj, num)
+# define DELD(obj, num)
 #endif
+
+E_API double          e_main_ts(const char *str);
+E_API double          e_main_ts_begin(const char *str);
+E_API double          e_main_ts_end(const char *str);
+
 #endif
+
diff --git a/src/include/e_log_client.h b/src/include/e_log_client.h
new file mode 100644 (file)
index 0000000..be2f30f
--- /dev/null
@@ -0,0 +1,124 @@
+#ifndef E_LOG_CLIENT_H
+#define E_LOG_CLIENT_H
+
+#include "e_log_intern.h"
+#include "e_client_intern.h"
+#include "e_pixmap_intern.h"
+
+#ifdef E_LOGGING
+
+static inline Ecore_Window
+e_log_client_util_win_get(const E_Client *ec)
+{
+   if (!ec) return 0;
+   if (!ec->pixmap) return 0;
+   return e_pixmap_window_get(ec->pixmap);
+}
+
+# if (E_LOGGING >= 2) /* new version */
+#  define ELOG(t, ec)                                       \
+   do                                                       \
+     {                                                      \
+        if (ec)                                             \
+          INF("%10.10s|w:0x%08zx|ec:%8p|",                  \
+              (t), (e_log_client_util_win_get(ec)), (ec));      \
+        else                                                \
+          INF("%10.10s|            |             |",        \
+              (t));                                         \
+     }                                                      \
+   while (0)
+
+#  define ELOGF(t, f, ec, x...)                             \
+   do                                                       \
+     {                                                      \
+        if (ec)                                             \
+          INF("%10.10s|w:0x%08zx|ec:%8p|"f,                 \
+              (t), (e_log_client_util_win_get(ec)), (ec), ##x); \
+        else                                                \
+          INF("%10.10s|            |             |"f,       \
+              (t), ##x);                                    \
+     }                                                      \
+   while (0)
+
+#  define ELOGFD(t, f, ec, x...)                            \
+   do                                                       \
+     {                                                      \
+        if (ec)                                             \
+          DBG("%10.10s|w:0x%08zx|ec:%8p|"f,                 \
+              (t), (e_log_client_util_win_get(ec)), (ec), ##x); \
+        else                                                \
+          DBG("%10.10s|            |             |"f,       \
+              (t), ##x);                                    \
+     }                                                      \
+   while (0)
+
+#  define ELOGFE(t, f, ec, x...)                            \
+   do                                                       \
+     {                                                      \
+        if (ec)                                             \
+          ERR("%10.10s|w:0x%08zx|ec:%8p|"f,                 \
+              (t), (e_log_client_util_win_get(ec)), (ec), ##x); \
+        else                                                \
+          ERR("%10.10s|            |             |"f,       \
+              (t), ##x);                                    \
+     }                                                      \
+   while (0)
+# else /* old version */
+#  define ELOG(t, cp, ec)                                   \
+   do                                                       \
+     {                                                      \
+        if (ec)                                             \
+          INF("%10.10s|w:0x%08zx|ec:%8p|",                  \
+              (t), (e_log_client_util_win_get(ec)), (ec));      \
+        else                                                \
+          INF("%10.10s|            |             |",        \
+              (t));                                         \
+     }                                                      \
+   while (0)
+
+#  define ELOGF(t, f, cp, ec, x...)                         \
+   do                                                       \
+     {                                                      \
+        if (ec)                                             \
+          INF("%10.10s|w:0x%08zx|ec:%8p|"f,                 \
+              (t), (e_log_client_util_win_get(ec)), (ec), ##x); \
+        else                                                \
+          INF("%10.10s|            |             |"f,       \
+              (t), ##x);                                    \
+     }                                                      \
+   while (0)
+
+#  define ELOGFD(t, f, cp, ec, x...)                        \
+   do                                                       \
+     {                                                      \
+        if (ec)                                             \
+          DBG("%10.10s|w:0x%08zx|ec:%8p|"f,                 \
+              (t), (e_log_client_util_win_get(ec)), (ec), ##x); \
+        else                                                \
+          DBG("%10.10s|            |             |"f,       \
+              (t), ##x);                                    \
+     }                                                      \
+   while (0)
+
+#  define ELOGFE(t, f, cp, ec, x...)                        \
+   do                                                       \
+     {                                                      \
+        if (ec)                                             \
+          ERR("%10.10s|w:0x%08zx|ec:%8p|"f,                 \
+              (t), (e_log_client_util_win_get(ec)), (ec), ##x); \
+        else                                                \
+          ERR("%10.10s|            |             |"f,       \
+              (t), ##x);                                    \
+     }                                                      \
+   while (0)
+# endif /* end of if (E_LOGGING >= 2) */
+#else // E_LOGGING
+
+#undef ELOG
+#undef ELOGF
+#define ELOG(...)           ;
+#define ELOGF(...)          ;
+
+#endif // E_LOGGING
+
+#endif
index 9591b4c..41c7056 100644 (file)
@@ -1,5 +1,3 @@
-#ifdef E_TYPEDEFS
-#else
 #ifndef E_MAIN_H
 #define E_MAIN_H
 
@@ -25,7 +23,7 @@ struct _E_Main_Hook
 };
 
 E_API E_Main_Hook *e_main_hook_add(E_Main_Hook_Point hookpoint, E_Main_Hook_Cb func, const void *data);
-E_API void e_main_hook_del(E_Main_Hook *ph);
+E_API void         e_main_hook_del(E_Main_Hook *ph);
 
 E_API void e_main_hook_call(E_Main_Hook_Point hookpoint);
 
@@ -34,4 +32,3 @@ extern void __gcov_flush(void);
 #endif
 
 #endif
-#endif
index 8473ce5..d0aa5f9 100644 (file)
@@ -1,9 +1,10 @@
-#ifdef E_TYPEDEFS
-typedef struct _E_Map E_Map;
-#else
 #ifndef E_MAP_H
 #define E_MAP_H
 
+#include <Evas.h>
+
+typedef struct _E_Map E_Map;
+
 /* current Evas_Map is support only four points.
  * So, we're provide e_map_new without count parameter. */
 E_API E_Map           *e_map_new(void);
@@ -33,4 +34,3 @@ E_API Eina_Bool        e_map_util_zoom(E_Map *em, double zoomx, double zoomy, in
 E_API Eina_Bool        e_map_util_rotate(E_Map *em, int angle, int cx, int cy);
 
 #endif
-#endif
index 1d60a92..907d703 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef E_TYPEDEFS
+#ifndef E_MODULE_H
+#define E_MODULE_H
 
 #define E_MODULE_API_VERSION 17
 
@@ -7,12 +8,6 @@ typedef struct _E_Module_Api E_Module_Api;
 
 typedef struct _E_Event_Module_Update E_Event_Module_Update;
 
-#else
-#ifndef E_MODULE_H
-#define E_MODULE_H
-
-extern E_API int E_EVENT_MODULE_DEFER_JOB;
-
 struct _E_Event_Module_Update
 {
    const char *name;
@@ -48,5 +43,6 @@ struct _E_Module_Api
    const char *name;
 };
 
-#endif
+extern E_API int E_EVENT_MODULE_DEFER_JOB;
+
 #endif
index 3ac0a35..d0943e1 100644 (file)
@@ -1,4 +1,8 @@
-#ifdef E_TYPEDEFS
+#ifndef E_OBJECT_H
+#define E_OBJECT_H
+
+#include <Eina.h>
+#include <Ecore.h>
 
 /* Object safety/debugging checks */
 /* */
 # endif
 #endif
 
-typedef void (*E_Object_Cleanup_Func) (void *obj);
-
-typedef struct _E_Object       E_Object;
 typedef struct _E_Object_Delfn E_Object_Delfn;
 
-#else
-#ifndef E_OBJECT_H
-#define E_OBJECT_H
-
-struct _E_Object
-{
-   int                      magic;
-   int                      type;
-   int                      references;
-   E_Object_Cleanup_Func    del_func;
-   E_Object_Cleanup_Func    cleanup_func;
-   E_Object_Cleanup_Func    free_att_func;
-   E_Object_Cleanup_Func    del_att_func;
-   E_Object_Cleanup_Func    del_delay_func;
-   Eina_Inlist             *del_fn_list;
-   void                    *data;
-   Ecore_Job               *delay_del_job;
-   int                      delay_del_ref;
-   int                      walking_list;
-   Eina_Bool                ref_debug : 1;
-   Eina_Bool                deleted : 1;
-};
-
 struct _E_Object_Delfn
 {
    EINA_INLIST;
@@ -147,4 +125,3 @@ E_API void  e_object_breadcrumb_debug    (E_Object *obj);
 */
 
 #endif
-#endif
index c9ebb04..209d80d 100644 (file)
@@ -1,10 +1,17 @@
-#ifdef E_TYPEDEFS
+#ifndef E_OUTPUT_H
+#define E_OUTPUT_H
+
+#include <e_zone.h>
+#include <e_comp_screen.h>
+#include <e_hwc.h>
+#include <e_client.h>
+#include <e_plane.h>
 
 #include <tbm_surface.h>
+#include <tdm.h>
 
 #define OUTPUT_NAME_LEN 64
 
-typedef struct _E_Output            E_Output;
 typedef struct _E_Output_Mode       E_Output_Mode;
 
 typedef void (*E_Output_Capture_Cb) (E_Output *output, tbm_surface_h surface, void *user_data);
@@ -17,18 +24,6 @@ typedef enum _E_Output_Dpms
    E_OUTPUT_DPMS_OFF,
 } E_OUTPUT_DPMS;
 
-typedef enum   _E_Output_Display_Mode
-{
-   E_OUTPUT_DISPLAY_MODE_NONE,
-   E_OUTPUT_DISPLAY_MODE_MIRROR,
-   E_OUTPUT_DISPLAY_MODE_PRESENTATION,
-} E_Output_Display_Mode;
-
-
-#else
-#ifndef E_OUTPUT_H
-#define E_OUTPUT_H
-
 struct _E_Output_Mode
 {
    int    w, h; // resolution width and height
@@ -165,4 +160,3 @@ E_API Eina_Bool           e_output_property_get(E_Output *output, unsigned int i
 E_API Eina_Bool           e_output_property_set(E_Output *output, unsigned int id, output_prop_value value);
 
 #endif
-#endif
index b1fb6da..4c550f1 100644 (file)
@@ -1,6 +1,10 @@
-#ifdef E_TYPEDEFS
+# ifndef E_PIXMAP_H
+# define E_PIXMAP_H
+
+#include <e_client.h>
 
 typedef struct _E_Pixmap E_Pixmap;
+typedef struct _E_Pixmap_Hook E_Pixmap_Hook;
 
 typedef enum
 {
@@ -10,12 +14,6 @@ typedef enum
    E_PIXMAP_TYPE_MAX
 } E_Pixmap_Type;
 
-#else
-# ifndef E_PIXMAP_H
-# define E_PIXMAP_H
-
-typedef struct _E_Pixmap_Hook E_Pixmap_Hook;
-
 typedef enum _E_Pixmap_Hook_Point
 {
    E_PIXMAP_HOOK_NEW,
@@ -51,4 +49,3 @@ E_API void e_pixmap_hook_del(E_Pixmap_Hook *ph);
 E_API void e_pixmap_buffer_clear(E_Pixmap *cp, Eina_Bool only_free);
 
 #endif
-#endif
index 4b3dabf..0dc21ba 100644 (file)
@@ -1,4 +1,21 @@
-#ifdef E_TYPEDEFS
+#ifndef E_PLANE_H
+#define E_PLANE_H
+
+//TODO: This file will be deprecated and will be removed.
+
+#include <e_comp_screen.h>
+#include <e_output.h>
+#include <e_plane_renderer.h>
+#include <e_comp_wl.h>
+#include <e_plane_renderer.h>
+#include <e_client.h>
+
+#define E_PLANE_TYPE (int)0xE0b11001
+
+typedef struct _E_Plane_Commit_Data          E_Plane_Commit_Data;
+typedef struct _E_Event_Plane_Win_Change     E_Event_Plane_Win_Change;
+typedef struct _E_Plane_Hook                 E_Plane_Hook;
+typedef void (*E_Plane_Hook_Cb) (void *data, E_Plane *plane);
 
 typedef enum _E_Plane_Type
 {
@@ -23,22 +40,6 @@ typedef enum _E_Plane_Color
    E_PLANE_COLOR_RGB
 } E_Plane_Color;
 
-typedef struct _E_Plane                      E_Plane;
-typedef struct _E_Plane_Commit_Data          E_Plane_Commit_Data;
-typedef struct _E_Event_Plane_Win_Change     E_Event_Plane_Win_Change;
-typedef struct _E_Plane_Hook                 E_Plane_Hook;
-typedef void (*E_Plane_Hook_Cb) (void *data, E_Plane *plane);
-
-#else
-#ifndef E_PLANE_H
-#define E_PLANE_H
-
-#define E_PLANE_TYPE (int)0xE0b11001
-
-#include "e_comp_screen.h"
-#include "e_output.h"
-#include "e_plane_renderer.h"
-#include "e_comp_wl.h"
 
 struct _E_Plane
 {
@@ -230,4 +231,3 @@ E_API E_Plane_Hook          *e_plane_hook_add(E_Plane_Hook_Point hookpoint, E_Pl
 E_API void                   e_plane_hook_del(E_Plane_Hook *ch);
 
 #endif
-#endif
index a06b88c..4f42e65 100644 (file)
@@ -1,4 +1,14 @@
-#ifdef E_TYPEDEFS
+#ifndef E_PLANE_RENDERER_H
+#define E_PLANE_RENDERER_H
+
+//TODO: This file will be deprecated and will be removed.
+
+#include <e_comp_screen.h>
+#include <e_output.h>
+#include <e_plane.h>
+
+typedef struct _E_Plane_Renderer_Client      E_Plane_Renderer_Client;
+typedef struct _E_Plane_Renderer_Buffer      E_Plane_Renderer_Buffer;
 
 typedef enum _E_Plane_Renderer_State
 {
@@ -8,17 +18,6 @@ typedef enum _E_Plane_Renderer_State
    E_PLANE_RENDERER_STATE_PENDING_DEACTIVATE,
 } E_Plane_Renderer_State;
 
-typedef struct _E_Plane_Renderer             E_Plane_Renderer;
-typedef struct _E_Plane_Renderer_Client      E_Plane_Renderer_Client;
-typedef struct _E_Plane_Renderer_Buffer      E_Plane_Renderer_Buffer;
-#else
-#ifndef E_PLANE_RENDERER_H
-#define E_PLANE_RENDERER_H
-
-#include "e_comp_screen.h"
-#include "e_output.h"
-#include "e_plane.h"
-
 struct _E_Plane_Renderer {
    tbm_surface_queue_h tqueue;
    int tqueue_width;
@@ -120,4 +119,3 @@ EINTERN void                       e_plane_renderer_hwc_trace_debug(Eina_Bool on
 EINTERN void                       e_plane_renderer_show_state(E_Plane_Renderer *renderer);
 
 #endif
-#endif
index b1d4f8b..63f6377 100644 (file)
@@ -1,8 +1,17 @@
-#ifdef E_TYPEDEFS
+#ifndef E_POINTER_H
+#define E_POINTER_H
+
+#include <e_object.h>
+
+#include <Ecore.h>
+#include <Ecore_Evas.h>
+#include <Evas.h>
 
 typedef struct _E_Pointer E_Pointer;
 typedef struct _E_Pointer_Hook E_Pointer_Hook;
 
+typedef void (*E_Pointer_Hook_Cb)(void *data, E_Pointer *ptr);
+
 typedef enum
 {
    /* These are compatible with netwm */
@@ -34,12 +43,6 @@ typedef enum _E_Pointer_Hook_Point
    E_POINTER_HOOK_LAST,
 } E_Pointer_Hook_Point;
 
-typedef void (*E_Pointer_Hook_Cb)(void *data, E_Pointer *ptr);
-
-#else
-#ifndef E_POINTER_H
-#define E_POINTER_H
-
 struct _E_Pointer
 {
    E_Object e_obj_inherit;
@@ -79,5 +82,4 @@ E_API void       e_pointer_rotation_set(E_Pointer *ptr, int rotation);
 E_API E_Pointer_Hook *e_pointer_hook_add(E_Pointer_Hook_Point hookpoint, E_Pointer_Hook_Cb func, const void *data);
 E_API void            e_pointer_hook_del(E_Pointer_Hook *ch);
 
-# endif
 #endif
index aad2863..caef883 100644 (file)
@@ -1,4 +1,11 @@
-# ifdef E_TYPEDEFS
+# ifndef E_POLICY_H
+# define E_POLICY_H
+
+#include <e_client.h>
+#include <e_zone.h>
+#include <e_desk.h>
+#include <e_module.h>
+
 typedef struct _E_Policy_Desk          E_Policy_Desk;
 typedef struct _E_Policy_Client        E_Policy_Client;
 typedef struct _E_Policy_Softkey       E_Policy_Softkey;
@@ -87,10 +94,6 @@ typedef enum
    E_QUICKPANEL_REGION_TYPE_CONTENTS = 1,
 } E_Quickpanel_Region_Type;
 
-# else
-# ifndef E_POLICY_H
-# define E_POLICY_H
-
 struct _E_Policy_Desk
 {
    E_Desk          *desk;
@@ -221,4 +224,3 @@ E_API void      e_policy_allow_user_geometry_set(E_Client *ec, Eina_Bool set);
 E_API Eina_Bool e_policy_allow_user_geometry_get(E_Client *ec);
 
 #endif
-#endif
index 80d6174..560b6ac 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_POLICY_PRIVATE_DATA_H
 #define E_POLICY_PRIVATE_DATA_H
 
+#include <Eina.h>
+
 /* define layer values here */
 typedef enum {
      E_POLICY_ANGLE_MAP_0 = 0,
index a59bc66..1dd72c7 100644 (file)
@@ -1,7 +1,23 @@
-#ifdef E_TYPEDEFS
+#ifndef E_POLICY_VISIBILITY_H
+#define E_POLICY_VISIBILITY_H
+
+#define E_VIS_JOB_TYPE_ALL (E_VIS_JOB_TYPE_SHOW                    | \
+                            E_VIS_JOB_TYPE_HIDE                    | \
+                            E_VIS_JOB_TYPE_RAISE                   | \
+                            E_VIS_JOB_TYPE_LOWER                   | \
+                            E_VIS_JOB_TYPE_ACTIVATE                | \
+                            E_VIS_JOB_TYPE_UNICONIFY               | \
+                            E_VIS_JOB_TYPE_UNICONIFY_BY_VISIBILITY | \
+                            E_VIS_JOB_TYPE_LAYER_LOWER             | \
+                            E_VIS_JOB_TYPE_DEFER_MOVE              | \
+                            E_VIS_JOB_TYPE_ICONIFY)
+
+typedef struct _E_Vis_Grab E_Vis_Grab;
 
 typedef struct _E_Pol_Vis_Hook E_Pol_Vis_Hook;
 
+typedef Eina_Bool (*E_Pol_Vis_Hook_Cb)(void *data, E_Client *ec);
+
 typedef enum _E_Pol_Vis_Hook_Type
 {
    E_POL_VIS_HOOK_TYPE_FG_SET,
@@ -26,25 +42,6 @@ typedef enum _E_Vis_Job_Type
    E_VIS_JOB_TYPE_ICONIFY                  = (1 << 9),
 } E_Vis_Job_Type;
 
-#define E_VIS_JOB_TYPE_ALL (E_VIS_JOB_TYPE_SHOW                    | \
-                            E_VIS_JOB_TYPE_HIDE                    | \
-                            E_VIS_JOB_TYPE_RAISE                   | \
-                            E_VIS_JOB_TYPE_LOWER                   | \
-                            E_VIS_JOB_TYPE_ACTIVATE                | \
-                            E_VIS_JOB_TYPE_UNICONIFY               | \
-                            E_VIS_JOB_TYPE_UNICONIFY_BY_VISIBILITY | \
-                            E_VIS_JOB_TYPE_LAYER_LOWER             | \
-                            E_VIS_JOB_TYPE_DEFER_MOVE              | \
-                            E_VIS_JOB_TYPE_ICONIFY)
-
-typedef Eina_Bool (*E_Pol_Vis_Hook_Cb)(void *data, E_Client *ec);
-
-#else
-#ifndef _E_POLICY_VISIBILITY_H_
-#define _E_POLICY_VISIBILITY_H_
-
-typedef struct _E_Vis_Grab E_Vis_Grab;
-
 E_API Eina_Bool                   e_policy_visibility_client_is_activity(E_Client *ec);
 E_API Eina_Bool                   e_policy_visibility_client_lower(E_Client *ec);
 E_API E_Vis_Grab                 *e_policy_visibility_client_grab_get(E_Client *ec, const char *name);
@@ -56,4 +53,3 @@ E_API E_Pol_Vis_Hook             *e_policy_visibility_hook_add(E_Pol_Vis_Hook_Ty
 E_API void                        e_policy_visibility_hook_del(E_Pol_Vis_Hook *h);
 
 #endif
-#endif
index 0fc025f..605cdf8 100644 (file)
@@ -1,6 +1,9 @@
 #ifndef E_POLICY_WL_H
 #define E_POLICY_WL_H
 
+#include <e_client.h>
+#include <e_policy.h>
+
 typedef struct _E_Policy_Wl_Hook E_Policy_Wl_Hook;
 
 typedef void (*E_Policy_Wl_Hook_Cb)(void *data, pid_t pid);
index 4c9c546..f2b2381 100644 (file)
@@ -1,10 +1,6 @@
-#ifdef E_TYPEDEFS
-
-#else
 #ifndef E_PREFIX_H
 #define E_PREFIX_H
 
 E_API size_t      e_prefix_data_snprintf(char *dst, size_t size, const char *fmt, ...) EINA_PRINTF(3, 4);
 
 #endif
-#endif
index 238d4c5..e59393e 100644 (file)
@@ -1,4 +1,5 @@
-#ifdef E_TYPEDEFS
+#ifndef E_PRESENTATION_TIME_H
+#define E_PRESENTATION_TIME_H
 
 typedef struct _E_Presentation_Time_Container E_Presentation_Time_Container;
 
@@ -7,9 +8,4 @@ struct _E_Presentation_Time_Container
    Eina_List *presentation_feedbacks;
 };
 
-#else
-#ifndef E_PRESENTATION_TIME_H
-#define E_PRESENTATION_TIME_H
-
 #endif // E_PRESENTATION_TIME_H
-#endif
index c1f8e95..45e0d57 100644 (file)
@@ -1,5 +1,3 @@
-#ifdef E_TYPEDEFS
-#else
 #ifndef E_PRIVILEGE_H
 #define E_PRIVILEGE_H
 
@@ -7,4 +5,3 @@ extern E_API   const char *E_PRIVILEGE_GESTURE_GRAB;
 extern E_API   const char *E_PRIVILEGE_GESTURE_ACTIVATE;
 
 #endif
-#endif
index 878b4d2..08735e2 100644 (file)
@@ -1,4 +1,12 @@
-# ifdef E_TYPEDEFS
+# ifndef E_PROCESSMGR_H
+# define E_PROCESSMGR_H
+
+typedef struct _E_Process_Manager E_Process_Manager;
+typedef struct _E_Process         E_Process;
+
+typedef struct _E_Process_Hook E_Process_Hook;
+
+typedef void (*E_Process_Hook_Cb)(void *data, E_Process *epro, void *user);
 
 typedef enum _E_Process_Action
 {
@@ -26,19 +34,6 @@ typedef enum _E_Process_Hook_Point
    E_PROCESS_HOOK_LAST
 } E_Process_Hook_Point;
 
-typedef struct _E_Process_Manager E_Process_Manager;
-typedef struct _E_Process E_Process;
-
-typedef struct _E_Process_Hook E_Process_Hook;
-
-typedef void (*E_Process_Hook_Cb)(void *data, E_Process *epro, void *user);
-
-
-# else
-
-# ifndef E_PROCESSMGR_H
-# define E_PROCESSMGR_H
-
 struct _E_Process
 {
    EINA_INLIST;
@@ -53,5 +48,3 @@ E_API void            e_process_hook_del(E_Process_Hook *ph);
 E_API E_Process_State e_process_state_get(pid_t pid);
 
 #endif
-#endif
-
index 99e7d5c..f381393 100644 (file)
@@ -1,5 +1,3 @@
-#ifdef E_TYPEDEFS
-#else
 #ifndef E_SCREENSAVER_H
 #define E_SCREENSAVER_H
 
@@ -15,4 +13,3 @@ E_API extern int E_EVENT_SCREENSAVER_OFF_PRE;
 E_API extern int E_EVENT_SCREENSAVER_OFF;
 
 #endif
-#endif
index 2e9a299..340f7d0 100644 (file)
@@ -1,9 +1,6 @@
-#ifdef E_TYPEDEFS
-#else
 #ifndef E_SECURITY_H
 #define E_SECURITY_H
 
 E_API Eina_Bool e_security_privilege_check(pid_t pid, uid_t uid, const char *privilege);
 
 #endif
-#endif
index 407c60d..0e62792 100644 (file)
@@ -1,7 +1,10 @@
-#ifndef E_SERVICE_GESTURE
-#define E_SERVICE_GESTURE
+#ifndef E_SERVICE_GESTURE_H
+#define E_SERVICE_GESTURE_H
 
-#include "e_policy_private_data.h"
+#include <e_types.h>
+#include <e_policy_private_data.h>
+
+#include <Evas.h>
 
 typedef struct _E_Policy_Gesture E_Policy_Gesture;
 
@@ -13,16 +16,16 @@ typedef enum
 } E_Policy_Gesture_Type;
 
 typedef void (*E_Policy_Gesture_Start_Cb)(void *data, Evas_Object *obj, int nfingers, int x, int y, unsigned int timestamp);
-typedef void (*E_Policy_Gesture_Move_Cb)(void *data, Evas_Object *obj, int nfingers, int x, int y, unsigned int timestamp);
-typedef void (*E_Policy_Gesture_End_Cb)(void *data, Evas_Object *obj, int nfingers, int x, int y, unsigned int timestamp);
+typedef void (*E_Policy_Gesture_Move_Cb) (void *data, Evas_Object *obj, int nfingers, int x, int y, unsigned int timestamp);
+typedef void (*E_Policy_Gesture_End_Cb)  (void *data, Evas_Object *obj, int nfingers, int x, int y, unsigned int timestamp);
 
 E_API E_Policy_Gesture  *e_service_gesture_add(Evas_Object *obj, E_Policy_Gesture_Type type, int nfingers);
-E_API void          e_service_gesture_del(E_Policy_Gesture *gesture);
-E_API void          e_service_gesture_type_set(E_Policy_Gesture *gesture, E_Policy_Gesture_Type type);
-E_API void          e_service_gesture_cb_set(E_Policy_Gesture *gesture, E_Policy_Gesture_Start_Cb cb_start, E_Policy_Gesture_Move_Cb cb_move, E_Policy_Gesture_End_Cb cb_end, void *data);
-E_API void          e_service_gesture_angle_set(E_Policy_Gesture *gesture, int angle);
-E_API void          e_service_gesture_fingers_set(E_Policy_Gesture *gesture, int nfingers);
-E_API void          e_service_gesture_wait_time_set(E_Policy_Gesture *gesture, double wait_time);
-E_API void          e_service_gesture_wait_dist_set(E_Policy_Gesture *gesture, int wait_dist);
+E_API void               e_service_gesture_del(E_Policy_Gesture *gesture);
+E_API void               e_service_gesture_type_set(E_Policy_Gesture *gesture, E_Policy_Gesture_Type type);
+E_API void               e_service_gesture_cb_set(E_Policy_Gesture *gesture, E_Policy_Gesture_Start_Cb cb_start, E_Policy_Gesture_Move_Cb cb_move, E_Policy_Gesture_End_Cb cb_end, void *data);
+E_API void               e_service_gesture_angle_set(E_Policy_Gesture *gesture, int angle);
+E_API void               e_service_gesture_fingers_set(E_Policy_Gesture *gesture, int nfingers);
+E_API void               e_service_gesture_wait_time_set(E_Policy_Gesture *gesture, double wait_time);
+E_API void               e_service_gesture_wait_dist_set(E_Policy_Gesture *gesture, int wait_dist);
 
 #endif /* E_SERVICE_GESTURE */
index d13948d..4d2608b 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_SERVICE_QUICKPANEL_H
 #define E_SERVICE_QUICKPANEL_H
 
+#include <e_policy.h>
+
 #include <tzsh_server.h>
 
 typedef struct _E_QP_Mgr_Funcs       E_QP_Mgr_Funcs;
index dc63f61..3357254 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef E_SERVICE_SOFTKEY_H
 #define E_SERVICE_SOFTKEY_H
 
+#include <e_policy.h>
+
 typedef struct _E_Service_Softkey E_Service_Softkey;
 typedef struct _E_Service_Softkey_Funcs E_Service_Softkey_Funcs;
 
index 28bf85b..a90b1cf 100644 (file)
@@ -1,9 +1,6 @@
-#ifdef E_TYPEDEFS
-#else
 #ifndef E_THEME_H
 #define E_THEME_H
 
 E_API int         e_theme_edje_object_set(Evas_Object *o, const char *category, const char *group);
 
 #endif
-#endif
diff --git a/src/include/e_types.h b/src/include/e_types.h
new file mode 100644 (file)
index 0000000..d322d39
--- /dev/null
@@ -0,0 +1,238 @@
+#ifndef E_TYPES_H
+#define E_TYPES_H
+
+#include <tdm.h>
+#include <wayland-server.h>
+#include <Eina.h>
+#include <Ecore_Input.h>
+
+# ifdef E_API
+#  undef E_API
+# endif
+# ifdef WIN32
+#  ifdef BUILDING_DLL
+#   define E_API __declspec(dllexport)
+#  else
+#   define E_API __declspec(dllimport)
+#  endif
+# else
+#  ifdef __GNUC__
+#   if __GNUC__ >= 4
+/* BROKEN in gcc 4 on amd64 */
+#    if 0
+#     pragma GCC visibility push(hidden)
+#    endif
+#    define E_API __attribute__ ((visibility("default")))
+#   else
+#    define E_API
+#   endif
+#  else
+#   define E_API
+#  endif
+# endif
+
+# ifdef EINTERN
+#  undef EINTERN
+# endif
+# ifdef __GNUC__
+#  if __GNUC__ >= 4
+#   define EINTERN __attribute__ ((visibility("hidden")))
+#  else
+#   define EINTERN
+#  endif
+# else
+#  define EINTERN
+# endif
+
+# define E_LAYER_COUNT 31
+
+//#define SMARTERR(args...) abort()
+#define SMARTERRNR() return
+#define SMARTERR(x)  return x
+
+typedef struct _E_Client                      E_Client;                      // type of e_client.h
+typedef struct _E_Desk                        E_Desk;                        // type of e_desk.h
+typedef struct _E_Zone                        E_Zone;                        // type of e_zone.h
+typedef struct _E_Output                      E_Output;                      // type of e_output.h
+typedef struct _E_Hwc                         E_Hwc;                         // type of e_hwc.h
+typedef struct _E_Hwc_Window                  E_Hwc_Window;                  // type of e_hwc_window.h
+typedef struct _E_Hwc_Window_Buffer           E_Hwc_Window_Buffer;           // type of e_hwc_window.h
+typedef struct _E_Hwc_Window_Target           E_Hwc_Window_Target;           // type of e_hwc_window.h
+typedef struct _E_Hwc_Window_Update_Data      E_Hwc_Window_Update_Data;      // type of e_hwc_window.h
+typedef struct _E_Hwc_Window_Queue            E_Hwc_Window_Queue;            // type of e_hwc_window_queue_intern.h
+typedef struct _E_Hwc_Window_Queue_Buffer     E_Hwc_Window_Queue_Buffer;     // type of e_hwc_window_queue_intern.h
+typedef struct _E_Hwc_Window_Queue_Buffer_Ref E_Hwc_Window_Queue_Buffer_Ref; // type of e_hwc_window_queue_intern.h
+typedef struct _E_Plane                       E_Plane;                       // type of e_plane.h
+typedef struct _E_Plane_Renderer              E_Plane_Renderer;              // type of e_plane_renderer.h
+typedef struct _E_Comp_Wl_Buffer              E_Comp_Wl_Buffer;              // type of e_comp_wl.h
+typedef struct _E_Comp_Wl_Buffer_Ref          E_Comp_Wl_Buffer_Ref;          // type of e_comp_wl.h
+typedef struct _E_Object                      E_Object;                      // type of e_object.h
+
+typedef struct _E_Client_Hook E_Client_Hook;  // type of e_client.h
+
+typedef struct E_Binding_Event_Mouse_Button   E_Binding_Event_Mouse_Button;  // type of e_bindings_intern.h FIXME: remove it
+typedef struct E_Binding_Event_Wheel          E_Binding_Event_Wheel;         // type of e_bindings_intern.h FIXME: remove it
+
+typedef void (*E_Object_Cleanup_Func) (void *obj); // type of e_object.h
+
+
+// enum of e_client.h
+typedef enum
+{
+   /* same as ecore-x types */
+   E_WINDOW_TYPE_UNKNOWN = 0,
+   E_WINDOW_TYPE_DESKTOP,
+   E_WINDOW_TYPE_DOCK,
+   E_WINDOW_TYPE_TOOLBAR,
+   E_WINDOW_TYPE_MENU,
+   E_WINDOW_TYPE_UTILITY,
+   E_WINDOW_TYPE_SPLASH,
+   E_WINDOW_TYPE_DIALOG,
+   E_WINDOW_TYPE_NORMAL,
+   E_WINDOW_TYPE_DROPDOWN_MENU,
+   E_WINDOW_TYPE_POPUP_MENU,
+   E_WINDOW_TYPE_TOOLTIP,
+   E_WINDOW_TYPE_NOTIFICATION,
+   E_WINDOW_TYPE_COMBO,
+   E_WINDOW_TYPE_DND,
+   /* since UNKNOWN was used improperly in comp matching,
+    * this value is a placeholder to indicate that we want
+    * only type UNKNOWN windows
+    */
+   E_WINDOW_TYPE_REAL_UNKNOWN = 999
+} E_Window_Type;
+
+// enum of e_desk.h
+typedef enum _E_Desk_Area_Layer
+{
+   E_DESK_AREA_LAYER_BACKGROUND          = 0,     //E_LAYER_DESKTOP
+   E_DESK_AREA_LAYER_NORMAL_BELOW        = 150,   //E_LAYER_CLIENT_BELOW
+   E_DESK_AREA_LAYER_NORMAL              = 200,   //E_LAYER_CLIENT_NORMAL,
+   E_DESK_AREA_LAYER_NORMAL_ABOVE        = 250,   //E_LAYER_CLIENT_ABOVE,
+   E_DESK_AREA_LAYER_NOTIFICATION_LOW    = 650,   //E_LAYER_CLIENT_NOTIFICATION_LOW,
+   E_DESK_AREA_LAYER_NOTIFICATION_NORMAL = 700,   //E_LAYER_CLIENT_NOTIFICATION_NORMAL,
+   E_DESK_AREA_LAYER_NOTIFICATION_HIGH   = 750,   //E_LAYER_CLIENT_NOTIFICATION_HIGH,
+   E_DESK_AREA_LAYER_NOTIFICATION_TOP    = 800,   //E_LAYER_CLIENT_NOTIFICATION_TOP,
+   E_DESK_AREA_LAYER_SYSTEM              = 900,   //E_LAYER_CLIENT_ALERT,
+} E_Desk_Area_Layer;
+
+// enum of e_comp.h
+typedef enum _E_Layer
+{
+   E_LAYER_BOTTOM = -100,
+   E_LAYER_BG = -1, // zone bg stuff
+   E_LAYER_DESKTOP = 0, // desktop objects: fileman, gadgets, shelves
+   E_LAYER_DESKTOP_TOP = 10, // raised desktop objects: gadgets
+   E_LAYER_CLIENT_DESKTOP = 100, //shelves
+   E_LAYER_CLIENT_BELOW = 150,
+   E_LAYER_CLIENT_NORMAL = 200,
+   E_LAYER_CLIENT_ABOVE = 250,
+   E_LAYER_CLIENT_EDGE = 300,
+   E_LAYER_CLIENT_FULLSCREEN = 350,
+   E_LAYER_CLIENT_EDGE_FULLSCREEN = 400,
+   E_LAYER_CLIENT_POPUP = 450,
+   E_LAYER_CLIENT_TOP = 500,
+   E_LAYER_CLIENT_PRIO = 600,
+   E_LAYER_CLIENT_NOTIFICATION_LOW = 650,
+   E_LAYER_CLIENT_NOTIFICATION_NORMAL = 700,
+   E_LAYER_CLIENT_NOTIFICATION_HIGH = 750,
+   E_LAYER_CLIENT_NOTIFICATION_TOP = 800,
+   E_LAYER_CLIENT_ALERT_LOW = 850,
+   E_LAYER_CLIENT_ALERT = 900,
+   E_LAYER_CLIENT_ALERT_HIGH = 950,
+   E_LAYER_CLIENT_DRAG = 980,
+   E_LAYER_CLIENT_CURSOR = 990,
+   E_LAYER_POPUP = 999, // popups
+   E_LAYER_EFFECT = 1999,
+   E_LAYER_DESK_OBJECT_BELOW = 3000,
+   E_LAYER_DESK_OBJECT = 3100,
+   E_LAYER_DESK_OBJECT_ABOVE = 3200,
+   E_LAYER_MENU = 5000, // menus
+   E_LAYER_DESKLOCK = 9999, // desklock
+   E_LAYER_MAX = 32767 // EVAS_LAYER_MAX
+} E_Layer;
+
+// enum of e_comp.h
+typedef enum   _E_Output_Display_Mode
+{
+   E_OUTPUT_DISPLAY_MODE_NONE,
+   E_OUTPUT_DISPLAY_MODE_MIRROR,
+   E_OUTPUT_DISPLAY_MODE_PRESENTATION,
+} E_Output_Display_Mode;
+
+// struct of e_comp_wl.h
+struct _E_Comp_Wl_Buffer_Ref
+{
+   E_Comp_Wl_Buffer *buffer;
+   struct wl_listener destroy_listener;
+};
+
+// struct of e_hwc_window_queue_intern.h
+struct _E_Hwc_Window_Queue_Buffer_Ref
+{
+   E_Hwc_Window_Queue_Buffer     *buffer;
+   struct wl_listener             destroy_listener;
+};
+
+// struct of e_hwc_window.h
+struct _E_Hwc_Window_Buffer
+{
+   tbm_surface_h                  tsurface;
+   E_Hwc_Window_Queue            *queue;
+   struct wl_listener             queue_destroy_listener;
+   Eina_Bool                      from_queue;
+   int                            transform;
+};
+
+// struct of e_hwc_window.h
+struct _E_Hwc_Window_Update_Data
+{
+   E_Comp_Wl_Buffer_Ref           buffer_ref;
+   E_Hwc_Window_Queue_Buffer_Ref  queue_buffer_ref;
+   E_Hwc_Window_Buffer            buffer;
+   tdm_hwc_window_info            info;
+   E_Hwc_Window                  *hwc_window;
+};
+
+struct _E_Object
+{
+   int                      magic;
+   int                      type;
+   int                      references;
+   E_Object_Cleanup_Func    del_func;
+   E_Object_Cleanup_Func    cleanup_func;
+   E_Object_Cleanup_Func    free_att_func;
+   E_Object_Cleanup_Func    del_att_func;
+   E_Object_Cleanup_Func    del_delay_func;
+   Eina_Inlist             *del_fn_list;
+   void                    *data;
+   Ecore_Job               *delay_del_job;
+   int                      delay_del_ref;
+   int                      walking_list;
+   Eina_Bool                ref_debug : 1;
+   Eina_Bool                deleted : 1;
+};
+
+// TODO:FIXME: remove the use of this structure
+struct _E_Action
+{
+   E_Object    e_obj_inherit;
+
+   const char *name;
+   struct
+   {
+      void (*go)(E_Object *obj, const char *params);
+      void (*go_mouse)(E_Object *obj, const char *params, E_Binding_Event_Mouse_Button *ev);
+      void (*go_wheel)(E_Object *obj, const char *params, E_Binding_Event_Wheel *ev);
+      void (*go_key)(E_Object *obj, const char *params, Ecore_Event_Key *ev);
+      void (*go_signal)(E_Object *obj, const char *params, const char *sig, const char *src);
+      void (*end)(E_Object *obj, const char *params);
+      void (*end_mouse)(E_Object *obj, const char *params, E_Binding_Event_Mouse_Button *ev);
+      void (*end_key)(E_Object *obj, const char *params, Ecore_Event_Key *ev);
+   } func;
+};
+
+extern Eina_Bool starting;
+extern Eina_Bool stopping;
+
+#endif
index 2c65957..80674af 100644 (file)
@@ -1,8 +1,11 @@
-#ifdef E_TYPEDEFS
+#ifndef E_UTIL_TRANSFORM_H
+#define E_UTIL_TRANSFORM_H
 
+#include <e_client.h>
+
+typedef struct _E_Util_Transform                    E_Util_Transform;
 typedef struct _E_Util_Transform_Value              E_Util_Transform_Value;
 typedef struct _E_Util_Transform_Texcoord           E_Util_Transform_Texcoord;
-typedef struct _E_Util_Transform                    E_Util_Transform;
 typedef struct _E_Util_Transform_Rect               E_Util_Transform_Rect;
 typedef struct _E_Util_Transform_Axis               E_Util_Transform_Axis;
 typedef struct _E_Util_Transform_Vertex             E_Util_Transform_Vertex;
@@ -10,11 +13,6 @@ typedef struct _E_Util_Transform_Rect_Vertex        E_Util_Transform_Rect_Vertex
 typedef struct _E_Util_Transform_Matrix             E_Util_Transform_Matrix;
 typedef struct _E_Util_Transform_Zoom               E_Util_Transform_Zoom;
 
-
-#else
-#ifndef E_UTIL_TRANSFORM_H_
-#define E_UTIL_TRANSFORM_H_
-
 struct _E_Util_Transform_Texcoord
 {
    double value[4][2];
@@ -175,4 +173,3 @@ E_API void                         e_util_transform_log(E_Util_Transform *transf
 E_API void e_util_transform_matrix_inv_rect_coords_get(E_Util_Transform *transform, E_Util_Transform_Rect_Vertex *vetices, int w, int h, int x, int y, int *out_x, int *out_y);
 
 #endif
-#endif
index 075c5df..de96b29 100644 (file)
@@ -1,6 +1,3 @@
-#ifdef E_TYPEDEFS
-
-#else
 #ifndef E_UTILS_H
 #define E_UTILS_H
 
@@ -9,4 +6,3 @@ E_API int          e_util_strcmp(const char *s1, const char *s2);
 E_API unsigned int e_util_timestamp_get(void);
 
 #endif
-#endif
index 92b4385..910261f 100644 (file)
@@ -1,12 +1,13 @@
-#ifdef E_TYPEDEFS
+#ifndef E_ZONE_H
+#define E_ZONE_H
 
-typedef enum _E_Zone_Display_State
-{
-   E_ZONE_DISPLAY_STATE_OFF,
-   E_ZONE_DISPLAY_STATE_ON,
-} E_Zone_Display_State;
+#include <e_client.h>
+#include <e_actions.h>
+#include <e_focus.h>
+#include <e_desk.h>
+
+#define E_ZONE_TYPE (int)0xE0b0100d
 
-typedef struct _E_Zone                      E_Zone;
 typedef struct _E_Zone_Obstacle             E_Zone_Obstacle;
 
 typedef struct _E_Event_Zone_Generic        E_Event_Zone_Desk_Count_Set;
@@ -28,15 +29,19 @@ typedef struct _E_Event_Zone_Generic                E_Event_Zone_Rotation_Effect
 #endif
 typedef struct _E_Event_Zone_Display_State_Change   E_Event_Zone_Display_State_Change;
 
-#else
-#ifndef E_ZONE_H
-#define E_ZONE_H
+typedef struct _E_Zone_Hook E_Zone_Hook;
+
+typedef void (*E_Zone_Hook_Cb)(void *data, E_Zone *zone);
 
 typedef Eina_Bool (*E_Zone_Cb_Orientation_Block_Set)(E_Zone *zone, const char* name_hint, Eina_Bool set);
 typedef void      (*E_Zone_Cb_Orientation_Force_Update_Add)(E_Zone *zone, E_Client *client);
 typedef void      (*E_Zone_Cb_Orientation_Force_Update_Del)(E_Zone *zone, E_Client *client);
 
-typedef struct _E_Zone_Hook E_Zone_Hook;
+typedef enum _E_Zone_Display_State
+{
+   E_ZONE_DISPLAY_STATE_OFF,
+   E_ZONE_DISPLAY_STATE_ON,
+} E_Zone_Display_State;
 
 typedef enum _E_Zone_Hook_Point
 {
@@ -44,8 +49,6 @@ typedef enum _E_Zone_Hook_Point
    E_ZONE_HOOK_LAST
 } E_Zone_Hook_Point;
 
-typedef void (*E_Zone_Hook_Cb)(void *data, E_Zone *zone);
-
 struct _E_Zone_Hook
 {
    EINA_INLIST;
@@ -55,8 +58,6 @@ struct _E_Zone_Hook
    unsigned char     delete_me : 1;
 };
 
-#define E_ZONE_TYPE (int)0xE0b0100d
-
 struct _E_Zone
 {
    E_Object     e_obj_inherit;
@@ -202,4 +203,3 @@ E_API E_Zone_Hook *e_zone_hook_add(E_Zone_Hook_Point hookpoint, E_Zone_Hook_Cb f
 E_API void         e_zone_hook_del(E_Zone_Hook *zh);
 
 #endif
-#endif
index b0d6cd6..d67cafb 100644 (file)
@@ -1,5 +1,9 @@
-#include "e.h"
+
+#include "e_intern.h"
 #include "bq_mgr_protocol.h"
+#include "e_object.h"
+#include "e_comp_intern.h"
+#include "e_module_intern.h"
 
 #define E_BQ_MGR_TYPE         (int)0xE0b91001
 #define E_BQ_QUEUE_TYPE       (int)0xE0b91002
index 85a7df1..59a2e86 100644 (file)
@@ -1,18 +1,13 @@
 
 bin_PROGRAMS = enlightenment-tests
 
-#tc_e_util_transform_sources = \
-#      tc-e_util_transform.cpp \
-#      ../src/bin/e_util_transform.c
-
 enlightenment_tests_SOURCES = \
        tc-main.cpp \
        tc-e_util_transform.cpp \
        $(top_srcdir)/src/bin/e_util_transform.c
 
-#enlightenment_tests_SOURCES += \
-#      tc-e_util_transform.cpp \
-#      ../src/bin/e_util_transform.c
+enlightenment_tests_SOURCES = \
+       tc-main.cpp
 
 enlightenment_tests_CFLAGS = \
        @DLOG_CFLAGS@ \
@@ -23,11 +18,7 @@ enlightenment_tests_CFLAGS = \
        @SUID_CFLAGS@ \
        @e_cflags@ \
        ${CFLAGS} \
-       -I$(top_builddir)/src/bin \
-       -I$(top_builddir)/src/bin/video \
-       -I$(top_builddir)/src/bin/services \
-       -I$(top_builddir)/src/include \
-       -I$(top_builddir)/src/modules
+       -I$(top_builddir)/src/include
 
 enlightenment_tests_CXXFLAGS = \
        @DLOG_CFLAGS@ \
@@ -37,11 +28,7 @@ enlightenment_tests_CXXFLAGS = \
        @GMOCK_CFLAGS@ \
        @SUID_CFLAGS@ \
        ${CXXFLAGS} \
-       -I$(top_builddir)/src/bin \
-       -I$(top_builddir)/src/bin/video \
-       -I$(top_builddir)/src/bin/services \
-       -I$(top_builddir)/src/include \
-       -I$(top_builddir)/src/modules
+       -I$(top_builddir)/src/include
 
 enlightenment_tests_LDFLAGS = \
        @DLOG_LIBS@ \