e_comp_screen: make an internal header

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

Change-Id: If5d524c6aeb39a4883fd9a396ff1974d77d86b77

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 5460f9a..59e6e8c 100644 (file)
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -3,6 +3,7 @@
 #include "e_utils_intern.h"
 #include "e_comp_canvas_intern.h"
 #include "e_comp_cfdata_intern.h"
+#include "e_comp_screen_intern.h"
 
 #include <sys/xattr.h>
 #include "services/e_service_quickpanel.h"

diff --git a/src/bin/e_comp_canvas.c b/src/bin/e_comp_canvas.c
index 656e5f8..c143103 100644 (file)
--- a/src/bin/e_comp_canvas.c
+++ b/src/bin/e_comp_canvas.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_comp_canvas_intern.h"
+#include "e_comp_screen_intern.h"
 
 static Eina_List *handlers;
 static Eina_Bool _ev_freeze = EINA_FALSE;

diff --git a/src/bin/e_comp_screen.c b/src/bin/e_comp_screen.c
index 9362c44..5cc952c 100644 (file)
--- a/src/bin/e_comp_screen.c
+++ b/src/bin/e_comp_screen.c
@@ -3,6 +3,7 @@
 #include "e_utils_intern.h"
 #include "e_scale_intern.h"
 #include "e_comp_canvas_intern.h"
+#include "e_comp_screen_intern.h"
 
 #include "Eeze.h"
 #include <tizen-extension-server-protocol.h>
@@ -914,7 +915,7 @@ fail:
 }
 
 E_API void
-_e_comp_screen_keymap_set(struct xkb_context **ctx, struct xkb_keymap **map)
+e_comp_screen_keymap_set(struct xkb_context **ctx, struct xkb_keymap **map)
 {
    char *keymap_path = NULL;
    struct xkb_context *context;
@@ -922,7 +923,7 @@ _e_comp_screen_keymap_set(struct xkb_context **ctx, struct xkb_keymap **map)
    struct xkb_rule_names names = {0,};
    const char* default_rules, *default_model, *default_layout, *default_variant, *default_options;
 
-   TRACE_INPUT_BEGIN(_e_comp_screen_keymap_set);
+   TRACE_INPUT_BEGIN(e_comp_screen_keymap_set);
 
    context = xkb_context_new(0);
    EINA_SAFETY_ON_NULL_RETURN(context);
@@ -1179,7 +1180,7 @@ e_comp_screen_init()
    if (e_config->xkb.use_cache && !dont_use_xkb_cache)
      {
         e_main_ts_begin("\tDRM Keymap Init");
-        _e_comp_screen_keymap_set(&ctx, &map);
+        e_comp_screen_keymap_set(&ctx, &map);
         e_main_ts_end("\tDRM Keymap Init Done");
      }
 

diff --git a/src/bin/e_comp_screen.h b/src/bin/e_comp_screen.h
index c818926..c6555bc 100644 (file)
--- a/src/bin/e_comp_screen.h
+++ b/src/bin/e_comp_screen.h
@@ -1,78 +1,18 @@
 #ifdef E_TYPEDEFS
 
+typedef struct _E_Comp_Screen   E_Comp_Screen;
+
 #else
 #ifndef E_COMP_SCREEN_H
 #define E_COMP_SCREEN_H
 
 #include <tdm.h>
+#include <xkbcommon/xkbcommon.h>
 
-typedef struct _E_Comp_Screen   E_Comp_Screen;
-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;
-   int x, y, w, h;
-   char *id; // this is the same id we get from _E_Output so look it up there
-};
-
-extern EINTERN int E_EVENT_SCREEN_CHANGE;
-
-EINTERN Eina_Bool         e_comp_screen_init(void);
-EINTERN void              e_comp_screen_shutdown(void);
-EINTERN void              e_comp_screen_hwc_info_debug(void);
-
-EINTERN void              e_comp_screen_e_screens_setup(E_Comp_Screen *e_comp_screen, int rw, int rh);
-EINTERN const Eina_List * e_comp_screen_e_screens_get(E_Comp_Screen *e_comp_screen);
-EINTERN Eina_Bool         e_comp_screen_rotation_pre_set(E_Comp_Screen *e_comp_screen, int rotation_pre);
-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);
-EINTERN Eina_Bool         e_comp_screen_rotation_ignore_output_transform_watch(E_Client *ec);
-EINTERN E_Output        * e_comp_screen_primary_output_get(E_Comp_Screen *e_comp_screen);
-
-EINTERN Eina_Bool         e_comp_screen_pp_support(void);
-EINTERN Eina_List       * e_comp_screen_pp_available_formats_get(void);
-E_API   Eina_Bool         e_comp_screen_available_video_formats_get(const tbm_format **formats, int *count);
-
-EINTERN void            * e_comp_screen_gbm_device_get(E_Comp_Screen *e_comp_screen);
-
-EINTERN Eina_Bool         e_comp_screen_size_get(E_Comp_Screen *e_comp_screen, int *w, int *h);
-
-EINTERN void              e_comp_screen_debug_info_get(Eldbus_Message_Iter *iter);
+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);
+E_API void       e_comp_screen_keymap_set(struct xkb_context **ctx, struct xkb_keymap **map);
 
 #endif /*E_COMP_SCREEN_H*/
 

