e_hwc: move the symbols to internal header

Move the unused symbols in public header for hwc
to internal headers

Change-Id: I2cdd4a0ad7777e62b51ffee6d40c101b4c4ed8f1

diff --git a/src/bin/compmgr/e_comp_canvas.c b/src/bin/compmgr/e_comp_canvas.c
index 6386703d8de8e76a552ea6d9912f5c6c2e54c64e..49068db4ce8f5f0d5e2147e3b6ac0677749cd93b 100644 (file)
--- a/src/bin/compmgr/e_comp_canvas.c
+++ b/src/bin/compmgr/e_comp_canvas.c
@@ -10,6 +10,7 @@
 #include "e_display_intern.h"
 #include "e_utils_intern.h"
 #include "e_view_intern.h"
+#include "e_view_rect.h"
 #include "e_view_edje_intern.h"
 #include "e_policy_zone_intern.h"
 #include "e_policy_desk_intern.h"

diff --git a/src/bin/core/e_client.c b/src/bin/core/e_client.c
index 5c32abd65e205e0a92ac2f84bb5d1ac4c3068ce2..8d505e4ec08b021251c185b2aca28ae18d0cd8ba 100644 (file)
--- a/src/bin/core/e_client.c
+++ b/src/bin/core/e_client.c
@@ -25,6 +25,7 @@
 #include "e_view_client_intern.h"
 #include "e_policy_zone_intern.h"
 #include "e_comp_canvas_intern.h"
+#include "e_hwc_window_intern.h"
 
 #define PRI(ec) ((E_Client_Private *)e_object_data_get(E_OBJECT(ec)))
 

diff --git a/src/bin/core/e_view_edje.c b/src/bin/core/e_view_edje.c
index 6c500f5d9a50d9a6bcca7764da45faa8b5c914cd..f07931f103b6e9bf0312c431a742d9232cbefcef 100644 (file)
--- a/src/bin/core/e_view_edje.c
+++ b/src/bin/core/e_view_edje.c
@@ -1,6 +1,7 @@
 #include "e_view_edje_intern.h"
 #include "e_view_intern.h"
 #include "e_view_image.h"
+#include "e_view_rect.h"
 #include "e_theme_intern.h"
 #include "e_comp_intern.h"
 #include "e_comp_object_intern.h"

diff --git a/src/bin/displaymgr/e_hwc_intern.h b/src/bin/displaymgr/e_hwc_intern.h
index 78c375aaaab9357f78250e55baa931f2f4e417ae..1e019ae89cb24af395032547aa032b0bf67c53b6 100644 (file)
--- a/src/bin/displaymgr/e_hwc_intern.h
+++ b/src/bin/displaymgr/e_hwc_intern.h
@@ -4,6 +4,144 @@
 #include "e_intern.h"
 #include "e_hwc.h"
 
