e_pixmap: make an internal header

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

Change-Id: Ic711b384d5104d2b7ca4b492641eeefaa7561012

diff --git a/src/bin/e_client.h b/src/bin/e_client.h
index 9f735a0..ec20c9a 100644 (file)
--- a/src/bin/e_client.h
+++ b/src/bin/e_client.h
@@ -1397,14 +1397,6 @@ e_client_util_ignored_get(const E_Client *ec)
 }
 
 static inline Ecore_Window
-e_client_util_pwin_get(const E_Client *ec)
-{
-   if (!ec) return 0;
-   if (!ec->pixmap) return 0;
-   return e_pixmap_parent_window_get(ec->pixmap);
-}
-
-static inline Ecore_Window
 e_client_util_win_get(const E_Client *ec)
 {
    if (!ec) return 0;

diff --git a/src/bin/e_client_intern.h b/src/bin/e_client_intern.h
index 1a88e5e..ad1d239 100644 (file)
--- a/src/bin/e_client_intern.h
+++ b/src/bin/e_client_intern.h
@@ -1,6 +1,8 @@
 #ifndef E_CLIENT_INTERN_H
 #define E_CLIENT_INTERN_H
 
+#include "e_pixmap_intern.h"
+
 #include <wayland-server.h>
 
 typedef struct E_Client E_Client;
@@ -27,6 +29,14 @@ typedef struct _E_Client_Data_Get_Visible_Below
 } E_Client_Data_Get_Visible_Below;
 //#endif
 
+static inline Ecore_Window
+e_client_util_pwin_get(const E_Client *ec)
+{
+   if (!ec) return 0;
+   if (!ec->pixmap) return 0;
+   return e_pixmap_parent_window_get(ec->pixmap);
+}
+
 EINTERN void e_client_eval_pre_fetch_listener_add(E_Client *ec, struct wl_listener *listener);
 EINTERN void e_client_eval_fetch_listener_add(E_Client *ec, struct wl_listener *listener);
 EINTERN void e_client_eval_pre_post_fetch_listener_add(E_Client *ec, struct wl_listener *listener);

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 03d1fc5..094202a 100644 (file)
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -6,6 +6,7 @@
 #include "e_comp_cfdata_intern.h"
 #include "e_comp_screen_intern.h"
 #include "e_comp_wl_intern.h"
+#include "e_client_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 ec3ed82..df50366 100644 (file)
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -13,6 +13,7 @@
 #include "e_comp_wl_subsurface_intern.h"
 #include "e_comp_wl_tbm_intern.h"
 #include "e_comp_intern.h"
