e_comp_wl: make an internal header

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

Change-Id: If574bcb91d799f0008888b3fc83ca4c64af18776

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index b2c60bc..99e1b70 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -6,6 +6,7 @@
 #include "e_uuid_store_intern.h"
 #include "e_utils_intern.h"
 #include "e_comp_canvas_intern.h"
+#include "e_comp_wl_intern.h"
 
 #define PRI(ec) ((E_Client_Private *)e_object_data_get(E_OBJECT(ec)))
 

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 59e6e8c..6c8d20f 100644 (file)
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -4,6 +4,7 @@
 #include "e_comp_canvas_intern.h"
 #include "e_comp_cfdata_intern.h"
 #include "e_comp_screen_intern.h"
+#include "e_comp_wl_intern.h"
 
 #include <sys/xattr.h>
 #include "services/e_service_quickpanel.h"

diff --git a/src/bin/e_comp_screen.c b/src/bin/e_comp_screen.c
index fc08a05..63d9e6b 100644 (file)
--- a/src/bin/e_comp_screen.c
+++ b/src/bin/e_comp_screen.c
@@ -5,6 +5,7 @@
 #include "e_comp_canvas_intern.h"
 #include "e_comp_screen_intern.h"
 #include "e_comp_wl_input_intern.h"
+#include "e_comp_wl_intern.h"
 
 #include "Eeze.h"
 #include <tizen-extension-server-protocol.h>

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 609d216..d1cfd69 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1,4 +1,6 @@
 #include "e.h"
+#include "e_comp_wl_intern.h"
+#include "e_comp_wl_private.h"
 #include "e_foreign.h"
 #include "e_wtz_shell_intern.h"
 #include "e_comp_wl_private.h"

diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h
index 8237d40..e375690 100644 (file)
--- a/src/bin/e_comp_wl.h
+++ b/src/bin/e_comp_wl.h
@@ -33,7 +33,6 @@ typedef struct _E_Comp_Wl_Pid_Hook E_Comp_Wl_Pid_Hook;
    })
 
 #include <tbm_surface.h>
-#include "e_device.h"
 
 typedef struct _E_Comp_Wl_Aux_Hint  E_Comp_Wl_Aux_Hint;
 typedef struct _E_Comp_Wl_Buffer E_Comp_Wl_Buffer;
@@ -586,100 +585,21 @@ struct _E_Comp_Wl_Seat
    Eina_Bool is_first_resource : 1;
 };
 