+typedef struct _E_Hwc_Window_Buffer           E_Hwc_Window_Buffer;
+typedef struct _E_Hwc_Window_Target           E_Hwc_Window_Target;
+typedef struct _E_Hwc_Window_Update_Data      E_Hwc_Window_Update_Data;
+typedef struct _E_Hwc_Window_Commit_Data      E_Hwc_Window_Commit_Data;
+
+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;
+
+// struct of e_hwc_window_intern.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_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_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;
+};
+
+#include "e_hwc_window_queue_intern.h"
+#include "e_hwc_window_intern.h"
+
+struct _E_Hwc
+{
+   E_Output            *output;
+
+   E_Hwc_Policy         hwc_policy;
+   E_Hwc_Mode           hwc_mode;
+   Eina_Bool            hwc_deactive : 1; // deactive hwc policy
+
+   Ecore_Evas          *ee;
+   Evas                *evas;
+
+   Eina_Bool            primary_output;
+
+   /* variables for hwc_windows policy  */
+   tdm_hwc             *thwc;
+   Eina_Bool            hwc_wins;
+   Eina_List           *hwc_windows;
+   E_Hwc_Window_Target *target_hwc_window;
+   tbm_surface_queue_h  target_buffer_queue;
+   E_Hwc_Window_Target *root_target_hwc_window;
+   Eina_Bool            wait_commit;
+   Eina_List           *visible_windows;
+   int                  num_visible_windows;
+   Eina_Bool            re_evaluate;
+   Eina_Bool            property_changed;
+
+   void                *gsurface;
+   int                  gsurface_width;
+   int                  gsurface_height;
+   int                  gsurface_format;
+
+   /* capabilities */
+   Eina_Bool     tdm_hwc_video_stream;
+   Eina_Bool     tdm_hwc_video_scale;
+   Eina_Bool     tdm_hwc_video_transform;
+   Eina_Bool     tdm_hwc_video_scanout;
+
+   Eina_Bool            intercept_pol;
+
+   /* variables for pp at hwc_windows policy */
+   tdm_pp               *tpp;
+   tbm_surface_queue_h   pp_tqueue;
+   E_Hwc_Window_Queue   *pp_queue;
+   Eina_Bool             pp_set;
+   Eina_Bool             pp_commit;
+   Eina_Rectangle        pp_src_rect, pp_dst_rect;
+   int                   pp_minw, pp_minh, pp_maxw, pp_maxh;
+   int                   pp_align;
+   int                   pp_align_vertical;
+   E_Hwc_Window         *pp_hwc_window;
+   E_Hwc_Window_Update_Data pp_update;
+
+   /* external output */
+   Eina_Rectangle       mirror_rect;
+   E_Hwc               *mirror_src_hwc;
+   Eina_List           *mirror_dst_hwc;
+
+   Eina_Rectangle       zoom_rect;
+   Eina_Bool            zoom_enabled;
+
+   int                  norender;
+
+   /* for fps */
+   double               fps;
+   double               old_fps;
+   double               frametimes[122];
+   double               time;
+   double               lapse;
+   int                  cframes;
+   int                  flapse;
+
+   Eina_Bool            present_sync;
+
+   Eina_Bool            tdm_hwc_fence;
+   int                  commit_fence_fd;
+
+   Eina_List           *wins_commit_data_list;
+
+   Eina_List           *sync_callback_list;
+
+   int                  gbm_format;
+
+   E_Hwc_Window        *below_transparent_window;
+
+   struct
+   {
+      int               min_w;
+      int               min_h;
+      int               max_w;
+      int               max_h;
+   } output_available;
+
+   Eina_Bool            comp_override;
+
+   unsigned int         restriction;
+   unsigned int         changed;
+   Eina_List           *changed_windows;
+};
+
 struct _E_Hwc_Hook
 {
    EINA_INLIST;

diff --git a/src/bin/displaymgr/e_hwc_window.c b/src/bin/displaymgr/e_hwc_window.c
index a9ab6f88d94719443b96c1bdd4f60a4e97f00069..e1ad172cb3179b1b7975765ef26ac03646601b3e 100644 (file)
--- a/src/bin/displaymgr/e_hwc_window.c
+++ b/src/bin/displaymgr/e_hwc_window.c
@@ -19,6 +19,7 @@
 #include "e_blur_intern.h"
 #include "e_view_intern.h"
 #include "e_view_client_intern.h"
+#include "e_output_intern.h"
 
 #include <pixman.h>
 #include <wayland-tbm-server.h>

diff --git a/src/bin/displaymgr/e_hwc_window_intern.h b/src/bin/displaymgr/e_hwc_window_intern.h
index d37e286db7e0e7bded0c865d44d22898faf26231..eec7c157356fb9d81f20abb60b8e92c3f3ee0a69 100644 (file)
--- a/src/bin/displaymgr/e_hwc_window_intern.h
+++ b/src/bin/displaymgr/e_hwc_window_intern.h
@@ -2,7 +2,9 @@
 #define E_HWC_WINDOW_INTERN_H
 
 #include "e_intern.h"
-#include "e_hwc_window.h"
+#include "e_hwc_intern.h"
+#include "e_egl_sync_intern.h"
+#include "e_view_rect.h"
 
 #define E_HWC_WINDOW_TYPE (int)0xE0b11003
 #define E_HWC_WINDOW_ZPOS_NONE -999
@@ -20,11 +22,25 @@
     } \
   while (0)
 
