kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elm: Fixed formatting. 

SVN revision: 69700
This commit is contained in:
Daniel Juyung Seo 2012-03-28 09:02:22 +00:00
parent 9d2fb4b4b5
commit 7908a77ad8
57 changed files with 493 additions and 448 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
legacy/elementary/src/lib/elm_bg.c
View File

@ -8,9 +8,10 @@ struct _Widget_Data
Evas_Object *base, *rect, *img, *overlay;
const char *file, *group;
Elm_Bg_Option option;
struct {
Evas_Coord w, h;
} load_opts;
struct
{
Evas_Coord w, h;
} load_opts;
};
static const char *widtype = NULL;

5
legacy/elementary/src/lib/elm_entry.c
View File

@ -53,11 +53,12 @@ struct _Widget_Data
Elm_Input_Panel_Return_Key_Type input_panel_return_key_type;
void *input_panel_imdata;
int input_panel_imdata_len;
struct {
struct
{
Evas_Object *hover_parent;
Evas_Object *pop, *hover;
const char *hover_style;
} anchor_hover;
} anchor_hover;
Eina_Bool changed : 1;
Eina_Bool single_line : 1;
Eina_Bool password : 1;

7
legacy/elementary/src/lib/elm_flip.c
View File

@ -30,9 +30,10 @@ struct _Widget_Data
Elm_Flip_Mode mode;
Evas_Object *clip;
Evas_Object *event[4];
struct {
Evas_Object *content, *clip;
} front, back;
struct
{
Evas_Object *content, *clip;
} front, back;
Ecore_Job *job;
Evas_Coord down_x, down_y, x, y, ox, oy, w, h;
Elm_Flip_Interaction intmode;

27
legacy/elementary/src/lib/elm_icon.c
View File

@ -17,27 +17,30 @@ struct _Widget_Data
Elm_Icon_Lookup_Order lookup_order;
#ifdef HAVE_ELEMENTARY_ETHUMB
struct {
struct {
const char *path;
const char *key;
} file, thumb;
struct
{
struct
{
const char *path;
const char *key;
} file, thumb;
Ecore_Event_Handler *eeh;
Ecore_Event_Handler *eeh;
Ethumb_Thumb_Format format;
Ethumb_Thumb_Format format;
Ethumb_Client_Async *request;
Ethumb_Client_Async *request;
Eina_Bool retry : 1;
} thumb;
Eina_Bool retry : 1;
} thumb;
#endif
#ifdef ELM_EFREET
struct {
struct
{
int requested_size;
Eina_Bool use : 1;
} freedesktop;
} freedesktop;
#endif
int in_eval;
Eina_Bool scale_up : 1;

47
legacy/elementary/src/lib/elm_layout.c
View File

@ -19,27 +19,32 @@ struct _Subinfo
{
const char *part;
Evas_Object *obj;
enum {
SWALLOW,
BOX_APPEND,
BOX_PREPEND,
BOX_INSERT_BEFORE,
BOX_INSERT_AT,
TABLE_PACK,
TEXT
} type;
union {
union {
const Evas_Object *reference;
unsigned int pos;
} box;
struct {
unsigned short col, row, colspan, rowspan;
} table;
struct {
const char *text;
} text;
} p;
enum
{
SWALLOW,
BOX_APPEND,
BOX_PREPEND,
BOX_INSERT_BEFORE,
BOX_INSERT_AT,
TABLE_PACK,
TEXT
} type;
union
{
union
{
const Evas_Object *reference;
unsigned int pos;
} box;
struct
{
unsigned short col, row, colspan, rowspan;
} table;
struct
{
const char *text;
} text;
} p;
};
struct _Part_Cursor

5
legacy/elementary/src/lib/elm_list.c
View File

@ -18,9 +18,10 @@ struct _Widget_Data
Elm_Object_Select_Mode select_mode;
int walking;
int movements;
struct {
struct
{
Evas_Coord x, y;
} history[SWIPE_MOVES];
} history[SWIPE_MOVES];
Eina_Bool scr_minw : 1;
Eina_Bool scr_minh : 1;
Eina_Bool swipe : 1;

11
legacy/elementary/src/lib/elm_menu.c
View File

