e_comp_canvas: make an internal header

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

Change-Id: Idb56fb177e68eb989e7e523589ec50e2bf7f1654

diff --git a/src/bin/e_bg.c b/src/bin/e_bg.c
index 206e865..9b14f61 100644 (file)
--- a/src/bin/e_bg.c
+++ b/src/bin/e_bg.c
@@ -2,6 +2,7 @@
 #include "e_bg_intern.h"
 #include "e_utils_intern.h"
 #include "e_theme_intern.h"
+#include "e_comp_canvas_intern.h"
 
 /* local subsystem functions */
 static void _e_bg_event_bg_update_free(void *data, void *event);

diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c
index 06ccd17..67f9ea1 100644 (file)
--- a/src/bin/e_bindings.c
+++ b/src/bin/e_bindings.c
@@ -2,6 +2,7 @@
 #include "e_bindings_intern.h"
 #include "e_actions_intern.h"
 #include "e_utils_intern.h"
+#include "e_comp_canvas_intern.h"
 
 /* local subsystem functions */
 static void               _e_bindings_mouse_free(E_Binding_Mouse *bind);

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 8f4cad3..b2c60bc 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -5,6 +5,7 @@
 #include "e_bindings_intern.h"
 #include "e_uuid_store_intern.h"
 #include "e_utils_intern.h"
+#include "e_comp_canvas_intern.h"
 
 #define PRI(ec) ((E_Client_Private *)e_object_data_get(E_OBJECT(ec)))
 

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 33ecde6..dea50b7 100644 (file)
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -1,6 +1,7 @@
 #include "e.h"
 #include "e_bg_intern.h"
 #include "e_utils_intern.h"
+#include "e_comp_canvas_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 263d19c..656e5f8 100644 (file)
--- a/src/bin/e_comp_canvas.c
+++ b/src/bin/e_comp_canvas.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_comp_canvas_intern.h"
 
 static Eina_List *handlers;
 static Eina_Bool _ev_freeze = EINA_FALSE;

diff --git a/src/bin/e_comp_canvas.h b/src/bin/e_comp_canvas.h
index a0c5d2c..e62878b 100644 (file)
--- a/src/bin/e_comp_canvas.h
+++ b/src/bin/e_comp_canvas.h
@@ -1,79 +1,14 @@
 #ifdef E_TYPEDEFS
 
-
-
 #else
 #ifndef E_COMP_CANVAS_H
 #define E_COMP_CANVAS_H
 
-EINTERN Eina_Bool e_comp_canvas_init(int w, int h);
-EINTERN void e_comp_canvas_clear(void);
-EINTERN void e_comp_all_freeze(void);
-EINTERN void e_comp_all_thaw(void);
-E_API E_Zone * e_comp_zone_xy_get(Evas_Coord x, Evas_Coord y);
-EINTERN E_Zone * e_comp_zone_number_get(int num);
-EINTERN E_Zone * e_comp_zone_id_get(int id);
-EINTERN void e_comp_canvas_zone_update(E_Zone *zone);
-EINTERN void e_comp_canvas_update(void);
-//#ifdef REFACTOR_DESK_AREA
-//#else
-EINTERN void e_comp_canvas_fake_layers_init(void);
-//#endif
-EINTERN void e_comp_canvas_fps_toggle(void);
-EINTERN E_Layer e_comp_canvas_layer_map_to(unsigned int layer);
-E_API unsigned int e_comp_canvas_layer_map(E_Layer layer);
-E_API unsigned int e_comp_canvas_client_layer_map(E_Layer layer);
-EINTERN E_Layer e_comp_canvas_client_layer_map_nearest(int layer);
-EINTERN void e_comp_canvas_keys_grab(void);
-EINTERN void e_comp_canvas_keys_ungrab(void);
-EINTERN void e_comp_canvas_feed_mouse_up(unsigned int activate_time);
-
-E_API void    e_comp_canvas_norender_push(void);
-E_API void    e_comp_canvas_norender_pop(void);
-EINTERN int   e_comp_canvas_norender_get(void);
-
-/* the following functions are used for adjusting root window coordinates
- * to/from canvas coordinates.
- * this ensures correct positioning when running E as a nested compositor
- *
- * - use the "adjust" functions to go root->canvas
- * - use the "unadjust" functions to go canvas->root
- */
-static inline int
-e_comp_canvas_x_root_unadjust(int x)
-{
-   int cx;
-
-   ecore_evas_geometry_get(e_comp->ee, &cx, NULL, NULL, NULL);
-   return x + cx;
-}
-
-static inline int
-e_comp_canvas_y_root_unadjust(int y)
-{
-   int cy;
-
-   ecore_evas_geometry_get(e_comp->ee, NULL, &cy, NULL, NULL);
-   return y + cy;
-}
-
-static inline int
-e_comp_canvas_x_root_adjust(int x)
-{
-   int cx;
-
-   ecore_evas_geometry_get(e_comp->ee, &cx, NULL, NULL, NULL);
-   return x - cx;
-}
-
-static inline int
-e_comp_canvas_y_root_adjust(int y)
-{
-   int cy;
-
-   ecore_evas_geometry_get(e_comp->ee, NULL, &cy, NULL, NULL);
-   return y - cy;
-}
+E_API E_Zone       *e_comp_zone_xy_get(Evas_Coord x, Evas_Coord y);
+E_API unsigned int  e_comp_canvas_layer_map(E_Layer layer);
+E_API unsigned int  e_comp_canvas_client_layer_map(E_Layer layer);
+E_API void          e_comp_canvas_norender_push(void);
+E_API void          e_comp_canvas_norender_pop(void);
 
 #endif
 #endif

