e_hwc: make an internal header

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

Change-Id: Iab40c267a581cf447f79099cd1ce6f630e5b6611

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 094202a..abbeed4 100644 (file)
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -7,6 +7,7 @@
 #include "e_comp_screen_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_client_intern.h"
+#include "e_hwc_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 cfb0d76..22745a6 100644 (file)
--- a/src/bin/e_comp_screen.c
+++ b/src/bin/e_comp_screen.c
@@ -13,6 +13,7 @@
 #include "e_error_intern.h"
 #include "e_pointer_intern.h"
 #include "e_output_intern.h"
+#include "e_hwc_intern.h"
 
 #include "Eeze.h"
 #include <tizen-extension-server-protocol.h>

diff --git a/src/bin/e_hwc.c b/src/bin/e_hwc.c
index 6a085a3..c4b26b1 100644 (file)
--- a/src/bin/e_hwc.c
+++ b/src/bin/e_hwc.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_hwc_intern.h"
 #include "e_utils_intern.h"
 #include "e_comp_screen_intern.h"
 #include "e_comp_intern.h"

diff --git a/src/bin/e_hwc.h b/src/bin/e_hwc.h
index 853cd99..3583b84 100644 (file)
--- a/src/bin/e_hwc.h
+++ b/src/bin/e_hwc.h
@@ -79,43 +79,6 @@ struct _E_Hwc_Presentation_Callback_List
 #define E_HWC_H
 
 #include <tdm.h>