@ -14,11 +14,12 @@ struct _Elm_Menu_Item
Evas_Smart_Cb func;
unsigned int idx;
struct {
Evas_Object *hv, *bx, *location;
Eina_List *items;
Eina_Bool open : 1;
} submenu;
struct
{
Evas_Object *hv, *bx, *location;
Eina_List *items;
Eina_Bool open : 1;
} submenu;
Eina_Bool separator : 1;
Eina_Bool selected : 1;

20
legacy/elementary/src/lib/elm_photo.c
View File

@ -14,19 +14,21 @@ struct _Widget_Data
Ecore_Timer *longtimer;
#ifdef HAVE_ELEMENTARY_ETHUMB
struct {
int id;
struct
{
int id;
struct {
const char *path;
const char *key;
} file, thumb;
struct
{
const char *path;
const char *key;
} file, thumb;
Ethumb_Exists *exists;
Ethumb_Exists *exists;
Ecore_Event_Handler *eeh;
Ecore_Event_Handler *eeh;
Ethumb_Thumb_Format format;
Ethumb_Thumb_Format format;
Eina_Bool retry : 1;
} thumb;

5
legacy/elementary/src/lib/elm_slideshow.c
View File

@ -33,10 +33,11 @@ struct _Widget_Data
double timeout;
Eina_Bool loop:1;
struct {
struct
{
const char *current;
Eina_List *list; //list of const char *
} layout;
} layout;
};
static const char *widtype = NULL;

39
legacy/elementary/src/lib/elm_store.c
View File

@ -13,29 +13,34 @@ struct _Elm_Store
{
EINA_MAGIC;
void (*free)(Elm_Store *store);
struct {
void (*free)(Elm_Store_Item *item);
} item;
struct
{
void (*free)(Elm_Store_Item *item);
} item;
Evas_Object *genlist;
Ecore_Thread *list_th;
Eina_Inlist *items;
Eina_List *realized;
int realized_count;
int cache_max;
struct {
struct {
Elm_Store_Item_List_Cb func;
void *data;
} list;
struct {
Elm_Store_Item_Fetch_Cb func;
void *data;
} fetch;
struct {
Elm_Store_Item_Unfetch_Cb func;
void *data;
} unfetch;
} cb;
struct
{
struct
{
Elm_Store_Item_List_Cb func;
void *data;
} list;
struct
{
Elm_Store_Item_Fetch_Cb func;
void *data;
} fetch;
struct
{
Elm_Store_Item_Unfetch_Cb func;
void *data;
} unfetch;
} cb;
Eina_Bool sorted : 1;
Eina_Bool fetch_thread : 1;
};

9
legacy/elementary/src/lib/elm_toolbar.c
View File

@ -36,10 +36,11 @@ struct _Elm_Toolbar_Item
Evas_Object *object;
Evas_Object *o_menu;
Evas_Smart_Cb func;
struct {
int priority;
Eina_Bool visible : 1;
} prio;
struct
{
int priority;
Eina_Bool visible : 1;
} prio;
Eina_Bool selected : 1;
Eina_Bool separator : 1;
Eina_Bool menu : 1;

35
legacy/elementary/src/lib/elm_transit.c
View File

@ -31,22 +31,25 @@ struct _Elm_Transit
Elm_Transit *prev_chain_transit;
Eina_List *next_chain_transits;
Elm_Transit_Tween_Mode tween_mode;
struct {
Elm_Transit_Del_Cb func;
void *arg;
} del_data;
struct {
double delayed;
double paused;
double duration;
double begin;
double current;
} time;
struct {
int count;
int current;
Eina_Bool reverse;
} repeat;
struct
{
Elm_Transit_Del_Cb func;
void *arg;
} del_data;
struct
{
double delayed;
double paused;
double duration;
double begin;
double current;
} time;
struct
{
int count;
int current;
Eina_Bool reverse;
} repeat;
double progress;
unsigned int effects_pending_del;
int walking;

59
legacy/elementary/src/lib/elm_web.c
View File