-typedef struct _E_Hwc_Window_Commit_Data          E_Hwc_Window_Commit_Data;
-typedef struct _E_Hwc_Window_Hook                 E_Hwc_Window_Hook;
+typedef struct _E_Hwc_Window_Hook             E_Hwc_Window_Hook;
 
 typedef void (*E_Hwc_Window_Hook_Cb) (void *data, E_Hwc_Window *hwc_window);
 
+typedef enum _E_Hwc_Window_State
+{
+   E_HWC_WINDOW_STATE_NONE,
+   E_HWC_WINDOW_STATE_CLIENT,
+   E_HWC_WINDOW_STATE_DEVICE,
+   E_HWC_WINDOW_STATE_VIDEO,
+   E_HWC_WINDOW_STATE_CURSOR,
+} E_Hwc_Window_State;
+
+typedef enum _E_Hwc_Window_Activation_State
+{
+   E_HWC_WINDOW_ACTIVATION_STATE_DEACTIVATED = 0,
+   E_HWC_WINDOW_ACTIVATION_STATE_ACTIVATED,
+} E_Hwc_Window_Activation_State;
+
 typedef enum
 {
    E_HWC_WINS_CHANGED_NONE = 0,
@@ -67,6 +83,147 @@ typedef enum _E_Hwc_Window_Hook_Point
    E_HWC_WINDOW_HOOK_LAST
 } E_Hwc_Window_Hook_Point;
 