-EINTERN Eina_Bool e_comp_wl_init(void);
-EINTERN void e_comp_wl_shutdown(void);
-
-EINTERN void e_comp_wl_deferred_job(void);
-
-EINTERN void e_comp_wl_surface_destroy(struct wl_resource *resource);
-EINTERN void e_comp_wl_surface_attach(E_Client *ec, E_Comp_Wl_Buffer *buffer);
-EINTERN Eina_Bool e_comp_wl_surface_commit(E_Client *ec);
-E_API void e_comp_wl_buffer_reference(E_Comp_Wl_Buffer_Ref *ref, E_Comp_Wl_Buffer *buffer);
-
-EINTERN Eina_Bool e_comp_wl_output_init(const char *id, const char *make, const char *model, int x, int y, int w, int h, int pw, int ph, unsigned int refresh, unsigned int subpixel, unsigned int transform);
-EINTERN void e_comp_wl_output_remove(const char *id);
-
-EINTERN Eina_Bool e_comp_wl_key_down(Ecore_Event_Key *ev, E_Device *dev);
-EINTERN Eina_Bool e_comp_wl_key_up(Ecore_Event_Key *ev, E_Device *dev);
-EINTERN Eina_Bool e_comp_wl_evas_handle_mouse_button(E_Client *ec, uint32_t timestamp, uint32_t button_id, uint32_t state);
-E_API void        e_comp_wl_touch_cancel(void);
-
-E_API E_Comp_Wl_Hook *e_comp_wl_hook_add(E_Comp_Wl_Hook_Point hookpoint, E_Comp_Wl_Hook_Cb func, const void *data);
-E_API void e_comp_wl_hook_del(E_Comp_Wl_Hook *ch);
-
-E_API E_Comp_Wl_Pid_Hook *e_comp_wl_pid_hook_add(E_Comp_Wl_Pid_Hook_Point hookpoint, E_Comp_Wl_Pid_Hook_Cb func, const void *data);
-E_API void e_comp_wl_pid_hook_del(E_Comp_Wl_Pid_Hook *ch);
-
+E_API void                      e_comp_wl_buffer_reference(E_Comp_Wl_Buffer_Ref *ref, E_Comp_Wl_Buffer *buffer);
+E_API void                      e_comp_wl_touch_cancel(void);
+E_API E_Client                 *e_comp_wl_topmost_parent_get(E_Client *ec);
+E_API enum wl_output_transform  e_comp_wl_output_buffer_transform_get(E_Client *ec);
+E_API void                      e_comp_wl_map_size_cal_from_buffer(E_Client *ec);
+E_API void                      e_comp_wl_map_size_cal_from_viewport(E_Client *ec);
+E_API void                      e_comp_wl_map_apply(E_Client *ec);
+E_API void                      e_comp_wl_input_cursor_timer_enable_set(Eina_Bool enabled);
+
+E_API E_Comp_Wl_Hook           *e_comp_wl_hook_add(E_Comp_Wl_Hook_Point hookpoint, E_Comp_Wl_Hook_Cb func, const void *data);
+E_API void                      e_comp_wl_hook_del(E_Comp_Wl_Hook *ch);
+E_API E_Comp_Wl_Pid_Hook       *e_comp_wl_pid_hook_add(E_Comp_Wl_Pid_Hook_Point hookpoint, E_Comp_Wl_Pid_Hook_Cb func, const void *data);
+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);
-
-EINTERN void e_comp_wl_shell_surface_ready(E_Client *ec);
-
-E_API   E_Client* e_comp_wl_topmost_parent_get(E_Client *ec);
-
-EINTERN enum wl_output_transform e_comp_wl_output_pending_buffer_transform_get(E_Client *ec);
-E_API enum wl_output_transform e_comp_wl_output_buffer_transform_get(E_Client *ec);
-E_API void e_comp_wl_map_size_cal_from_buffer(E_Client *ec);
-E_API void e_comp_wl_map_size_cal_from_viewport(E_Client *ec);
-E_API void e_comp_wl_map_apply(E_Client *ec);
-
-EINTERN void e_comp_wl_map_inv_coord_get(E_Client *ec, int x, int y, int *mx, int *my);
-
-E_API void e_comp_wl_input_cursor_timer_enable_set(Eina_Bool enabled);
-EINTERN void e_comp_wl_send_event_device(struct wl_client *wc, uint32_t timestamp, Ecore_Device *dev, uint32_t serial);
-EINTERN void e_comp_wl_send_event_e_device(struct wl_client *wc, uint32_t timestamp, E_Device *dev, uint32_t serial);
-
-EINTERN Eina_Bool e_comp_wl_key_send(E_Client *ec, int keycode, Eina_Bool pressed, void *dev, uint32_t time);
-EINTERN Eina_Bool e_comp_wl_key_cancel(E_Client *ec, int keycode, Ecore_Device *dev, uint32_t time);
-EINTERN Eina_Bool e_comp_wl_touch_send(E_Client *ec, int idx, int x, int y, Eina_Bool pressed, Ecore_Device *dev, double radius_x, double radius_y, double pressure, double angle, uint32_t time);
-EINTERN Eina_Bool e_comp_wl_touch_update_send(E_Client *ec, int idx, int x, int y, Ecore_Device *dev, double radius_x, double radius_y, double pressure, double angle, uint32_t time);
-EINTERN Eina_Bool e_comp_wl_touch_cancel_send(E_Client *ec);
-EINTERN Eina_Bool e_comp_wl_mouse_button_send(E_Client *ec, int buttons, Eina_Bool pressed, Ecore_Device *dev, uint32_t time);
-EINTERN Eina_Bool e_comp_wl_mouse_move_send(E_Client *ec, int x, int y, Ecore_Device *dev, uint32_t time);
-EINTERN Eina_Bool e_comp_wl_mouse_wheel_send(E_Client *ec, int direction, int z, Ecore_Device *dev, uint32_t time);
-EINTERN Eina_Bool e_comp_wl_mouse_in_send(E_Client *ec, int x, int y, Ecore_Device *dev, uint32_t time);
-EINTERN Eina_Bool e_comp_wl_mouse_out_send(E_Client *ec, Ecore_Device *dev, uint32_t time);
-EINTERN void e_comp_wl_mouse_in_renew(E_Client *ec, int buttons, int x, int y, void *data, Evas_Modifier *modifiers, Evas_Lock *locks, unsigned int timestamp, Evas_Event_Flags event_flags, Evas_Device *dev, Evas_Object *event_src);
-EINTERN void e_comp_wl_mouse_out_renew(E_Client *ec, int buttons, int x, int y, void *data, Evas_Modifier *modifiers, Evas_Lock *locks, unsigned int timestamp, Evas_Event_Flags event_flags, Evas_Device *dev, Evas_Object *event_src);
-EINTERN Eina_Bool e_comp_wl_key_process(Ecore_Event_Key *ev, E_Device *dev, int type);
-
-EINTERN Eina_Bool e_comp_wl_cursor_hide(E_Client *ec);
-
-EINTERN void e_comp_wl_pos_convert(int width, int height, int transform, int scale, int sx, int sy, int *bx, int *by);
-EINTERN void e_comp_wl_pos_convert_inverse(int width, int height, int transform, int scale, int bx, int by, int *sx, int *sy);
-EINTERN void e_comp_wl_rect_convert(int width, int height, int transform, int scale, int sx, int sy, int sw, int sh, int *bx, int *by, int *bw, int *bh);
-EINTERN void e_comp_wl_rect_convert_inverse(int width, int height, int transform, int scale, int bx, int by, int bw, int bh, int *sx, int *sy, int *sw, int *sh);
-EINTERN E_Comp_Wl_Output* e_comp_wl_output_find(E_Client *ec);
-EINTERN Eina_Array *e_comp_wl_output_find_all(E_Client *ec);
-
-EINTERN void     e_comp_wl_feed_focus_in(E_Client *ec);
-
-EINTERN Eina_Bool e_comp_wl_commit_sync_client_geometry_add(E_Client *ec, uint32_t serial, int32_t x, int32_t y, int32_t w, int32_t h);
-EINTERN Eina_Bool e_comp_wl_commit_sync_configure(E_Client *ec);
-
-EINTERN Eina_Bool         e_comp_wl_pid_output_configured_resolution_send(pid_t pid, int w, int h);
-
-EINTERN void    e_comp_wl_surface_state_init(E_Comp_Wl_Surface_State *state, int w, int h);
-EINTERN void    e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state);
-EINTERN void    e_comp_wl_hook_call(E_Comp_Wl_Hook_Point hookpoint, E_Client *ec);
-EINTERN void    e_comp_wl_surface_state_finish(E_Comp_Wl_Surface_State *state);
-EINTERN void    e_comp_wl_surface_state_buffer_set(E_Comp_Wl_Surface_State *state, E_Comp_Wl_Buffer *buffer);
-
-EINTERN Eina_Bool e_comp_wl_surface_viewport_get(E_Client *ec, Eina_Rectangle *buffer_viewport, Eina_Rectangle *output_viewport, unsigned int *transform);
-
-EINTERN Eina_Bool     e_comp_wl_surface_role_set(E_Client *ec, const char *role_name, struct wl_resource *error_resource, uint32_t error_code);
-EINTERN const char   *e_comp_wl_surface_role_get(E_Client *ec);
-
-EINTERN struct wl_resource *e_comp_wl_client_surface_get(E_Client *ec);
-EINTERN void e_comp_wl_client_surface_set(E_Client *ec, struct wl_resource *surface);
-
-EINTERN void    e_comp_wl_display_flush();
-EINTERN void    e_comp_wl_focused_client_flush();
-
-EINTERN void    e_comp_wl_connection_lock();
-EINTERN void    e_comp_wl_connection_unlock();
-
-EINTERN E_Client *e_comp_wl_util_client_from_surface_resource(struct wl_resource *surface_resource);
+E_API void                      e_comp_wl_intercept_hook_del(E_Comp_Wl_Intercept_Hook *ch);
 
 # endif
 #endif