@ -18,13 +18,14 @@ typedef struct _View_Smart_Data View_Smart_Data;
struct _View_Smart_Data
{
Ewk_View_Smart_Data base;
struct {
Evas_Event_Mouse_Down event;
Evas_Coord x, y;
unsigned int move_count;
Ecore_Timer *longpress_timer;
Ecore_Animator *pan_anim;
} mouse;
struct
{
Evas_Event_Mouse_Down event;
Evas_Coord x, y;
unsigned int move_count;
Ecore_Timer *longpress_timer;
Ecore_Animator *pan_anim;
} mouse;
};
#endif
@ -34,34 +35,38 @@ struct _Widget_Data
Evas_Object *self;
#ifdef HAVE_ELEMENTARY_WEB
Evas_Object *ewk_view;
struct {
Elm_Web_Window_Open window_create;
void *window_create_data;
Elm_Web_Dialog_Alert alert;
void *alert_data;
Elm_Web_Dialog_Confirm confirm;
void *confirm_data;
Elm_Web_Dialog_Prompt prompt;
void *prompt_data;
Elm_Web_Dialog_File_Selector file_selector;
void *file_selector_data;
Elm_Web_Console_Message console_message;
void *console_message_data;
} hook;
struct
{
Elm_Web_Window_Open window_create;
void *window_create_data;
Elm_Web_Dialog_Alert alert;
void *alert_data;
Elm_Web_Dialog_Confirm confirm;
void *confirm_data;
Elm_Web_Dialog_Prompt prompt;
void *prompt_data;
Elm_Web_Dialog_File_Selector file_selector;
void *file_selector_data;
Elm_Web_Console_Message console_message;
void *console_message_data;
} hook;
Elm_Win_Keyboard_Mode input_method;
struct {
struct
{
Elm_Web_Zoom_Mode mode;
float current;
float min, max;
Eina_Bool no_anim;
Ecore_Timer *timer;
} zoom;
struct {
struct {
} zoom;
struct
{
struct
{
int x, y;
} start, end;
} start, end;
Ecore_Animator *animator;
} bring_in;
} bring_in;
Eina_Bool tab_propagate : 1;
Eina_Bool inwin_mode : 1;
#else

50
legacy/elementary/src/lib/elm_win.c
View File

@ -20,18 +20,20 @@ struct _Elm_Win
Elm_Win_Keyboard_Mode kbdmode;
Elm_Win_Indicator_Mode indmode;
Elm_Win_Indicator_Opacity_Mode ind_o_mode;
struct {
const char *info;
Ecore_Timer *timer;
int repeat_count;
int shot_counter;
} shot;
struct
{
const char *info;
Ecore_Timer *timer;
int repeat_count;
int shot_counter;
} shot;
int resize_location;
int *autodel_clear, rot;
int show_count;
struct {
int x, y;
} screen;
struct
{
int x, y;
} screen;
struct
{
Ecore_Evas *ee;
@ -39,23 +41,25 @@ struct _Elm_Win
Evas_Object *obj, *hot_obj;
int hot_x, hot_y;
} pointer;
struct {
Evas_Object *top;
struct
{
Evas_Object *top;
struct {
Evas_Object *target;
Eina_Bool visible : 1;
Eina_Bool handled : 1;
} cur, prev;
struct
{
Evas_Object *target;
Eina_Bool visible : 1;
Eina_Bool handled : 1;
} cur, prev;
const char *style;
Ecore_Job *reconf_job;
const char *style;
Ecore_Job *reconf_job;
Eina_Bool enabled : 1;
Eina_Bool changed_theme : 1;
Eina_Bool top_animate : 1;
Eina_Bool geometry_changed : 1;
} focus_highlight;
Eina_Bool enabled : 1;
Eina_Bool changed_theme : 1;
Eina_Bool top_animate : 1;
Eina_Bool geometry_changed : 1;
} focus_highlight;
Evas_Object *icon;
const char *title;

129
legacy/elementary/src/lib/els_scroller.c
View File