+struct _E_Hwc_Window
+{
+   E_Object                       e_obj_inherit;
+
+   E_Client                      *ec;
+   E_Object_Delfn                *ec_delfn;
+   E_Hwc                         *hwc;
+   tdm_hwc_window                *thwc_window;
+   int                            zpos;
+   Eina_Bool                      is_target;
+   Eina_Bool                      is_root_target;
+   Eina_Bool                      is_video;
+   Eina_Bool                      is_cursor;
+   Eina_Bool                      is_deleted;
+   Eina_Bool                      set_name;
+
+   E_Hwc_Window_Activation_State  activation_state; /* hwc_window has occupied the hw layer or not */
+
+   E_Hwc_Window_State             state;
+   E_Hwc_Window_State             accepted_state;
+
+   E_Hwc_Window_Update_Data       current;
+   Eina_List                     *pending_update_list;
+
+   Eina_List                     *prop_list;
+
+   E_Hwc_Window_Update_Data       commit;
+   Eina_List                     *commit_data_list;
+
+   /* current display information */
+   E_Hwc_Window_Update_Data       display;
+
+   struct
+   {
+      int                         rotation;
+      E_Comp_Wl_Buffer           *buffer;
+      void                       *img_ptr;
+      int                         img_w;
+      int                         img_h;
+      int                         img_stride;
+   } cursor;
+   struct wl_listener             cursor_buffer_destroy_listener;
+
+   struct
+   {
+      /* for fps */
+      double               fps;
+      double               old_fps;
+      double               frametimes[122];
+      double               time;
+      double               lapse;
+      int                  cframes;
+      int                  flapse;
+   } fps;
+
+   int                            constraints;
+
+   E_Hwc_Window_Queue            *queue;
+   struct wl_listener             queue_destroy_listener;
+
+   Eina_Bool                      render_target;
+   Eina_Bool                      on_rendered_target;
+
+   unsigned int                   restriction;
+
+   E_Presentation_Time_Container  presentation_container;
+
+   Eina_Bool                      present_sync;
+
+   E_Hwc_Presentation_Callback_List pending_presentation_callbacks;
+   E_Hwc_Presentation_Callback_List presentation_callbacks;
+
+   struct wayland_tbm_client_queue *cqueue;
+
+   E_Zone                        *zone;
+   E_Object_Delfn                *zone_delfn;
+
+   E_View_Rect                   *below_transparent_view;
+
+   Eina_Bool                      comp_override;
+   Eina_Bool                      never_hwc;
+   Eina_Bool                      visible_skip;
+
+   struct wl_listener             image_filter_set_listener;
+   struct wl_listener             render_op_set_listener;
+   struct wl_listener             content_type_set_listener;
+   struct wl_listener             color_set_listener;
+   struct wl_listener             color_visible_set_listener;
+
+   Eina_Bool                      evas_visible;
+   Eina_Bool                      hwc_visible;
+
+   Eina_Bool                      changed;
+
+   // view listener
+   struct wl_listener show_listener;
+   struct wl_listener hide_listener;
+   struct wl_listener move_listener;
+   struct wl_listener resize_listener;
+   struct wl_listener restack_listener;
+
+   struct wl_listener transparent_show_listener;
+   struct wl_listener transparent_hide_listener;
+   struct wl_listener transparent_move_listener;
+   struct wl_listener transparent_resize_listener;
+   struct wl_listener transparent_restack_listener;
+};
+
+struct _E_Hwc_Window_Target
+{
+   E_Hwc_Window        hwc_window; /* don't move this field */
+   E_Hwc              *hwc;
+
+   Ecore_Evas         *ee;
+   Evas               *evas;
+   int                 event_fd;
+   Ecore_Fd_Handler   *event_hdlr;
+
+   /* a surface the rendering is currently performing at */
+   tbm_surface_h       dequeued_tsurface;
+   Eina_List          *rendering_tsurfaces;
+   Eina_List          *rendered_windows;
+   Eina_Bool           is_rendering;
+
+   E_Hwc_Window_Queue *pp_queue;
+   struct wl_listener  pp_queue_destroy_listener;
+
+   E_Egl_Sync         *end_render_sync;
+
+   Eina_List          *present_sync_windows;
+   Eina_List          *pending_presentation_cb_wins;
+};
+
+struct _E_Hwc_Window_Commit_Data {
+   E_Hwc_Window                  *hwc_window;
+   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;
+};
+
 struct _E_Hwc_Window_Hook
 {
    EINA_INLIST;

diff --git a/src/bin/displaymgr/e_hwc_window_queue_intern.h b/src/bin/displaymgr/e_hwc_window_queue_intern.h
index 7425297efdedc4f466b27f03700955b6825c5371..102413ea0feaab880c8d870e226b65eb3e81c582 100644 (file)
--- a/src/bin/displaymgr/e_hwc_window_queue_intern.h
+++ b/src/bin/displaymgr/e_hwc_window_queue_intern.h
@@ -2,7 +2,7 @@
 #define E_HWC_WINDOW_QUEUE_INTERN_H
 
 #include "e_intern.h"
-#include "e_hwc_window_intern.h"
+#include "e_hwc_intern.h"
 
 #include <Eldbus.h>
 #include <wayland-server.h>

diff --git a/src/bin/displaymgr/video/e_video_hwc.c b/src/bin/displaymgr/video/e_video_hwc.c
index 9002d096b1b1302e8d475009de9c0d8f3fe91241..c3b37276e4172b8b3db53fcca4adc9ddb229cc83 100644 (file)
--- a/src/bin/displaymgr/video/e_video_hwc.c
+++ b/src/bin/displaymgr/video/e_video_hwc.c
@@ -14,6 +14,7 @@
 #include "e_compositor_intern.h"
 #include "e_view_client_intern.h"
 #include "e_hwc_windows_intern.h"
+#include "e_hwc_intern.h"
 
 #include <wayland-tbm-server.h>
 

diff --git a/src/bin/server/e_comp_wl_tizen_hwc.c b/src/bin/server/e_comp_wl_tizen_hwc.c
index eecf0086658a478ed993c5d2b1efb01b9a896575..29248bc1c298a7d8b0df180c882e05d6d0f4c60c 100644 (file)
--- a/src/bin/server/e_comp_wl_tizen_hwc.c
+++ b/src/bin/server/e_comp_wl_tizen_hwc.c
@@ -3,9 +3,11 @@
 #include "e_client_intern.h"
 #include "e_utils_intern.h"
 #include "e_error_intern.h"
+#include "e_hwc_intern.h"
 #include "e_hwc_window_intern.h"
 #include "e_hwc_window_queue_intern.h"
 #include "e_compositor_intern.h"
+#include "e_output_intern.h"
 
 #include <libds-tizen/hwc.h>
 

diff --git a/src/bin/server/e_explicit_sync.c b/src/bin/server/e_explicit_sync.c
index 21765ca6ad1b4985666465f5f2085dbe73beccfd..68d16fa653ae28dc8d5c976ff1a28cd14d124225 100644 (file)
--- a/src/bin/server/e_explicit_sync.c
+++ b/src/bin/server/e_explicit_sync.c
@@ -5,6 +5,7 @@
 #include "e_egl_sync_intern.h"
 #include "e_client_intern.h"
 #include "e_display_intern.h"
+#include "e_hwc_intern.h"
 
 #include <linux-explicit-synchronization-unstable-v1-server-protocol.h>
 #include <tizen-extension-server-protocol.h>

diff --git a/src/bin/server/e_presentation_time.c b/src/bin/server/e_presentation_time.c
index fdff2af19a4b35246b038d2ff3e42749ea0b00a7..cbd0fb3b72d8d5da246044efc30d18ddf59573e6 100644 (file)
--- a/src/bin/server/e_presentation_time.c
+++ b/src/bin/server/e_presentation_time.c
@@ -3,6 +3,7 @@
 #include "e_client_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_utils_intern.h"
+#include "e_output_intern.h"
 
 #include <presentation-time-server-protocol.h>
 #include <tizen-extension-server-protocol.h>

diff --git a/src/bin/windowmgr/e_pointer.c b/src/bin/windowmgr/e_pointer.c
index 45795172990d7ea5b4be39d3b31b2966dc577c41..14d724c154ca68d4a15185ae7920269002306026 100644 (file)
--- a/src/bin/windowmgr/e_pointer.c
+++ b/src/bin/windowmgr/e_pointer.c
@@ -6,6 +6,7 @@
 #include "e_comp_wl_intern.h"
 #include "e_view_intern.h"
 #include "e_view_client_intern.h"
+#include "e_output_intern.h"
 
 /* local variables */
 static Eina_List *_ptrs = NULL;

diff --git a/src/include/e_hwc.h b/src/include/e_hwc.h
index 1c341f07d6c068a920e1440c009b11115bba05c9..1a0227fc5839725db98d1e5fad83e480e5f2f50d 100644 (file)
--- a/src/include/e_hwc.h
+++ b/src/include/e_hwc.h
@@ -2,13 +2,14 @@
 #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;
@@ -70,105 +71,6 @@ struct _E_Hwc_Presentation_Callback_List
    Eina_List *callbacks;
 };
 