diff --git a/src/bin/e_comp_wl_buffer_intern.h b/src/bin/e_comp_wl_buffer_intern.h
index 8312e82..027da2c 100644 (file)
--- a/src/bin/e_comp_wl_buffer_intern.h
+++ b/src/bin/e_comp_wl_buffer_intern.h
@@ -3,7 +3,6 @@
 
 #include <libds/types/ds_buffer.h>
 #include <tbm_surface.h>
-#include "e_comp_wl.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);

diff --git a/src/bin/e_comp_wl_capture.c b/src/bin/e_comp_wl_capture.c
index 07acdfd..d0ffab1 100644 (file)
--- a/src/bin/e_comp_wl_capture.c
+++ b/src/bin/e_comp_wl_capture.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_comp_wl_capture_intern.h"
+#include "e_comp_wl_intern.h"
 
 #include <tbm_surface.h>
 #include <tbm_surface_internal.h>

diff --git a/src/bin/e_comp_wl_data.c b/src/bin/e_comp_wl_data.c
index ff41109..a0e98d5 100644 (file)
--- a/src/bin/e_comp_wl_data.c
+++ b/src/bin/e_comp_wl_data.c
@@ -3,6 +3,7 @@
 #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"
 
 typedef struct {
    int src_fd;

diff --git a/src/bin/e_comp_wl_data_intern.h b/src/bin/e_comp_wl_data_intern.h
index 49bd6bb..4a56d4c 100644 (file)
--- a/src/bin/e_comp_wl_data_intern.h
+++ b/src/bin/e_comp_wl_data_intern.h
@@ -1,8 +1,6 @@
 #ifndef E_COMP_WL_DATA_INTERN_H
 #define E_COMP_WL_DATA_INTERN_H
 
-#  include "e_comp_wl.h"
-
 #  ifdef PIPE_BUF
 #   define CLIPBOARD_CHUNK PIPE_BUF
 #  else

diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c
index 2e9e738..8bb64f0 100644 (file)
--- a/src/bin/e_comp_wl_input.c
+++ b/src/bin/e_comp_wl_input.c
@@ -2,6 +2,7 @@
 #include "e.h"
 #include "e_comp_wl_input_intern.h"
 #include "e_utils_intern.h"
+#include "e_comp_wl_intern.h"
 
 #include <sys/mman.h>
 #include <pixman.h>

diff --git a/src/bin/e_comp_wl_intern.h b/src/bin/e_comp_wl_intern.h
new file mode 100644 (file)
index 0000000..bc52758
--- /dev/null
+++ b/src/bin/e_comp_wl_intern.h
@@ -0,0 +1,83 @@
+#ifndef E_COMP_WL_INTERN_H
+#define E_COMP_WL_INTERN_H
+
+#include "e_device.h"
+
+EINTERN Eina_Bool e_comp_wl_init(void);
+EINTERN void      e_comp_wl_shutdown(void);
+
+EINTERN void e_comp_wl_deferred_job(void);
+
+EINTERN void      e_comp_wl_surface_destroy(struct wl_resource *resource);
+EINTERN void      e_comp_wl_surface_attach(E_Client *ec, E_Comp_Wl_Buffer *buffer);
+EINTERN Eina_Bool e_comp_wl_surface_commit(E_Client *ec);
+
+EINTERN Eina_Bool                 e_comp_wl_output_init(const char *id, const char *make, const char *model, int x, int y, int w, int h, int pw, int ph, unsigned int refresh, unsigned int subpixel, unsigned int transform);
+EINTERN void                      e_comp_wl_output_remove(const char *id);
+EINTERN enum wl_output_transform  e_comp_wl_output_pending_buffer_transform_get(E_Client *ec);
+EINTERN E_Comp_Wl_Output         *e_comp_wl_output_find(E_Client *ec);
+EINTERN Eina_Array               *e_comp_wl_output_find_all(E_Client *ec);
+EINTERN Eina_Bool                 e_comp_wl_pid_output_configured_resolution_send(pid_t pid, int w, int h);
+
+EINTERN Eina_Bool e_comp_wl_key_down(Ecore_Event_Key *ev, E_Device *dev);
+EINTERN Eina_Bool e_comp_wl_key_up(Ecore_Event_Key *ev, E_Device *dev);
+EINTERN Eina_Bool e_comp_wl_key_send(E_Client *ec, int keycode, Eina_Bool pressed, void *dev, uint32_t time);
+EINTERN Eina_Bool e_comp_wl_key_cancel(E_Client *ec, int keycode, Ecore_Device *dev, uint32_t time);
+EINTERN Eina_Bool e_comp_wl_key_process(Ecore_Event_Key *ev, E_Device *dev, int type);
+
+EINTERN Eina_Bool e_comp_wl_touch_send(E_Client *ec, int idx, int x, int y, Eina_Bool pressed, Ecore_Device *dev, double radius_x, double radius_y, double pressure, double angle, uint32_t time);
+EINTERN Eina_Bool e_comp_wl_touch_update_send(E_Client *ec, int idx, int x, int y, Ecore_Device *dev, double radius_x, double radius_y, double pressure, double angle, uint32_t time);
+EINTERN Eina_Bool e_comp_wl_touch_cancel_send(E_Client *ec);
+
+EINTERN Eina_Bool e_comp_wl_mouse_button_send(E_Client *ec, int buttons, Eina_Bool pressed, Ecore_Device *dev, uint32_t time);
+EINTERN Eina_Bool e_comp_wl_mouse_move_send(E_Client *ec, int x, int y, Ecore_Device *dev, uint32_t time);
+EINTERN Eina_Bool e_comp_wl_mouse_wheel_send(E_Client *ec, int direction, int z, Ecore_Device *dev, uint32_t time);
+EINTERN Eina_Bool e_comp_wl_mouse_in_send(E_Client *ec, int x, int y, Ecore_Device *dev, uint32_t time);
+EINTERN Eina_Bool e_comp_wl_mouse_out_send(E_Client *ec, Ecore_Device *dev, uint32_t time);
+EINTERN void      e_comp_wl_mouse_in_renew(E_Client *ec, int buttons, int x, int y, void *data, Evas_Modifier *modifiers, Evas_Lock *locks, unsigned int timestamp, Evas_Event_Flags event_flags, Evas_Device *dev, Evas_Object *event_src);
+EINTERN void      e_comp_wl_mouse_out_renew(E_Client *ec, int buttons, int x, int y, void *data, Evas_Modifier *modifiers, Evas_Lock *locks, unsigned int timestamp, Evas_Event_Flags event_flags, Evas_Device *dev, Evas_Object *event_src);
+
+EINTERN void e_comp_wl_send_event_device(struct wl_client *wc, uint32_t timestamp, Ecore_Device *dev, uint32_t serial);
+EINTERN void e_comp_wl_send_event_e_device(struct wl_client *wc, uint32_t timestamp, E_Device *dev, uint32_t serial);
+
+EINTERN Eina_Bool e_comp_wl_evas_handle_mouse_button(E_Client *ec, uint32_t timestamp, uint32_t button_id, uint32_t state);
+
+EINTERN void e_comp_wl_shell_surface_ready(E_Client *ec);
+
+EINTERN void e_comp_wl_map_inv_coord_get(E_Client *ec, int x, int y, int *mx, int *my);
+
+EINTERN Eina_Bool e_comp_wl_cursor_hide(E_Client *ec);
+
+EINTERN void e_comp_wl_pos_convert(int width, int height, int transform, int scale, int sx, int sy, int *bx, int *by);
+EINTERN void e_comp_wl_pos_convert_inverse(int width, int height, int transform, int scale, int bx, int by, int *sx, int *sy);
+EINTERN void e_comp_wl_rect_convert(int width, int height, int transform, int scale, int sx, int sy, int sw, int sh, int *bx, int *by, int *bw, int *bh);
+EINTERN void e_comp_wl_rect_convert_inverse(int width, int height, int transform, int scale, int bx, int by, int bw, int bh, int *sx, int *sy, int *sw, int *sh);
+
+EINTERN void     e_comp_wl_feed_focus_in(E_Client *ec);
+
+EINTERN Eina_Bool e_comp_wl_commit_sync_client_geometry_add(E_Client *ec, uint32_t serial, int32_t x, int32_t y, int32_t w, int32_t h);
+EINTERN Eina_Bool e_comp_wl_commit_sync_configure(E_Client *ec);
+
+EINTERN void        e_comp_wl_surface_state_init(E_Comp_Wl_Surface_State *state, int w, int h);
+EINTERN void        e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state);
+EINTERN void        e_comp_wl_surface_state_finish(E_Comp_Wl_Surface_State *state);
+EINTERN void        e_comp_wl_surface_state_buffer_set(E_Comp_Wl_Surface_State *state, E_Comp_Wl_Buffer *buffer);
+EINTERN Eina_Bool   e_comp_wl_surface_viewport_get(E_Client *ec, Eina_Rectangle *buffer_viewport, Eina_Rectangle *output_viewport, unsigned int *transform);
+EINTERN Eina_Bool   e_comp_wl_surface_role_set(E_Client *ec, const char *role_name, struct wl_resource *error_resource, uint32_t error_code);
+EINTERN const char *e_comp_wl_surface_role_get(E_Client *ec);
+EINTERN void        e_comp_wl_client_surface_set(E_Client *ec, struct wl_resource *surface);
+
+EINTERN struct wl_resource *e_comp_wl_client_surface_get(E_Client *ec);
+
+EINTERN void        e_comp_wl_hook_call(E_Comp_Wl_Hook_Point hookpoint, E_Client *ec);
+
+
+EINTERN void    e_comp_wl_display_flush();
+EINTERN void    e_comp_wl_focused_client_flush();
+
+EINTERN void    e_comp_wl_connection_lock();
+EINTERN void    e_comp_wl_connection_unlock();
+
+EINTERN E_Client *e_comp_wl_util_client_from_surface_resource(struct wl_resource *surface_resource);
+
+#endif