diff --git a/src/bin/e_comp_canvas_intern.h b/src/bin/e_comp_canvas_intern.h
new file mode 100644 (file)
index 0000000..bd96b16
--- /dev/null
+++ b/src/bin/e_comp_canvas_intern.h
@@ -0,0 +1,67 @@
+#ifndef E_COMP_CANVAS_INTERN_H
+#define E_COMP_CANVAS_INTERN_H
+
+EINTERN Eina_Bool  e_comp_canvas_init(int w, int h);
+EINTERN void       e_comp_canvas_clear(void);
+EINTERN void       e_comp_all_freeze(void);
+EINTERN void       e_comp_all_thaw(void);
+EINTERN E_Zone    *e_comp_zone_number_get(int num);
+EINTERN E_Zone    *e_comp_zone_id_get(int id);
+EINTERN void       e_comp_canvas_zone_update(E_Zone *zone);
+EINTERN void       e_comp_canvas_update(void);
+//#ifdef REFACTOR_DESK_AREA
+//#else
+EINTERN void e_comp_canvas_fake_layers_init(void);
+//#endif
+EINTERN void       e_comp_canvas_fps_toggle(void);
+EINTERN E_Layer    e_comp_canvas_layer_map_to(unsigned int layer);
+EINTERN E_Layer    e_comp_canvas_client_layer_map_nearest(int layer);
+EINTERN void       e_comp_canvas_keys_grab(void);
+EINTERN void       e_comp_canvas_keys_ungrab(void);
+EINTERN void       e_comp_canvas_feed_mouse_up(unsigned int activate_time);
+EINTERN int        e_comp_canvas_norender_get(void);
+
+/* the following functions are used for adjusting root window coordinates
+ * to/from canvas coordinates.
+ * this ensures correct positioning when running E as a nested compositor
+ *
+ * - use the "adjust" functions to go root->canvas
+ * - use the "unadjust" functions to go canvas->root
+ */
+static inline int
+e_comp_canvas_x_root_unadjust(int x)
+{
+   int cx;
+
+   ecore_evas_geometry_get(e_comp->ee, &cx, NULL, NULL, NULL);
+   return x + cx;
+}
+
+static inline int
+e_comp_canvas_y_root_unadjust(int y)
+{
+   int cy;
+
+   ecore_evas_geometry_get(e_comp->ee, NULL, &cy, NULL, NULL);
+   return y + cy;
+}
+
+static inline int
+e_comp_canvas_x_root_adjust(int x)
+{
+   int cx;
+
+   ecore_evas_geometry_get(e_comp->ee, &cx, NULL, NULL, NULL);
+   return x - cx;
+}
+
+static inline int
+e_comp_canvas_y_root_adjust(int y)
+{
+   int cy;
+
+   ecore_evas_geometry_get(e_comp->ee, NULL, &cy, NULL, NULL);
+   return y - cy;
+}
+
+#endif

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index cb7f5f8..5bac3bc 100644 (file)
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -4,6 +4,10 @@
 #endif
 #include "e_bindings_intern.h"
 #include "e_utils_intern.h"
+#ifdef REFACTOR_DESK_AREA
+#else
+#include "e_comp_canvas_intern.h"
+#endif
 
 /* data keys:
 

diff --git a/src/bin/e_comp_screen.c b/src/bin/e_comp_screen.c
index b6d8177..9362c44 100644 (file)
--- a/src/bin/e_comp_screen.c
+++ b/src/bin/e_comp_screen.c
@@ -2,6 +2,7 @@
 #include "e_client_intern.h"
 #include "e_utils_intern.h"
 #include "e_scale_intern.h"
+#include "e_comp_canvas_intern.h"
 
 #include "Eeze.h"
 #include <tizen-extension-server-protocol.h>

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

diff --git a/src/bin/e_comp_wl_data.c b/src/bin/e_comp_wl_data.c
index 20c0f7f..d3339f1 100644 (file)
--- a/src/bin/e_comp_wl_data.c
+++ b/src/bin/e_comp_wl_data.c
@@ -1,5 +1,6 @@
 #define EXECUTIVE_MODE_ENABLED
 #include "e.h"
+#include "e_comp_canvas_intern.h"
 
 typedef struct {
    int src_fd;

diff --git a/src/bin/e_desk_area.c b/src/bin/e_desk_area.c
index 90ee710..9383768 100644 (file)
--- a/src/bin/e_desk_area.c
+++ b/src/bin/e_desk_area.c
@@ -2,6 +2,7 @@
 #ifdef REFACTOR_DESK_AREA
 #include "e_client_intern.h"
 #include "e_comp_object_intern.h"
+#include "e_comp_canvas_intern.h"
 #endif
 
 #include <libds-tizen/screen.h>

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index f0189e5..2a2cc99 100644 (file)
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -9,6 +9,7 @@
 #include "e_screensaver_intern.h"
 #include "e_scale_intern.h"
 #include "e_process_intern.h"
+#include "e_comp_canvas_intern.h"
 
 #ifdef __linux__
 # include <sys/prctl.h>

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

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

diff --git a/src/bin/e_test_helper.c b/src/bin/e_test_helper.c
index 10fee7f..b061ef2 100644 (file)
--- a/src/bin/e_test_helper.c
+++ b/src/bin/e_test_helper.c
@@ -1,6 +1,7 @@
 #include "e.h"
 #include "e_test_helper_intern.h"
 #include "e_policy_wl.h"
+#include "e_comp_canvas_intern.h"
 
 #define BUS "org.enlightenment.wm"
 #define PATH "/org/enlightenment/wm"