-struct _E_Hwc
-{
-   E_Output            *output;
-
-   E_Hwc_Policy         hwc_policy;
-   E_Hwc_Mode           hwc_mode;
-   Eina_Bool            hwc_deactive : 1; // deactive hwc policy
-
-   Ecore_Evas          *ee;
-   Evas                *evas;
-
-   Eina_Bool            primary_output;
-
-   /* variables for hwc_windows policy  */
-   tdm_hwc             *thwc;
-   Eina_Bool            hwc_wins;
-   Eina_List           *hwc_windows;
-   E_Hwc_Window_Target *target_hwc_window;
-   tbm_surface_queue_h  target_buffer_queue;
-   E_Hwc_Window_Target *root_target_hwc_window;
-   Eina_Bool            wait_commit;
-   Eina_List           *visible_windows;
-   int                  num_visible_windows;
-   Eina_Bool            re_evaluate;
-   Eina_Bool            property_changed;
-
-   void                *gsurface;
-   int                  gsurface_width;
-   int                  gsurface_height;
-   int                  gsurface_format;
-
-   /* capabilities */
-   Eina_Bool     tdm_hwc_video_stream;
-   Eina_Bool     tdm_hwc_video_scale;
-   Eina_Bool     tdm_hwc_video_transform;
-   Eina_Bool     tdm_hwc_video_scanout;
-
-   Eina_Bool            intercept_pol;
-
-   /* variables for pp at hwc_windows policy */
-   tdm_pp               *tpp;
-   tbm_surface_queue_h   pp_tqueue;
-   E_Hwc_Window_Queue   *pp_queue;
-   Eina_Bool             pp_set;
-   Eina_Bool             pp_commit;
-   Eina_Rectangle        pp_src_rect, pp_dst_rect;
-   int                   pp_minw, pp_minh, pp_maxw, pp_maxh;
-   int                   pp_align;
-   int                   pp_align_vertical;
-   E_Hwc_Window         *pp_hwc_window;
-   E_Hwc_Window_Update_Data pp_update;
-
-   /* external output */
-   Eina_Rectangle       mirror_rect;
-   E_Hwc               *mirror_src_hwc;
-   Eina_List           *mirror_dst_hwc;
-
-   Eina_Rectangle       zoom_rect;
-   Eina_Bool            zoom_enabled;
-
-   int                  norender;
-
-   /* for fps */
-   double               fps;
-   double               old_fps;
-   double               frametimes[122];
-   double               time;
-   double               lapse;
-   int                  cframes;
-   int                  flapse;
-
-   Eina_Bool            present_sync;
-
-   Eina_Bool            tdm_hwc_fence;
-   int                  commit_fence_fd;
-
-   Eina_List           *wins_commit_data_list;
-
-   Eina_List           *sync_callback_list;
-
-   int                  gbm_format;
-
-   E_Hwc_Window        *below_transparent_window;
-
-   struct
-   {
-      int               min_w;
-      int               min_h;
-      int               max_w;
-      int               max_h;
-   } output_available;
-
-   Eina_Bool            comp_override;
-
-   unsigned int         restriction;
-   unsigned int         changed;
-   Eina_List           *changed_windows;
-};
-
 E_API extern int E_EVENT_HWC_ACTIVE;
 E_API extern int E_EVENT_HWC_DEACTIVE;
 
