diff options
author | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
commit | 825a3d837a33f226c879cd02ad15c3fba57e8b2c (patch) | |
tree | 75f57bd9c4253508d338dc79ba8e57a7abc42255 /libraries/evas/src/lib/include/evas_private.h | |
parent | Add ability to disable the test harness, or the Lua compile test. (diff) | |
download | SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.zip SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.gz SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.bz2 SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.xz |
Update the EFL to what I'm actually using, coz I'm using some stuff not yet released.
Diffstat (limited to '')
-rw-r--r-- | libraries/evas/src/lib/include/evas_private.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/libraries/evas/src/lib/include/evas_private.h b/libraries/evas/src/lib/include/evas_private.h index 90498d0..84c1d36 100644 --- a/libraries/evas/src/lib/include/evas_private.h +++ b/libraries/evas/src/lib/include/evas_private.h | |||
@@ -301,12 +301,13 @@ struct _Evas | |||
301 | struct { | 301 | struct { |
302 | unsigned char inside : 1; | 302 | unsigned char inside : 1; |
303 | int mouse_grabbed; | 303 | int mouse_grabbed; |
304 | int downs; | ||
304 | DATA32 button; | 305 | DATA32 button; |
305 | Evas_Coord x, y; | 306 | Evas_Coord x, y; |
307 | int nogrep; | ||
306 | struct { | 308 | struct { |
307 | Eina_List *in; | 309 | Eina_List *in; |
308 | } object; | 310 | } object; |
309 | |||
310 | } pointer; | 311 | } pointer; |
311 | 312 | ||
312 | struct { | 313 | struct { |
@@ -320,6 +321,12 @@ struct _Evas | |||
320 | unsigned char changed : 1; | 321 | unsigned char changed : 1; |
321 | } output; | 322 | } output; |
322 | 323 | ||
324 | struct | ||
325 | { | ||
326 | Evas_Coord x, y, w, h; | ||
327 | Eina_Bool changed : 1; | ||
328 | } framespace; | ||
329 | |||
323 | Eina_List *damages; | 330 | Eina_List *damages; |
324 | Eina_List *obscures; | 331 | Eina_List *obscures; |
325 | 332 | ||
@@ -331,6 +338,7 @@ struct _Evas | |||
331 | 338 | ||
332 | int walking_list; | 339 | int walking_list; |
333 | int events_frozen; | 340 | int events_frozen; |
341 | Evas_Event_Flags default_event_flags; | ||
334 | 342 | ||
335 | struct { | 343 | struct { |
336 | Evas_Module *module; | 344 | Evas_Module *module; |
@@ -577,7 +585,7 @@ struct _Evas_Object | |||
577 | unsigned char recalculate_cycle; | 585 | unsigned char recalculate_cycle; |
578 | Eina_Clist calc_entry; | 586 | Eina_Clist calc_entry; |
579 | 587 | ||
580 | Evas_Object_Pointer_Mode pointer_mode : 1; | 588 | Evas_Object_Pointer_Mode pointer_mode : 2; |
581 | 589 | ||
582 | Eina_Bool store : 1; | 590 | Eina_Bool store : 1; |
583 | Eina_Bool pass_events : 1; | 591 | Eina_Bool pass_events : 1; |
@@ -608,6 +616,8 @@ struct _Evas_Object | |||
608 | Eina_Bool changed_move_only : 1; | 616 | Eina_Bool changed_move_only : 1; |
609 | Eina_Bool changed_nomove : 1; | 617 | Eina_Bool changed_nomove : 1; |
610 | Eina_Bool del_ref : 1; | 618 | Eina_Bool del_ref : 1; |
619 | |||
620 | Eina_Bool is_frame : 1; | ||
611 | }; | 621 | }; |
612 | 622 | ||
613 | struct _Evas_Func_Node | 623 | struct _Evas_Func_Node |
@@ -772,6 +782,7 @@ struct _Evas_Func | |||
772 | char *(*image_format_get) (void *data, void *image); | 782 | char *(*image_format_get) (void *data, void *image); |
773 | void (*image_colorspace_set) (void *data, void *image, int cspace); | 783 | void (*image_colorspace_set) (void *data, void *image, int cspace); |
774 | int (*image_colorspace_get) (void *data, void *image); | 784 | int (*image_colorspace_get) (void *data, void *image); |
785 | Eina_Bool (*image_can_region_get) (void *data, void *image); | ||
775 | void (*image_mask_create) (void *data, void *image); | 786 | void (*image_mask_create) (void *data, void *image); |
776 | void *(*image_native_set) (void *data, void *image, void *native); | 787 | void *(*image_native_set) (void *data, void *image, void *native); |
777 | void *(*image_native_get) (void *data, void *image); | 788 | void *(*image_native_get) (void *data, void *image); |
@@ -861,6 +872,7 @@ struct _Evas_Image_Load_Func | |||
861 | Eina_Bool (*file_head) (Image_Entry *ie, const char *file, const char *key, int *error); | 872 | Eina_Bool (*file_head) (Image_Entry *ie, const char *file, const char *key, int *error); |
862 | Eina_Bool (*file_data) (Image_Entry *ie, const char *file, const char *key, int *error); | 873 | Eina_Bool (*file_data) (Image_Entry *ie, const char *file, const char *key, int *error); |
863 | double (*frame_duration) (Image_Entry *ie, const char *file, const int start, const int frame_num); | 874 | double (*frame_duration) (Image_Entry *ie, const char *file, const int start, const int frame_num); |
875 | Eina_Bool do_region; | ||
864 | }; | 876 | }; |
865 | 877 | ||
866 | struct _Evas_Image_Save_Func | 878 | struct _Evas_Image_Save_Func |
@@ -904,7 +916,7 @@ void evas_object_clip_across_check(Evas_Object *obj); | |||
904 | void evas_object_clip_across_clippees_check(Evas_Object *obj); | 916 | void evas_object_clip_across_clippees_check(Evas_Object *obj); |
905 | void evas_object_mapped_clip_across_mark(Evas_Object *obj); | 917 | void evas_object_mapped_clip_across_mark(Evas_Object *obj); |
906 | void evas_event_callback_call(Evas *e, Evas_Callback_Type type, void *event_info); | 918 | void evas_event_callback_call(Evas *e, Evas_Callback_Type type, void *event_info); |
907 | void evas_object_event_callback_call(Evas_Object *obj, Evas_Callback_Type type, void *event_info); | 919 | void evas_object_event_callback_call(Evas_Object *obj, Evas_Callback_Type type, void *event_info, int event_id); |
908 | Eina_List *evas_event_objects_event_list(Evas *e, Evas_Object *stop, int x, int y); | 920 | Eina_List *evas_event_objects_event_list(Evas *e, Evas_Object *stop, int x, int y); |
909 | int evas_mem_free(int mem_required); | 921 | int evas_mem_free(int mem_required); |
910 | int evas_mem_degrade(int mem_required); | 922 | int evas_mem_degrade(int mem_required); |