+#include "e_pixmap_intern.h"
 
 /* data keys:
 

diff --git a/src/bin/e_comp_wl_subsurface.c b/src/bin/e_comp_wl_subsurface.c
index 312e531..607ac98 100644 (file)
--- a/src/bin/e_comp_wl_subsurface.c
+++ b/src/bin/e_comp_wl_subsurface.c
@@ -2,6 +2,7 @@
 #include "e_comp_wl_subsurface_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_viewport_intern.h"
+#include "e_pixmap_intern.h"
 
 #include <tizen-extension-server-protocol.h>
 

diff --git a/src/bin/e_compositor.c b/src/bin/e_compositor.c
index a1bcea9..a0e6aec 100644 (file)
--- a/src/bin/e_compositor.c
+++ b/src/bin/e_compositor.c
@@ -6,6 +6,7 @@
 #include "e_comp_wl_rsm_intern.h"
 #include "e_comp_wl_subsurface_intern.h"
 #include "e_comp_intern.h"
+#include "e_pixmap_intern.h"
 
 #include <libds/compositor.h>
 #include <libds/subcompositor.h>

diff --git a/src/bin/e_foreign_shell.c b/src/bin/e_foreign_shell.c
index 6e5fec4..59a5a64 100644 (file)
--- a/src/bin/e_foreign_shell.c
+++ b/src/bin/e_foreign_shell.c
@@ -1,6 +1,7 @@
 #include "e_foreign_private.h"
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_subsurface_intern.h"
+#include "e_pixmap_intern.h"
 
 #define ESINF(obj, fmt, x...) \
    FINF("EShell:%p| "fmt, es->ec, obj, ##x)

diff --git a/src/bin/e_hwc_window.c b/src/bin/e_hwc_window.c
index cdf7213..0a213bb 100644 (file)
--- a/src/bin/e_hwc_window.c
+++ b/src/bin/e_hwc_window.c
@@ -4,6 +4,7 @@
 #include "e_comp_wl_subsurface_intern.h"
 #include "e_comp_wl_tbm_intern.h"
 #include "e_pointer_intern.h"
+#include "e_pixmap_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 5366b69..12c9f52 100644 (file)
--- a/src/bin/e_hwc_window_queue.c
+++ b/src/bin/e_hwc_window_queue.c
@@ -3,6 +3,7 @@
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_renderer_intern.h"
 #include "e_comp_wl_tbm_intern.h"
+#include "e_pixmap_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 118e9a5..6a02ebb 100644 (file)
--- a/src/bin/e_hwc_windows.c
+++ b/src/bin/e_hwc_windows.c
@@ -4,6 +4,7 @@
 #include "e_comp_wl_tbm_intern.h"
 #include "services/e_service_quickpanel.h"
 #include "e_comp_wl_tizen_hwc_intern.h"
+#include "e_pixmap_intern.h"
 
 # include <Evas_Engine_GL_Tbm.h>
 # include <Evas_Engine_Software_Tbm.h>

diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c
index 47bce6f..61ce8e8 100644 (file)
--- a/src/bin/e_pixmap.c
+++ b/src/bin/e_pixmap.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_pixmap_intern.h"
 #include "e_comp_wl_buffer_intern.h"
 #include "e_comp_wl_tbm_intern.h"
 

diff --git a/src/bin/e_pixmap.h b/src/bin/e_pixmap.h
index 5f8e2ea..b1fb6da 100644 (file)
--- a/src/bin/e_pixmap.h
+++ b/src/bin/e_pixmap.h
@@ -28,62 +28,27 @@ typedef enum _E_Pixmap_Hook_Point
 
 typedef void (*E_Pixmap_Hook_Cb)(void *data, E_Pixmap *cp);
 
-struct _E_Pixmap_Hook
-{
-   EINA_INLIST;
-   E_Pixmap_Hook_Point hookpoint;
-   E_Pixmap_Hook_Cb    func;
-   void               *data;
-   unsigned char       delete_me : 1;
-};
-
-E_API int e_pixmap_free(E_Pixmap *cp);
-EINTERN void e_pixmap_win_id_del(E_Pixmap *cp);
-E_API E_Pixmap *e_pixmap_ref(E_Pixmap *cp);
-E_API E_Pixmap *e_pixmap_new(E_Pixmap_Type type, ...);
-E_API E_Pixmap_Type e_pixmap_type_get(const E_Pixmap *cp);
-E_API void *e_pixmap_resource_get(E_Pixmap *cp);
+E_API E_Pixmap              *e_pixmap_new(E_Pixmap_Type type, ...);
+E_API int                    e_pixmap_free(E_Pixmap *cp);
+E_API E_Pixmap              *e_pixmap_ref(E_Pixmap *cp);
+E_API E_Pixmap_Type          e_pixmap_type_get(const E_Pixmap *cp);
+E_API void                  *e_pixmap_resource_get(E_Pixmap *cp);
 E_API E_Comp_Wl_Client_Data *e_pixmap_cdata_get(E_Pixmap *cp);
-EINTERN void e_pixmap_cdata_set(E_Pixmap *cp, E_Comp_Wl_Client_Data *cdata);
-E_API void e_pixmap_resource_set(E_Pixmap *cp, void *resource);
-EINTERN void e_pixmap_parent_window_set(E_Pixmap *cp, Ecore_Window win);
-EINTERN Eina_Bool e_pixmap_dirty_get(E_Pixmap *cp);
-E_API void e_pixmap_clear(E_Pixmap *cp);
-EINTERN void e_pixmap_usable_set(E_Pixmap *cp, Eina_Bool set);
-E_API Eina_Bool e_pixmap_usable_get(const E_Pixmap *cp);
-EINTERN void e_pixmap_dirty(E_Pixmap *cp);
-EINTERN Eina_Bool e_pixmap_refresh(E_Pixmap *cp);
-EINTERN Eina_Bool e_pixmap_size_changed(E_Pixmap *cp, int w, int h);
-E_API Eina_Bool e_pixmap_size_get(E_Pixmap *cp, int *w, int *h);
-EINTERN void e_pixmap_client_set(E_Pixmap *cp, E_Client *ec);
-E_API E_Client *e_pixmap_client_get(E_Pixmap *cp);
-EINTERN E_Pixmap *e_pixmap_find(E_Pixmap_Type type, ...);
-EINTERN E_Client *e_pixmap_find_client(E_Pixmap_Type type, ...);
-E_API E_Client *e_pixmap_find_client_by_res_id(uint32_t res_id);
-E_API uint32_t e_pixmap_res_id_get(E_Pixmap *cp);
-E_API uint64_t e_pixmap_window_get(E_Pixmap *cp);
-EINTERN Ecore_Window e_pixmap_parent_window_get(E_Pixmap *cp);
-E_API Eina_Bool e_pixmap_native_surface_init(E_Pixmap *cp, Evas_Native_Surface *ns);
-E_API void e_pixmap_image_clear(E_Pixmap *cp, Eina_Bool cache);
-EINTERN Eina_Bool e_pixmap_image_refresh(E_Pixmap *cp);
-EINTERN Eina_Bool e_pixmap_image_exists(const E_Pixmap *cp);
-EINTERN Eina_Bool e_pixmap_image_is_argb(const E_Pixmap *cp);
-EINTERN void *e_pixmap_image_data_get(E_Pixmap *cp);
-EINTERN void e_pixmap_image_data_ref(E_Pixmap *cp);
-
-EINTERN void e_pixmap_image_opaque_set(E_Pixmap *cp, int x, int y, int w, int h);
-EINTERN void e_pixmap_image_opaque_get(E_Pixmap *cp, int *x, int *y, int *w, int *h);
+E_API void                   e_pixmap_resource_set(E_Pixmap *cp, void *resource);
+E_API void                   e_pixmap_clear(E_Pixmap *cp);
+E_API Eina_Bool              e_pixmap_usable_get(const E_Pixmap *cp);
+E_API Eina_Bool              e_pixmap_size_get(E_Pixmap *cp, int *w, int *h);
+E_API E_Client              *e_pixmap_client_get(E_Pixmap *cp);
+E_API E_Client              *e_pixmap_find_client_by_res_id(uint32_t res_id);
+E_API uint32_t               e_pixmap_res_id_get(E_Pixmap *cp);
+E_API uint64_t               e_pixmap_window_get(E_Pixmap *cp);
+E_API Eina_Bool              e_pixmap_native_surface_init(E_Pixmap *cp, Evas_Native_Surface *ns);
+E_API void                   e_pixmap_image_clear(E_Pixmap *cp, Eina_Bool cache);
 
 E_API E_Pixmap_Hook *e_pixmap_hook_add(E_Pixmap_Hook_Point hookpoint, E_Pixmap_Hook_Cb func, const void *data);
 E_API void e_pixmap_hook_del(E_Pixmap_Hook *ph);
 
-EINTERN Eina_Bool e_pixmap_init(void);
-EINTERN void e_pixmap_shutdown(void);
 E_API void e_pixmap_buffer_clear(E_Pixmap *cp, Eina_Bool only_free);
 
-EINTERN void e_pixmap_buffer_clear_cancel(E_Pixmap *cp);
-EINTERN void *e_pixmap_ref_resource_get(E_Pixmap *cp);
-
-# endif
-
+#endif
 #endif

diff --git a/src/bin/e_pixmap_intern.h b/src/bin/e_pixmap_intern.h
new file mode 100644 (file)
index 0000000..7502e4c
--- /dev/null
+++ b/src/bin/e_pixmap_intern.h
@@ -0,0 +1,39 @@
+#ifndef E_PIXMAP_INTERN_H
+#define E_PIXMAP_INTERN_H
+
+struct _E_Pixmap_Hook
+{
+   EINA_INLIST;
+   E_Pixmap_Hook_Point hookpoint;
+   E_Pixmap_Hook_Cb    func;
+   void               *data;
+   unsigned char       delete_me : 1;
+};
+
+EINTERN Eina_Bool e_pixmap_init(void);
+EINTERN void      e_pixmap_shutdown(void);
+
+EINTERN void          e_pixmap_win_id_del(E_Pixmap *cp);
+EINTERN void          e_pixmap_cdata_set(E_Pixmap *cp, E_Comp_Wl_Client_Data *cdata);
+EINTERN void          e_pixmap_parent_window_set(E_Pixmap *cp, Ecore_Window win);
+EINTERN Eina_Bool     e_pixmap_dirty_get(E_Pixmap *cp);
+EINTERN void          e_pixmap_usable_set(E_Pixmap *cp, Eina_Bool set);
+EINTERN void          e_pixmap_dirty(E_Pixmap *cp);
+EINTERN Eina_Bool     e_pixmap_refresh(E_Pixmap *cp);
+EINTERN Eina_Bool     e_pixmap_size_changed(E_Pixmap *cp, int w, int h);
+EINTERN void          e_pixmap_client_set(E_Pixmap *cp, E_Client *ec);
+EINTERN E_Pixmap     *e_pixmap_find(E_Pixmap_Type type, ...);
+EINTERN E_Client     *e_pixmap_find_client(E_Pixmap_Type type, ...);
+EINTERN Ecore_Window  e_pixmap_parent_window_get(E_Pixmap *cp);
+EINTERN void          e_pixmap_buffer_clear_cancel(E_Pixmap *cp);
+EINTERN void         *e_pixmap_ref_resource_get(E_Pixmap *cp);
+
+EINTERN Eina_Bool     e_pixmap_image_refresh(E_Pixmap *cp);
+EINTERN Eina_Bool     e_pixmap_image_exists(const E_Pixmap *cp);
+EINTERN Eina_Bool     e_pixmap_image_is_argb(const E_Pixmap *cp);
+EINTERN void         *e_pixmap_image_data_get(E_Pixmap *cp);
+EINTERN void          e_pixmap_image_data_ref(E_Pixmap *cp);
+EINTERN void          e_pixmap_image_opaque_set(E_Pixmap *cp, int x, int y, int w, int h);
+EINTERN void          e_pixmap_image_opaque_get(E_Pixmap *cp, int *x, int *y, int *w, int *h);
+
+#endif

diff --git a/src/bin/e_plane_renderer.c b/src/bin/e_plane_renderer.c
index 6ccad90..faa7209 100644 (file)
--- a/src/bin/e_plane_renderer.c
+++ b/src/bin/e_plane_renderer.c
@@ -4,6 +4,7 @@
 #include "e_comp_screen_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_pointer_intern.h"
+#include "e_pixmap_intern.h"
 
 # include <tdm.h>
 # include <tdm_helper.h>

diff --git a/src/bin/e_policy.c b/src/bin/e_policy.c
index a50810c..5091442 100644 (file)
--- a/src/bin/e_policy.c
+++ b/src/bin/e_policy.c
@@ -6,6 +6,7 @@
 #include "services/e_service_quickpanel.h"
 #include "e_comp_wl_subsurface_intern.h"
 #include "e_comp_intern.h"
+#include "e_pixmap_intern.h"
 
 E_Policy *e_policy = NULL;
 Eina_Hash *hash_policy_desks = NULL;

diff --git a/src/bin/e_policy_stack.c b/src/bin/e_policy_stack.c
index 1043d73..2a310f7 100644 (file)
--- a/src/bin/e_policy_stack.c
+++ b/src/bin/e_policy_stack.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_pixmap_intern.h"
 
 Eina_Bool
 _e_policy_stack_transient_for_check_descendant(E_Client *ec, E_Client *ancestor, E_Transient policy)

diff --git a/src/bin/e_test_helper.c b/src/bin/e_test_helper.c
index 4b5bf89..f892cd9 100644 (file)
--- a/src/bin/e_test_helper.c
+++ b/src/bin/e_test_helper.c
@@ -4,6 +4,7 @@
 #include "e_comp_canvas_intern.h"
 #include "e_comp_intern.h"
 #include "e_devicemgr_intern.h"
+#include "e_pixmap_intern.h"
 
 #define BUS "org.enlightenment.wm"
 #define PATH "/org/enlightenment/wm"

diff --git a/src/bin/services/e_service_quickpanel.c b/src/bin/services/e_service_quickpanel.c
index 0d09c82..c1be487 100644 (file)
--- a/src/bin/services/e_service_quickpanel.c
+++ b/src/bin/services/e_service_quickpanel.c
@@ -3,6 +3,7 @@
 #include "services/e_service_gesture.h"
 #include "services/e_service_region.h"
 #include "e_policy_wl.h"
+#include "e_pixmap_intern.h"
 
 #define SMART_NAME            "quickpanel_object"
 #define INTERNAL_ENTRY                       \