diff --git a/src/bin/e_comp_screen_intern.h b/src/bin/e_comp_screen_intern.h
new file mode 100644 (file)
index 0000000..4c77a67
--- /dev/null
+++ b/src/bin/e_comp_screen_intern.h
@@ -0,0 +1,65 @@
+#ifndef E_COMP_SCREEN_INTER_H
+#define E_COMP_SCREEN_INTER_H
+
+#include <tdm.h>
+
+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;
+   int x, y, w, h;
+   char *id; // this is the same id we get from _E_Output so look it up there
+};
+
+extern EINTERN int E_EVENT_SCREEN_CHANGE;
+
+EINTERN Eina_Bool         e_comp_screen_init(void);
+EINTERN void              e_comp_screen_shutdown(void);
+
+EINTERN void              e_comp_screen_hwc_info_debug(void);
+EINTERN void              e_comp_screen_e_screens_setup(E_Comp_Screen *e_comp_screen, int rw, int rh);
+EINTERN const Eina_List  *e_comp_screen_e_screens_get(E_Comp_Screen *e_comp_screen);
+EINTERN Eina_Bool         e_comp_screen_rotation_pre_set(E_Comp_Screen *e_comp_screen, int rotation_pre);
+EINTERN Eina_Bool         e_comp_screen_rotation_ignore_output_transform_watch(E_Client *ec);
+EINTERN E_Output         *e_comp_screen_primary_output_get(E_Comp_Screen *e_comp_screen);
+EINTERN Eina_Bool         e_comp_screen_pp_support(void);
+EINTERN Eina_List        *e_comp_screen_pp_available_formats_get(void);
+EINTERN void             *e_comp_screen_gbm_device_get(E_Comp_Screen *e_comp_screen);
+EINTERN Eina_Bool         e_comp_screen_size_get(E_Comp_Screen *e_comp_screen, int *w, int *h);
+EINTERN void              e_comp_screen_debug_info_get(Eldbus_Message_Iter *iter);
+
+#endif

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 4c4ff33..4c41f26 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -8,6 +8,7 @@
 #include "e_utils_intern.h"
 #include "e_scale_intern.h"
 #include "e_comp_canvas_intern.h"
+#include "e_comp_screen_intern.h"
 
 #include <tizen-extension-server-protocol.h>
 

diff --git a/src/bin/e_comp_wl_tbm.c b/src/bin/e_comp_wl_tbm.c
index cfb9aa8..da81d27 100644 (file)
--- a/src/bin/e_comp_wl_tbm.c
+++ b/src/bin/e_comp_wl_tbm.c
@@ -1,6 +1,7 @@
 #include "e.h"
 #include "e_tbm_gbm_server_intern.h"
 #include "e_utils_intern.h"
+#include "e_comp_screen_intern.h"
 
 #include <wayland-tbm-server.h>
 #include <tbm_bufmgr.h>

diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index f380975..12ce8f4 100644 (file)
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -5,6 +5,7 @@
 #include "e_client_intern.h"
 #endif
 #include "e_utils_intern.h"
+#include "e_comp_screen_intern.h"
 
 #include <libds-tizen/screen.h>
 

diff --git a/src/bin/e_eom.c b/src/bin/e_eom.c
index a6ee374..31ace92 100644 (file)
--- a/src/bin/e_eom.c
+++ b/src/bin/e_eom.c
@@ -5,6 +5,7 @@
 #include "e.h"
 #include "e_client_intern.h"
 #include "e_xdg_shell_v6_intern.h"
+#include "e_comp_screen_intern.h"
 
 #include <xdg-shell-unstable-v5-server-protocol.h>
 #include <eom-server-protocol.h>

diff --git a/src/bin/e_explicit_sync.c b/src/bin/e_explicit_sync.c
index 86c26b9..db37560 100644 (file)
--- a/src/bin/e_explicit_sync.c
+++ b/src/bin/e_explicit_sync.c
@@ -1,4 +1,6 @@
 #include "e.h"
+#include "e_comp_screen_intern.h"
+
 #include <linux-explicit-synchronization-unstable-v1-server-protocol.h>
 #include <tizen-extension-server-protocol.h>
 

diff --git a/src/bin/e_hwc.c b/src/bin/e_hwc.c
index 0cf629a..6a1b474 100644 (file)
--- a/src/bin/e_hwc.c
+++ b/src/bin/e_hwc.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_utils_intern.h"
+#include "e_comp_screen_intern.h"
 #include "services/e_service_quickpanel.h"
 
 #include <Evas_GL.h>

diff --git a/src/bin/e_hwc_planes.c b/src/bin/e_hwc_planes.c
index 493e04c..8a816d4 100644 (file)
--- a/src/bin/e_hwc_planes.c
+++ b/src/bin/e_hwc_planes.c
@@ -1,5 +1,7 @@
 #include "e.h"
+#include "e_comp_screen_intern.h"
 #include "services/e_service_quickpanel.h"
+
 #include <wayland-tbm-server.h>
 
 EINTERN Eina_Bool

diff --git a/src/bin/e_hwc_windows.c b/src/bin/e_hwc_windows.c
index 7d053c9..45d9721 100644 (file)
--- a/src/bin/e_hwc_windows.c
+++ b/src/bin/e_hwc_windows.c
@@ -1,5 +1,7 @@
 #include "e.h"
+#include "e_comp_screen_intern.h"
 #include "services/e_service_quickpanel.h"
+
 # include <Evas_Engine_GL_Tbm.h>
 # include <Evas_Engine_Software_Tbm.h>
 # include <wayland-tbm-server.h>

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index ee5ed67..4e59044 100644 (file)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -9,6 +9,7 @@
 #include "services/e_service_quickpanel.h"
 #include "services/e_service_kvm.h"
 #include "e_process_intern.h"
+#include "e_comp_screen_intern.h"
 
 #include <tbm_bufmgr.h>
 #include <tbm_surface.h>

diff --git a/src/bin/e_info_server_input.c b/src/bin/e_info_server_input.c
index 08aef5f..b0ee1bd 100644 (file)
--- a/src/bin/e_info_server_input.c
+++ b/src/bin/e_info_server_input.c
@@ -2,6 +2,7 @@
 #include "e_info_server_input.h"
 #include "e_info_shared_types.h"
 #include "e_input_private.h"
+#include "e_comp_screen_intern.h"
 
 #include <linux/uinput.h>
 

diff --git a/src/bin/e_input.c b/src/bin/e_input.c
index 9f87415..5531fad 100644 (file)
--- a/src/bin/e_input.c
+++ b/src/bin/e_input.c
@@ -1,5 +1,7 @@
 #include "e.h"
 #include "e_input_private.h"
+#include "e_comp_screen_intern.h"
+
 #include <Ecore_Input_Evas.h>
 
 #include <cpu-boosting.h>

