e_comp_wl_shell: make an internal header

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

Change-Id: I4aed227cc54b979d192c54965d46038e463e2d90

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 79b291fb33929d066cc2ac504b9217479a2adf77..201abb76a9c98fc284d287a5be6cc865aba2a5b9 100644 (file)
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -94,7 +94,6 @@ src/bin/video/e_client_video.h \
 src/bin/video/e_zone_video.h \
 src/bin/video/e_video_debug.h \
 src/bin/e_comp_wl_viewport.h \
-src/bin/e_comp_wl_shell.h \
 src/bin/e_comp_wl_capture.h \
 src/bin/services/e_service_gesture.h \
 src/bin/services/e_service_lockscreen.h \

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index c6312b17683fa34aa5afc711562f67e7775afe40..75119fcf4195cdd9c5f91a49dda3911503003421 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -17,6 +17,7 @@
 #include "e_comp_wl_renderer_intern.h"
 #include "e_comp_wl_rsm_intern.h"
 #include "e_comp_wl_screenshooter_intern.h"
+#include "e_comp_wl_shell_intern.h"
 
 #include <tizen-extension-server-protocol.h>
 #include <relative-pointer-unstable-v1-server-protocol.h>

diff --git a/src/bin/e_comp_wl_shell.c b/src/bin/e_comp_wl_shell.c
index cfb26572b705276b941f593b49b82a75fd1a9013..8043a3a14bc8139e352d627961d1ac7a3cd5c4dc 100644 (file)
--- a/src/bin/e_comp_wl_shell.c
+++ b/src/bin/e_comp_wl_shell.c
@@ -5,6 +5,7 @@
 #include "e_xdg_shell_v6_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_rsm_intern.h"
+#include "e_comp_wl_shell_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_shell.h b/src/bin/e_comp_wl_shell.h
deleted file mode 100644 (file)
index 06fc7dd..0000000
--- a/src/bin/e_comp_wl_shell.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-# ifndef E_COMP_WL_SHELL_H
-#  define E_COMP_WL_SHELL_H
-
-typedef struct
-{
-   void (*configure_send)(struct wl_resource *resource, uint32_t edges, int32_t width, int32_t height);
-   void (*configure)(struct wl_resource *resource, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-   void (*ping)(struct wl_resource *resource);
-   void (*map)(struct wl_resource *resource);
-   void (*unmap)(struct wl_resource *resource);
-} E_Shell_Surface_Api;
-
-EINTERN void e_comp_wl_shell_init(void);
-EINTERN void e_comp_wl_shell_shutdown(void);
-
-EINTERN Eina_Bool e_shell_e_client_shell_assignable_check(E_Client *ec);
-EINTERN void      e_shell_e_client_shsurface_assign(E_Client *ec, struct wl_resource *shsurface, E_Shell_Surface_Api *api);
-EINTERN void      e_shell_e_client_shsurface_api_set(E_Client *ec, E_Shell_Surface_Api *api);
-EINTERN void      e_shell_e_client_toplevel_set(E_Client *ec);
-EINTERN void      e_shell_e_client_popup_set(E_Client *ec);
-EINTERN Eina_Bool e_shell_e_client_name_title_set(E_Client *ec, const char *name, const char *title);
-EINTERN Eina_Bool e_shell_e_client_app_id_set(E_Client *ec, const char *app_id);
-EINTERN void      e_shell_e_client_parent_set(E_Client *ec, struct wl_resource *parent_resource);
-EINTERN void      e_shell_e_client_map(E_Client *ec);
-EINTERN void      e_shell_e_client_unmap(E_Client *ec);
-EINTERN Eina_Bool e_shell_e_client_interactive_move(E_Client *ec, struct wl_resource *seat);
-EINTERN Eina_Bool e_shell_e_client_interactive_resize(E_Client *ec, struct wl_resource *resource, struct wl_resource *seat, uint32_t edges);
-EINTERN void      e_shell_e_client_pong(E_Client *ec);
-EINTERN void      e_shell_e_client_destroy(E_Client *ec);
-
-
-
-# endif
-#endif

diff --git a/src/bin/e_comp_wl_shell_intern.h b/src/bin/e_comp_wl_shell_intern.h
new file mode 100644 (file)
index 0000000..c65fcf1
--- /dev/null
+++ b/src/bin/e_comp_wl_shell_intern.h
@@ -0,0 +1,31 @@
+#ifndef E_COMP_WL_SHELL_INTERN_H
+#define E_COMP_WL_SHELL_INTERN_H
+
+typedef struct
+{
+   void (*configure_send)(struct wl_resource *resource, uint32_t edges, int32_t width, int32_t height);
+   void (*configure)(struct wl_resource *resource, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
+   void (*ping)(struct wl_resource *resource);
+   void (*map)(struct wl_resource *resource);
+   void (*unmap)(struct wl_resource *resource);
+} E_Shell_Surface_Api;
+
+EINTERN void e_comp_wl_shell_init(void);
+EINTERN void e_comp_wl_shell_shutdown(void);
+
+EINTERN Eina_Bool e_shell_e_client_shell_assignable_check(E_Client *ec);
+EINTERN void      e_shell_e_client_shsurface_assign(E_Client *ec, struct wl_resource *shsurface, E_Shell_Surface_Api *api);
+EINTERN void      e_shell_e_client_shsurface_api_set(E_Client *ec, E_Shell_Surface_Api *api);
+EINTERN void      e_shell_e_client_toplevel_set(E_Client *ec);
+EINTERN void      e_shell_e_client_popup_set(E_Client *ec);
+EINTERN Eina_Bool e_shell_e_client_name_title_set(E_Client *ec, const char *name, const char *title);
+EINTERN Eina_Bool e_shell_e_client_app_id_set(E_Client *ec, const char *app_id);
+EINTERN void      e_shell_e_client_parent_set(E_Client *ec, struct wl_resource *parent_resource);
+EINTERN void      e_shell_e_client_map(E_Client *ec);
+EINTERN void      e_shell_e_client_unmap(E_Client *ec);
+EINTERN Eina_Bool e_shell_e_client_interactive_move(E_Client *ec, struct wl_resource *seat);
+EINTERN Eina_Bool e_shell_e_client_interactive_resize(E_Client *ec, struct wl_resource *resource, struct wl_resource *seat, uint32_t edges);
+EINTERN void      e_shell_e_client_pong(E_Client *ec);
+EINTERN void      e_shell_e_client_destroy(E_Client *ec);
+
+#endif

diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index 5b8fa281db7ebf7594c4bd8245b675cbc095bdf1..d7deec548bbfd246ea25468113d6f5742c61d38f 100644 (file)
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -53,7 +53,6 @@
 #include "e_comp_wl_tbm.h"
 #include "e_comp_wl_rsm.h"
 #include "e_comp_wl_viewport.h"
-#include "e_comp_wl_shell.h"
 #include "e_policy.h"
 #include "e_policy_conformant.h"
 #include "e_policy_visibility.h"

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