e_comp_screen: move the e_comp_screen structure into internal header

Do not expose the member varaible of e_comp_screen structure.

Change-Id: I2bff8dfce85543fb146fbdd0fcf17e2bb944d656

diff --git a/src/bin/e_comp_screen_intern.h b/src/bin/e_comp_screen_intern.h
index f1f471cd8a0d1b320acb42622bc8b672045eb20c..590328f9616b23abba972fe5f80ea92d11d848e4 100644 (file)
--- a/src/bin/e_comp_screen_intern.h
+++ b/src/bin/e_comp_screen_intern.h
@@ -8,6 +8,38 @@
 
 typedef struct _E_Screen        E_Screen;
 
+struct _E_Comp_Screen
+{
+   Eina_List     *outputs; // available screens
+   int            w, h; // virtual resolution (calculated)
+   unsigned char  ignore_hotplug_events;
+   unsigned char  ignore_acpi_events;
+   Eina_List     *e_screens;
+
+   int            num_outputs;
+   tdm_display   *tdisplay;
+   tbm_bufmgr     bufmgr;
+   void          *gdevice;
+   int            gdevice_fd;
+
+   /* for sw compositing */
+   const Eina_List *devices;
+
+   /* for screen_rotation */
+   int rotation_pre;
+   int rotation_setting;
+   int rotation;
+
+   /* pp support */
+   Eina_Bool  pp_enabled;
+   Eina_List *available_pp_formats;
+
+   tbm_surface_queue_h tqueue;
+
+   int fd;
+   Ecore_Fd_Handler *hdlr;
+};
+
 struct _E_Screen
 {
    int screen, escreen;

diff --git a/src/include/e_comp_screen.h b/src/include/e_comp_screen.h
index 2b32410a394e6bf4c4d74ac3838c8f214b6df9ad..d598a10da0dc477313b5cac80aa6f4ce297d5087 100644 (file)
--- a/src/include/e_comp_screen.h
+++ b/src/include/e_comp_screen.h
@@ -9,47 +9,6 @@
 
 typedef struct _E_Comp_Screen   E_Comp_Screen;
 
-struct _E_Comp_Screen
-{
-   Eina_List     *outputs; // available screens
-   int            w, h; // virtual resolution (calculated)
-   unsigned char  ignore_hotplug_events;
-   unsigned char  ignore_acpi_events;
-   Eina_List     *e_screens;
-
-   int            num_outputs;
-//#ifdef E_DISPLAY
-//#else
-   tdm_display   *tdisplay;
-   tbm_bufmgr     bufmgr;
-   void          *gdevice;
-   int            gdevice_fd;
-//#endif
-
-   /* for sw compositing */
-   const Eina_List *devices;
-
-   /* for screen_rotation */
-   int rotation_pre;
-   int rotation_setting;
-   int rotation;
-
-//#ifdef E_DISPLAY
-//#else
-   /* pp support */
-   Eina_Bool  pp_enabled;
-   Eina_List *available_pp_formats;
-//#endif
-
-   tbm_surface_queue_h tqueue;
-
-//#ifdef E_DISPLAY
-//#else
-   int fd;
-   Ecore_Fd_Handler *hdlr;
-//#endif
-};
-
 E_API Eina_Bool  e_comp_screen_rotation_setting_set(E_Comp_Screen *e_comp_screen, int rotation);
 E_API void       e_comp_screen_rotation_ignore_output_transform_send(E_Client *ec, Eina_Bool ignore);
 E_API Eina_Bool  e_comp_screen_available_video_formats_get(const tbm_format **formats, int *count);