summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@samsung.com>2013-03-12 20:09:10 +0900
committerCedric BAIL <cedric.bail@samsung.com>2013-03-12 20:09:10 +0900
commitf4ff9a1a3eda20f578357ef30bb661c707d5f028 (patch)
treecb369f46721b7d8eba2bac00cfc2ccea3c4cca1f
parente07a7ac891a7c3ad9451ce4a1de2f3fb50c01f92 (diff)
evas: cleanup header in preparation for Eina_Cow.
-rw-r--r--src/lib/evas/Evas.h7
-rw-r--r--src/lib/evas/include/evas_private.h66
2 files changed, 36 insertions, 37 deletions
diff --git a/src/lib/evas/Evas.h b/src/lib/evas/Evas.h
index 0c4699e..26d4e09 100644
--- a/src/lib/evas/Evas.h
+++ b/src/lib/evas/Evas.h
@@ -718,13 +718,6 @@ typedef struct _Evas_Public_Data Evas_Public_Data;
718 */ 718 */
719typedef Eo Evas_Object; 719typedef Eo Evas_Object;
720 720
721/**
722 * @typedef Evas_Object_Protected_Data
723 * Protected data for an Evas Object.
724 * @ingroup Evas_Object_Group
725 */
726typedef struct _Evas_Object_Protected_Data Evas_Object_Protected_Data;
727
728typedef void Evas_Performance; /**< An Evas Performance handle */ 721typedef void Evas_Performance; /**< An Evas Performance handle */
729typedef struct _Evas_Modifier Evas_Modifier; /**< An opaque type containing information on which modifier keys are registered in an Evas canvas */ 722typedef struct _Evas_Modifier Evas_Modifier; /**< An opaque type containing information on which modifier keys are registered in an Evas canvas */
730typedef struct _Evas_Lock Evas_Lock; /**< An opaque type containing information on which lock keys are registered in an Evas canvas */ 723typedef struct _Evas_Lock Evas_Lock; /**< An opaque type containing information on which lock keys are registered in an Evas canvas */
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index a8e01ee..6258d44 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -50,6 +50,9 @@ typedef struct _Evas_Coord_Touch_Point Evas_Coord_Touch_Point;
50typedef struct _Evas_Object_Proxy_Data Evas_Object_Proxy_Data; 50typedef struct _Evas_Object_Proxy_Data Evas_Object_Proxy_Data;
51typedef struct _Evas_Object_Map_Data Evas_Object_Map_Data; 51typedef struct _Evas_Object_Map_Data Evas_Object_Map_Data;
52 52
53typedef struct _Evas_Object_Protected_State Evas_Object_Protected_State;
54typedef struct _Evas_Object_Protected_Data Evas_Object_Protected_Data;
55
53enum _Evas_Font_Style 56enum _Evas_Font_Style
54{ 57{
55 EVAS_FONT_STYLE_SLANT, 58 EVAS_FONT_STYLE_SLANT,
@@ -529,6 +532,38 @@ struct _Evas_Object_Map_Data
529 RGBA_Map *spans; 532 RGBA_Map *spans;
530}; 533};
531 534
535struct _Evas_Object_Protected_State
536{
537 Evas_Object_Protected_Data *clipper;
538 Evas_Object *eo_clipper;
539 double scale;
540 Evas_Coord_Rectangle geometry;
541 Evas_Coord_Rectangle bounding_box;
542 struct {
543 struct {
544 Evas_Coord x, y, w, h;
545 unsigned char r, g, b, a;
546 Eina_Bool visible : 1;
547 Eina_Bool dirty : 1;
548 } clip;
549 } cache;
550 short layer;
551 struct {
552 unsigned char r, g, b, a;
553 } color;
554
555 Evas_Render_Op render_op : 4;
556
557 Eina_Bool visible : 1;
558 Eina_Bool have_clipees : 1;
559 Eina_Bool anti_alias : 1;
560 Eina_Bool valid_bounding_box : 1;
561 Eina_Bool cached_surface : 1;
562 Eina_Bool parent_cached_surface : 1;
563 Eina_Bool opaque_valid : 1;
564 Eina_Bool opaque : 1;
565};
566
532struct _Evas_Object_Protected_Data 567struct _Evas_Object_Protected_Data
533{ 568{
534 EINA_INLIST; 569 EINA_INLIST;
@@ -536,36 +571,7 @@ struct _Evas_Object_Protected_Data
536 const char *type; 571 const char *type;
537 Evas_Layer *layer; 572 Evas_Layer *layer;
538 573
539 struct { 574 Evas_Object_Protected_State cur, prev;
540 Evas_Object_Protected_Data *clipper;
541 Evas_Object *eo_clipper;
542 double scale;
543 Evas_Coord_Rectangle geometry;
544 Evas_Coord_Rectangle bounding_box;
545 struct {
546 struct {
547 Evas_Coord x, y, w, h;
548 unsigned char r, g, b, a;
549 Eina_Bool visible : 1;
550 Eina_Bool dirty : 1;
551 } clip;
552 } cache;
553 short layer;
554 struct {
555 unsigned char r, g, b, a;
556 } color;
557
558 Evas_Render_Op render_op : 4;
559
560 Eina_Bool visible : 1;
561 Eina_Bool have_clipees : 1;
562 Eina_Bool anti_alias : 1;
563 Eina_Bool valid_bounding_box : 1;
564 Eina_Bool cached_surface : 1;
565 Eina_Bool parent_cached_surface : 1;
566 Eina_Bool opaque_valid : 1;
567 Eina_Bool opaque : 1;
568 } cur, prev;
569 575
570 char *name; 576 char *name;
571 577