e_hwc_windows: make an internal header

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

Change-Id: I9ccaf68bf7f236e16b5df70ead1cb8db67a5f1af

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index abbeed4..651cb58 100644 (file)
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -8,6 +8,7 @@
 #include "e_comp_wl_intern.h"
 #include "e_client_intern.h"
 #include "e_hwc_intern.h"
+#include "e_hwc_windows_intern.h"
 
 #include <sys/xattr.h>
 #include "services/e_service_quickpanel.h"

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 5e76ed3..7080afc 100644 (file)
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -15,6 +15,7 @@
 #include "e_comp_intern.h"
 #include "e_pixmap_intern.h"
 #include "e_map_intern.h"
+#include "e_hwc_windows_intern.h"
 
 /* data keys:
 

diff --git a/src/bin/e_comp_screen.c b/src/bin/e_comp_screen.c
index 22745a6..62281bc 100644 (file)
--- a/src/bin/e_comp_screen.c
+++ b/src/bin/e_comp_screen.c
@@ -14,6 +14,7 @@
 #include "e_pointer_intern.h"
 #include "e_output_intern.h"
 #include "e_hwc_intern.h"
+#include "e_hwc_windows_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 c4b26b1..3deab30 100644 (file)
--- a/src/bin/e_hwc.c
+++ b/src/bin/e_hwc.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_hwc_intern.h"
+#include "e_hwc_windows_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_window.c b/src/bin/e_hwc_window.c
index 24af767..34a68da 100644 (file)
--- a/src/bin/e_hwc_window.c
+++ b/src/bin/e_hwc_window.c
@@ -1,4 +1,6 @@
 #include "e.h"
+#include "e_hwc_windows_intern.h"
+#include "e_hwc_intern.h"
 #include "e_comp_wl_buffer_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_subsurface_intern.h"
@@ -6,7 +8,6 @@
 #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_windows.c b/src/bin/e_hwc_windows.c
index 9b58b45..5d88f1c 100644 (file)
--- a/src/bin/e_hwc_windows.c
+++ b/src/bin/e_hwc_windows.c
@@ -1,4 +1,6 @@
 #include "e.h"
+#include "e_hwc_windows_intern.h"
+#include "e_hwc_intern.h"
 #include "e_comp_screen_intern.h"
 #include "e_explicit_sync_intern.h"
 #include "e_comp_wl_tbm_intern.h"
@@ -7,7 +9,6 @@
 #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>
@@ -1195,7 +1196,7 @@ _e_hwc_windows_visible_windows_list_get(E_Hwc *hwc)
                {
                   e_map_point_coord_get(map, 0, &x1, &y1, NULL);
                   e_map_point_coord_get(map, 2, &x2, &y2, NULL);
-                  
+
                   x = MIN(x1, x2);
                   y = MIN(y1, y2);
                   w = MAX(x1, x2) - x;

diff --git a/src/bin/e_hwc_windows.h b/src/bin/e_hwc_windows.h
index e036223..d9ea695 100644 (file)
--- a/src/bin/e_hwc_windows.h
+++ b/src/bin/e_hwc_windows.h
@@ -1,73 +1,11 @@
 #ifdef E_TYPEDEFS
 
-typedef struct _E_Hwc_Windows_Commit_Data  E_Hwc_Windows_Commit_Data;
-
 #else
 #ifndef E_HWC_WINDOWS_H
 #define E_HWC_WINDOWS_H
 
-typedef enum
-{
-   E_HWC_WINS_DEBUG_CMD_NONE,
-   E_HWC_WINS_DEBUG_CMD_VIS,
-   E_HWC_WINS_DEBUG_CMD_ALL,
-   E_HWC_WINS_DEBUG_CMD_CL,
-   E_HWC_WINS_DEBUG_CMD_DV,
-   E_HWC_WINS_DEBUG_CMD_CS,
-   E_HWC_WINS_DEBUG_CMD_VD,
-   E_HWC_WINS_DEBUG_CMD_NO,
-   E_HWC_WINS_DEBUG_CMD_QUEUE,
-   E_HWC_WINS_DEBUG_CMD_COMMIT,
-} E_Hwc_Wins_Debug_Cmd;
-
-struct _E_Hwc_Windows_Commit_Data {
-   E_Hwc_Window_Commit_Data *target_commit_data;
-   Eina_List *commit_data_list;
-   E_Hwc *hwc;
-
-   Ecore_Timer *commit_handler_timer;
-   Eina_Bool commit_handler_log_timeout_set;
-
-   Eina_Bool use_vblank_handler;
-   Eina_Bool vblank_done;
-};
-
-EINTERN Eina_Bool            e_hwc_windows_init(void);
-EINTERN void                 e_hwc_windows_deinit(void);
-EINTERN Eina_Bool            e_hwc_windows_render(E_Hwc *hwc);
-EINTERN Eina_Bool            e_hwc_windows_commit(E_Hwc *hwc, E_Output_Display_Mode display_mode);
-EINTERN Eina_Bool            e_hwc_windows_ecore_evas_set(E_Hwc *hwc, Ecore_Evas *ee);
-EINTERN E_Hwc_Window_Target *e_hwc_windows_target_window_new(E_Hwc *hwc, Eina_Bool is_root_target);
-EINTERN void                 e_hwc_windows_target_window_del(E_Hwc_Window_Target *target_hwc_window);
-EINTERN void                 e_hwc_windows_rendered_window_add(E_Hwc_Window *hwc_window);
-EINTERN Eina_Bool            e_hwc_windows_get_available_properties(E_Hwc *hwc, const tdm_prop **props, int *count);
-EINTERN Eina_Bool            e_hwc_windows_get_video_available_properties(E_Hwc *hwc, const tdm_prop **props, int *count);
-
-EINTERN Eina_Bool            e_hwc_windows_pp_commit_possible_check(E_Hwc *hwc);
-EINTERN Eina_Bool            e_hwc_windows_zoom_set(E_Hwc *hwc, Eina_Rectangle *rect);
-EINTERN void                 e_hwc_windows_zoom_unset(E_Hwc *hwc);
-EINTERN Eina_Bool            e_hwc_windows_fps_get(E_Hwc *hwc, double *fps);
-
-EINTERN void                 e_hwc_windows_trace_debug(Eina_Bool onoff);
-EINTERN void                 e_hwc_windows_debug_info_get(Eldbus_Message_Iter *iter, E_Hwc_Wins_Debug_Cmd cmd);
 E_API   void                 e_hwc_windows_debug_dump_start(void);
 E_API   void                 e_hwc_windows_debug_dump_stop(void);
 
-EINTERN Eina_Bool            e_hwc_windows_mirror_set(E_Hwc *hwc, E_Hwc *src_hwc);
-EINTERN void                 e_hwc_windows_mirror_unset(E_Hwc *hwc);
-
-EINTERN Eina_Bool            e_hwc_windows_present_sync(E_Hwc *hwc);
-
-EINTERN void                 e_hwc_windows_client_type_override(E_Hwc *hwc);
-
-EINTERN Eina_Bool            e_hwc_windows_fence_enabled_get(E_Hwc *hwc);
-
-EINTERN void                 e_hwc_windows_target_window_force_render(E_Hwc_Window_Target *target_hwc_window);
-
-EINTERN Eina_Bool            e_hwc_windows_pp_set(E_Hwc *hwc, Eina_Rectangle *src_rect, Eina_Rectangle *dst_rect);
-EINTERN void                 e_hwc_windows_pp_unset(E_Hwc *hwc);
-
-EINTERN void                 e_hwc_windows_presentation_time_feedback_and_callback_take(E_Hwc *hwc, tbm_surface_h tsurface);
-
 #endif
 #endif

diff --git a/src/bin/e_hwc_windows_intern.h b/src/bin/e_hwc_windows_intern.h
new file mode 100644 (file)
index 0000000..25da759
--- /dev/null
+++ b/src/bin/e_hwc_windows_intern.h
@@ -0,0 +1,62 @@
+#ifndef E_HWC_WINDOWS_INTERN_H
+#define E_HWC_WINDOWS_INTERN_H
+
+typedef struct _E_Hwc_Windows_Commit_Data  E_Hwc_Windows_Commit_Data;
+
+typedef enum
+{
+   E_HWC_WINS_DEBUG_CMD_NONE,
+   E_HWC_WINS_DEBUG_CMD_VIS,
+   E_HWC_WINS_DEBUG_CMD_ALL,
+   E_HWC_WINS_DEBUG_CMD_CL,
+   E_HWC_WINS_DEBUG_CMD_DV,
+   E_HWC_WINS_DEBUG_CMD_CS,
+   E_HWC_WINS_DEBUG_CMD_VD,
+   E_HWC_WINS_DEBUG_CMD_NO,
+   E_HWC_WINS_DEBUG_CMD_QUEUE,
+   E_HWC_WINS_DEBUG_CMD_COMMIT,
+} E_Hwc_Wins_Debug_Cmd;
+
+struct _E_Hwc_Windows_Commit_Data {
+   E_Hwc_Window_Commit_Data *target_commit_data;
+   Eina_List *commit_data_list;
+   E_Hwc *hwc;
+
+   Ecore_Timer *commit_handler_timer;
+   Eina_Bool commit_handler_log_timeout_set;
+
+   Eina_Bool use_vblank_handler;
+   Eina_Bool vblank_done;
+};
+
+EINTERN Eina_Bool            e_hwc_windows_init(void);
+EINTERN void                 e_hwc_windows_deinit(void);
+EINTERN Eina_Bool            e_hwc_windows_render(E_Hwc *hwc);
+EINTERN Eina_Bool            e_hwc_windows_commit(E_Hwc *hwc, E_Output_Display_Mode display_mode);
+EINTERN Eina_Bool            e_hwc_windows_ecore_evas_set(E_Hwc *hwc, Ecore_Evas *ee);
+EINTERN void                 e_hwc_windows_rendered_window_add(E_Hwc_Window *hwc_window);
+EINTERN Eina_Bool            e_hwc_windows_get_available_properties(E_Hwc *hwc, const tdm_prop **props, int *count);
+EINTERN Eina_Bool            e_hwc_windows_get_video_available_properties(E_Hwc *hwc, const tdm_prop **props, int *count);
+EINTERN void                 e_hwc_windows_client_type_override(E_Hwc *hwc);
+
+EINTERN E_Hwc_Window_Target *e_hwc_windows_target_window_new(E_Hwc *hwc, Eina_Bool is_root_target);
+EINTERN void                 e_hwc_windows_target_window_del(E_Hwc_Window_Target *target_hwc_window);
+EINTERN void                 e_hwc_windows_target_window_force_render(E_Hwc_Window_Target *target_hwc_window);
+
+EINTERN Eina_Bool            e_hwc_windows_mirror_set(E_Hwc *hwc, E_Hwc *src_hwc);
+EINTERN void                 e_hwc_windows_mirror_unset(E_Hwc *hwc);
+
+EINTERN Eina_Bool            e_hwc_windows_pp_commit_possible_check(E_Hwc *hwc);
+EINTERN Eina_Bool            e_hwc_windows_zoom_set(E_Hwc *hwc, Eina_Rectangle *rect);
+EINTERN void                 e_hwc_windows_zoom_unset(E_Hwc *hwc);
+EINTERN Eina_Bool            e_hwc_windows_fps_get(E_Hwc *hwc, double *fps);
+
+EINTERN Eina_Bool            e_hwc_windows_fence_enabled_get(E_Hwc *hwc);
+
+EINTERN void                 e_hwc_windows_presentation_time_feedback_and_callback_take(E_Hwc *hwc, tbm_surface_h tsurface);
+EINTERN Eina_Bool            e_hwc_windows_present_sync(E_Hwc *hwc);
+
+EINTERN void                 e_hwc_windows_trace_debug(Eina_Bool onoff);
+EINTERN void                 e_hwc_windows_debug_info_get(Eldbus_Message_Iter *iter, E_Hwc_Wins_Debug_Cmd cmd);
+
+#endif

diff --git a/src/bin/e_info_client.c b/src/bin/e_info_client.c
index 909b1b9..6ff6ec6 100644 (file)
--- a/src/bin/e_info_client.c
+++ b/src/bin/e_info_client.c
@@ -1,5 +1,7 @@
 #include "e.h"
 #include "e_info_shared_types.h"
+#include "e_hwc_windows_intern.h"
+
 #include <time.h>
 #include <dirent.h>
 #include <sys/mman.h>

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index 71f016f..e4d7253 100644 (file)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -22,6 +22,7 @@
 #include "e_module_intern.h"
 #include "e_magnifier_intern.h"
 #include "e_hwc_intern.h"
+#include "e_hwc_windows_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 59c62d4..191fab7 100644 (file)
--- a/src/bin/e_output.c
+++ b/src/bin/e_output.c
@@ -10,6 +10,7 @@
 #include "e_input_intern.h"
 #include "e_error_intern.h"
 #include "e_hwc_intern.h"
+#include "e_hwc_windows_intern.h"
 
 #include <device/board-internal.h>
 

diff --git a/src/bin/video/iface/e_video_hwc_windows.c b/src/bin/video/iface/e_video_hwc_windows.c
index 52819b2..a80209b 100644 (file)
--- a/src/bin/video/iface/e_video_hwc_windows.c
+++ b/src/bin/video/iface/e_video_hwc_windows.c
@@ -5,6 +5,7 @@
 #include "e_video_internal.h"
 #include "e_video_hwc.h"
 #include "e_comp_screen_intern.h"
+#include "e_hwc_windows_intern.h"
 
 typedef struct _E_Video_Hwc_Windows E_Video_Hwc_Windows;