diff --git a/src/bin/e_comp_wl_rsm.c b/src/bin/e_comp_wl_rsm.c
index 5a37e12..dd23466 100644 (file)
--- a/src/bin/e_comp_wl_rsm.c
+++ b/src/bin/e_comp_wl_rsm.c
@@ -3,6 +3,7 @@
 #include "e_device.h"
 #include "e_client_intern.h"
 #include "e_process_intern.h"
+#include "e_comp_wl_intern.h"
 
 #include <tizen-remote-surface-server-protocol.h>
 #include <tbm_surface.h>

diff --git a/src/bin/e_comp_wl_shell.c b/src/bin/e_comp_wl_shell.c
index 7d9501a..5d2f549 100644 (file)
--- a/src/bin/e_comp_wl_shell.c
+++ b/src/bin/e_comp_wl_shell.c
@@ -3,6 +3,7 @@
 #include "e_actions_intern.h"
 #include "e_bindings_intern.h"
 #include "e_xdg_shell_v6_intern.h"
+#include "e_comp_wl_intern.h"
 
 #include <xdg-shell-unstable-v5-server-protocol.h>
 #include <xdg-shell-unstable-v6-server-protocol.h>

diff --git a/src/bin/e_comp_wl_subsurface.c b/src/bin/e_comp_wl_subsurface.c
index 3f891d6..ed98bc7 100644 (file)
--- a/src/bin/e_comp_wl_subsurface.c
+++ b/src/bin/e_comp_wl_subsurface.c
@@ -1,4 +1,6 @@
 #include "e.h"
