cedric pushed a commit to branch master.
commit f4ff9a1a3eda20f578357ef30bb661c707d5f028
Author: Cedric BAIL <[email protected]>
Date: Tue Mar 12 20:09:10 2013 +0900
evas: cleanup header in preparation for Eina_Cow.
---
src/lib/evas/Evas.h | 7 ----
src/lib/evas/include/evas_private.h | 66 ++++++++++++++++++++-----------------
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;
*/
typedef Eo Evas_Object;
-/**
- * @typedef Evas_Object_Protected_Data
- * Protected data for an Evas Object.
- * @ingroup Evas_Object_Group
- */
-typedef struct _Evas_Object_Protected_Data Evas_Object_Protected_Data;
-
typedef void Evas_Performance; /**< An Evas Performance
handle */
typedef struct _Evas_Modifier Evas_Modifier; /**< An opaque type
containing information on which modifier keys are registered in an Evas canvas
*/
typedef 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;
typedef struct _Evas_Object_Proxy_Data Evas_Object_Proxy_Data;
typedef struct _Evas_Object_Map_Data Evas_Object_Map_Data;
+typedef struct _Evas_Object_Protected_State Evas_Object_Protected_State;
+typedef struct _Evas_Object_Protected_Data Evas_Object_Protected_Data;
+
enum _Evas_Font_Style
{
EVAS_FONT_STYLE_SLANT,
@@ -529,6 +532,38 @@ struct _Evas_Object_Map_Data
RGBA_Map *spans;
};
+struct _Evas_Object_Protected_State
+{
+ Evas_Object_Protected_Data *clipper;
+ Evas_Object *eo_clipper;
+ double scale;
+ Evas_Coord_Rectangle geometry;
+ Evas_Coord_Rectangle bounding_box;
+ struct {
+ struct {
+ Evas_Coord x, y, w, h;
+ unsigned char r, g, b, a;
+ Eina_Bool visible : 1;
+ Eina_Bool dirty : 1;
+ } clip;
+ } cache;
+ short layer;
+ struct {
+ unsigned char r, g, b, a;
+ } color;
+
+ Evas_Render_Op render_op : 4;
+
+ Eina_Bool visible : 1;
+ Eina_Bool have_clipees : 1;
+ Eina_Bool anti_alias : 1;
+ Eina_Bool valid_bounding_box : 1;
+ Eina_Bool cached_surface : 1;
+ Eina_Bool parent_cached_surface : 1;
+ Eina_Bool opaque_valid : 1;
+ Eina_Bool opaque : 1;
+};
+
struct _Evas_Object_Protected_Data
{
EINA_INLIST;
@@ -536,36 +571,7 @@ struct _Evas_Object_Protected_Data
const char *type;
Evas_Layer *layer;
- struct {
- Evas_Object_Protected_Data *clipper;
- Evas_Object *eo_clipper;
- double scale;
- Evas_Coord_Rectangle geometry;
- Evas_Coord_Rectangle bounding_box;
- struct {
- struct {
- Evas_Coord x, y, w, h;
- unsigned char r, g, b, a;
- Eina_Bool visible : 1;
- Eina_Bool dirty : 1;
- } clip;
- } cache;
- short layer;
- struct {
- unsigned char r, g, b, a;
- } color;
-
- Evas_Render_Op render_op : 4;
-
- Eina_Bool visible : 1;
- Eina_Bool have_clipees : 1;
- Eina_Bool anti_alias : 1;
- Eina_Bool valid_bounding_box : 1;
- Eina_Bool cached_surface : 1;
- Eina_Bool parent_cached_surface : 1;
- Eina_Bool opaque_valid : 1;
- Eina_Bool opaque : 1;
- } cur, prev;
+ Evas_Object_Protected_State cur, prev;
char *name;
--
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