@@ -196,7 +98,6 @@ E_API void                    e_hwc_mode_set(E_Hwc *hwc, E_Hwc_Mode mode);
 E_API E_Hwc_Mode              e_hwc_mode_get(E_Hwc *hwc);
 E_API void                    e_hwc_deactive_set(E_Hwc *hwc, Eina_Bool set);
 E_API Eina_Bool               e_hwc_deactive_get(E_Hwc *hwc);
-E_API E_Output               *e_hwc_output_get(E_Hwc *hwc);
 E_API E_Hwc_Policy            e_hwc_hwc_policy_get(E_Hwc *hwc);
 
 #endif

diff --git a/src/include/e_hwc_window.h b/src/include/e_hwc_window.h
index c98b38898bd0405587b889e82388b5c505e93e94..acc0780c321d9bdcb1891468240632493d976d05 100644 (file)
--- a/src/include/e_hwc_window.h
+++ b/src/include/e_hwc_window.h
@@ -1,174 +1,6 @@
 #ifndef E_HWC_WINDOW_H
 #define E_HWC_WINDOW_H
 
-#include <e_types.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 <e_view_rect.h>
-
-#include <tbm_surface.h>
-#include <wayland-server.h>
-#include <Ecore.h>
-
-typedef enum _E_Hwc_Window_State
-{
-   E_HWC_WINDOW_STATE_NONE,
-   E_HWC_WINDOW_STATE_CLIENT,
-   E_HWC_WINDOW_STATE_DEVICE,
-   E_HWC_WINDOW_STATE_VIDEO,
-   E_HWC_WINDOW_STATE_CURSOR,
-} E_Hwc_Window_State;
-
-typedef enum _E_Hwc_Window_Activation_State
-{
-   E_HWC_WINDOW_ACTIVATION_STATE_DEACTIVATED = 0,
-   E_HWC_WINDOW_ACTIVATION_STATE_ACTIVATED,
-} E_Hwc_Window_Activation_State;
-
-struct _E_Hwc_Window
-{
-   E_Object                       e_obj_inherit;
-
-   E_Client                      *ec;
-   E_Object_Delfn                *ec_delfn;
-   E_Hwc                         *hwc;
-   tdm_hwc_window                *thwc_window;
-   int                            zpos;
-   Eina_Bool                      is_target;
-   Eina_Bool                      is_root_target;
-   Eina_Bool                      is_video;
-   Eina_Bool                      is_cursor;
-   Eina_Bool                      is_deleted;
-   Eina_Bool                      set_name;
-
-   E_Hwc_Window_Activation_State  activation_state; /* hwc_window has occupied the hw layer or not */
-
-   E_Hwc_Window_State             state;
-   E_Hwc_Window_State             accepted_state;
-
-   E_Hwc_Window_Update_Data       current;
-   Eina_List                     *pending_update_list;
-
-   Eina_List                     *prop_list;
-
-   E_Hwc_Window_Update_Data       commit;
-   Eina_List                     *commit_data_list;
-
-   /* current display information */
-   E_Hwc_Window_Update_Data       display;
-
-   struct
-   {
-      int                         rotation;
-      E_Comp_Wl_Buffer           *buffer;
-      void                       *img_ptr;
-      int                         img_w;
-      int                         img_h;
-      int                         img_stride;
-   } cursor;
-   struct wl_listener             cursor_buffer_destroy_listener;
-
-   struct
-   {
-      /* for fps */
-      double               fps;
-      double               old_fps;
-      double               frametimes[122];
-      double               time;
-      double               lapse;
-      int                  cframes;
-      int                  flapse;
-   } fps;
-
-   int                            constraints;
-
-   E_Hwc_Window_Queue            *queue;
-   struct wl_listener             queue_destroy_listener;
-
-   Eina_Bool                      render_target;
-   Eina_Bool                      on_rendered_target;
-
-   unsigned int                   restriction;
-
-   E_Presentation_Time_Container  presentation_container;
-
-   Eina_Bool                      present_sync;
-
-   E_Hwc_Presentation_Callback_List pending_presentation_callbacks;
-   E_Hwc_Presentation_Callback_List presentation_callbacks;
-
-   struct wayland_tbm_client_queue *cqueue;
-
-   E_Zone                        *zone;
-   E_Object_Delfn                *zone_delfn;
-
-   E_View_Rect                   *below_transparent_view;
-
-   Eina_Bool                      comp_override;
-   Eina_Bool                      never_hwc;
-   Eina_Bool                      visible_skip;
-
-   struct wl_listener             image_filter_set_listener;
-   struct wl_listener             render_op_set_listener;
-   struct wl_listener             content_type_set_listener;
-   struct wl_listener             color_set_listener;
-   struct wl_listener             color_visible_set_listener;
-
-   Eina_Bool                      evas_visible;
-   Eina_Bool                      hwc_visible;
-
-   Eina_Bool                      changed;
-
-   // view listener
-   struct wl_listener show_listener;
-   struct wl_listener hide_listener;
-   struct wl_listener move_listener;
-   struct wl_listener resize_listener;
-   struct wl_listener restack_listener;
-   
-   struct wl_listener transparent_show_listener;
-   struct wl_listener transparent_hide_listener;
-   struct wl_listener transparent_move_listener;
-   struct wl_listener transparent_resize_listener;
-   struct wl_listener transparent_restack_listener;
-};
-
-struct _E_Hwc_Window_Target
-{
-   E_Hwc_Window        hwc_window; /* don't move this field */
-   E_Hwc              *hwc;
-
-   Ecore_Evas         *ee;
-   Evas               *evas;
-   int                 event_fd;
-   Ecore_Fd_Handler   *event_hdlr;
-
-   /* a surface the rendering is currently performing at */
-   tbm_surface_h       dequeued_tsurface;
-   Eina_List          *rendering_tsurfaces;
-   Eina_List          *rendered_windows;
-   Eina_Bool           is_rendering;
-
-   E_Hwc_Window_Queue *pp_queue;
-   struct wl_listener  pp_queue_destroy_listener;
-
-   E_Egl_Sync         *end_render_sync;
-
-   Eina_List          *present_sync_windows;
-   Eina_List          *pending_presentation_cb_wins;
-};
-
-struct _E_Hwc_Window_Commit_Data {
-   E_Hwc_Window                  *hwc_window;
-   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;
-};
+typedef struct _E_Hwc_Window E_Hwc_Window;
 
 #endif // E_HWC_WINDOW_H

diff --git a/src/include/e_types.h b/src/include/e_types.h
index eb5c7d18e70a90760e784ddf3132af91427746da..8b9775b9eda910f25919d27d8053fe787af8b6aa 100644 (file)
--- a/src/include/e_types.h
+++ b/src/include/e_types.h
@@ -65,14 +65,6 @@ typedef struct _E_Client                      E_Client;                      //
 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_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
@@ -176,33 +168,6 @@ struct _E_Comp_Wl_Buffer_Ref
    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;