diff options
author | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
commit | c963d75dfdeec11f82e79e727062fbf89afa2c04 (patch) | |
tree | 895633dbf641110be46f117c29890c49b3ffc0bd /libraries/ecore/src/lib/ecore_evas/ecore_evas_private.h | |
parent | Adding the new extantz viewer and grid manager. (diff) | |
download | SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2 SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz |
Update EFL to latest beta.
Diffstat (limited to 'libraries/ecore/src/lib/ecore_evas/ecore_evas_private.h')
-rw-r--r-- | libraries/ecore/src/lib/ecore_evas/ecore_evas_private.h | 57 |
1 files changed, 40 insertions, 17 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 9a88a7a..e31653a 100644 --- a/libraries/ecore/src/lib/ecore_evas/ecore_evas_private.h +++ b/libraries/ecore/src/lib/ecore_evas/ecore_evas_private.h | |||
@@ -123,6 +123,7 @@ extern int _ecore_evas_log_dom; | |||
123 | #define IDLE_FLUSH_TIME 0.5 | 123 | #define IDLE_FLUSH_TIME 0.5 |
124 | #ifndef _ECORE_EVAS_H | 124 | #ifndef _ECORE_EVAS_H |
125 | typedef struct _Ecore_Evas Ecore_Evas; | 125 | typedef struct _Ecore_Evas Ecore_Evas; |
126 | typedef void (*Ecore_Evas_Event_Cb) (Ecore_Evas *ee); | ||
126 | #endif | 127 | #endif |
127 | 128 | ||
128 | typedef struct _Ecore_Evas_Engine Ecore_Evas_Engine; | 129 | typedef struct _Ecore_Evas_Engine Ecore_Evas_Engine; |
@@ -131,20 +132,20 @@ typedef struct _Ecore_Evas_Engine_Func Ecore_Evas_Engine_Func; | |||
131 | struct _Ecore_Evas_Engine_Func | 132 | struct _Ecore_Evas_Engine_Func |
132 | { | 133 | { |
133 | void (*fn_free) (Ecore_Evas *ee); | 134 | void (*fn_free) (Ecore_Evas *ee); |
134 | void (*fn_callback_resize_set) (Ecore_Evas *ee, void (*func) (Ecore_Evas *ee)); | 135 | void (*fn_callback_resize_set) (Ecore_Evas *ee, Ecore_Evas_Event_Cb func); |
135 | void (*fn_callback_move_set) (Ecore_Evas *ee, void (*func) (Ecore_Evas *ee)); | 136 | void (*fn_callback_move_set) (Ecore_Evas *ee, Ecore_Evas_Event_Cb func); |
136 | void (*fn_callback_show_set) (Ecore_Evas *ee, void (*func) (Ecore_Evas *ee)); | 137 | void (*fn_callback_show_set) (Ecore_Evas *ee, Ecore_Evas_Event_Cb func); |
137 | void (*fn_callback_hide_set) (Ecore_Evas *ee, void (*func) (Ecore_Evas *ee)); | 138 | void (*fn_callback_hide_set) (Ecore_Evas *ee, Ecore_Evas_Event_Cb func); |
138 | void (*fn_callback_delete_request_set) (Ecore_Evas *ee, void (*func) (Ecore_Evas *ee)); | 139 | void (*fn_callback_delete_request_set) (Ecore_Evas *ee, Ecore_Evas_Event_Cb func); |
139 | void (*fn_callback_destroy_set) (Ecore_Evas *ee, void (*func) (Ecore_Evas *ee)); | 140 | void (*fn_callback_destroy_set) (Ecore_Evas *ee, Ecore_Evas_Event_Cb func); |
140 | void (*fn_callback_focus_in_set) (Ecore_Evas *ee, void (*func) (Ecore_Evas *ee)); | 141 | void (*fn_callback_focus_in_set) (Ecore_Evas *ee, Ecore_Evas_Event_Cb func); |
141 | void (*fn_callback_focus_out_set) (Ecore_Evas *ee, void (*func) (Ecore_Evas *ee)); | 142 | void (*fn_callback_focus_out_set) (Ecore_Evas *ee, Ecore_Evas_Event_Cb func); |
142 | void (*fn_callback_mouse_in_set) (Ecore_Evas *ee, void (*func) (Ecore_Evas *ee)); | 143 | void (*fn_callback_mouse_in_set) (Ecore_Evas *ee, Ecore_Evas_Event_Cb func); |
143 | void (*fn_callback_mouse_out_set) (Ecore_Evas *ee, void (*func) (Ecore_Evas *ee)); | 144 | void (*fn_callback_mouse_out_set) (Ecore_Evas *ee, Ecore_Evas_Event_Cb func); |
144 | void (*fn_callback_sticky_set) (Ecore_Evas *ee, void (*func) (Ecore_Evas *ee)); | 145 | void (*fn_callback_sticky_set) (Ecore_Evas *ee, Ecore_Evas_Event_Cb func); |
145 | void (*fn_callback_unsticky_set) (Ecore_Evas *ee, void (*func) (Ecore_Evas *ee)); | 146 | void (*fn_callback_unsticky_set) (Ecore_Evas *ee, Ecore_Evas_Event_Cb func); |
146 | void (*fn_callback_pre_render_set) (Ecore_Evas *ee, void (*func) (Ecore_Evas *ee)); | 147 | void (*fn_callback_pre_render_set) (Ecore_Evas *ee, Ecore_Evas_Event_Cb func); |
147 | void (*fn_callback_post_render_set) (Ecore_Evas *ee, void (*func) (Ecore_Evas *ee)); | 148 | void (*fn_callback_post_render_set) (Ecore_Evas *ee, Ecore_Evas_Event_Cb func); |
148 | void (*fn_move) (Ecore_Evas *ee, int x, int y); | 149 | void (*fn_move) (Ecore_Evas *ee, int x, int y); |
149 | void (*fn_managed_move) (Ecore_Evas *ee, int x, int y); | 150 | void (*fn_managed_move) (Ecore_Evas *ee, int x, int y); |
150 | void (*fn_resize) (Ecore_Evas *ee, int w, int h); | 151 | void (*fn_resize) (Ecore_Evas *ee, int w, int h); |
@@ -177,6 +178,13 @@ struct _Ecore_Evas_Engine_Func | |||
177 | void (*fn_alpha_set) (Ecore_Evas *ee, int alpha); | 178 | void (*fn_alpha_set) (Ecore_Evas *ee, int alpha); |
178 | void (*fn_transparent_set) (Ecore_Evas *ee, int transparent); | 179 | void (*fn_transparent_set) (Ecore_Evas *ee, int transparent); |
179 | 180 | ||
181 | void (*fn_window_group_set) (Ecore_Evas *ee, const Ecore_Evas *ee_group); | ||
182 | void (*fn_aspect_set) (Ecore_Evas *ee, double aspect); | ||
183 | void (*fn_urgent_set) (Ecore_Evas *ee, int urgent); | ||
184 | void (*fn_modal_set) (Ecore_Evas *ee, int modal); | ||
185 | void (*fn_demands_attention_set) (Ecore_Evas *ee, int demand); | ||
186 | void (*fn_focus_skip_set) (Ecore_Evas *ee, int skip); | ||
187 | |||
180 | int (*fn_render) (Ecore_Evas *ee); | 188 | int (*fn_render) (Ecore_Evas *ee); |
181 | void (*fn_screen_geometry_get) (const Ecore_Evas *ee, int *x, int *y, int *w, int *h); | 189 | void (*fn_screen_geometry_get) (const Ecore_Evas *ee, int *x, int *y, int *w, int *h); |
182 | }; | 190 | }; |
@@ -271,11 +279,13 @@ struct _Ecore_Evas_Engine | |||
271 | #if defined(BUILD_ECORE_EVAS_WAYLAND_SHM) || defined(BUILD_ECORE_EVAS_WAYLAND_EGL) | 279 | #if defined(BUILD_ECORE_EVAS_WAYLAND_SHM) || defined(BUILD_ECORE_EVAS_WAYLAND_EGL) |
272 | struct | 280 | struct |
273 | { | 281 | { |
282 | Ecore_Wl_Window *parent, *win; | ||
274 | Evas_Object *frame; | 283 | Evas_Object *frame; |
275 | 284 | ||
276 | struct wl_shell_surface *shell_surface; | 285 | # if defined(BUILD_ECORE_EVAS_WAYLAND_SHM) |
277 | struct wl_surface *surface; | ||
278 | struct wl_buffer *buffer; | 286 | struct wl_buffer *buffer; |
287 | # endif | ||
288 | |||
279 | } wl; | 289 | } wl; |
280 | #endif | 290 | #endif |
281 | 291 | ||
@@ -333,6 +343,9 @@ struct _Ecore_Evas | |||
333 | int layer; | 343 | int layer; |
334 | Ecore_Window window; | 344 | Ecore_Window window; |
335 | unsigned char avoid_damage; | 345 | unsigned char avoid_damage; |
346 | Ecore_Evas *group_ee; | ||
347 | Ecore_Window group_ee_win; | ||
348 | double aspect; | ||
336 | char focused : 1; | 349 | char focused : 1; |
337 | char iconified : 1; | 350 | char iconified : 1; |
338 | char borderless : 1; | 351 | char borderless : 1; |
@@ -343,7 +356,12 @@ struct _Ecore_Evas | |||
343 | char sticky : 1; | 356 | char sticky : 1; |
344 | char request_pos : 1; | 357 | char request_pos : 1; |
345 | char draw_frame : 1; | 358 | char draw_frame : 1; |
346 | } prop; | 359 | char hwsurface : 1; |
360 | char urgent : 1; | ||
361 | char modal : 1; | ||
362 | char demand_attention : 1; | ||
363 | char focus_skip : 1; | ||
364 | } prop; | ||
347 | 365 | ||
348 | struct { | 366 | struct { |
349 | void (*fn_resize) (Ecore_Evas *ee); | 367 | void (*fn_resize) (Ecore_Evas *ee); |
@@ -361,6 +379,7 @@ struct _Ecore_Evas | |||
361 | void (*fn_pre_render) (Ecore_Evas *ee); | 379 | void (*fn_pre_render) (Ecore_Evas *ee); |
362 | void (*fn_post_render) (Ecore_Evas *ee); | 380 | void (*fn_post_render) (Ecore_Evas *ee); |
363 | void (*fn_pre_free) (Ecore_Evas *ee); | 381 | void (*fn_pre_free) (Ecore_Evas *ee); |
382 | void (*fn_state_change) (Ecore_Evas *ee); | ||
364 | } func; | 383 | } func; |
365 | 384 | ||
366 | Ecore_Evas_Engine engine; | 385 | Ecore_Evas_Engine engine; |
@@ -406,11 +425,15 @@ int _ecore_evas_ews_shutdown(void); | |||
406 | #ifdef BUILD_ECORE_EVAS_WAYLAND_SHM | 425 | #ifdef BUILD_ECORE_EVAS_WAYLAND_SHM |
407 | void _ecore_evas_wayland_shm_resize(Ecore_Evas *ee, int location); | 426 | 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); | 427 | void _ecore_evas_wayland_shm_drag_start(Ecore_Evas *ee, Ecore_Evas *drag_ee, void *source); |
428 | void _ecore_evas_wayland_shm_pointer_set(Ecore_Evas *ee, int hot_x, int hot_y); | ||
429 | void _ecore_evas_wayland_shm_type_set(Ecore_Evas *ee, int type); | ||
409 | #endif | 430 | #endif |
410 | 431 | ||
411 | #ifdef BUILD_ECORE_EVAS_WAYLAND_EGL | 432 | #ifdef BUILD_ECORE_EVAS_WAYLAND_EGL |
412 | void _ecore_evas_wayland_egl_resize(Ecore_Evas *ee, int location); | 433 | 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); | 434 | void _ecore_evas_wayland_egl_drag_start(Ecore_Evas *ee, Ecore_Evas *drag_ee, void *source); |
435 | void _ecore_evas_wayland_egl_pointer_set(Ecore_Evas *ee, int hot_x, int hot_y); | ||
436 | void _ecore_evas_wayland_egl_type_set(Ecore_Evas *ee, int type); | ||
414 | #endif | 437 | #endif |
415 | 438 | ||
416 | void _ecore_evas_fps_debug_init(void); | 439 | void _ecore_evas_fps_debug_init(void); |