Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/evas

Dir     : e17/libs/evas/src/lib/include


Modified Files:
        evas_common.h evas_private.h 


Log Message:


save a few bytes by packing structures better... simple savings :)

===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/include/evas_common.h,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -3 -r1.85 -r1.86
--- evas_common.h       21 Jun 2007 20:10:13 -0000      1.85
+++ evas_common.h       28 Jun 2007 23:22:20 -0000      1.86
@@ -263,8 +263,8 @@
       DATA32 col;
    } col;
    struct RGBA_Draw_Context_clip {
-      char   use : 1;
       int    x, y, w, h;
+      char   use : 1;
    } clip;
    Cutout_Rects cutout;
    struct {
@@ -289,8 +289,8 @@
 {
    int                w, h;
    DATA32            *data;
-   char               no_free : 1;
    RGBA_Image        *im;
+   char               no_free : 1;
 };
 
 struct _RGBA_Pipe_Op
@@ -358,17 +358,16 @@
      {
        void           *module;
        void           *loader;
-//     int             format;
        char           *file;
        char           *real_file;
        char           *key;
        char           *comment;
+//     int             format;
      } info;
-   int                  references;
    void                *extended_info;
-   RGBA_Image_Loadopts  load_opts;
-   unsigned char        scale;
    RGBA_Pipe           *pipe;
+   int                  references;
+   RGBA_Image_Loadopts  load_opts;
    int                  ref;
    time_t               timestamp;
    time_t               laststat;
@@ -378,6 +377,7 @@
       unsigned char        no_free : 1;
       unsigned char        dirty : 1;
    } cs;
+   unsigned char        scale;
 };
 
 struct _RGBA_Gradient_Color_Stop
@@ -400,26 +400,24 @@
      {
        DATA32        *data;
        int            len;
-       unsigned char  has_alpha : 1;
        float          angle;
        int            direction;
        float          offset;
+       unsigned char  has_alpha : 1;
      } map;
 
    struct {
        Evas_Object_List *stops;
-       int               nstops;
        DATA32           *data;
+       int               nstops;
        int               len;
    }  color;
    struct {
        Evas_Object_List *stops;
-       int               nstops;
        DATA8            *data;
+       int               nstops;
        int               len;
    }  alpha;
-   unsigned char     imported_data : 1;
-   unsigned char     has_alpha : 1;
 
    struct
      {
@@ -436,6 +434,9 @@
      } type;
    
    int references;
+   
+   unsigned char     imported_data : 1;
+   unsigned char     has_alpha : 1;
 };
 
 struct _RGBA_Gradient_Type
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/include/evas_private.h,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- evas_private.h      17 Jun 2007 02:56:57 -0000      1.84
+++ evas_private.h      28 Jun 2007 23:22:20 -0000      1.85
@@ -39,19 +39,20 @@
    void                        *handle;        /* the dlopen handle */
    char                        *path;          /* the path where this modules 
is */
    char                        *name;          /* the name of the dir where 
this module is */
-   Evas_Module_Type    type;           /* the type detected by the path */
    struct
      {
        int (*open)(Evas_Module *);
        void (*close)(Evas_Module *);
      } func;
-   unsigned char       loaded : 1;
-   
    void                *functions;     /* this are the functions exported by 
the module */
    void                *data;          /* some internal data for the module 
i.e the id for engines */
 
+   Evas_Module_Type    type;           /* the type detected by the path */
+   
    int           ref; /* how many refs */
    int           last_used; /* the cycle count when it was last used */
+   
+   unsigned char       loaded : 1;
 };
 
 
@@ -219,10 +220,11 @@
 
    int               usage;
 
+   Evas_Smart_Class *smart_class;
+
    unsigned char     delete_me : 1;
    unsigned char     class_allocated : 1;
 
-   Evas_Smart_Class *smart_class;
 };
 
 struct _Evas_Modifier
@@ -245,9 +247,9 @@
 
 struct _Evas_Callbacks
 {
-   unsigned char     deletions_waiting : 1;
-   int               walking_list;
    Evas_Object_List *callbacks;
+   int               walking_list;
+   unsigned char     deletions_waiting : 1;
 /*   
    Evas_Object_List *down;
    Evas_Object_List *up;
@@ -299,8 +301,6 @@
       unsigned char  changed : 1;
    } output;
 
-   int               output_validity;
-
    Evas_List        *damages;
    Evas_List        *obscures;
 
@@ -308,7 +308,7 @@
 
    Evas_Hash        *name_hash;
 
-   unsigned char     changed : 1;
+   int               output_validity;
 
    int               walking_list;
    int               events_frozen;
@@ -333,13 +333,14 @@
    Evas_List     *font_path;
 
    Evas_Object   *focused;
+   void          *attach_data;
    Evas_Modifier  modifiers;
    Evas_Lock      locks;
    unsigned int   last_timestamp;
-   void          *attach_data;
    int            last_mouse_down_counter;
    int            last_mouse_up_counter;
    Evas_Font_Hinting_Flags hinting;
+   unsigned char     changed : 1;
    unsigned char  delete_me : 1;
 };
 
@@ -477,7 +478,6 @@
 
 struct _Evas_Font
 {
-   char     type;
    struct {
       const char *prop[14];
    } x;
@@ -485,6 +485,7 @@
       const char *name;
    } simple;
    const char *path;
+   char     type;
 };
 
 struct _Evas_Font_Alias



-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to