-#include "e_hwc_window.h"
-
-struct _E_Hwc_Hook
-{
-   EINA_INLIST;
-   E_Hwc_Hook_Point hookpoint;
-   E_Hwc_Hook_Cb func;
-   void *data;
-   unsigned char delete_me : 1;
-};
-
-struct _E_Hwc_Intercept_Hook
-{
-   EINA_INLIST;
-   E_Hwc_Intercept_Hook_Point  hookpoint;
-   E_Hwc_Intercept_Hook_Cb     func;
-   void                       *data;
-   unsigned char               delete_me : 1;
-};
-
-struct _E_Hwc_Sync_Callback
-{
-   E_Hwc                      *hwc;
-   void                       *data;
-   E_Hwc_Sync_Done_Cb          cb;
-   Eina_Bool                   done;
-};
-
-struct _E_Hwc_Presentation_Callback
-{
-   E_Hwc                            *hwc;
-   void                             *data;
-   E_Hwc_Presentation_Done_Cb        cb;
-
-   Eina_Bool                         done;
-   E_Hwc_Presentation_Callback_List *list;
-};
 
 struct _E_Hwc
 {
@@ -210,30 +173,6 @@ struct _E_Hwc
 E_API extern int E_EVENT_HWC_ACTIVE;
 E_API extern int E_EVENT_HWC_DEACTIVE;
 
-EINTERN Eina_Bool             e_hwc_init(void);
-EINTERN void                  e_hwc_deinit(void);
-
-EINTERN Eina_Bool             e_hwc_ecore_evas_init(void);
-EINTERN void                  e_hwc_ecore_evas_deinit(void);
-
-EINTERN E_Hwc                *e_hwc_new(E_Output *output, Eina_Bool primary_output);
-EINTERN void                  e_hwc_del(E_Hwc *hwc);
-EINTERN E_Hwc_Mode            e_hwc_mode_get(E_Hwc *hwc);
-EINTERN void                  e_hwc_deactive_set(E_Hwc *hwc, Eina_Bool set);
-EINTERN Eina_Bool             e_hwc_deactive_get(E_Hwc *hwc);
-EINTERN Eina_Bool             e_hwc_client_is_above_hwc(E_Client *ec, E_Client *hwc_ec);
-EINTERN int                   e_hwc_output_index_get(E_Hwc *hwc);
-EINTERN tbm_surface_queue_h   e_hwc_tbm_surface_queue_get(E_Hwc *hwc);
-
-EINTERN void                  e_hwc_norender_push(E_Hwc *hwc);
-EINTERN void                  e_hwc_norender_pop(E_Hwc *hwc);
-EINTERN int                   e_hwc_norender_get(E_Hwc *hwc);
-
-EINTERN E_Hwc_Hook           *e_hwc_hook_add(E_Hwc_Hook_Point hookpoint, E_Hwc_Hook_Cb func, const void *data);
-EINTERN void                  e_hwc_hook_del(E_Hwc_Hook *ch);
-
-EINTERN Eina_Bool             e_hwc_intercept_hook_call(E_Hwc_Intercept_Hook_Point hookpoint, E_Hwc *hwc);
-
 E_API E_Hwc_Intercept_Hook   *e_hwc_intercept_hook_add(E_Hwc_Intercept_Hook_Point hookpoint, E_Hwc_Intercept_Hook_Cb func, const void *data);
 E_API void                    e_hwc_intercept_hook_del(E_Hwc_Intercept_Hook *ch);
 
@@ -247,13 +186,8 @@ E_API Eina_Bool               e_client_hwc_available_properties_get(E_Client *ec
 E_API Eina_Bool               e_client_hwc_property_get(E_Client *ec, unsigned int id, hwc_value *value);
 E_API Eina_Bool               e_client_hwc_property_set(E_Client *ec, unsigned int id, hwc_value value);
 
-EINTERN Eina_Bool               e_client_hwc_on_plane(E_Client *ec);
 E_API Eina_Bool               e_client_hwc_visible_skip_set(E_Client *ec, Eina_Bool skip);
 
-EINTERN Eina_Bool             e_hwc_sync_callback_call(E_Hwc_Sync_Callback *sync_callback);
-
-EINTERN void                 *e_hwc_gbm_surface_get(E_Hwc *hwc, int *width, int *height, int *format);
-
 /* Once callback of E_Hwc_Sync_Callback is called, E_Hwc_Sync_Callback should be destroyed */
 E_API E_Hwc_Sync_Callback    *e_hwc_sync_callback_add(E_Hwc *hwc, E_Hwc_Sync_Done_Cb cb, void *data);
 E_API void                    e_hwc_sync_callback_del(E_Hwc_Sync_Callback *sync_callback);
@@ -262,14 +196,5 @@ E_API void                    e_hwc_sync_callback_del(E_Hwc_Sync_Callback *sync_
 E_API E_Hwc_Presentation_Callback *e_client_hwc_presentation_callback_add(E_Client *ec, E_Hwc_Presentation_Done_Cb cb, void *data);
 E_API void                         e_hwc_presentation_callback_del(E_Hwc_Presentation_Callback *callback);
 
-EINTERN Eina_Bool                  e_hwc_presentation_callback_call(E_Hwc_Presentation_Callback *callback);
-
-EINTERN void                       e_hwc_presentation_callback_list_init(E_Hwc_Presentation_Callback_List *list);
-EINTERN void                       e_hwc_presentation_callback_list_finish(E_Hwc_Presentation_Callback_List *list);
-EINTERN Eina_Bool                  e_hwc_presentation_callback_list_set(E_Hwc_Presentation_Callback_List *list, E_Hwc_Presentation_Callback *callback);
-EINTERN Eina_Bool                  e_hwc_presentation_callback_list_unset(E_Hwc_Presentation_Callback_List *list, E_Hwc_Presentation_Callback *callback);
-EINTERN void                       e_hwc_presentation_callback_list_merge(E_Hwc_Presentation_Callback_List *inout, E_Hwc_Presentation_Callback_List *input);
-EINTERN void                       e_hwc_presentation_callback_list_call(E_Hwc_Presentation_Callback_List *list);
-
 #endif
 #endif

diff --git a/src/bin/e_hwc_intern.h b/src/bin/e_hwc_intern.h
new file mode 100644 (file)
index 0000000..df14bb6
--- /dev/null
+++ b/src/bin/e_hwc_intern.h
@@ -0,0 +1,78 @@
+#ifndef E_HWC_INTERN_H
+#define E_HWC_INTERN_H
+
+struct _E_Hwc_Hook
+{
+   EINA_INLIST;
+   E_Hwc_Hook_Point hookpoint;
+   E_Hwc_Hook_Cb func;
+   void *data;
+   unsigned char delete_me : 1;
+};
+
+struct _E_Hwc_Intercept_Hook
+{
+   EINA_INLIST;
+   E_Hwc_Intercept_Hook_Point  hookpoint;
+   E_Hwc_Intercept_Hook_Cb     func;
+   void                       *data;
+   unsigned char               delete_me : 1;
+};
+
+struct _E_Hwc_Sync_Callback
+{
+   E_Hwc                      *hwc;
+   void                       *data;
+   E_Hwc_Sync_Done_Cb          cb;
+   Eina_Bool                   done;
+};
+
+struct _E_Hwc_Presentation_Callback
+{
+   E_Hwc                            *hwc;
+   void                             *data;
+   E_Hwc_Presentation_Done_Cb        cb;
+
+   Eina_Bool                         done;
+   E_Hwc_Presentation_Callback_List *list;
+};
+
+EINTERN Eina_Bool e_hwc_init(void);
+EINTERN void      e_hwc_deinit(void);
+
+EINTERN Eina_Bool e_hwc_ecore_evas_init(void);
+EINTERN void      e_hwc_ecore_evas_deinit(void);
+
+EINTERN E_Hwc      *e_hwc_new(E_Output *output, Eina_Bool primary_output);
+EINTERN void        e_hwc_del(E_Hwc *hwc);
+EINTERN E_Hwc_Mode  e_hwc_mode_get(E_Hwc *hwc);
+EINTERN void        e_hwc_deactive_set(E_Hwc *hwc, Eina_Bool set);
+EINTERN Eina_Bool   e_hwc_deactive_get(E_Hwc *hwc);
+EINTERN Eina_Bool   e_hwc_client_is_above_hwc(E_Client *ec, E_Client *hwc_ec);
+EINTERN int         e_hwc_output_index_get(E_Hwc *hwc);
+EINTERN Eina_Bool   e_client_hwc_on_plane(E_Client *ec);
+
+EINTERN void        e_hwc_norender_push(E_Hwc *hwc);
+EINTERN void        e_hwc_norender_pop(E_Hwc *hwc);
+EINTERN int         e_hwc_norender_get(E_Hwc *hwc);
+
+EINTERN tbm_surface_queue_h   e_hwc_tbm_surface_queue_get(E_Hwc *hwc);
+EINTERN void                 *e_hwc_gbm_surface_get(E_Hwc *hwc, int *width, int *height, int *format);
+
+EINTERN E_Hwc_Hook *e_hwc_hook_add(E_Hwc_Hook_Point hookpoint, E_Hwc_Hook_Cb func, const void *data);
+EINTERN void        e_hwc_hook_del(E_Hwc_Hook *ch);
+
+EINTERN Eina_Bool   e_hwc_intercept_hook_call(E_Hwc_Intercept_Hook_Point hookpoint, E_Hwc *hwc);
+
+EINTERN Eina_Bool   e_hwc_sync_callback_call(E_Hwc_Sync_Callback *sync_callback);
+
+EINTERN Eina_Bool   e_hwc_presentation_callback_call(E_Hwc_Presentation_Callback *callback);
+
+EINTERN void        e_hwc_presentation_callback_list_init(E_Hwc_Presentation_Callback_List *list);
+EINTERN void        e_hwc_presentation_callback_list_finish(E_Hwc_Presentation_Callback_List *list);
+EINTERN Eina_Bool   e_hwc_presentation_callback_list_set(E_Hwc_Presentation_Callback_List *list, E_Hwc_Presentation_Callback *callback);
+EINTERN Eina_Bool   e_hwc_presentation_callback_list_unset(E_Hwc_Presentation_Callback_List *list, E_Hwc_Presentation_Callback *callback);
+EINTERN void        e_hwc_presentation_callback_list_merge(E_Hwc_Presentation_Callback_List *inout, E_Hwc_Presentation_Callback_List *input);
+EINTERN void        e_hwc_presentation_callback_list_call(E_Hwc_Presentation_Callback_List *list);
+
+#endif

diff --git a/src/bin/e_hwc_planes.c b/src/bin/e_hwc_planes.c
index f758733..b471682 100644 (file)
--- a/src/bin/e_hwc_planes.c
+++ b/src/bin/e_hwc_planes.c
@@ -3,6 +3,7 @@
 #include "e_comp_intern.h"
 #include "services/e_service_quickpanel.h"
 #include "e_output_intern.h"
+#include "e_hwc_intern.h"
 
 #include <wayland-tbm-server.h>
 

diff --git a/src/bin/e_hwc_window.c b/src/bin/e_hwc_window.c
index 23de519..24af767 100644 (file)
--- a/src/bin/e_hwc_window.c
+++ b/src/bin/e_hwc_window.c
@@ -6,6 +6,7 @@
 #include "e_pointer_intern.h"
 #include "e_pixmap_intern.h"
 #include "e_presentation_time_intern.h"
+#include "e_hwc_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 12c9f52..57509fc 100644 (file)
--- a/src/bin/e_hwc_window_queue.c
+++ b/src/bin/e_hwc_window_queue.c
@@ -4,6 +4,7 @@
 #include "e_comp_wl_renderer_intern.h"
 #include "e_comp_wl_tbm_intern.h"
 #include "e_pixmap_intern.h"
+#include "e_hwc_intern.h"
 
 # include <gbm.h>
 # include <wayland-tbm-server.h>

diff --git a/src/bin/e_hwc_windows.c b/src/bin/e_hwc_windows.c
index 4fba8ff..9b58b45 100644 (file)
--- a/src/bin/e_hwc_windows.c
+++ b/src/bin/e_hwc_windows.c
@@ -7,6 +7,7 @@
 #include "e_pixmap_intern.h"
 #include "e_presentation_time_intern.h"
 #include "e_output_intern.h"
+#include "e_hwc_intern.h"
 
 # include <Evas_Engine_GL_Tbm.h>
 # include <Evas_Engine_Software_Tbm.h>

diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index e0b0c86..3ad3f72 100644 (file)
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -34,11 +34,11 @@
 #include "e_plane.h"
 #include "e_plane_renderer.h"
 #include "e_output.h"
-#include "e_hwc.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"
 #include "e_egl_sync.h"

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index d54fd34..71f016f 100644 (file)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -21,6 +21,7 @@
 #include "e_output_intern.h"
 #include "e_module_intern.h"
 #include "e_magnifier_intern.h"
+#include "e_hwc_intern.h"
 
 #include <tbm_bufmgr.h>
 #include <tbm_surface.h>

diff --git a/src/bin/e_output.c b/src/bin/e_output.c
index 42eb980..59c62d4 100644 (file)
--- a/src/bin/e_output.c
+++ b/src/bin/e_output.c
@@ -9,6 +9,7 @@
 #include "e_comp_intern.h"
 #include "e_input_intern.h"
 #include "e_error_intern.h"
+#include "e_hwc_intern.h"
 
 #include <device/board-internal.h>