+#include "e_comp_wl_intern.h"
+#include "e_comp_wl_intern.h"
 
 #include <tizen-extension-server-protocol.h>
 

diff --git a/src/bin/e_comp_wl_viewport.c b/src/bin/e_comp_wl_viewport.c
index 2adf9ec..0bd73cb 100644 (file)
--- a/src/bin/e_comp_wl_viewport.c
+++ b/src/bin/e_comp_wl_viewport.c
@@ -4,6 +4,8 @@
 
 #include "e.h"
 #include "e_compositor.h"
+#include "e_comp_wl_intern.h"
+
 #include <wayland-server.h>
 #include <wayland-tbm-server.h>
 #include <scaler-server-protocol.h>

diff --git a/src/bin/e_compositor.c b/src/bin/e_compositor.c
index c89585c..52d5382 100644 (file)
--- a/src/bin/e_compositor.c
+++ b/src/bin/e_compositor.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_comp_wl_intern.h"
 #include "e_comp_wl_private.h"
 #include "e_comp_wl_data_intern.h"
 

diff --git a/src/bin/e_devicemgr_input.c b/src/bin/e_devicemgr_input.c
index f94c09f..26053be 100644 (file)
--- a/src/bin/e_devicemgr_input.c
+++ b/src/bin/e_devicemgr_input.c
@@ -1,5 +1,6 @@
 #include "e_devicemgr_private.h"
 #include "e_input_event.h"
