summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile_Ecore_Evas.am4
-rw-r--r--src/lib/ecore_evas/Ecore_Evas.h3
-rw-r--r--src/lib/ecore_evas/ecore_evas.c11
-rw-r--r--src/lib/ecore_evas/ecore_evas_buffer.c11
-rw-r--r--src/lib/ecore_evas/ecore_evas_buffer.h10
-rw-r--r--src/lib/ecore_evas/ecore_evas_deprecated.c2
-rw-r--r--src/lib/ecore_evas/ecore_evas_ews.c7
-rw-r--r--src/lib/ecore_evas/ecore_evas_extn.h15
-rw-r--r--src/lib/ecore_evas/ecore_evas_module.c5
-rw-r--r--src/lib/ecore_evas/ecore_evas_private.h74
-rw-r--r--src/lib/ecore_evas/ecore_evas_util.c2
-rw-r--r--src/lib/ecore_evas/ecore_evas_wayland.h16
-rw-r--r--src/lib/ecore_evas/ecore_evas_win32.h12
-rw-r--r--src/lib/ecore_evas/ecore_evas_x11.h41
-rw-r--r--src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c12
-rw-r--r--src/modules/ecore_evas/engines/extn/ecore_evas_extn.c10
-rw-r--r--src/modules/ecore_evas/engines/fb/ecore_evas_fb.c14
-rw-r--r--src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c7
-rw-r--r--src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c14
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h9
-rw-r--r--src/modules/ecore_evas/engines/win32/ecore_evas_win32.c11
-rw-r--r--src/modules/ecore_evas/engines/x/ecore_evas_x.c11
22 files changed, 171 insertions, 130 deletions
diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
index 4e646b09bc..6f7b8d7b43 100644
--- a/src/Makefile_Ecore_Evas.am
+++ b/src/Makefile_Ecore_Evas.am
@@ -16,6 +16,10 @@ lib/ecore_evas/ecore_evas_deprecated.c \
16lib/ecore_evas/ecore_evas_ews.c \ 16lib/ecore_evas/ecore_evas_ews.c \
17lib/ecore_evas/ecore_evas_module.c \ 17lib/ecore_evas/ecore_evas_module.c \
18lib/ecore_evas/ecore_evas_private.h \ 18lib/ecore_evas/ecore_evas_private.h \
19lib/ecore_evas/ecore_evas_extn.h \
20lib/ecore_evas/ecore_evas_wayland.h \
21lib/ecore_evas/ecore_evas_win32.h \
22lib/ecore_evas/ecore_evas_x11.h \
19lib/ecore_evas/ecore_evas_util.c 23lib/ecore_evas/ecore_evas_util.c
20 24
21lib_ecore_evas_libecore_evas_la_CPPFLAGS = \ 25lib_ecore_evas_libecore_evas_la_CPPFLAGS = \
diff --git a/src/lib/ecore_evas/Ecore_Evas.h b/src/lib/ecore_evas/Ecore_Evas.h
index 839d7a6d50..7d73cf82f5 100644
--- a/src/lib/ecore_evas/Ecore_Evas.h
+++ b/src/lib/ecore_evas/Ecore_Evas.h
@@ -1,9 +1,8 @@
1#ifndef _ECORE_EVAS_H 1#ifndef _ECORE_EVAS_H
2#define _ECORE_EVAS_H 2#define _ECORE_EVAS_H
3 3
4#include "Ecore_Evas_Types.h"
5
6#include <Evas.h> 4#include <Evas.h>
5#include <Ecore_Evas_Types.h>
7 6
8#ifdef EAPI 7#ifdef EAPI
9# undef EAPI 8# undef EAPI
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 15b95736f3..8635c97e64 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -21,12 +21,17 @@
21# include <Evil.h> 21# include <Evil.h>
22#endif 22#endif
23 23
24#include "Ecore.h" 24#include <Ecore.h>
25#include "ecore_private.h" 25#include "ecore_private.h"
26#include "Ecore_Input.h" 26#include <Ecore_Input.h>
27#include <Ecore_Input_Evas.h>
27 28
28#include "ecore_evas_private.h"
29#include "Ecore_Evas.h" 29#include "Ecore_Evas.h"
30#include "ecore_evas_private.h"
31#include "ecore_evas_x11.h"
32#include "ecore_evas_wayland.h"
33#include "ecore_evas_extn.h"
34#include "ecore_evas_win32.h"
30 35
31EAPI Eina_Bool _ecore_evas_app_comp_sync = 1; 36EAPI Eina_Bool _ecore_evas_app_comp_sync = 1;
32EAPI int _ecore_evas_log_dom = -1; 37EAPI int _ecore_evas_log_dom = -1;
diff --git a/src/lib/ecore_evas/ecore_evas_buffer.c b/src/lib/ecore_evas/ecore_evas_buffer.c
index c76af25ada..a3cd572475 100644
--- a/src/lib/ecore_evas/ecore_evas_buffer.c
+++ b/src/lib/ecore_evas/ecore_evas_buffer.c
@@ -2,8 +2,17 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#include "ecore_evas_buffer.h" 5#include <stdlib.h>
6
7#include <Evas.h>
6#include <Evas_Engine_Buffer.h> 8#include <Evas_Engine_Buffer.h>
9#include <Ecore.h>
10#include "ecore_private.h"
11#include <Ecore_Input.h>
12
13#include "Ecore_Evas.h"
14#include "ecore_evas_buffer.h"
15#include "ecore_evas_private.h"
7 16
8static void 17static void
9_ecore_evas_buffer_free(Ecore_Evas *ee) 18_ecore_evas_buffer_free(Ecore_Evas *ee)
diff --git a/src/lib/ecore_evas/ecore_evas_buffer.h b/src/lib/ecore_evas/ecore_evas_buffer.h
index 06f82f9fea..e065d8a5f9 100644
--- a/src/lib/ecore_evas/ecore_evas_buffer.h
+++ b/src/lib/ecore_evas/ecore_evas_buffer.h
@@ -1,16 +1,6 @@
1#ifndef _ECORE_EVAS_BUFFER_PRIVATE_H_ 1#ifndef _ECORE_EVAS_BUFFER_PRIVATE_H_
2#define _ECORE_EVAS_BUFFER_PRIVATE_H_ 2#define _ECORE_EVAS_BUFFER_PRIVATE_H_
3 3
4#include <stdlib.h>
5
6#include <Ecore.h>
7#include "ecore_private.h"
8#include <Ecore_Input.h>
9
10#include "ecore_evas_private.h"
11#include "Ecore_Evas.h"
12
13
14typedef struct _Ecore_Evas_Engine_Buffer_Data Ecore_Evas_Engine_Buffer_Data; 4typedef struct _Ecore_Evas_Engine_Buffer_Data Ecore_Evas_Engine_Buffer_Data;
15 5
16struct _Ecore_Evas_Engine_Buffer_Data { 6struct _Ecore_Evas_Engine_Buffer_Data {
diff --git a/src/lib/ecore_evas/ecore_evas_deprecated.c b/src/lib/ecore_evas/ecore_evas_deprecated.c
index 20a57ebf80..1b40807e53 100644
--- a/src/lib/ecore_evas/ecore_evas_deprecated.c
+++ b/src/lib/ecore_evas/ecore_evas_deprecated.c
@@ -7,8 +7,8 @@
7#include <Ecore.h> 7#include <Ecore.h>
8#include "ecore_private.h" 8#include "ecore_private.h"
9 9
10#include "ecore_evas_private.h"
11#include "Ecore_Evas.h" 10#include "Ecore_Evas.h"
11#include "ecore_evas_private.h"
12 12
13 13
14/* Ecore_Evas WinCE support was removed. However we keep the functions 14/* Ecore_Evas WinCE support was removed. However we keep the functions
diff --git a/src/lib/ecore_evas/ecore_evas_ews.c b/src/lib/ecore_evas/ecore_evas_ews.c
index 936b70a415..ea5c983005 100644
--- a/src/lib/ecore_evas/ecore_evas_ews.c
+++ b/src/lib/ecore_evas/ecore_evas_ews.c
@@ -6,15 +6,14 @@
6#include <string.h> 6#include <string.h>
7#include <sys/types.h> 7#include <sys/types.h>
8 8
9#include <Eina.h>
10#include <Ecore.h>
11#include "ecore_private.h"
12#include <Evas.h> 9#include <Evas.h>
13#include <Evas_Engine_Buffer.h> 10#include <Evas_Engine_Buffer.h>
11#include <Ecore.h>
12#include "ecore_private.h"
14#include <Ecore_Input.h> 13#include <Ecore_Input.h>
15 14
16#include "ecore_evas_private.h"
17#include "Ecore_Evas.h" 15#include "Ecore_Evas.h"
16#include "ecore_evas_private.h"
18 17
19EAPI int ECORE_EVAS_EWS_EVENT_MANAGER_CHANGE = 0; 18EAPI int ECORE_EVAS_EWS_EVENT_MANAGER_CHANGE = 0;
20EAPI int ECORE_EVAS_EWS_EVENT_ADD = 0; 19EAPI int ECORE_EVAS_EWS_EVENT_ADD = 0;
diff --git a/src/lib/ecore_evas/ecore_evas_extn.h b/src/lib/ecore_evas/ecore_evas_extn.h
new file mode 100644
index 0000000000..540f1384a7
--- /dev/null
+++ b/src/lib/ecore_evas/ecore_evas_extn.h
@@ -0,0 +1,15 @@
1#ifndef ECORE_EVAS_EXTN_H_
2# define ECORE_EVAS_EXTN_H_
3
4typedef struct _Ecore_Evas_Interface_Extn Ecore_Evas_Interface_Extn;
5
6struct _Ecore_Evas_Interface_Extn {
7 Ecore_Evas_Interface base;
8
9 void (*data_lock)(Ecore_Evas *ee);
10 void (*data_unlock)(Ecore_Evas *ee);
11 Eina_Bool (*connect)(Ecore_Evas *ee, const char *svcname, int svcnum, Eina_Bool svcsys);
12 Eina_Bool (*listen)(Ecore_Evas *ee, const char *svcname, int svcnum, Eina_Bool svcsys);
13};
14
15#endif
diff --git a/src/lib/ecore_evas/ecore_evas_module.c b/src/lib/ecore_evas/ecore_evas_module.c
index 4160dedc70..0194bd2973 100644
--- a/src/lib/ecore_evas/ecore_evas_module.c
+++ b/src/lib/ecore_evas/ecore_evas_module.c
@@ -2,6 +2,9 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#include <Ecore.h>
6#include "ecore_private.h"
7
5#include "Ecore_Evas.h" 8#include "Ecore_Evas.h"
6#include "ecore_evas_private.h" 9#include "ecore_evas_private.h"
7 10
@@ -9,7 +12,7 @@ static Eina_Hash *_registered_engines = NULL;
9static Eina_List *_engines_paths = NULL; 12static Eina_List *_engines_paths = NULL;
10static Eina_List *_engines_available = NULL; 13static Eina_List *_engines_available = NULL;
11 14
12#if defined(__CEGCC__) || defined(__MINGW32CE__) || defined(_WIN32) 15#ifdef _WIN32
13# define ECORE_EVAS_ENGINE_NAME "module.dll" 16# define ECORE_EVAS_ENGINE_NAME "module.dll"
14#else 17#else
15# define ECORE_EVAS_ENGINE_NAME "module.so" 18# define ECORE_EVAS_ENGINE_NAME "module.so"
diff --git a/src/lib/ecore_evas/ecore_evas_private.h b/src/lib/ecore_evas/ecore_evas_private.h
index 793461fe73..f789c3f20b 100644
--- a/src/lib/ecore_evas/ecore_evas_private.h
+++ b/src/lib/ecore_evas/ecore_evas_private.h
@@ -1,14 +1,6 @@
1#ifndef _ECORE_EVAS_PRIVATE_H 1#ifndef _ECORE_EVAS_PRIVATE_H
2#define _ECORE_EVAS_PRIVATE_H 2#define _ECORE_EVAS_PRIVATE_H
3 3
4#include "Ecore_Evas_Types.h"
5
6#include <Evas.h>
7#include <Ecore.h>
8#include <ecore_private.h>
9#include <Ecore_Input.h>
10#include <Ecore_Input_Evas.h>
11
12#define ECORE_MAGIC_EVAS 0x76543211 4#define ECORE_MAGIC_EVAS 0x76543211
13 5
14/** Log domain macros and variables **/ 6/** Log domain macros and variables **/
@@ -53,14 +45,6 @@ typedef struct _Ecore_Evas_Engine_Func Ecore_Evas_Engine_Func;
53typedef struct _Ecore_Evas_Interface Ecore_Evas_Interface; 45typedef struct _Ecore_Evas_Interface Ecore_Evas_Interface;
54 46
55/* Engines interfaces */ 47/* Engines interfaces */
56typedef struct _Ecore_Evas_Interface_Extn Ecore_Evas_Interface_Extn;
57typedef struct _Ecore_Evas_Interface_X11 Ecore_Evas_Interface_X11;
58typedef struct _Ecore_Evas_Interface_Software_X11 Ecore_Evas_Interface_Software_X11;
59typedef struct _Ecore_Evas_Interface_Gl_X11 Ecore_Evas_Interface_Gl_X11;
60typedef struct _Ecore_Evas_Interface_Wayland Ecore_Evas_Interface_Wayland;
61typedef struct _Ecore_Evas_Interface_Win32 Ecore_Evas_Interface_Win32;
62
63
64struct _Ecore_Evas_Engine_Func 48struct _Ecore_Evas_Engine_Func
65{ 49{
66 void (*fn_free) (Ecore_Evas *ee); 50 void (*fn_free) (Ecore_Evas *ee);
@@ -133,64 +117,6 @@ struct _Ecore_Evas_Interface
133 unsigned int version; 117 unsigned int version;
134}; 118};
135 119
136struct _Ecore_Evas_Interface_X11 {
137 Ecore_Evas_Interface base;
138
139 void (*leader_set)(Ecore_Evas *ee, Ecore_X_Window win);
140 Ecore_X_Window (*leader_get)(Ecore_Evas *ee);
141 void (*leader_default_set)(Ecore_Evas *ee);
142 void (*shape_input_rectangle_set)(Ecore_Evas *ee, int x, int y, int w, int h);
143 void (*shape_input_rectangle_add)(Ecore_Evas *ee, int x, int y, int w, int h);
144 void (*shape_input_rectangle_subtract)(Ecore_Evas *ee, int x, int y, int w, int h);
145 void (*shape_input_empty)(Ecore_Evas *ee);
146 void (*shape_input_reset)(Ecore_Evas *ee);
147 void (*shape_input_apply)(Ecore_Evas *ee);
148};
149
150struct _Ecore_Evas_Interface_Software_X11 {
151 Ecore_Evas_Interface base;
152
153 Ecore_X_Window (*window_get)(const Ecore_Evas *ee);
154 void (*resize_set)(Ecore_Evas *ee, Eina_Bool on);
155 Eina_Bool (*resize_get)(const Ecore_Evas *ee);
156 void (*extra_event_window_add)(Ecore_Evas *ee, Ecore_X_Window win);
157};
158
159struct _Ecore_Evas_Interface_Gl_X11 {
160 Ecore_Evas_Interface base;
161
162 Ecore_X_Window (*window_get)(const Ecore_Evas *ee);
163 void (*resize_set)(Ecore_Evas *ee, Eina_Bool on);
164 Eina_Bool (*resize_get)(const Ecore_Evas *ee);
165 void (*extra_event_window_add)(Ecore_Evas *ee, Ecore_X_Window win);
166 void (*pre_post_swap_callback_set)(const Ecore_Evas *ee, void *data, void (*pre_cb) (void *data, Evas *e), void (*post_cb) (void *data, Evas *e));
167};
168
169struct _Ecore_Evas_Interface_Extn {
170 Ecore_Evas_Interface base;
171
172 void (*data_lock)(Ecore_Evas *ee);
173 void (*data_unlock)(Ecore_Evas *ee);
174 Eina_Bool (*connect)(Ecore_Evas *ee, const char *svcname, int svcnum, Eina_Bool svcsys);
175 Eina_Bool (*listen)(Ecore_Evas *ee, const char *svcname, int svcnum, Eina_Bool svcsys);
176};
177
178struct _Ecore_Evas_Interface_Wayland {
179 Ecore_Evas_Interface base;
180
181 void (*resize)(Ecore_Evas *ee, int location);
182 void (*move)(Ecore_Evas *ee, int x, int y);
183 void (*pointer_set)(Ecore_Evas *ee, int hot_x, int hot_y);
184 void (*type_set)(Ecore_Evas *ee, int type);
185 Ecore_Wl_Window* (*window_get)(const Ecore_Evas *ee);
186};
187
188struct _Ecore_Evas_Interface_Win32 {
189 Ecore_Evas_Interface base;
190
191 Ecore_Win32_Window* (*window_get)(const Ecore_Evas *ee);
192};
193
194struct _Ecore_Evas_Engine 120struct _Ecore_Evas_Engine
195{ 121{
196 Ecore_Evas_Engine_Func *func; 122 Ecore_Evas_Engine_Func *func;
diff --git a/src/lib/ecore_evas/ecore_evas_util.c b/src/lib/ecore_evas/ecore_evas_util.c
index 824464021d..e50c8de69a 100644
--- a/src/lib/ecore_evas/ecore_evas_util.c
+++ b/src/lib/ecore_evas/ecore_evas_util.c
@@ -9,8 +9,8 @@
9#include <Ecore_Getopt.h> 9#include <Ecore_Getopt.h>
10#include "ecore_private.h" 10#include "ecore_private.h"
11 11
12#include "ecore_evas_private.h"
13#include "Ecore_Evas.h" 12#include "Ecore_Evas.h"
13#include "ecore_evas_private.h"
14 14
15static const char ASSOCIATE_KEY[] = "__Ecore_Evas_Associate"; 15static const char ASSOCIATE_KEY[] = "__Ecore_Evas_Associate";
16 16
diff --git a/src/lib/ecore_evas/ecore_evas_wayland.h b/src/lib/ecore_evas/ecore_evas_wayland.h
new file mode 100644
index 0000000000..ba21718470
--- /dev/null
+++ b/src/lib/ecore_evas/ecore_evas_wayland.h
@@ -0,0 +1,16 @@
1#ifndef ECORE_EVAS_WAYLAND_H_
2# define ECORE_EVAS_WAYLAND_H_
3
4typedef struct _Ecore_Evas_Interface_Wayland Ecore_Evas_Interface_Wayland;
5
6struct _Ecore_Evas_Interface_Wayland {
7 Ecore_Evas_Interface base;
8
9 void (*resize)(Ecore_Evas *ee, int location);
10 void (*move)(Ecore_Evas *ee, int x, int y);
11 void (*pointer_set)(Ecore_Evas *ee, int hot_x, int hot_y);
12 void (*type_set)(Ecore_Evas *ee, int type);
13 Ecore_Wl_Window* (*window_get)(const Ecore_Evas *ee);
14};
15
16#endif
diff --git a/src/lib/ecore_evas/ecore_evas_win32.h b/src/lib/ecore_evas/ecore_evas_win32.h
new file mode 100644
index 0000000000..86cfa1830e
--- /dev/null
+++ b/src/lib/ecore_evas/ecore_evas_win32.h
@@ -0,0 +1,12 @@
1#ifndef ECORE_EVAS_WIN32_H
2# define ECORE_EVAS_WIN32_H
3
4typedef struct _Ecore_Evas_Interface_Win32 Ecore_Evas_Interface_Win32;
5
6struct _Ecore_Evas_Interface_Win32 {
7 Ecore_Evas_Interface base;
8
9 Ecore_Win32_Window* (*window_get)(const Ecore_Evas *ee);
10};
11
12#endif
diff --git a/src/lib/ecore_evas/ecore_evas_x11.h b/src/lib/ecore_evas/ecore_evas_x11.h
new file mode 100644
index 0000000000..10d4fe8a1b
--- /dev/null
+++ b/src/lib/ecore_evas/ecore_evas_x11.h
@@ -0,0 +1,41 @@
1#ifndef ECORE_EVAS_X11_H_
2# define ECORE_EVAS_X11_H_
3
4typedef struct _Ecore_Evas_Interface_X11 Ecore_Evas_Interface_X11;
5typedef struct _Ecore_Evas_Interface_Software_X11 Ecore_Evas_Interface_Software_X11;
6typedef struct _Ecore_Evas_Interface_Gl_X11 Ecore_Evas_Interface_Gl_X11;
7
8struct _Ecore_Evas_Interface_X11 {
9 Ecore_Evas_Interface base;
10
11 void (*leader_set)(Ecore_Evas *ee, Ecore_X_Window win);
12 Ecore_X_Window (*leader_get)(Ecore_Evas *ee);
13 void (*leader_default_set)(Ecore_Evas *ee);
14 void (*shape_input_rectangle_set)(Ecore_Evas *ee, int x, int y, int w, int h);
15 void (*shape_input_rectangle_add)(Ecore_Evas *ee, int x, int y, int w, int h);
16 void (*shape_input_rectangle_subtract)(Ecore_Evas *ee, int x, int y, int w, int h);
17 void (*shape_input_empty)(Ecore_Evas *ee);
18 void (*shape_input_reset)(Ecore_Evas *ee);
19 void (*shape_input_apply)(Ecore_Evas *ee);
20};
21
22struct _Ecore_Evas_Interface_Software_X11 {
23 Ecore_Evas_Interface base;
24
25 Ecore_X_Window (*window_get)(const Ecore_Evas *ee);
26 void (*resize_set)(Ecore_Evas *ee, Eina_Bool on);
27 Eina_Bool (*resize_get)(const Ecore_Evas *ee);
28 void (*extra_event_window_add)(Ecore_Evas *ee, Ecore_X_Window win);
29};
30
31struct _Ecore_Evas_Interface_Gl_X11 {
32 Ecore_Evas_Interface base;
33
34 Ecore_X_Window (*window_get)(const Ecore_Evas *ee);
35 void (*resize_set)(Ecore_Evas *ee, Eina_Bool on);
36 Eina_Bool (*resize_get)(const Ecore_Evas *ee);
37 void (*extra_event_window_add)(Ecore_Evas *ee, Ecore_X_Window win);
38 void (*pre_post_swap_callback_set)(const Ecore_Evas *ee, void *data, void (*pre_cb) (void *data, Evas *e), void (*post_cb) (void *data, Evas *e));
39};
40
41#endif
diff --git a/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c b/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
index 5f0e865d22..9d1ba65e36 100644
--- a/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
+++ b/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
@@ -2,17 +2,17 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#include "ecore_evas_private.h" 5#include <Ecore.h>
6#include "Ecore_Evas.h"
7
8#include "Ecore.h"
9#include "ecore_private.h" 6#include "ecore_private.h"
10#include "Ecore_Input.h" 7#include <Ecore_Input.h>
11#include "Ecore_Input_Evas.h" 8#include <Ecore_Input_Evas.h>
12 9
13#include <Ecore_Cocoa.h> 10#include <Ecore_Cocoa.h>
14#include <Evas_Engine_GL_Cocoa.h> 11#include <Evas_Engine_GL_Cocoa.h>
15 12
13#include "Ecore_Evas.h"
14#include "ecore_evas_private.h"
15
16 16
17// FIXME: this engine has lots of problems. only 1 window at a time, drawRect looks wrong, doesnt handle resizes and more 17// FIXME: this engine has lots of problems. only 1 window at a time, drawRect looks wrong, doesnt handle resizes and more
18 18
diff --git a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
index f6b83503ba..0a42c9e113 100644
--- a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
+++ b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
@@ -25,10 +25,18 @@
25#include <sys/file.h> 25#include <sys/file.h>
26#include <unistd.h> 26#include <unistd.h>
27 27
28#include <Evas.h>
29#include <Evas_Engine_Buffer.h>
30#include <Ecore.h>
31#include <Ecore_Evas.h>
32#include <Ecore_Input.h>
33
28#include <Ecore_Ipc.h> 34#include <Ecore_Ipc.h>
29 35
36#include "ecore_private.h" // FIXME: Because of ECORE_MAGIC
37#include "ecore_evas_private.h"
30#include "ecore_evas_buffer.h" 38#include "ecore_evas_buffer.h"
31#include <Evas_Engine_Buffer.h> 39#include "ecore_evas_extn.h"
32 40
33static const char *interface_extn_name = "extn"; 41static const char *interface_extn_name = "extn";
34static const int interface_extn_version = 1; 42static const int interface_extn_version = 1;
diff --git a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
index 5dd014a95e..cc620ae0ce 100644
--- a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
+++ b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
@@ -6,15 +6,17 @@
6#include <sys/types.h> 6#include <sys/types.h>
7#include <dirent.h> 7#include <dirent.h>
8 8
9#include <Eina.h>
10#include <Evas_Engine_FB.h>
9#include <Ecore.h> 11#include <Ecore.h>
10#include <Ecore_Evas.h> 12#include "ecore_private.h"
13#include <Ecore_Input.h>
14#include <Ecore_Input_Evas.h>
11#include <Ecore_Fb.h> 15#include <Ecore_Fb.h>
12#include <ecore_evas_private.h> 16#include "ecore_fb_private.h"
13#include <ecore_fb_private.h>
14#include <ecore_private.h>
15 17
16#include <Eina.h> 18#include <Ecore_Evas.h>
17#include <Evas_Engine_FB.h> 19#include "ecore_evas_private.h"
18 20
19static int _ecore_evas_init_count = 0; 21static int _ecore_evas_init_count = 0;
20 22
diff --git a/src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c b/src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c
index bef0b0dd41..112e619904 100644
--- a/src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c
+++ b/src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c
@@ -3,15 +3,16 @@
3#endif 3#endif
4 4
5#include <Ecore.h> 5#include <Ecore.h>
6#include "ecore_private.h"
6#include <Ecore_Input.h> 7#include <Ecore_Input.h>
7#include <Ecore_Input_Evas.h> 8#include <Ecore_Input_Evas.h>
8 9
9#include "ecore_evas_private.h"
10#include "Ecore_Evas.h"
11
12#include <Ecore_Psl1ght.h> 10#include <Ecore_Psl1ght.h>
13#include <Evas_Engine_PSL1GHT.h> 11#include <Evas_Engine_PSL1GHT.h>
14 12
13#include <Ecore_Evas.h>
14#include "ecore_evas_private.h"
15
15static int _ecore_evas_init_count = 0; 16static int _ecore_evas_init_count = 0;
16 17
17static Ecore_Evas *psl1ght_ee = NULL; 18static Ecore_Evas *psl1ght_ee = NULL;
diff --git a/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c b/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
index 1a33357e73..86d41a11be 100644
--- a/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
+++ b/src/modules/ecore_evas/engines/sdl/ecore_evas_sdl.c
@@ -2,23 +2,23 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#include <stdlib.h>
6#include <string.h>
5 7
6#include "ecore_evas_private.h" 8#include <SDL/SDL.h>
7#include "Ecore_Evas.h"
8
9 9
10#include <Ecore.h> 10#include <Ecore.h>
11#include "ecore_private.h"
11#include <Ecore_Input.h> 12#include <Ecore_Input.h>
12#include <Ecore_Input_Evas.h> 13#include <Ecore_Input_Evas.h>
13#include <Ecore_Sdl.h> 14#include <Ecore_Sdl.h>
14#include <Evas_Engine_Buffer.h> 15#include <Evas_Engine_Buffer.h>
15#ifdef BUILD_ECORE_EVAS_OPENGL_SDL 16#ifdef BUILD_ECORE_EVAS_OPENGL_SDL
16# include <Evas_Engine_GL_SDL.h> 17# include <Evas_Engine_GL_SDL.h>
17#endif 18#endif
18 19
19#include <stdlib.h> 20#include <Ecore_Evas.h>
20#include <string.h> 21#include "ecore_evas_private.h"
21#include <SDL/SDL.h>
22/* 22/*
23 * SDL only handle one window at a time. That's by definition, there is nothing wrong here. 23 * SDL only handle one window at a time. That's by definition, there is nothing wrong here.
24 * 24 *
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
index 854dfa7650..9ca11c327e 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
@@ -15,10 +15,15 @@
15#endif 15#endif
16 16
17#include <Eina.h> 17#include <Eina.h>
18#include <Ecore.h>
19#include "ecore_private.h"
20#include <Ecore_Input.h>
21#include <Ecore_Input_Evas.h>
22#include <Ecore_Wayland.h>
18 23
24#include <Ecore_Evas.h>
19#include "ecore_evas_private.h" 25#include "ecore_evas_private.h"
20#include "Ecore_Evas.h" 26#include "ecore_evas_wayland.h"
21#include <Ecore_Wayland.h>
22 27
23typedef struct _Ecore_Evas_Engine_Wl_Data Ecore_Evas_Engine_Wl_Data; 28typedef struct _Ecore_Evas_Engine_Wl_Data Ecore_Evas_Engine_Wl_Data;
24 29
diff --git a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
index 57fb2fc211..48b0602fd6 100644
--- a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
+++ b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
@@ -6,12 +6,15 @@
6 6
7#include <Ecore.h> 7#include <Ecore.h>
8#include "ecore_private.h" 8#include "ecore_private.h"
9#include "ecore_evas_private.h" 9#include <Ecore_Input.h>
10#include "Ecore_Evas.h" 10#include <Ecore_Input_Evas.h>
11 11#include <Ecore_Win32.h>
12#include "Ecore_Win32.h"
13#include "ecore_win32_private.h" 12#include "ecore_win32_private.h"
14 13
14#include "Ecore_Evas.h"
15#include "ecore_evas_private.h"
16#include "ecore_evas_win32.h"
17
15#define WIN32_LEAN_AND_MEAN 18#define WIN32_LEAN_AND_MEAN
16#include <windows.h> 19#include <windows.h>
17#undef WIN32_LEAN_AND_MEAN 20#undef WIN32_LEAN_AND_MEAN
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index 61e38b9ad7..cc6830f7fe 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -2,14 +2,14 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#include "ecore_evas_private.h"
6#include "Ecore_Evas.h"
7
8#include <stdlib.h> 5#include <stdlib.h>
9#include <string.h> 6#include <string.h>
10 7
11#include <Eina.h> 8#include <Eina.h>
12#include <Ecore.h> 9#include <Ecore.h>
10#include "ecore_private.h"
11#include <Ecore_Input.h>
12#include <Ecore_Input_Evas.h>
13 13
14#include <Ecore_X.h> 14#include <Ecore_X.h>
15#include <Ecore_X_Atoms.h> 15#include <Ecore_X_Atoms.h>
@@ -22,10 +22,13 @@
22# include <Evas_Engine_GL_X11.h> 22# include <Evas_Engine_GL_X11.h>
23#endif 23#endif
24 24
25#include <Ecore_Evas.h>
26#include "ecore_evas_private.h"
27#include "ecore_evas_x11.h"
28
25#define EDBG(...) \ 29#define EDBG(...) \
26 EINA_LOG(_ecore_evas_log_dom, EINA_LOG_LEVEL_DBG + 1, __VA_ARGS__); 30 EINA_LOG(_ecore_evas_log_dom, EINA_LOG_LEVEL_DBG + 1, __VA_ARGS__);
27 31
28
29static int _ecore_evas_init_count = 0; 32static int _ecore_evas_init_count = 0;
30 33
31static Ecore_Event_Handler *ecore_evas_event_handlers[13]; 34static Ecore_Event_Handler *ecore_evas_event_handlers[13];