evas/evas_private.h - just removed white spaces and fixed indentation.
SVN revision: 60388
This commit is contained in:
ChunEon Park
parent
a5537f4193
commit
def0aed32f
|
|
@ -95,27 +95,27 @@ MAGIC_CHECK_FAILED(o, t, m)
|
|||
#define EVAS_OBJECT_IMAGE_FREE_FILE_AND_KEY(o) \
|
||||
if ((o)->cur.file) \
|
||||
{ \
|
||||
eina_stringshare_del((o)->cur.file); \
|
||||
if ((o)->prev.file == (o)->cur.file) \
|
||||
(o)->prev.file = NULL; \
|
||||
(o)->cur.file = NULL; \
|
||||
eina_stringshare_del((o)->cur.file); \
|
||||
if ((o)->prev.file == (o)->cur.file) \
|
||||
(o)->prev.file = NULL; \
|
||||
(o)->cur.file = NULL; \
|
||||
} \
|
||||
if ((o)->cur.key) \
|
||||
{ \
|
||||
eina_stringshare_del((o)->cur.key); \
|
||||
if ((o)->prev.key == (o)->cur.key) \
|
||||
(o)->prev.key = NULL; \
|
||||
(o)->cur.key = NULL; \
|
||||
eina_stringshare_del((o)->cur.key); \
|
||||
if ((o)->prev.key == (o)->cur.key) \
|
||||
(o)->prev.key = NULL; \
|
||||
(o)->cur.key = NULL; \
|
||||
} \
|
||||
if ((o)->prev.file) \
|
||||
{ \
|
||||
eina_stringshare_del((o)->prev.file); \
|
||||
(o)->prev.file = NULL; \
|
||||
eina_stringshare_del((o)->prev.file); \
|
||||
(o)->prev.file = NULL; \
|
||||
} \
|
||||
if ((o)->prev.key) \
|
||||
{ \
|
||||
eina_stringshare_del((o)->prev.key); \
|
||||
(o)->prev.key = NULL; \
|
||||
eina_stringshare_del((o)->prev.key); \
|
||||
(o)->prev.key = NULL; \
|
||||
}
|
||||
|
||||
struct _Evas_Key_Grab
|
||||
|
|
@ -247,7 +247,7 @@ struct _Evas
|
|||
DATA32 button;
|
||||
Evas_Coord x, y;
|
||||
struct {
|
||||
Eina_List *in;
|
||||
Eina_List *in;
|
||||
} object;
|
||||
|
||||
} pointer;
|
||||
|
|
@ -279,9 +279,9 @@ struct _Evas
|
|||
Evas_Module *module;
|
||||
Evas_Func *func;
|
||||
struct {
|
||||
void *output;
|
||||
void *output;
|
||||
|
||||
void *context;
|
||||
void *context;
|
||||
} data;
|
||||
|
||||
void *info;
|
||||
|
|
@ -435,16 +435,16 @@ struct _Evas_Object
|
|||
double scale;
|
||||
Evas_Coord_Rectangle geometry;
|
||||
struct {
|
||||
struct {
|
||||
Evas_Coord x, y, w, h;
|
||||
unsigned char r, g, b, a;
|
||||
Eina_Bool visible : 1;
|
||||
Eina_Bool dirty : 1;
|
||||
} clip;
|
||||
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;
|
||||
unsigned char r, g, b, a;
|
||||
} color;
|
||||
Eina_Bool usemap : 1;
|
||||
Eina_Bool visible : 1;
|
||||
|
|
@ -482,14 +482,14 @@ struct _Evas_Object
|
|||
struct {
|
||||
Eina_List *proxies;
|
||||
void *surface;
|
||||
int w,h;
|
||||
int w,h;
|
||||
Eina_Bool redraw;
|
||||
} proxy;
|
||||
|
||||
#if 0 // filtering disabled
|
||||
Evas_Filter_Info *filter;
|
||||
#endif
|
||||
|
||||
|
||||
Evas_Size_Hints *size_hints;
|
||||
|
||||
int last_mouse_down_counter;
|
||||
|
|
@ -497,11 +497,11 @@ struct _Evas_Object
|
|||
int mouse_grabbed;
|
||||
|
||||
int last_event;
|
||||
|
||||
|
||||
struct {
|
||||
int in_move, in_resize;
|
||||
int in_move, in_resize;
|
||||
} doing;
|
||||
|
||||
|
||||
unsigned int ref;
|
||||
|
||||
unsigned char delete_me;
|
||||
|
|
@ -635,8 +635,8 @@ struct _Evas_Func
|
|||
void (*context_clip_clip) (void *data, void *context, int x, int y, int w, int h);
|
||||
void (*context_clip_unset) (void *data, void *context);
|
||||
int (*context_clip_get) (void *data, void *context, int *x, int *y, int *w, int *h);
|
||||
void (*context_mask_set) (void *data, void *context, void *mask, int x, int y, int w, int h);
|
||||
void (*context_mask_unset) (void *data, void *context);
|
||||
void (*context_mask_set) (void *data, void *context, void *mask, int x, int y, int w, int h);
|
||||
void (*context_mask_unset) (void *data, void *context);
|
||||
void (*context_color_set) (void *data, void *context, int r, int g, int b, int a);
|
||||
int (*context_color_get) (void *data, void *context, int *r, int *g, int *b, int *a);
|
||||
void (*context_multiplier_set) (void *data, void *context, int r, int g, int b, int a);
|
||||
|
|
@ -736,13 +736,13 @@ struct _Evas_Func
|
|||
Filtered_Image *(*image_filtered_save) (void *image, void *filtered, uint8_t *key, size_t len);
|
||||
void (*image_filtered_free) (void *image, Filtered_Image *);
|
||||
#endif
|
||||
|
||||
|
||||
/* EFL-GL Glue Layer */
|
||||
void *(*gl_surface_create) (void *data, void *config, int w, int h);
|
||||
int (*gl_surface_destroy) (void *data, void *surface);
|
||||
void *(*gl_context_create) (void *data, void *share_context);
|
||||
int (*gl_context_destroy) (void *data, void *context);
|
||||
int (*gl_make_current) (void *data, void *surface, void *context);
|
||||
int (*gl_make_current) (void *data, void *surface, void *context);
|
||||
void *(*gl_proc_address_get) (void *data, const char *name);
|
||||
int (*gl_native_surface_get) (void *data, void *surface, void *native_surface);
|
||||
void *(*gl_api_get) (void *data);
|
||||
|
|
@ -891,9 +891,9 @@ int evas_async_target_del(const void *target);
|
|||
void _evas_preload_thread_init(void);
|
||||
void _evas_preload_thread_shutdown(void);
|
||||
Evas_Preload_Pthread *evas_preload_thread_run(void (*func_heavy)(void *data),
|
||||
void (*func_end)(void *data),
|
||||
void (*func_cancel)(void *data),
|
||||
const void *data);
|
||||
void (*func_end)(void *data),
|
||||
void (*func_cancel)(void *data),
|
||||
const void *data);
|
||||
Eina_Bool evas_preload_thread_cancel(Evas_Preload_Pthread *thread);
|
||||
|
||||
void _evas_walk(Evas *e);
|
||||
|
|
@ -907,7 +907,7 @@ void evas_render_object_recalc(Evas_Object *obj);
|
|||
|
||||
Eina_Bool evas_map_inside_get(const Evas_Map *m, Evas_Coord x, Evas_Coord y);
|
||||
Eina_Bool evas_map_coords_get(const Evas_Map *m, Evas_Coord x, Evas_Coord y, Evas_Coord *mx, Evas_Coord *my, int grab);
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/*****************************************/
|
||||
/********************/
|
||||
|
|
@ -915,7 +915,7 @@ Eina_Bool evas_map_coords_get(const Evas_Map *m, Evas_Coord x, Evas_Coord y, Eva
|
|||
|
||||
#ifdef MPOOL
|
||||
typedef struct _Evas_Mempool Evas_Mempool;
|
||||
|
||||
|
||||
struct _Evas_Mempool
|
||||
{
|
||||
int count;
|
||||
|
|
@ -961,11 +961,11 @@ struct _Evas_Mempool
|
|||
calloc(1, sizeof(siz))
|
||||
# define EVAS_MEMPOOL_FREE(x, p) \
|
||||
free(p)
|
||||
#endif
|
||||
#endif
|
||||
/********************/
|
||||
/*****************************************/
|
||||
/****************************************************************************/
|
||||
|
||||
|
||||
#define EVAS_API_OVERRIDE(func, api, prefix) \
|
||||
(api)->func = prefix##func
|
||||
#define EVAS_API_RESET(func, api) \
|
||||
|
|
|
|||
Loading…
Reference in New Issue