+#include "e_comp_wl_intern.h"
 
 Eina_Bool
 e_devicemgr_strcmp(const char *dst, const char *src)

diff --git a/src/bin/e_devicemgr_keyboard_grab.c b/src/bin/e_devicemgr_keyboard_grab.c
index 3fae1df..7b99239 100644 (file)
--- a/src/bin/e_devicemgr_keyboard_grab.c
+++ b/src/bin/e_devicemgr_keyboard_grab.c
@@ -1,4 +1,5 @@
 #include "e_devicemgr_private.h"
+#include "e_comp_wl_intern.h"
 
 static void _e_devicemgr_keyboard_grab_client_cb_destroy(struct wl_listener *l, void *data);
 

diff --git a/src/bin/e_devicemgr_wl.c b/src/bin/e_devicemgr_wl.c
index 87c2be5..22a1fab 100644 (file)
--- a/src/bin/e_devicemgr_wl.c
+++ b/src/bin/e_devicemgr_wl.c
@@ -1,4 +1,5 @@
 #include "e_devicemgr_private.h"
+#include "e_comp_wl_intern.h"
 
 #ifdef HAVE_CYNARA
 #define E_DEVMGR_CYNARA_ERROR_CHECK_GOTO(func_name, ret, label) \

diff --git a/src/bin/e_foreign_shell.c b/src/bin/e_foreign_shell.c
index 8fa5ba7..94272b5 100644 (file)
--- a/src/bin/e_foreign_shell.c
+++ b/src/bin/e_foreign_shell.c
@@ -1,4 +1,5 @@
 #include "e_foreign_private.h"
