enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

this is a rather large stress test of the improved version of uncrustify+config that I have been working on 

as far as I can tell, it's perfect for non-headers

header example following as soon as I finish making it space EINA_XYZ() args properly


SVN revision: 53774
This commit is contained in:
Mike Blumenkrantz 2010-10-22 17:07:41 +00:00
parent be3d7651e6
commit 76224aeb9e
1 changed files with 3722 additions and 3682 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/bin/e_fm.c
View File

@ -47,18 +47,23 @@ struct _E_Fm2_Smart_Data
const char *path;
const char *realpath;
struct {
struct
{
Evas_Coord w, h;
} max, pmax;
struct {
struct
{
Evas_Coord x, y;
} pos;
struct {
struct
{
Eina_List *list;
int member_max;
} regions;
struct {
struct {
struct
{
struct
{
E_Fm_Cb func;
void *data;
} start, end, replace;
@ -90,21 +95,24 @@ struct _E_Fm2_Smart_Data
const char *custom_theme;
const char *custom_theme_content;
struct {
struct
{
Evas_Object *obj, *obj2;
Eina_List *last_insert;
Eina_List **list_index;
int iter;
} tmp;
struct {
struct
{
Eina_List *actions;
Ecore_Idler *idler;
Ecore_Timer *timer;
Eina_Bool deletions : 1;
} live;
struct {
struct
{
char *buf;
Ecore_Timer *timer;
} typebuf;
@ -121,7 +129,8 @@ struct _E_Fm2_Smart_Data
Eina_Bool drop_all : 1;
Eina_Bool drag : 1;
Eina_Bool selecting : 1;
struct {
struct
{
int ox, oy;
int x, y, w, h;
} selrect;
@ -153,7 +162,8 @@ struct _E_Fm2_Icon
E_Fm2_Icon_Info info;
struct {
struct
{
Evas_Coord x, y;
Eina_Bool start : 1;
Eina_Bool dnd : 1;
@ -2455,6 +2465,7 @@ _e_fm2_client_file_trash(const char *path, Evas_Object *e_fm)
e_fm2_op_registry_entry_add(id, e_fm, E_FM_OP_TRASH, _e_fm2_operation_abort_internal);
return id;
}
#endif
static int
@ -2728,10 +2739,12 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
case E_FM_OP_HELLO: /*hello*/
// printf("E_FM_OP_HELLO\n");
break;
case E_FM_OP_OK: /*req ok*/
// printf("E_FM_OP_OK\n");
cl->req--;
break;
case E_FM_OP_FILE_ADD: /*file add*/
// printf("E_FM_OP_FILE_ADD\n");
case E_FM_OP_FILE_CHANGE: /*file change*/
@ -2857,6 +2870,7 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
if (evdir) free(evdir);
}
break;
case E_FM_OP_FILE_DEL: /*file del*/
// printf("E_FM_OP_FILE_DEL\n");
path = e->data;
@ -2868,6 +2882,7 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
}
free(evdir);
break;
case E_FM_OP_MONITOR_END: /*mon dir del*/
// printf("E_FM_OP_MONITOR_END\n");
path = e->data;
@ -2876,6 +2891,7 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
dels = eina_list_append(dels, obj);
}
break;
default:
break;
}
@ -3225,7 +3241,8 @@ _e_fm2_dev_path_map(const char *dev, const char *path)
if (v)
{
if (!v->mount_point)
v->mount_point = e_fm2_device_volume_mountpoint_get(v);;
v->mount_point = e_fm2_device_volume_mountpoint_get(v);
;
if (PRT("%s/%s", v->mount_point, path) >= sizeof(buf))
return NULL;
}
@ -3874,14 +3891,20 @@ _e_fm2_icon_place_relative(E_Fm2_Icon *ic, E_Fm2_Icon *icr, int xrel, int yrel,
ic->y = icr->y;
if (xrel > 0) ic->x += icr->w;
else if (xrel < 0) ic->x -= ic->w;
else if (xa == 1) ic->x += (icr->w - ic->w) / 2;
else if (xa == 2) ic->x += icr->w - ic->w;
else if (xrel < 0)
ic->x -= ic->w;
else if (xa == 1)
ic->x += (icr->w - ic->w) / 2;
else if (xa == 2)
ic->x += icr->w - ic->w;
if (yrel > 0) ic->y += icr->h;
else if (yrel < 0) ic->y -= ic->h;
else if (ya == 1) ic->y += (icr->h - ic->h) / 2;
else if (ya == 2) ic->y += icr->h - ic->h;
else if (yrel < 0)
ic->y -= ic->h;
else if (ya == 1)
ic->y += (icr->h - ic->h) / 2;
else if (ya == 2)
ic->y += icr->h - ic->h;
}
static void
@ -4052,23 +4075,29 @@ _e_fm2_icons_place(Evas_Object *obj)
case E_FM2_VIEW_MODE_ICONS:
_e_fm2_icons_place_icons(sd);
break;
case E_FM2_VIEW_MODE_GRID_ICONS:
_e_fm2_icons_place_grid_icons(sd);
break;
case E_FM2_VIEW_MODE_CUSTOM_ICONS:
_e_fm2_icons_place_custom_icons(sd);
break;
case E_FM2_VIEW_MODE_CUSTOM_GRID_ICONS:
/* FIXME: not going to implement this at this stage */
_e_fm2_icons_place_custom_grid_icons(sd);
break;
case E_FM2_VIEW_MODE_CUSTOM_SMART_GRID_ICONS:
/* FIXME: not going to implement this at this stage */
_e_fm2_icons_place_custom_smart_grid_icons(sd);
break;
case E_FM2_VIEW_MODE_LIST:
_e_fm2_icons_place_list(sd);
break;
default:
break;
}
@ -4541,6 +4570,7 @@ _e_fm2_icon_fill(E_Fm2_Icon *ic, E_Fm2_Finfo *finf)
ic->min_w = mw;
ic->min_h = mh;
break;
case E_FM2_VIEW_MODE_LIST:
{
obj = ic->sd->tmp.obj;
@ -4575,6 +4605,7 @@ _e_fm2_icon_fill(E_Fm2_Icon *ic, E_Fm2_Finfo *finf)
ic->min_w = mw;
ic->min_h = mh;
break;
default:
break;
}
@ -5379,7 +5410,6 @@ _e_fm2_icon_sel_down(Evas_Object *obj)
_e_fm2_icon_make_visible(ic_down);
}
static void
_e_fm2_icon_sel_up(Evas_Object *obj)
{
@ -5454,7 +5484,6 @@ _e_fm2_icon_sel_up(Evas_Object *obj)
_e_fm2_icon_make_visible(ic_up);
}
/* FIXME: prototype */
static void
_e_fm2_typebuf_show(Evas_Object *obj)
@ -5502,6 +5531,7 @@ _e_fm2_typebuf_history_next(Evas_Object *obj)
if (!sd) return;
/* FIXME: do */
}
#endif
static int
@ -6443,7 +6473,6 @@ _e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, void *evas_event)
ic->down_sel = EINA_TRUE;
ic->last_selected = EINA_TRUE;
}
}
if (sel_change)
evas_object_smart_callback_call(ic->sd->obj, "selection_change", NULL);
@ -6655,18 +6684,23 @@ _e_fm2_cb_icon_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU
case E_GADCON_TYPE:
con = ((E_Gadcon *)(ic->sd->eobj))->zone->container;
break;
case E_WIN_TYPE:
con = ((E_Win *)(ic->sd->eobj))->container;
break;
case E_ZONE_TYPE:
con = ((E_Zone *)(ic->sd->eobj))->container;
break;
case E_BORDER_TYPE:
con = ((E_Border *)(ic->sd->eobj))->zone->container;
break;
case E_POPUP_TYPE:
con = ((E_Popup *)(ic->sd->eobj))->zone->container;
break;
/* FIXME: add more types as needed */
default:
break;
@ -6986,8 +7020,7 @@ _e_fm2_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event
{
/* FIXME: typebuf extras */
if (sd->typebuf_visible)
{ /* typebuf mode: delete */ }
else
{ /* typebuf mode: delete */ }else
_e_fm2_file_delete(obj);
}
else if (!evas_key_modifier_is_set(ev->modifiers, "Control") &&
@ -7222,11 +7255,13 @@ _e_fm2_cb_resize_job(void *data)
_e_fm2_icons_place(sd->obj);
_e_fm2_regions_populate(sd->obj);
break;
case E_FM2_VIEW_MODE_GRID_ICONS:
_e_fm2_regions_free(sd->obj);
_e_fm2_icons_place(sd->obj);
_e_fm2_regions_populate(sd->obj);
break;
case E_FM2_VIEW_MODE_CUSTOM_ICONS:
if (sd->config->view.fit_custom_pos)
{
@ -7242,6 +7277,7 @@ _e_fm2_cb_resize_job(void *data)
_e_fm2_icons_place(sd->obj);
_e_fm2_regions_populate(sd->obj);
break;
case E_FM2_VIEW_MODE_CUSTOM_GRID_ICONS:
/* FIXME: not going to implement this at this stage */
_e_fm2_regions_free(sd->obj);
@ -7249,6 +7285,7 @@ _e_fm2_cb_resize_job(void *data)
_e_fm2_icons_place(sd->obj);
_e_fm2_regions_populate(sd->obj);
break;
case E_FM2_VIEW_MODE_CUSTOM_SMART_GRID_ICONS:
/* FIXME: not going to implement this at this stage */
_e_fm2_regions_free(sd->obj);
@ -7256,6 +7293,7 @@ _e_fm2_cb_resize_job(void *data)
_e_fm2_icons_place(sd->obj);
_e_fm2_regions_populate(sd->obj);
break;
case E_FM2_VIEW_MODE_LIST:
if (sd->iconlist_changed)
{
@ -7270,6 +7308,7 @@ _e_fm2_cb_resize_job(void *data)
_e_fm2_icons_place(sd->obj);
_e_fm2_regions_populate(sd->obj);
break;
default:
break;
}
@ -7933,7 +7972,8 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp)
e_menu_item_callback_set(mi, _e_fm2_new_directory, sd);
}
}
if (!ic->info.removable) {
if (!ic->info.removable)
{
if (!(sd->icon_menu.flags & E_FM2_MENU_NO_CUT))
{
if (ecore_file_can_write(sd->realpath))
@ -9342,7 +9382,6 @@ _e_fm_string_append_char(char *str, size_t *size, size_t *len, char c)
return str;
}
static char *
_e_fm_string_append_quoted(char *str, size_t *size, size_t *len, const char *src)
{
@ -9433,9 +9472,6 @@ _e_fm2_refresh_job_cb(void *data)
sd->refresh_job = NULL;
}
static void
_e_fm2_live_file_add(Evas_Object *obj, const char *file, const char *file_rel, int after, E_Fm2_Finfo *finf)
{
@ -9561,6 +9597,7 @@ _e_fm2_live_process(Evas_Object *obj)
_e_fm2_file_add(obj, a->file, 1, a->file2, a->flags, &(a->finf));
}
break;
case FILE_DEL:
if (!strcmp(a->file, ".order"))
{
@ -9574,6 +9611,7 @@ _e_fm2_live_process(Evas_Object *obj)
sd->live.deletions = EINA_TRUE;
}
break;
case FILE_CHANGE:
if (!strcmp(a->file, ".order"))
{
@ -9614,6 +9652,7 @@ _e_fm2_live_process(Evas_Object *obj)
}
}
break;
default:
break;
}
@ -9854,3 +9893,4 @@ e_fm2_operation_abort(int id)
e_fm2_op_registry_entry_abort(ere);
e_fm2_op_registry_entry_unref(ere);
}