diff --git a/src/bin/e_input_device.c b/src/bin/e_input_device.c
index 92bff79..17edcd6 100644 (file)
--- a/src/bin/e_input_device.c
+++ b/src/bin/e_input_device.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_input_private.h"
+#include "e_comp_screen_intern.h"
 
 /* e_input_device private variable */
 static Eina_List *einput_devices;

diff --git a/src/bin/e_input_evdev.c b/src/bin/e_input_evdev.c
index 0ffb1ea..c21c356 100644 (file)
--- a/src/bin/e_input_evdev.c
+++ b/src/bin/e_input_evdev.c
@@ -4,6 +4,7 @@
 #include "e_keyrouter_private.h"
 #include "e_input_event.h"
 #include "e_devicemgr.h"
+#include "e_comp_screen_intern.h"
 
 #include <glib.h>
 

diff --git a/src/bin/e_output.c b/src/bin/e_output.c
index 5108850..21998cc 100644 (file)
--- a/src/bin/e_output.c
+++ b/src/bin/e_output.c
@@ -1,6 +1,7 @@
 #include "e.h"
 #include "e_client_intern.h"
 #include "e_utils_intern.h"
+#include "e_comp_screen_intern.h"
 
 #include <device/board-internal.h>
 

diff --git a/src/bin/e_plane.c b/src/bin/e_plane.c
index 888d2d5..37e8865 100644 (file)
--- a/src/bin/e_plane.c
+++ b/src/bin/e_plane.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_comp_canvas_intern.h"
+#include "e_comp_screen_intern.h"
 
 #include <device/board-internal.h>
 

diff --git a/src/bin/e_plane_renderer.c b/src/bin/e_plane_renderer.c
index 757cbac..06a0334 100644 (file)
--- a/src/bin/e_plane_renderer.c
+++ b/src/bin/e_plane_renderer.c
@@ -1,6 +1,7 @@
 #include "e.h"
 #include "e_comp_wl_buffer.h"
 #include "e_comp_canvas_intern.h"
+#include "e_comp_screen_intern.h"
 
 # include <tdm.h>
 # include <tdm_helper.h>

diff --git a/src/bin/e_tbm_gbm_server.c b/src/bin/e_tbm_gbm_server.c
index 7e01dff..6998014 100644 (file)
--- a/src/bin/e_tbm_gbm_server.c
+++ b/src/bin/e_tbm_gbm_server.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_tbm_gbm_server_intern.h"
+#include "e_comp_screen_intern.h"
 
 #include <assert.h>
 #include <stdbool.h>

diff --git a/src/bin/video/e_zone_video.c b/src/bin/video/e_zone_video.c
index 6e423f8..1a2124d 100644 (file)
--- a/src/bin/video/e_zone_video.c
+++ b/src/bin/video/e_zone_video.c
@@ -1,4 +1,5 @@
 #include "e_video_internal.h"
+#include "e_comp_screen_intern.h"
 
 static int
 gcd(int a, int b)

diff --git a/src/bin/video/iface/e_video_hwc.c b/src/bin/video/iface/e_video_hwc.c
index c8f67d5..3076f2c 100644 (file)
--- a/src/bin/video/iface/e_video_hwc.c
+++ b/src/bin/video/iface/e_video_hwc.c
@@ -4,6 +4,8 @@
 
 #include "e_video_internal.h"
 #include "e_video_hwc.h"
+#include "e_comp_screen_intern.h"
+
 #include <wayland-tbm-server.h>
 
 #ifdef DUMP_BUFFER

diff --git a/src/bin/video/iface/e_video_hwc_planes.c b/src/bin/video/iface/e_video_hwc_planes.c
index f827d62..788ac00 100644 (file)
--- a/src/bin/video/iface/e_video_hwc_planes.c
+++ b/src/bin/video/iface/e_video_hwc_planes.c
@@ -4,6 +4,7 @@
 
 #include "e_video_internal.h"
 #include "e_video_hwc.h"
+#include "e_comp_screen_intern.h"
 
 #define CHECKING_PRIMARY_ZPOS
 

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