@ -26,7 +26,8 @@ struct _Smart_Data
Elm_Smart_Scroller_Policy hbar_flags, vbar_flags;
struct {
struct
{
Evas_Coord x, y;
Evas_Coord sx, sy;
Evas_Coord dx, dy;
@ -36,68 +37,75 @@ struct _Smart_Data
Evas_Coord bx0, by0;
Evas_Coord b0x, b0y;
Evas_Coord b2x, b2y;
struct {
struct
{
Evas_Coord x, y;
double timestamp, localtimestamp;
} history[60];
struct {
double tadd, dxsum, dysum;
double est_timestamp_diff;
} hist;
double anim_start;
double anim_start2;
double anim_start3;
double onhold_vx, onhold_vy, onhold_tlast, onhold_vxe, onhold_vye;
double extra_time;
Evas_Coord hold_x, hold_y;
Ecore_Animator *hold_animator;
Ecore_Animator *onhold_animator;
Ecore_Animator *momentum_animator;
Ecore_Animator *bounce_x_animator;
Ecore_Animator *bounce_y_animator;
Evas_Coord locked_x, locked_y;
int hdir, vdir;
Eina_Bool now : 1;
Eina_Bool cancelled : 1;
Eina_Bool hold : 1;
Eina_Bool hold_parent : 1;
Eina_Bool want_dragged : 1;
Eina_Bool dragged : 1;
Eina_Bool dragged_began : 1;
Eina_Bool dir_x : 1;
Eina_Bool dir_y : 1;
Eina_Bool locked : 1;
Eina_Bool bounce_x_hold : 1;
Eina_Bool bounce_y_hold : 1;
Eina_Bool scroll : 1;
Eina_Bool want_reset : 1;
} down;
} history[60];
struct
{
double tadd, dxsum, dysum;
double est_timestamp_diff;
} hist;
double anim_start;
double anim_start2;
double anim_start3;
double onhold_vx, onhold_vy, onhold_tlast, onhold_vxe, onhold_vye;
double extra_time;
Evas_Coord hold_x, hold_y;
Ecore_Animator *hold_animator;
Ecore_Animator *onhold_animator;
Ecore_Animator *momentum_animator;
Ecore_Animator *bounce_x_animator;
Ecore_Animator *bounce_y_animator;
Evas_Coord locked_x, locked_y;
int hdir, vdir;
Eina_Bool now : 1;
Eina_Bool cancelled : 1;
Eina_Bool hold : 1;
Eina_Bool hold_parent : 1;
Eina_Bool want_dragged : 1;
Eina_Bool dragged : 1;
Eina_Bool dragged_began : 1;
Eina_Bool dir_x : 1;
Eina_Bool dir_y : 1;
Eina_Bool locked : 1;
Eina_Bool bounce_x_hold : 1;
Eina_Bool bounce_y_hold : 1;
Eina_Bool scroll : 1;
Eina_Bool want_reset : 1;
} down;
struct {
Evas_Coord w, h;
Eina_Bool resized : 1;
} child;
struct {
Evas_Coord x, y;
} step, page;
struct
{
Evas_Coord w, h;
Eina_Bool resized : 1;
} child;
struct
{
Evas_Coord x, y;
} step, page;
struct {
void (*set) (Evas_Object *obj, Evas_Coord x, Evas_Coord y);
void (*get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
void (*max_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
void (*min_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
void (*child_size_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
void (*gravity_set) (Evas_Object *obj, double x, double y);
void (*gravity_get) (Evas_Object *obj, double *x, double *y);
} pan_func;
struct
{
void (*set) (Evas_Object *obj, Evas_Coord x, Evas_Coord y);
void (*get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
void (*max_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
void (*min_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
void (*child_size_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
void (*gravity_set) (Evas_Object *obj, double x, double y);
void (*gravity_get) (Evas_Object *obj, double *x, double *y);
} pan_func;
struct {
struct {
Evas_Coord start, end;
double t_start, t_end;
Ecore_Animator *animator;
} x, y;
} scrollto;
struct
{
struct
{
Evas_Coord start, end;
double t_start, t_end;
Ecore_Animator *animator;
} x, y;
} scrollto;
double pagerel_h, pagerel_v;
Evas_Coord pagesize_h, pagesize_v;
@ -1836,10 +1844,11 @@ _smart_hold_animator(void *data)
int i, count = 0;
Evas_Coord basex = 0, basey = 0, x, y;
double dt, t, tdiff, tnow, twin;
struct {
struct
{
Evas_Coord x, y, dx, dy;
double t, dt;
} pos[60];
} pos[60];
tdiff = sd->down.hist.est_timestamp_diff;
tnow = ecore_time_get() - tdiff;

14
legacy/elementary/src/lib/els_tooltip.c
View File

@ -43,12 +43,14 @@ struct _Elm_Tooltip
Ecore_Timer *hide_timer;
Ecore_Job *reconfigure_job;
Evas_Coord mouse_x, mouse_y;
struct {
Evas_Coord x, y, bx, by;
} pad;
struct {
double x, y;
} rel_pos;
struct
{
Evas_Coord x, y, bx, by;
} pad;
struct
{
double x, y;
} rel_pos;
double hide_timeout; /* from theme */
Eina_Bool visible_lock:1;
Eina_Bool changed_style:1;