diff options
Diffstat (limited to '')
-rw-r--r-- | libraries/ecore/src/lib/ecore_evas/ecore_evas_private.h | 52 |
1 files changed, 37 insertions, 15 deletions
diff --git a/libraries/ecore/src/lib/ecore_evas/ecore_evas_private.h b/libraries/ecore/src/lib/ecore_evas/ecore_evas_private.h index 2c20761..9a88a7a 100644 --- a/libraries/ecore/src/lib/ecore_evas/ecore_evas_private.h +++ b/libraries/ecore/src/lib/ecore_evas/ecore_evas_private.h | |||
@@ -1,18 +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 | #ifdef HAVE_CONFIG_H | ||
5 | # include <config.h> | ||
6 | #endif | ||
7 | |||
8 | #include <sys/types.h> | ||
9 | #include <sys/stat.h> | ||
10 | #include <fcntl.h> | ||
11 | |||
12 | #ifdef HAVE_SYS_MMAN_H | ||
13 | # include <sys/mman.h> | ||
14 | #endif | ||
15 | |||
16 | #include <Evas.h> | 4 | #include <Evas.h> |
17 | #include <Ecore.h> | 5 | #include <Ecore.h> |
18 | #include <ecore_private.h> | 6 | #include <ecore_private.h> |
@@ -91,9 +79,17 @@ | |||
91 | # include <Evas_Engine_Gl_Cocoa.h> | 79 | # include <Evas_Engine_Gl_Cocoa.h> |
92 | #endif | 80 | #endif |
93 | 81 | ||
94 | /** | 82 | #ifdef BUILD_ECORE_EVAS_WAYLAND_SHM |
95 | Log domain macros and variable | 83 | # include "Ecore_Wayland.h" |
96 | **/ | 84 | # include <Evas_Engine_Wayland_Shm.h> |
85 | #endif | ||
86 | |||
87 | #ifdef BUILD_ECORE_EVAS_WAYLAND_EGL | ||
88 | # include "Ecore_Wayland.h" | ||
89 | # include <Evas_Engine_Wayland_Egl.h> | ||
90 | #endif | ||
91 | |||
92 | /** Log domain macros and variables **/ | ||
97 | 93 | ||
98 | extern int _ecore_evas_log_dom; | 94 | extern int _ecore_evas_log_dom; |
99 | 95 | ||
@@ -272,6 +268,17 @@ struct _Ecore_Evas_Engine | |||
272 | } ews; | 268 | } ews; |
273 | #endif | 269 | #endif |
274 | 270 | ||
271 | #if defined(BUILD_ECORE_EVAS_WAYLAND_SHM) || defined(BUILD_ECORE_EVAS_WAYLAND_EGL) | ||
272 | struct | ||
273 | { | ||
274 | Evas_Object *frame; | ||
275 | |||
276 | struct wl_shell_surface *shell_surface; | ||
277 | struct wl_surface *surface; | ||
278 | struct wl_buffer *buffer; | ||
279 | } wl; | ||
280 | #endif | ||
281 | |||
275 | Ecore_Timer *idle_flush_timer; | 282 | Ecore_Timer *idle_flush_timer; |
276 | }; | 283 | }; |
277 | 284 | ||
@@ -290,6 +297,7 @@ struct _Ecore_Evas | |||
290 | Eina_Bool should_be_visible : 1; | 297 | Eina_Bool should_be_visible : 1; |
291 | Eina_Bool alpha : 1; | 298 | Eina_Bool alpha : 1; |
292 | Eina_Bool transparent : 1; | 299 | Eina_Bool transparent : 1; |
300 | Eina_Bool in : 1; | ||
293 | 301 | ||
294 | Eina_Hash *data; | 302 | Eina_Hash *data; |
295 | 303 | ||
@@ -334,6 +342,7 @@ struct _Ecore_Evas | |||
334 | char withdrawn : 1; | 342 | char withdrawn : 1; |
335 | char sticky : 1; | 343 | char sticky : 1; |
336 | char request_pos : 1; | 344 | char request_pos : 1; |
345 | char draw_frame : 1; | ||
337 | } prop; | 346 | } prop; |
338 | 347 | ||
339 | struct { | 348 | struct { |
@@ -394,6 +403,16 @@ void _ecore_evas_ews_events_init(void); | |||
394 | int _ecore_evas_ews_shutdown(void); | 403 | int _ecore_evas_ews_shutdown(void); |
395 | #endif | 404 | #endif |
396 | 405 | ||
406 | #ifdef BUILD_ECORE_EVAS_WAYLAND_SHM | ||
407 | void _ecore_evas_wayland_shm_resize(Ecore_Evas *ee, int location); | ||
408 | void _ecore_evas_wayland_shm_drag_start(Ecore_Evas *ee, Ecore_Evas *drag_ee, void *source); | ||
409 | #endif | ||
410 | |||
411 | #ifdef BUILD_ECORE_EVAS_WAYLAND_EGL | ||
412 | void _ecore_evas_wayland_egl_resize(Ecore_Evas *ee, int location); | ||
413 | void _ecore_evas_wayland_egl_drag_start(Ecore_Evas *ee, Ecore_Evas *drag_ee, void *source); | ||
414 | #endif | ||
415 | |||
397 | void _ecore_evas_fps_debug_init(void); | 416 | void _ecore_evas_fps_debug_init(void); |
398 | void _ecore_evas_fps_debug_shutdown(void); | 417 | void _ecore_evas_fps_debug_shutdown(void); |
399 | void _ecore_evas_fps_debug_rendertime_add(double t); | 418 | void _ecore_evas_fps_debug_rendertime_add(double t); |
@@ -430,4 +449,7 @@ void _ecore_evas_mouse_multi_up_process(Ecore_Evas *ee, int device, | |||
430 | 449 | ||
431 | extern Eina_Bool _ecore_evas_app_comp_sync; | 450 | extern Eina_Bool _ecore_evas_app_comp_sync; |
432 | 451 | ||
452 | void _ecore_evas_extn_init(void); | ||
453 | void _ecore_evas_extn_shutdown(void); | ||
454 | |||
433 | #endif | 455 | #endif |