+#include "e_comp_wl_intern.h"
 
 #define ESINF(obj, fmt, x...) \
    FINF("EShell:%p| "fmt, es->ec, obj, ##x)

diff --git a/src/bin/e_hwc_window.c b/src/bin/e_hwc_window.c
index d385928..542b29f 100644 (file)
--- a/src/bin/e_hwc_window.c
+++ b/src/bin/e_hwc_window.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_comp_wl_buffer_intern.h"
+#include "e_comp_wl_intern.h"
 
 # include <pixman.h>
 # include <wayland-tbm-server.h>

diff --git a/src/bin/e_hwc_window_queue.c b/src/bin/e_hwc_window_queue.c
index dc34f3f..7bae815 100644 (file)
--- a/src/bin/e_hwc_window_queue.c
+++ b/src/bin/e_hwc_window_queue.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_comp_wl_buffer_intern.h"
+#include "e_comp_wl_intern.h"
 
 # include <gbm.h>
 # include <wayland-tbm-server.h>

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index 4e59044..086b8ff 100644 (file)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -1,6 +1,5 @@
 #include "e.h"
 #include "e_utils_intern.h"
-#include "e_comp_wl.h"
 #include "e_policy_wl.h"
 #include "e_comp_object.h"
 #include "e_info_protocol.h"

diff --git a/src/bin/e_input.c b/src/bin/e_input.c
index f88cdcf..b7ba803 100644 (file)
--- a/src/bin/e_input.c
+++ b/src/bin/e_input.c
@@ -2,6 +2,7 @@
 #include "e_input_private.h"
 #include "e_comp_screen_intern.h"
 #include "e_comp_wl_input_intern.h"
+#include "e_comp_wl_intern.h"
 
 #include <Ecore_Input_Evas.h>
 #include <cpu-boosting.h>

diff --git a/src/bin/e_input_inputs.c b/src/bin/e_input_inputs.c
index 2ef6f60..8238006 100644 (file)
--- a/src/bin/e_input_inputs.c
+++ b/src/bin/e_input_inputs.c
@@ -2,6 +2,7 @@
 #include "e_input_private.h"
 #include "e_input_event.h"
 #include "e_keyrouter.h"
+#include "e_comp_wl_intern.h"
 
 #include <glib.h>
 

diff --git a/src/bin/e_keyrouter.c b/src/bin/e_keyrouter.c
index 5bcfc2a..44ae9d8 100644 (file)
--- a/src/bin/e_keyrouter.c
+++ b/src/bin/e_keyrouter.c
@@ -3,6 +3,7 @@
 #include "e_keyrouter_private.h"
 #include "e_input_event.h"
 #include "e_comp_wl_input_intern.h"
+#include "e_comp_wl_intern.h"
 
 #include <glib.h>
 

diff --git a/src/bin/e_keyrouter_events.c b/src/bin/e_keyrouter_events.c
index 8a2e86c..24724d8 100644 (file)
--- a/src/bin/e_keyrouter_events.c
+++ b/src/bin/e_keyrouter_events.c
@@ -1,5 +1,6 @@
 #include "e_keyrouter_private.h"
 #include "e_comp_wl_input_intern.h"
+#include "e_comp_wl_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);

diff --git a/src/bin/e_keyrouter_wl.c b/src/bin/e_keyrouter_wl.c
index fdc50f3..9c05f35 100644 (file)
--- a/src/bin/e_keyrouter_wl.c
+++ b/src/bin/e_keyrouter_wl.c
@@ -1,5 +1,6 @@
 #include "e_keyrouter_private.h"
 #include "e_comp_wl_input_intern.h"
+#include "e_comp_wl_intern.h"
 
 void
 e_keyrouter_wl_event_surface_send(struct wl_resource *surface, int key, int mode)

diff --git a/src/bin/e_output.c b/src/bin/e_output.c
index 21998cc..753df95 100644 (file)
--- a/src/bin/e_output.c
+++ b/src/bin/e_output.c
@@ -2,6 +2,7 @@
 #include "e_client_intern.h"
 #include "e_utils_intern.h"
 #include "e_comp_screen_intern.h"
+#include "e_comp_wl_intern.h"
 
 #include <device/board-internal.h>
 

diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c
index 0f7d727..fd614bf 100644 (file)
--- a/src/bin/e_pixmap.c
+++ b/src/bin/e_pixmap.c
@@ -1,5 +1,4 @@
 #include "e.h"
-#include "e_comp_wl.h"
 #include "e_comp_wl_buffer_intern.h"
 
 #include <wayland-tbm-server.h>

diff --git a/src/bin/e_plane.c b/src/bin/e_plane.c
index 37e8865..781ea68 100644 (file)
--- a/src/bin/e_plane.c
+++ b/src/bin/e_plane.c
@@ -1,6 +1,7 @@
 #include "e.h"
 #include "e_comp_canvas_intern.h"
 #include "e_comp_screen_intern.h"
+#include "e_comp_wl_intern.h"
 
 #include <device/board-internal.h>
 

diff --git a/src/bin/e_plane_renderer.c b/src/bin/e_plane_renderer.c
index 9f22f15..6646eb6 100644 (file)
--- a/src/bin/e_plane_renderer.c
+++ b/src/bin/e_plane_renderer.c
@@ -2,6 +2,7 @@
 #include "e_comp_wl_buffer_intern.h"
 #include "e_comp_canvas_intern.h"
 #include "e_comp_screen_intern.h"
+#include "e_comp_wl_intern.h"
 
 # include <tdm.h>
 # include <tdm_helper.h>

diff --git a/src/bin/e_policy_conformant.c b/src/bin/e_policy_conformant.c
index 26a6c0e..59d8048 100644 (file)
--- a/src/bin/e_policy_conformant.c
+++ b/src/bin/e_policy_conformant.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_comp_wl_intern.h"
 
 #include <wayland-server.h>
 #include <tizen-extension-server-protocol.h>

diff --git a/src/bin/e_policy_visibility.c b/src/bin/e_policy_visibility.c
index cdf2570..26ceebd 100644 (file)
--- a/src/bin/e_policy_visibility.c
+++ b/src/bin/e_policy_visibility.c
@@ -5,7 +5,6 @@
  */
 
 #include "e.h"
-#include "e_comp_wl.h"
 #include "e_policy_wl.h"
 #include "e_policy_visibility.h"
 #include "e_policy_visibility_internal.h"

diff --git a/src/bin/e_policy_wl.c b/src/bin/e_policy_wl.c
index 1826f2a..d6837a6 100644 (file)
--- a/src/bin/e_policy_wl.c
+++ b/src/bin/e_policy_wl.c
@@ -19,6 +19,7 @@
 #include "e_client_intern.h"
 #include "e_subsurface_watcher_intern.h"
 #include "e_comp_wl_data_intern.h"
+#include "e_comp_wl_intern.h"
 
 #include <device/display.h>
 #include <wayland-server.h>

diff --git a/src/bin/e_xdg_shell_v6.c b/src/bin/e_xdg_shell_v6.c
index 090aa9e..5c5a9dc 100644 (file)
--- a/src/bin/e_xdg_shell_v6.c
+++ b/src/bin/e_xdg_shell_v6.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_xdg_shell_v6_intern.h"
+#include "e_comp_wl_intern.h"
 
 #include <libds/surface.h>
 #include <libds/types/ds_xdg_shell_v6.h>

diff --git a/src/bin/services/e_service_kvm.c b/src/bin/services/e_service_kvm.c
index 107d61e..707f0e8 100644 (file)
--- a/src/bin/services/e_service_kvm.c
+++ b/src/bin/services/e_service_kvm.c
@@ -1,6 +1,7 @@
 #include "e.h"
 #include "services/e_service_kvm.h"
 #include "e_comp_wl_data_intern.h"
+#include "e_comp_wl_intern.h"
 
 #include <wayland-server.h>
 #include <tzsh_server.h>

diff --git a/src/bin/video/e_client_video.c b/src/bin/video/e_client_video.c
index 60a22da..ac1a084 100644 (file)
--- a/src/bin/video/e_client_video.c
+++ b/src/bin/video/e_client_video.c
@@ -1,4 +1,5 @@
 #include "e_video_internal.h"
+#include "e_comp_wl_intern.h"
 
 #define EO_DATA_KEY  "E_Client_Video"
 

diff --git a/src/bin/video/iface/e_video_hwc.c b/src/bin/video/iface/e_video_hwc.c
index 3076f2c..2eeba4c 100644 (file)
--- a/src/bin/video/iface/e_video_hwc.c
+++ b/src/bin/video/iface/e_video_hwc.c
@@ -5,6 +5,7 @@
 #include "e_video_internal.h"
 #include "e_video_hwc.h"
 #include "e_comp_screen_intern.h"
+#include "e_comp_wl_intern.h"
 
 #include <wayland-tbm-server.h>
 

diff --git a/src/bin/video/iface/e_video_hwc_planes.c b/src/bin/video/iface/e_video_hwc_planes.c
index 788ac00..f4b024b 100644 (file)
--- a/src/bin/video/iface/e_video_hwc_planes.c
+++ b/src/bin/video/iface/e_video_hwc_planes.c
@@ -5,6 +5,7 @@
 #include "e_video_internal.h"
 #include "e_video_hwc.h"
 #include "e_comp_screen_intern.h"
+#include "e_comp_wl_intern.h"
 
 #define CHECKING_PRIMARY_ZPOS