From 32661a5ac456a4de47fb812a9ea22b4efa2c9edc Mon Sep 17 00:00:00 2001 From: Cedric Bail Date: Mon, 11 Mar 2013 21:11:44 +0100 Subject: [PATCH] ecore_evas: re-order inclusion of header to fix compilation on Windows. It is a very tricky things to get header order right on windows. Having that order only in .c files simplify the work a lot. So let's try to do it with Ecore_Evas after it rewrite and split into modules. --- src/Makefile_Ecore_Evas.am | 4 + src/lib/ecore_evas/Ecore_Evas.h | 3 +- src/lib/ecore_evas/ecore_evas.c | 11 ++- src/lib/ecore_evas/ecore_evas_buffer.c | 11 ++- src/lib/ecore_evas/ecore_evas_buffer.h | 10 --- src/lib/ecore_evas/ecore_evas_deprecated.c | 2 +- src/lib/ecore_evas/ecore_evas_ews.c | 7 +- src/lib/ecore_evas/ecore_evas_extn.h | 15 ++++ src/lib/ecore_evas/ecore_evas_module.c | 5 +- src/lib/ecore_evas/ecore_evas_private.h | 74 ------------------- src/lib/ecore_evas/ecore_evas_util.c | 2 +- src/lib/ecore_evas/ecore_evas_wayland.h | 16 ++++ src/lib/ecore_evas/ecore_evas_win32.h | 12 +++ src/lib/ecore_evas/ecore_evas_x11.h | 41 ++++++++++ .../engines/cocoa/ecore_evas_cocoa.c | 12 +-- .../ecore_evas/engines/extn/ecore_evas_extn.c | 10 ++- .../ecore_evas/engines/fb/ecore_evas_fb.c | 16 ++-- .../engines/psl1ght/ecore_evas_psl1ght.c | 7 +- .../ecore_evas/engines/sdl/ecore_evas_sdl.c | 14 ++-- .../wayland/ecore_evas_wayland_private.h | 11 ++- .../engines/win32/ecore_evas_win32.c | 11 ++- .../ecore_evas/engines/x/ecore_evas_x.c | 11 ++- 22 files changed, 173 insertions(+), 132 deletions(-) create mode 100644 src/lib/ecore_evas/ecore_evas_extn.h create mode 100644 src/lib/ecore_evas/ecore_evas_wayland.h create mode 100644 src/lib/ecore_evas/ecore_evas_win32.h create mode 100644 src/lib/ecore_evas/ecore_evas_x11.h 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 \ lib/ecore_evas/ecore_evas_ews.c \ lib/ecore_evas/ecore_evas_module.c \ lib/ecore_evas/ecore_evas_private.h \ +lib/ecore_evas/ecore_evas_extn.h \ +lib/ecore_evas/ecore_evas_wayland.h \ +lib/ecore_evas/ecore_evas_win32.h \ +lib/ecore_evas/ecore_evas_x11.h \ lib/ecore_evas/ecore_evas_util.c lib_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 @@ #ifndef _ECORE_EVAS_H #define _ECORE_EVAS_H -#include "Ecore_Evas_Types.h" - #include +#include #ifdef EAPI # 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 @@ # include #endif -#include "Ecore.h" +#include #include "ecore_private.h" -#include "Ecore_Input.h" +#include +#include -#include "ecore_evas_private.h" #include "Ecore_Evas.h" +#include "ecore_evas_private.h" +#include "ecore_evas_x11.h" +#include "ecore_evas_wayland.h" +#include "ecore_evas_extn.h" +#include "ecore_evas_win32.h" EAPI Eina_Bool _ecore_evas_app_comp_sync = 1; EAPI 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 @@ # include #endif -#include "ecore_evas_buffer.h" +#include + +#include #include +#include +#include "ecore_private.h" +#include + +#include "Ecore_Evas.h" +#include "ecore_evas_buffer.h" +#include "ecore_evas_private.h" static void _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 @@ #ifndef _ECORE_EVAS_BUFFER_PRIVATE_H_ #define _ECORE_EVAS_BUFFER_PRIVATE_H_ -#include - -#include -#include "ecore_private.h" -#include - -#include "ecore_evas_private.h" -#include "Ecore_Evas.h" - - typedef struct _Ecore_Evas_Engine_Buffer_Data Ecore_Evas_Engine_Buffer_Data; struct _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 @@ #include #include "ecore_private.h" -#include "ecore_evas_private.h" #include "Ecore_Evas.h" +#include "ecore_evas_private.h" /* 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 @@ #include #include -#include -#include -#include "ecore_private.h" #include #include +#include +#include "ecore_private.h" #include -#include "ecore_evas_private.h" #include "Ecore_Evas.h" +#include "ecore_evas_private.h" EAPI int ECORE_EVAS_EWS_EVENT_MANAGER_CHANGE = 0; EAPI 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 @@ +#ifndef ECORE_EVAS_EXTN_H_ +# define ECORE_EVAS_EXTN_H_ + +typedef struct _Ecore_Evas_Interface_Extn Ecore_Evas_Interface_Extn; + +struct _Ecore_Evas_Interface_Extn { + Ecore_Evas_Interface base; + + void (*data_lock)(Ecore_Evas *ee); + void (*data_unlock)(Ecore_Evas *ee); + Eina_Bool (*connect)(Ecore_Evas *ee, const char *svcname, int svcnum, Eina_Bool svcsys); + Eina_Bool (*listen)(Ecore_Evas *ee, const char *svcname, int svcnum, Eina_Bool svcsys); +}; + +#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 @@ # include #endif +#include +#include "ecore_private.h" + #include "Ecore_Evas.h" #include "ecore_evas_private.h" @@ -9,7 +12,7 @@ static Eina_Hash *_registered_engines = NULL; static Eina_List *_engines_paths = NULL; static Eina_List *_engines_available = NULL; -#if defined(__CEGCC__) || defined(__MINGW32CE__) || defined(_WIN32) +#ifdef _WIN32 # define ECORE_EVAS_ENGINE_NAME "module.dll" #else # 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 @@ #ifndef _ECORE_EVAS_PRIVATE_H #define _ECORE_EVAS_PRIVATE_H -#include "Ecore_Evas_Types.h" - -#include -#include -#include -#include -#include - #define ECORE_MAGIC_EVAS 0x76543211 /** Log domain macros and variables **/ @@ -53,14 +45,6 @@ typedef struct _Ecore_Evas_Engine_Func Ecore_Evas_Engine_Func; typedef struct _Ecore_Evas_Interface Ecore_Evas_Interface; /* Engines interfaces */ -typedef struct _Ecore_Evas_Interface_Extn Ecore_Evas_Interface_Extn; -typedef struct _Ecore_Evas_Interface_X11 Ecore_Evas_Interface_X11; -typedef struct _Ecore_Evas_Interface_Software_X11 Ecore_Evas_Interface_Software_X11; -typedef struct _Ecore_Evas_Interface_Gl_X11 Ecore_Evas_Interface_Gl_X11; -typedef struct _Ecore_Evas_Interface_Wayland Ecore_Evas_Interface_Wayland; -typedef struct _Ecore_Evas_Interface_Win32 Ecore_Evas_Interface_Win32; - - struct _Ecore_Evas_Engine_Func { void (*fn_free) (Ecore_Evas *ee); @@ -133,64 +117,6 @@ struct _Ecore_Evas_Interface unsigned int version; }; -struct _Ecore_Evas_Interface_X11 { - Ecore_Evas_Interface base; - - void (*leader_set)(Ecore_Evas *ee, Ecore_X_Window win); - Ecore_X_Window (*leader_get)(Ecore_Evas *ee); - void (*leader_default_set)(Ecore_Evas *ee); - void (*shape_input_rectangle_set)(Ecore_Evas *ee, int x, int y, int w, int h); - void (*shape_input_rectangle_add)(Ecore_Evas *ee, int x, int y, int w, int h); - void (*shape_input_rectangle_subtract)(Ecore_Evas *ee, int x, int y, int w, int h); - void (*shape_input_empty)(Ecore_Evas *ee); - void (*shape_input_reset)(Ecore_Evas *ee); - void (*shape_input_apply)(Ecore_Evas *ee); -}; - -struct _Ecore_Evas_Interface_Software_X11 { - Ecore_Evas_Interface base; - - Ecore_X_Window (*window_get)(const Ecore_Evas *ee); - void (*resize_set)(Ecore_Evas *ee, Eina_Bool on); - Eina_Bool (*resize_get)(const Ecore_Evas *ee); - void (*extra_event_window_add)(Ecore_Evas *ee, Ecore_X_Window win); -}; - -struct _Ecore_Evas_Interface_Gl_X11 { - Ecore_Evas_Interface base; - - Ecore_X_Window (*window_get)(const Ecore_Evas *ee); - void (*resize_set)(Ecore_Evas *ee, Eina_Bool on); - Eina_Bool (*resize_get)(const Ecore_Evas *ee); - void (*extra_event_window_add)(Ecore_Evas *ee, Ecore_X_Window win); - 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)); -}; - -struct _Ecore_Evas_Interface_Extn { - Ecore_Evas_Interface base; - - void (*data_lock)(Ecore_Evas *ee); - void (*data_unlock)(Ecore_Evas *ee); - Eina_Bool (*connect)(Ecore_Evas *ee, const char *svcname, int svcnum, Eina_Bool svcsys); - Eina_Bool (*listen)(Ecore_Evas *ee, const char *svcname, int svcnum, Eina_Bool svcsys); -}; - -struct _Ecore_Evas_Interface_Wayland { - Ecore_Evas_Interface base; - - void (*resize)(Ecore_Evas *ee, int location); - void (*move)(Ecore_Evas *ee, int x, int y); - void (*pointer_set)(Ecore_Evas *ee, int hot_x, int hot_y); - void (*type_set)(Ecore_Evas *ee, int type); - Ecore_Wl_Window* (*window_get)(const Ecore_Evas *ee); -}; - -struct _Ecore_Evas_Interface_Win32 { - Ecore_Evas_Interface base; - - Ecore_Win32_Window* (*window_get)(const Ecore_Evas *ee); -}; - struct _Ecore_Evas_Engine { 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 @@ #include #include "ecore_private.h" -#include "ecore_evas_private.h" #include "Ecore_Evas.h" +#include "ecore_evas_private.h" static const char ASSOCIATE_KEY[] = "__Ecore_Evas_Associate"; 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 @@ +#ifndef ECORE_EVAS_WAYLAND_H_ +# define ECORE_EVAS_WAYLAND_H_ + +typedef struct _Ecore_Evas_Interface_Wayland Ecore_Evas_Interface_Wayland; + +struct _Ecore_Evas_Interface_Wayland { + Ecore_Evas_Interface base; + + void (*resize)(Ecore_Evas *ee, int location); + void (*move)(Ecore_Evas *ee, int x, int y); + void (*pointer_set)(Ecore_Evas *ee, int hot_x, int hot_y); + void (*type_set)(Ecore_Evas *ee, int type); + Ecore_Wl_Window* (*window_get)(const Ecore_Evas *ee); +}; + +#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 @@ +#ifndef ECORE_EVAS_WIN32_H +# define ECORE_EVAS_WIN32_H + +typedef struct _Ecore_Evas_Interface_Win32 Ecore_Evas_Interface_Win32; + +struct _Ecore_Evas_Interface_Win32 { + Ecore_Evas_Interface base; + + Ecore_Win32_Window* (*window_get)(const Ecore_Evas *ee); +}; + +#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 @@ +#ifndef ECORE_EVAS_X11_H_ +# define ECORE_EVAS_X11_H_ + +typedef struct _Ecore_Evas_Interface_X11 Ecore_Evas_Interface_X11; +typedef struct _Ecore_Evas_Interface_Software_X11 Ecore_Evas_Interface_Software_X11; +typedef struct _Ecore_Evas_Interface_Gl_X11 Ecore_Evas_Interface_Gl_X11; + +struct _Ecore_Evas_Interface_X11 { + Ecore_Evas_Interface base; + + void (*leader_set)(Ecore_Evas *ee, Ecore_X_Window win); + Ecore_X_Window (*leader_get)(Ecore_Evas *ee); + void (*leader_default_set)(Ecore_Evas *ee); + void (*shape_input_rectangle_set)(Ecore_Evas *ee, int x, int y, int w, int h); + void (*shape_input_rectangle_add)(Ecore_Evas *ee, int x, int y, int w, int h); + void (*shape_input_rectangle_subtract)(Ecore_Evas *ee, int x, int y, int w, int h); + void (*shape_input_empty)(Ecore_Evas *ee); + void (*shape_input_reset)(Ecore_Evas *ee); + void (*shape_input_apply)(Ecore_Evas *ee); +}; + +struct _Ecore_Evas_Interface_Software_X11 { + Ecore_Evas_Interface base; + + Ecore_X_Window (*window_get)(const Ecore_Evas *ee); + void (*resize_set)(Ecore_Evas *ee, Eina_Bool on); + Eina_Bool (*resize_get)(const Ecore_Evas *ee); + void (*extra_event_window_add)(Ecore_Evas *ee, Ecore_X_Window win); +}; + +struct _Ecore_Evas_Interface_Gl_X11 { + Ecore_Evas_Interface base; + + Ecore_X_Window (*window_get)(const Ecore_Evas *ee); + void (*resize_set)(Ecore_Evas *ee, Eina_Bool on); + Eina_Bool (*resize_get)(const Ecore_Evas *ee); + void (*extra_event_window_add)(Ecore_Evas *ee, Ecore_X_Window win); + 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)); +}; + +#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 @@ # include #endif -#include "ecore_evas_private.h" -#include "Ecore_Evas.h" - -#include "Ecore.h" +#include #include "ecore_private.h" -#include "Ecore_Input.h" -#include "Ecore_Input_Evas.h" +#include +#include #include #include +#include "Ecore_Evas.h" +#include "ecore_evas_private.h" + // FIXME: this engine has lots of problems. only 1 window at a time, drawRect looks wrong, doesnt handle resizes and more 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 @@ #include #include +#include +#include +#include +#include +#include + #include +#include "ecore_private.h" // FIXME: Because of ECORE_MAGIC +#include "ecore_evas_private.h" #include "ecore_evas_buffer.h" -#include +#include "ecore_evas_extn.h" static const char *interface_extn_name = "extn"; static 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 @@ #include #include -#include -#include -#include -#include -#include -#include - #include #include +#include +#include "ecore_private.h" +#include +#include +#include +#include "ecore_fb_private.h" + +#include +#include "ecore_evas_private.h" static int _ecore_evas_init_count = 0; 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 @@ #endif #include +#include "ecore_private.h" #include #include -#include "ecore_evas_private.h" -#include "Ecore_Evas.h" - #include #include +#include +#include "ecore_evas_private.h" + static int _ecore_evas_init_count = 0; static 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 @@ # include #endif +#include +#include -#include "ecore_evas_private.h" -#include "Ecore_Evas.h" - +#include #include +#include "ecore_private.h" #include #include #include #include #ifdef BUILD_ECORE_EVAS_OPENGL_SDL -# include +# include #endif -#include -#include -#include +#include +#include "ecore_evas_private.h" /* * SDL only handle one window at a time. That's by definition, there is nothing wrong here. * 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,11 +15,16 @@ #endif #include - -#include "ecore_evas_private.h" -#include "Ecore_Evas.h" +#include +#include "ecore_private.h" +#include +#include #include +#include +#include "ecore_evas_private.h" +#include "ecore_evas_wayland.h" + typedef struct _Ecore_Evas_Engine_Wl_Data Ecore_Evas_Engine_Wl_Data; struct _Ecore_Evas_Engine_Wl_Data 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 @@ #include #include "ecore_private.h" -#include "ecore_evas_private.h" -#include "Ecore_Evas.h" - -#include "Ecore_Win32.h" +#include +#include +#include #include "ecore_win32_private.h" +#include "Ecore_Evas.h" +#include "ecore_evas_private.h" +#include "ecore_evas_win32.h" + #define WIN32_LEAN_AND_MEAN #include #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 @@ # include #endif -#include "ecore_evas_private.h" -#include "Ecore_Evas.h" - #include #include #include #include +#include "ecore_private.h" +#include +#include #include #include @@ -22,10 +22,13 @@ # include #endif +#include +#include "ecore_evas_private.h" +#include "ecore_evas_x11.h" + #define EDBG(...) \ EINA_LOG(_ecore_evas_log_dom, EINA_LOG_LEVEL_DBG + 1, __VA_ARGS__); - static int _ecore_evas_init_count = 0; static Ecore_Event_Handler *ecore_evas_event_handlers[13];