forked from enlightenment/enlightenment
ATTN: JEFFDAMETH!
YOUR CODE FORMATTING IS BROKEN! PLEASE FIX THIS IN YOUR EDITOR ASAP! SVN revision: 65704
This commit is contained in:
parent
03411559de
commit
0cc0f8c658
|
@ -262,7 +262,6 @@ evry_event_handler_add(int type, Eina_Bool (*func) (void *data, int type, void *
|
||||||
return ecore_event_handler_add(_evry_events[type], func, data);
|
return ecore_event_handler_add(_evry_events[type], func, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Evry_Type
|
Evry_Type
|
||||||
evry_type_register(const char *type)
|
evry_type_register(const char *type)
|
||||||
{
|
{
|
||||||
|
@ -304,7 +303,8 @@ evry_type_get(Evry_Type type)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int evry_api_version_check(int version)
|
int
|
||||||
|
evry_api_version_check(int version)
|
||||||
{
|
{
|
||||||
if (EVRY_API_VERSION == version)
|
if (EVRY_API_VERSION == version)
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -314,7 +314,6 @@ int evry_api_version_check(int version)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
_evry_cb_view_sort(const void *data1, const void *data2)
|
_evry_cb_view_sort(const void *data1, const void *data2)
|
||||||
{
|
{
|
||||||
|
@ -323,7 +322,6 @@ _evry_cb_view_sort(const void *data1, const void *data2)
|
||||||
return v1->priority - v2->priority;
|
return v1->priority - v2->priority;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
evry_view_register(Evry_View *view, int priority)
|
evry_view_register(Evry_View *view, int priority)
|
||||||
{
|
{
|
||||||
|
@ -612,3 +610,4 @@ _e_mod_menu_add(void *data __UNUSED__, E_Menu *m)
|
||||||
e_util_menu_item_theme_icon_set(mi, "system-run");
|
e_util_menu_item_theme_icon_set(mi, "system-run");
|
||||||
e_menu_item_callback_set(mi, _e_mod_run_cb, NULL);
|
e_menu_item_callback_set(mi, _e_mod_run_cb, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,6 @@ static int _evry_view_key_press(Evry_State *s, Ecore_Event_Key *ev);
|
||||||
static void _evry_view_show(Evry_Window *win, Evry_View *v, int slide);
|
static void _evry_view_show(Evry_Window *win, Evry_View *v, int slide);
|
||||||
static void _evry_view_hide(Evry_Window *win, Evry_View *v, int slide);
|
static void _evry_view_hide(Evry_Window *win, Evry_View *v, int slide);
|
||||||
|
|
||||||
|
|
||||||
static void _evry_item_desel(Evry_State *s);
|
static void _evry_item_desel(Evry_State *s);
|
||||||
static void _evry_item_sel(Evry_State *s, Evry_Item *it);
|
static void _evry_item_sel(Evry_State *s, Evry_Item *it);
|
||||||
|
|
||||||
|
@ -500,7 +499,6 @@ evry_item_ref(Evry_Item *it)
|
||||||
#ifdef PRINT_REFS
|
#ifdef PRINT_REFS
|
||||||
printf("%d, %d\t ref : %s\n", it->ref, _item_cnt, it->label);
|
printf("%d, %d\t ref : %s\n", it->ref, _item_cnt, it->label);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
@ -685,7 +683,6 @@ evry_plugin_update(Evry_Plugin *p, int action)
|
||||||
_evry_clear(SUBJ_SEL);
|
_evry_clear(SUBJ_SEL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
else if (action == EVRY_UPDATE_REFRESH)
|
else if (action == EVRY_UPDATE_REFRESH)
|
||||||
{
|
{
|
||||||
|
@ -834,14 +831,17 @@ _evry_window_new(E_Zone *zone, E_Zone_Edge edge)
|
||||||
x = to_side - offset_s;
|
x = to_side - offset_s;
|
||||||
y = to_side - offset_s;
|
y = to_side - offset_s;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_ZONE_EDGE_TOP_RIGHT:
|
case E_ZONE_EDGE_TOP_RIGHT:
|
||||||
x = zone->w - (mw + offset_s + to_side);
|
x = zone->w - (mw + offset_s + to_side);
|
||||||
y = to_side - offset_s;
|
y = to_side - offset_s;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_ZONE_EDGE_BOTTOM_RIGHT:
|
case E_ZONE_EDGE_BOTTOM_RIGHT:
|
||||||
x = zone->w - (mw + offset_s + to_side);
|
x = zone->w - (mw + offset_s + to_side);
|
||||||
y = zone->h - (mh + offset_s + to_side);
|
y = zone->h - (mh + offset_s + to_side);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_ZONE_EDGE_BOTTOM_LEFT:
|
case E_ZONE_EDGE_BOTTOM_LEFT:
|
||||||
x = to_side - offset_s;
|
x = to_side - offset_s;
|
||||||
y = zone->h - (mh + offset_s + to_side);
|
y = zone->h - (mh + offset_s + to_side);
|
||||||
|
@ -888,6 +888,7 @@ _evry_cb_drag_finished(E_Drag *drag, int dropped)
|
||||||
{
|
{
|
||||||
E_FREE(drag->data);
|
E_FREE(drag->data);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
|
@ -1056,7 +1057,6 @@ _evry_selector_cb_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__
|
||||||
else
|
else
|
||||||
_evry_selectors_switch(win, 1);
|
_evry_selectors_switch(win, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (sel == ACTN_SEL)
|
else if (sel == ACTN_SEL)
|
||||||
{
|
{
|
||||||
if (CUR_SEL == SUBJ_SEL)
|
if (CUR_SEL == SUBJ_SEL)
|
||||||
|
@ -1851,7 +1851,6 @@ _evry_input_complete(Evry_State *s)
|
||||||
static int
|
static int
|
||||||
_evry_cheat_history(Evry_State *s, int promote, int delete)
|
_evry_cheat_history(Evry_State *s, int promote, int delete)
|
||||||
{
|
{
|
||||||
|
|
||||||
History_Entry *he;
|
History_Entry *he;
|
||||||
History_Item *hi;
|
History_Item *hi;
|
||||||
History_Types *ht;
|
History_Types *ht;
|
||||||
|
@ -2661,7 +2660,6 @@ _evry_view_create(Evry_State *s)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
_evry_view_update(Evry_Window *win, Evry_State *s)
|
_evry_view_update(Evry_Window *win, Evry_State *s)
|
||||||
{
|
{
|
||||||
|
@ -2974,7 +2972,6 @@ _evry_plugin_select(Evry_State *s, Evry_Plugin *p)
|
||||||
_evry_view_show(s->selector->win, s->view, 0);
|
_evry_view_show(s->selector->win, s->view, 0);
|
||||||
s->view->update(s->view);
|
s->view->update(s->view);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3060,3 +3057,4 @@ _evry_cb_selection_notify(void *data, int type __UNUSED__, void *event)
|
||||||
|
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -59,7 +59,6 @@ struct _E_Config_Dialog_Data
|
||||||
Plugin_Page page[3];
|
Plugin_Page page[3];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
EAPI E_Config_Dialog *
|
EAPI E_Config_Dialog *
|
||||||
evry_config_dialog(E_Container *con, const char *params __UNUSED__)
|
evry_config_dialog(E_Container *con, const char *params __UNUSED__)
|
||||||
{
|
{
|
||||||
|
@ -600,7 +599,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *e, E_Config_Dialog_Data *cfdat
|
||||||
return otb;
|
return otb;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************/
|
/***************************************************************************/
|
||||||
|
|
||||||
static void *_cat_create_data(E_Config_Dialog *cfd);
|
static void *_cat_create_data(E_Config_Dialog *cfd);
|
||||||
|
@ -743,3 +741,4 @@ _cat_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *e, E_Config_Dia
|
||||||
|
|
||||||
return otb;
|
return otb;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -110,7 +110,6 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
|
||||||
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
|
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
|
||||||
_button_cb_mouse_down, inst);
|
_button_cb_mouse_down, inst);
|
||||||
|
|
||||||
|
|
||||||
if (_illume_running())
|
if (_illume_running())
|
||||||
{
|
{
|
||||||
inst->illume_mode = EINA_TRUE;
|
inst->illume_mode = EINA_TRUE;
|
||||||
|
@ -210,8 +209,8 @@ _gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
|
||||||
|
|
||||||
/***************************************************************************/
|
/***************************************************************************/
|
||||||
|
|
||||||
|
static void
|
||||||
static void _del_func(void *data, void *obj __UNUSED__)
|
_del_func(void *data, void *obj __UNUSED__)
|
||||||
{
|
{
|
||||||
Instance *inst = data;
|
Instance *inst = data;
|
||||||
|
|
||||||
|
@ -309,6 +308,7 @@ _cb_focus_out(void *data, int type __UNUSED__, void *event)
|
||||||
|
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_gadget_popup_show(Instance *inst)
|
_gadget_popup_show(Instance *inst)
|
||||||
{
|
{
|
||||||
|
@ -332,24 +332,28 @@ _gadget_popup_show(Instance *inst)
|
||||||
e_win_move(ewin, x, y + h);
|
e_win_move(ewin, x, y + h);
|
||||||
inst->hide_y = -1;
|
inst->hide_y = -1;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_BOTTOM:
|
case E_GADCON_ORIENT_BOTTOM:
|
||||||
case E_GADCON_ORIENT_CORNER_BR:
|
case E_GADCON_ORIENT_CORNER_BR:
|
||||||
case E_GADCON_ORIENT_CORNER_BL:
|
case E_GADCON_ORIENT_CORNER_BL:
|
||||||
e_win_move(ewin, x, y - ph);
|
e_win_move(ewin, x, y - ph);
|
||||||
inst->hide_y = 1;
|
inst->hide_y = 1;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_LEFT:
|
case E_GADCON_ORIENT_LEFT:
|
||||||
case E_GADCON_ORIENT_CORNER_LT:
|
case E_GADCON_ORIENT_CORNER_LT:
|
||||||
case E_GADCON_ORIENT_CORNER_LB:
|
case E_GADCON_ORIENT_CORNER_LB:
|
||||||
e_win_move(ewin, x + w, y);
|
e_win_move(ewin, x + w, y);
|
||||||
inst->hide_x = -1;
|
inst->hide_x = -1;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_RIGHT:
|
case E_GADCON_ORIENT_RIGHT:
|
||||||
case E_GADCON_ORIENT_CORNER_RT:
|
case E_GADCON_ORIENT_CORNER_RT:
|
||||||
case E_GADCON_ORIENT_CORNER_RB:
|
case E_GADCON_ORIENT_CORNER_RB:
|
||||||
e_win_move(ewin, x - pw, y);
|
e_win_move(ewin, x - pw, y);
|
||||||
inst->hide_x = 1;
|
inst->hide_x = 1;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_FLOAT:
|
case E_GADCON_ORIENT_FLOAT:
|
||||||
case E_GADCON_ORIENT_HORIZ:
|
case E_GADCON_ORIENT_HORIZ:
|
||||||
case E_GADCON_ORIENT_VERT:
|
case E_GADCON_ORIENT_VERT:
|
||||||
|
@ -362,7 +366,6 @@ _gadget_popup_show(Instance *inst)
|
||||||
|
|
||||||
if (ewin->y + ph > inst->win->zone->h)
|
if (ewin->y + ph > inst->win->zone->h)
|
||||||
e_win_move(ewin, ewin->x, inst->win->zone->h - ph);
|
e_win_move(ewin, ewin->x, inst->win->zone->h - ph);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -394,6 +397,7 @@ _gadget_window_show(Instance *inst)
|
||||||
inst->hide_y = -1;
|
inst->hide_y = -1;
|
||||||
e_win_move(ewin, zx, gy + gh);
|
e_win_move(ewin, zx, gy + gh);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_BOTTOM:
|
case E_GADCON_ORIENT_BOTTOM:
|
||||||
case E_GADCON_ORIENT_CORNER_BR:
|
case E_GADCON_ORIENT_CORNER_BR:
|
||||||
case E_GADCON_ORIENT_CORNER_BL:
|
case E_GADCON_ORIENT_CORNER_BL:
|
||||||
|
@ -402,6 +406,7 @@ _gadget_window_show(Instance *inst)
|
||||||
inst->hide_y = 1;
|
inst->hide_y = 1;
|
||||||
e_win_move(ewin, zx, gy - ph);
|
e_win_move(ewin, zx, gy - ph);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_LEFT:
|
case E_GADCON_ORIENT_LEFT:
|
||||||
case E_GADCON_ORIENT_CORNER_LT:
|
case E_GADCON_ORIENT_CORNER_LT:
|
||||||
case E_GADCON_ORIENT_CORNER_LB:
|
case E_GADCON_ORIENT_CORNER_LB:
|
||||||
|
@ -410,6 +415,7 @@ _gadget_window_show(Instance *inst)
|
||||||
inst->hide_x = -1;
|
inst->hide_x = -1;
|
||||||
e_win_move(ewin, gx + gw, zy);
|
e_win_move(ewin, gx + gw, zy);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_RIGHT:
|
case E_GADCON_ORIENT_RIGHT:
|
||||||
case E_GADCON_ORIENT_CORNER_RT:
|
case E_GADCON_ORIENT_CORNER_RT:
|
||||||
case E_GADCON_ORIENT_CORNER_RB:
|
case E_GADCON_ORIENT_CORNER_RB:
|
||||||
|
@ -418,6 +424,7 @@ _gadget_window_show(Instance *inst)
|
||||||
inst->hide_x = 1;
|
inst->hide_x = 1;
|
||||||
e_win_move(ewin, gx - pw, zy);
|
e_win_move(ewin, gx - pw, zy);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_FLOAT:
|
case E_GADCON_ORIENT_FLOAT:
|
||||||
case E_GADCON_ORIENT_HORIZ:
|
case E_GADCON_ORIENT_HORIZ:
|
||||||
case E_GADCON_ORIENT_VERT:
|
case E_GADCON_ORIENT_VERT:
|
||||||
|
@ -537,7 +544,6 @@ _button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_
|
||||||
* inst->mouse_down = 1;
|
* inst->mouse_down = 1;
|
||||||
* } */
|
* } */
|
||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
evry_gadget_init(void)
|
evry_gadget_init(void)
|
||||||
{
|
{
|
||||||
|
@ -674,8 +680,8 @@ _list_select_cb(void *data __UNUSED__, Evas_Object *obj)
|
||||||
int sel = e_widget_ilist_selected_get(obj);
|
int sel = e_widget_ilist_selected_get(obj);
|
||||||
|
|
||||||
e_widget_ilist_nth_data_get(obj, sel);
|
e_widget_ilist_nth_data_get(obj, sel);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static Evas_Object *
|
static Evas_Object *
|
||||||
|
@ -748,3 +754,4 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -164,6 +164,7 @@ _hist_cleanup_cb(const Eina_Hash *hash __UNUSED__, const void *key, void *data,
|
||||||
|
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
evry_history_free(void)
|
evry_history_free(void)
|
||||||
{
|
{
|
||||||
|
@ -214,7 +215,6 @@ evry_history_load(void)
|
||||||
evry_hist->subjects = eina_hash_string_superfast_new(NULL);
|
evry_hist->subjects = eina_hash_string_superfast_new(NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
evry_history_unload(void)
|
evry_history_unload(void)
|
||||||
{
|
{
|
||||||
|
@ -467,3 +467,4 @@ evry_history_item_usage_set(Evry_Item *it, const char *input, const char *ctxt)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -119,7 +119,6 @@ _cb_sort(const void *data1, const void *data2)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (it1->fuzzy_match || it2->fuzzy_match)
|
if (it1->fuzzy_match || it2->fuzzy_match)
|
||||||
|
|
||||||
if (it1->fuzzy_match || it2->fuzzy_match)
|
if (it1->fuzzy_match || it2->fuzzy_match)
|
||||||
{
|
{
|
||||||
if (it1->fuzzy_match && !it2->fuzzy_match)
|
if (it1->fuzzy_match && !it2->fuzzy_match)
|
||||||
|
@ -129,11 +128,11 @@ _cb_sort(const void *data1, const void *data2)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
if (it1->fuzzy_match - it2->fuzzy_match)
|
if (it1->fuzzy_match - it2->fuzzy_match)
|
||||||
return (it1->fuzzy_match - it2->fuzzy_match);
|
return it1->fuzzy_match - it2->fuzzy_match;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (it1->priority - it2->priority)
|
if (it1->priority - it2->priority)
|
||||||
return (it1->priority - it2->priority);
|
return it1->priority - it2->priority;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -193,7 +192,6 @@ evry_plug_actions_shutdown()
|
||||||
evry_item_free(it);
|
evry_item_free(it);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
evry_action_register(Evry_Action *act, int priority)
|
evry_action_register(Evry_Action *act, int priority)
|
||||||
{
|
{
|
||||||
|
@ -251,7 +249,6 @@ evry_action_free(Evry_Action *act)
|
||||||
evry_item_free(EVRY_ITEM(act));
|
evry_item_free(EVRY_ITEM(act));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* TODO assign actions to plugins othersie there will be too liitle
|
/* TODO assign actions to plugins othersie there will be too liitle
|
||||||
names soon */
|
names soon */
|
||||||
Evry_Action *
|
Evry_Action *
|
||||||
|
@ -270,3 +267,4 @@ evry_action_find(const char *name)
|
||||||
|
|
||||||
return act;
|
return act;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -259,7 +259,6 @@ _fetch(Evry_Plugin *plugin, const char *input)
|
||||||
|
|
||||||
if (cnt++ > MAX_ITEMS)
|
if (cnt++ > MAX_ITEMS)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (lp) eina_list_free(lp);
|
if (lp) eina_list_free(lp);
|
||||||
|
@ -269,7 +268,6 @@ _fetch(Evry_Plugin *plugin, const char *input)
|
||||||
eina_list_free(items);
|
eina_list_free(items);
|
||||||
return EVRY_PLUGIN_HAS_ITEMS(p);
|
return EVRY_PLUGIN_HAS_ITEMS(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 'text' and 'actions' are always loaded */
|
/* 'text' and 'actions' are always loaded */
|
||||||
else if ((subj_sel) && (eina_list_count(s->plugins) == 2))
|
else if ((subj_sel) && (eina_list_count(s->plugins) == 2))
|
||||||
{
|
{
|
||||||
|
@ -332,3 +330,4 @@ evry_aggregator_new(int type)
|
||||||
|
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@ struct _Plugin
|
||||||
Eina_List *menu_items;
|
Eina_List *menu_items;
|
||||||
|
|
||||||
Eina_Hash *added;
|
Eina_Hash *added;
|
||||||
Efreet_Menu *menu;;
|
Efreet_Menu *menu;
|
||||||
|
|
||||||
Evry_Item_App *command;
|
Evry_Item_App *command;
|
||||||
};
|
};
|
||||||
|
@ -59,7 +59,7 @@ struct _Item_Menu
|
||||||
{
|
{
|
||||||
Evry_Item base;
|
Evry_Item base;
|
||||||
|
|
||||||
Efreet_Menu *menu;;
|
Efreet_Menu *menu;
|
||||||
};
|
};
|
||||||
|
|
||||||
static const Evry_API *evry = NULL;
|
static const Evry_API *evry = NULL;
|
||||||
|
@ -81,12 +81,12 @@ static Eina_List *exe_list2 = NULL;
|
||||||
static Eina_List *apps_cache = NULL;
|
static Eina_List *apps_cache = NULL;
|
||||||
static void _scan_executables();
|
static void _scan_executables();
|
||||||
|
|
||||||
|
|
||||||
#define GET_MENU(_m, _it) Item_Menu * _m = (Item_Menu *)_it
|
#define GET_MENU(_m, _it) Item_Menu * _m = (Item_Menu *)_it
|
||||||
|
|
||||||
/***************************************************************************/
|
/***************************************************************************/
|
||||||
|
|
||||||
static void _hash_free(void *data)
|
static void
|
||||||
|
_hash_free(void *data)
|
||||||
{
|
{
|
||||||
GET_APP(app, data);
|
GET_APP(app, data);
|
||||||
EVRY_ITEM_FREE(app);
|
EVRY_ITEM_FREE(app);
|
||||||
|
@ -154,7 +154,7 @@ _cb_sort(const void *data1, const void *data2)
|
||||||
const Evry_Item *it2 = data2;
|
const Evry_Item *it2 = data2;
|
||||||
|
|
||||||
if (it1->usage && it2->usage)
|
if (it1->usage && it2->usage)
|
||||||
return (it1->usage > it2->usage ? -1 : 1);
|
return it1->usage > it2->usage ? -1 : 1;
|
||||||
if (it1->usage && !it2->usage)
|
if (it1->usage && !it2->usage)
|
||||||
return -1;
|
return -1;
|
||||||
if (it2->usage && !it1->usage)
|
if (it2->usage && !it1->usage)
|
||||||
|
@ -169,7 +169,7 @@ _cb_sort(const void *data1, const void *data2)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
if (it1->fuzzy_match - it2->fuzzy_match)
|
if (it1->fuzzy_match - it2->fuzzy_match)
|
||||||
return (it1->fuzzy_match - it2->fuzzy_match);
|
return it1->fuzzy_match - it2->fuzzy_match;
|
||||||
}
|
}
|
||||||
|
|
||||||
return strcasecmp(it1->label, it2->label);
|
return strcasecmp(it1->label, it2->label);
|
||||||
|
@ -659,7 +659,6 @@ _fetch(Evry_Plugin *plugin, const char *input)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
EINA_LIST_FOREACH (p->menu_items, l, it)
|
EINA_LIST_FOREACH (p->menu_items, l, it)
|
||||||
{
|
{
|
||||||
if (!input)
|
if (!input)
|
||||||
|
@ -801,7 +800,6 @@ _fetch_mime(Evry_Plugin *plugin, const char *input)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
_complete(Evry_Plugin *plugin __UNUSED__, const Evry_Item *it, char **input)
|
_complete(Evry_Plugin *plugin __UNUSED__, const Evry_Item *it, char **input)
|
||||||
{
|
{
|
||||||
|
@ -1101,7 +1099,6 @@ _plugins_init(const Evry_API *api)
|
||||||
evry->plugin_register(p, EVRY_PLUGIN_SUBJECT, 1);
|
evry->plugin_register(p, EVRY_PLUGIN_SUBJECT, 1);
|
||||||
_plugins = eina_list_append(_plugins, p);
|
_plugins = eina_list_append(_plugins, p);
|
||||||
|
|
||||||
|
|
||||||
p = EVRY_PLUGIN_BASE("Exebuf", _module_icon, EVRY_TYPE_APP,
|
p = EVRY_PLUGIN_BASE("Exebuf", _module_icon, EVRY_TYPE_APP,
|
||||||
_begin_exe, _finish_exe, _fetch_exe);
|
_begin_exe, _finish_exe, _fetch_exe);
|
||||||
p->complete = &_complete;
|
p->complete = &_complete;
|
||||||
|
@ -1298,7 +1295,6 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *e, E_Config_Dialog_Data *cf
|
||||||
static void
|
static void
|
||||||
_fill_data(E_Config_Dialog_Data *cfdata)
|
_fill_data(E_Config_Dialog_Data *cfdata)
|
||||||
{
|
{
|
||||||
|
|
||||||
#define CP(_name) cfdata->_name = strdup(_conf->_name);
|
#define CP(_name) cfdata->_name = strdup(_conf->_name);
|
||||||
#define C(_name) cfdata->_name = _conf->_name;
|
#define C(_name) cfdata->_name = _conf->_name;
|
||||||
CP(cmd_terminal);
|
CP(cmd_terminal);
|
||||||
|
@ -1383,7 +1379,6 @@ _conf_init(E_Module *m)
|
||||||
|
|
||||||
_conf = e_config_domain_load("module.everything-apps", conf_edd);
|
_conf = e_config_domain_load("module.everything-apps", conf_edd);
|
||||||
|
|
||||||
|
|
||||||
if (_conf && !e_util_module_config_check(_("Everything Applications"),
|
if (_conf && !e_util_module_config_check(_("Everything Applications"),
|
||||||
_conf->version,
|
_conf->version,
|
||||||
MOD_CONFIG_FILE_VERSION))
|
MOD_CONFIG_FILE_VERSION))
|
||||||
|
@ -1449,7 +1444,6 @@ evry_plug_apps_save(void)
|
||||||
|
|
||||||
/***************************************************************************/
|
/***************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
/* taken from e_exebuf.c */
|
/* taken from e_exebuf.c */
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_scan_idler(void *data __UNUSED__)
|
_scan_idler(void *data __UNUSED__)
|
||||||
|
@ -1607,3 +1601,4 @@ _scan_executables()
|
||||||
|
|
||||||
exe_scan_idler = ecore_idler_add(_scan_idler, NULL);
|
exe_scan_idler = ecore_idler_add(_scan_idler, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -203,7 +203,8 @@ _cb_data(void *data, int type __UNUSED__, void *event)
|
||||||
p->items = eina_list_prepend(p->items, cur_item);
|
p->items = eina_list_prepend(p->items, cur_item);
|
||||||
EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
|
EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
|
||||||
}
|
}
|
||||||
else if (it) evry->item_changed(it, 0, 0);
|
else if (it)
|
||||||
|
evry->item_changed(it, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
|
@ -295,3 +296,4 @@ evry_plug_calc_shutdown(void)
|
||||||
|
|
||||||
void
|
void
|
||||||
evry_plug_calc_save(void){}
|
evry_plug_calc_save(void){}
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ _action(Evry_Action *act)
|
||||||
static int
|
static int
|
||||||
_check_item(Evry_Action *act __UNUSED__, const Evry_Item *it)
|
_check_item(Evry_Action *act __UNUSED__, const Evry_Item *it)
|
||||||
{
|
{
|
||||||
return (it && it->label && (strlen(it->label) > 0));
|
return it && it->label && (strlen(it->label) > 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
Eina_Bool
|
Eina_Bool
|
||||||
|
@ -48,3 +48,4 @@ evry_plug_clipboard_shutdown(void)
|
||||||
ecore_x_window_free(clipboard_win);
|
ecore_x_window_free(clipboard_win);
|
||||||
evry_action_free(act);
|
evry_action_free(act);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
#include "e_mod_main.h"
|
#include "e_mod_main.h"
|
||||||
|
|
||||||
|
|
||||||
typedef struct _Plugin Plugin;
|
typedef struct _Plugin Plugin;
|
||||||
|
|
||||||
struct _Plugin
|
struct _Plugin
|
||||||
|
@ -211,3 +210,4 @@ evry_plug_collection_shutdown(void)
|
||||||
EVRY_PLUGIN_FREE(p);
|
EVRY_PLUGIN_FREE(p);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -126,7 +126,6 @@ _item_fill(Evry_Item_File *file)
|
||||||
if (!EVRY_ITEM(file)->detail)
|
if (!EVRY_ITEM(file)->detail)
|
||||||
evry->util_file_detail_set(file);
|
evry->util_file_detail_set(file);
|
||||||
|
|
||||||
|
|
||||||
evry->util_file_detail_set(file);
|
evry->util_file_detail_set(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -144,7 +143,7 @@ _cb_sort(const void *data1, const void *data2)
|
||||||
|
|
||||||
if (it1->fuzzy_match && it2->fuzzy_match)
|
if (it1->fuzzy_match && it2->fuzzy_match)
|
||||||
if (it1->fuzzy_match - it2->fuzzy_match)
|
if (it1->fuzzy_match - it2->fuzzy_match)
|
||||||
return (it1->fuzzy_match - it2->fuzzy_match);
|
return it1->fuzzy_match - it2->fuzzy_match;
|
||||||
|
|
||||||
return strcasecmp(it1->label, it2->label);
|
return strcasecmp(it1->label, it2->label);
|
||||||
}
|
}
|
||||||
|
@ -780,11 +779,11 @@ _cb_sort_recent(const void *data1, const void *data2)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
if (it1->hi && it2->hi)
|
if (it1->hi && it2->hi)
|
||||||
return (it1->hi->last_used > it2->hi->last_used ? -1 : 1);
|
return it1->hi->last_used > it2->hi->last_used ? -1 : 1;
|
||||||
|
|
||||||
if (it1->fuzzy_match && it2->fuzzy_match)
|
if (it1->fuzzy_match && it2->fuzzy_match)
|
||||||
if (it1->fuzzy_match - it2->fuzzy_match)
|
if (it1->fuzzy_match - it2->fuzzy_match)
|
||||||
return (it1->fuzzy_match - it2->fuzzy_match);
|
return it1->fuzzy_match - it2->fuzzy_match;
|
||||||
|
|
||||||
return strcasecmp(it1->label, it2->label);
|
return strcasecmp(it1->label, it2->label);
|
||||||
}
|
}
|
||||||
|
@ -842,7 +841,6 @@ _recentf_files_filter(Plugin *p)
|
||||||
return cnt;
|
return cnt;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
/* use thread only to not block ui for ecore_file_exists ... */
|
/* use thread only to not block ui for ecore_file_exists ... */
|
||||||
|
|
||||||
|
@ -912,6 +910,7 @@ _recentf_end_func(void *data)
|
||||||
p->thread = NULL;
|
p->thread = NULL;
|
||||||
E_FREE(d);
|
E_FREE(d);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
|
@ -1130,7 +1129,7 @@ _recentf_fetch(Evry_Plugin *plugin, const char *input)
|
||||||
static int
|
static int
|
||||||
_open_folder_check(Evry_Action *act __UNUSED__, const Evry_Item *it)
|
_open_folder_check(Evry_Action *act __UNUSED__, const Evry_Item *it)
|
||||||
{
|
{
|
||||||
return (it->browseable && e_action_find("fileman"));
|
return it->browseable && e_action_find("fileman");
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
@ -1185,7 +1184,7 @@ _file_trash_action(Evry_Action *act)
|
||||||
efreet_uri_free(euri);
|
efreet_uri_free(euri);
|
||||||
}
|
}
|
||||||
|
|
||||||
return (ok > 0);
|
return ok > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
@ -1249,8 +1248,8 @@ _sort_by_date(Plugin *p)
|
||||||
_files_filter(p);
|
_files_filter(p);
|
||||||
|
|
||||||
EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
|
EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_sort_by_name(Plugin *p)
|
_sort_by_name(Plugin *p)
|
||||||
{
|
{
|
||||||
|
@ -1264,7 +1263,6 @@ _sort_by_name(Plugin *p)
|
||||||
_files_filter(p);
|
_files_filter(p);
|
||||||
|
|
||||||
EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
|
EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
@ -1304,7 +1302,6 @@ _cb_key_down(Evry_Plugin *plugin, const Ecore_Event_Key *ev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
_plugins_init(const Evry_API *api)
|
_plugins_init(const Evry_API *api)
|
||||||
{
|
{
|
||||||
|
@ -1356,7 +1353,6 @@ _plugins_init(const Evry_API *api)
|
||||||
|
|
||||||
#undef ACTION_NEW
|
#undef ACTION_NEW
|
||||||
|
|
||||||
|
|
||||||
p = EVRY_PLUGIN_BASE("Files", _module_icon, EVRY_TYPE_FILE,
|
p = EVRY_PLUGIN_BASE("Files", _module_icon, EVRY_TYPE_FILE,
|
||||||
_begin, _finish, _fetch);
|
_begin, _finish, _fetch);
|
||||||
p->input_type = EVRY_TYPE_FILE;
|
p->input_type = EVRY_TYPE_FILE;
|
||||||
|
@ -1370,7 +1366,6 @@ _plugins_init(const Evry_API *api)
|
||||||
if (evry->plugin_register(p, EVRY_PLUGIN_SUBJECT, 2))
|
if (evry->plugin_register(p, EVRY_PLUGIN_SUBJECT, 2))
|
||||||
p->config->min_query = 1;
|
p->config->min_query = 1;
|
||||||
|
|
||||||
|
|
||||||
p = EVRY_PLUGIN_BASE("Files", _module_icon, EVRY_TYPE_FILE,
|
p = EVRY_PLUGIN_BASE("Files", _module_icon, EVRY_TYPE_FILE,
|
||||||
_begin, _finish, _fetch);
|
_begin, _finish, _fetch);
|
||||||
p->cb_key_down = &_cb_key_down;
|
p->cb_key_down = &_cb_key_down;
|
||||||
|
@ -1432,7 +1427,6 @@ _plugins_shutdown(void)
|
||||||
evry->action_free(act);
|
evry->action_free(act);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************/
|
/***************************************************************************/
|
||||||
|
|
||||||
static E_Config_DD *conf_edd = NULL;
|
static E_Config_DD *conf_edd = NULL;
|
||||||
|
@ -1516,7 +1510,6 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
|
||||||
NULL, NULL);
|
NULL, NULL);
|
||||||
e_widget_framelist_object_append(of, ow);
|
e_widget_framelist_object_append(of, ow);
|
||||||
|
|
||||||
|
|
||||||
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
||||||
return o;
|
return o;
|
||||||
}
|
}
|
||||||
|
@ -1664,3 +1657,4 @@ evry_plug_files_save(void)
|
||||||
{
|
{
|
||||||
e_config_domain_save("module.everything-files", conf_edd, _conf);
|
e_config_domain_save("module.everything-files", conf_edd, _conf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -200,7 +200,6 @@ _plugins_shutdown(void)
|
||||||
EVRY_ACTION_FREE(act);
|
EVRY_ACTION_FREE(act);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************/
|
/***************************************************************************/
|
||||||
|
|
||||||
Eina_Bool
|
Eina_Bool
|
||||||
|
@ -221,3 +220,4 @@ evry_plug_settings_shutdown(void)
|
||||||
|
|
||||||
void
|
void
|
||||||
evry_plug_settings_save(void){}
|
evry_plug_settings_save(void){}
|
||||||
|
|
||||||
|
|
|
@ -91,3 +91,4 @@ evry_plug_text_shutdown(void)
|
||||||
EVRY_PLUGIN_FREE(p1);
|
EVRY_PLUGIN_FREE(p1);
|
||||||
EVRY_PLUGIN_FREE(p2);
|
EVRY_PLUGIN_FREE(p2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,6 @@ static Evas_Object *_icon_get(Evry_Item *it, Evas *e);
|
||||||
|
|
||||||
#define GET_BORDER(_bd, _it) Border_Item * _bd = (Border_Item *)_it;
|
#define GET_BORDER(_bd, _it) Border_Item * _bd = (Border_Item *)_it;
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_border_item_free(Evry_Item *it)
|
_border_item_free(Evry_Item *it)
|
||||||
{
|
{
|
||||||
|
@ -98,6 +97,7 @@ _cb_border_remove(void *data, __UNUSED__ int type, void *event)
|
||||||
|
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_cb_border_add(void *data, __UNUSED__ int type, void *event)
|
_cb_border_add(void *data, __UNUSED__ int type, void *event)
|
||||||
{
|
{
|
||||||
|
@ -116,7 +116,6 @@ _cb_border_add(void *data, __UNUSED__ int type, void *event)
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static Evry_Plugin *
|
static Evry_Plugin *
|
||||||
_begin(Evry_Plugin *plugin, const Evry_Item *item __UNUSED__)
|
_begin(Evry_Plugin *plugin, const Evry_Item *item __UNUSED__)
|
||||||
{
|
{
|
||||||
|
@ -276,7 +275,6 @@ _icon_get(Evry_Item *it, Evas *e)
|
||||||
return o;
|
return o;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************/
|
/***************************************************************************/
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
@ -369,6 +367,7 @@ _act_border(Evry_Action *act)
|
||||||
e_border_desk_set(bd, e_desk_current_get(zone));
|
e_border_desk_set(bd, e_desk_current_get(zone));
|
||||||
focus = 1;
|
focus = 1;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -496,3 +495,4 @@ evry_plug_windows_shutdown(void)
|
||||||
|
|
||||||
void
|
void
|
||||||
evry_plug_windows_save(void){}
|
evry_plug_windows_save(void){}
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,6 @@ evry_plugins_shutdown(void)
|
||||||
evry_action_free(act);
|
evry_action_free(act);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
_evry_cb_plugin_sort(const void *data1, const void *data2)
|
_evry_cb_plugin_sort(const void *data1, const void *data2)
|
||||||
{
|
{
|
||||||
|
@ -240,3 +239,4 @@ evry_plugin_find(const char *name)
|
||||||
|
|
||||||
return pc->plugin;
|
return pc->plugin;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -228,7 +228,7 @@ _evry_fuzzy_match_sort_cb(const void *data1, const void *data2)
|
||||||
const Evry_Item *it2 = data2;
|
const Evry_Item *it2 = data2;
|
||||||
|
|
||||||
if (it1->priority - it2->priority)
|
if (it1->priority - it2->priority)
|
||||||
return (it1->priority - it2->priority);
|
return it1->priority - it2->priority;
|
||||||
|
|
||||||
if (it1->fuzzy_match || it2->fuzzy_match)
|
if (it1->fuzzy_match || it2->fuzzy_match)
|
||||||
{
|
{
|
||||||
|
@ -239,7 +239,7 @@ _evry_fuzzy_match_sort_cb(const void *data1, const void *data2)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
if (it1->fuzzy_match - it2->fuzzy_match)
|
if (it1->fuzzy_match - it2->fuzzy_match)
|
||||||
return (it1->fuzzy_match - it2->fuzzy_match);
|
return it1->fuzzy_match - it2->fuzzy_match;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -251,7 +251,6 @@ evry_fuzzy_match_sort(Eina_List *items)
|
||||||
return eina_list_sort(items, -1, _evry_fuzzy_match_sort_cb);
|
return eina_list_sort(items, -1, _evry_fuzzy_match_sort_cb);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int _sort_flags = 0;
|
static int _sort_flags = 0;
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
@ -311,7 +310,7 @@ _evry_items_sort_func(const void *data1, const void *data2)
|
||||||
int prio2 = it2->plugin->config->priority;
|
int prio2 = it2->plugin->config->priority;
|
||||||
|
|
||||||
if (prio1 - prio2)
|
if (prio1 - prio2)
|
||||||
return (prio1 - prio2);
|
return prio1 - prio2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -326,26 +325,26 @@ _evry_items_sort_func(const void *data1, const void *data2)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
if (abs (it1->fuzzy_match - it2->fuzzy_match) > 5)
|
if (abs (it1->fuzzy_match - it2->fuzzy_match) > 5)
|
||||||
return (it1->fuzzy_match - it2->fuzzy_match);
|
return it1->fuzzy_match - it2->fuzzy_match;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* sort recently/most frequently used items first */
|
/* sort recently/most frequently used items first */
|
||||||
if (it1->usage > 0.0 || it2->usage > 0.0)
|
if (it1->usage > 0.0 || it2->usage > 0.0)
|
||||||
{
|
{
|
||||||
return (it1->usage > it2->usage ? -1 : 1);
|
return it1->usage > it2->usage ? -1 : 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* sort items which match input better first */
|
/* sort items which match input better first */
|
||||||
if (it1->fuzzy_match > 0 || it2->fuzzy_match > 0)
|
if (it1->fuzzy_match > 0 || it2->fuzzy_match > 0)
|
||||||
{
|
{
|
||||||
if (it1->fuzzy_match - it2->fuzzy_match)
|
if (it1->fuzzy_match - it2->fuzzy_match)
|
||||||
return (it1->fuzzy_match - it2->fuzzy_match);
|
return it1->fuzzy_match - it2->fuzzy_match;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* sort itemswith higher priority first */
|
/* sort itemswith higher priority first */
|
||||||
if ((it1->plugin == it2->plugin) &&
|
if ((it1->plugin == it2->plugin) &&
|
||||||
(it1->priority - it2->priority))
|
(it1->priority - it2->priority))
|
||||||
return (it1->priority - it2->priority);
|
return it1->priority - it2->priority;
|
||||||
|
|
||||||
/* sort items with higher plugin priority first */
|
/* sort items with higher plugin priority first */
|
||||||
if (it1->type != EVRY_TYPE_ACTION &&
|
if (it1->type != EVRY_TYPE_ACTION &&
|
||||||
|
@ -355,7 +354,7 @@ _evry_items_sort_func(const void *data1, const void *data2)
|
||||||
int prio2 = it2->plugin->config->priority;
|
int prio2 = it2->plugin->config->priority;
|
||||||
|
|
||||||
if (prio1 - prio2)
|
if (prio1 - prio2)
|
||||||
return (prio1 - prio2);
|
return prio1 - prio2;
|
||||||
}
|
}
|
||||||
|
|
||||||
return strcasecmp(it1->label, it2->label);
|
return strcasecmp(it1->label, it2->label);
|
||||||
|
@ -438,7 +437,6 @@ evry_icon_theme_get(const char *icon, Evas *e)
|
||||||
return o;
|
return o;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Evas_Object *
|
Evas_Object *
|
||||||
evry_util_icon_get(Evry_Item *it, Evas *e)
|
evry_util_icon_get(Evry_Item *it, Evas *e)
|
||||||
{
|
{
|
||||||
|
@ -686,19 +684,70 @@ _isalnum(unsigned char in)
|
||||||
{
|
{
|
||||||
switch (in)
|
switch (in)
|
||||||
{
|
{
|
||||||
case '0': case '1': case '2': case '3': case '4':
|
case '0':
|
||||||
case '5': case '6': case '7': case '8': case '9':
|
case '1':
|
||||||
case 'a': case 'b': case 'c': case 'd': case 'e':
|
case '2':
|
||||||
case 'f': case 'g': case 'h': case 'i': case 'j':
|
case '3':
|
||||||
case 'k': case 'l': case 'm': case 'n': case 'o':
|
case '4':
|
||||||
case 'p': case 'q': case 'r': case 's': case 't':
|
case '5':
|
||||||
case 'u': case 'v': case 'w': case 'x': case 'y': case 'z':
|
case '6':
|
||||||
case 'A': case 'B': case 'C': case 'D': case 'E':
|
case '7':
|
||||||
case 'F': case 'G': case 'H': case 'I': case 'J':
|
case '8':
|
||||||
case 'K': case 'L': case 'M': case 'N': case 'O':
|
case '9':
|
||||||
case 'P': case 'Q': case 'R': case 'S': case 'T':
|
case 'a':
|
||||||
case 'U': case 'V': case 'W': case 'X': case 'Y': case 'Z':
|
case 'b':
|
||||||
|
case 'c':
|
||||||
|
case 'd':
|
||||||
|
case 'e':
|
||||||
|
case 'f':
|
||||||
|
case 'g':
|
||||||
|
case 'h':
|
||||||
|
case 'i':
|
||||||
|
case 'j':
|
||||||
|
case 'k':
|
||||||
|
case 'l':
|
||||||
|
case 'm':
|
||||||
|
case 'n':
|
||||||
|
case 'o':
|
||||||
|
case 'p':
|
||||||
|
case 'q':
|
||||||
|
case 'r':
|
||||||
|
case 's':
|
||||||
|
case 't':
|
||||||
|
case 'u':
|
||||||
|
case 'v':
|
||||||
|
case 'w':
|
||||||
|
case 'x':
|
||||||
|
case 'y':
|
||||||
|
case 'z':
|
||||||
|
case 'A':
|
||||||
|
case 'B':
|
||||||
|
case 'C':
|
||||||
|
case 'D':
|
||||||
|
case 'E':
|
||||||
|
case 'F':
|
||||||
|
case 'G':
|
||||||
|
case 'H':
|
||||||
|
case 'I':
|
||||||
|
case 'J':
|
||||||
|
case 'K':
|
||||||
|
case 'L':
|
||||||
|
case 'M':
|
||||||
|
case 'N':
|
||||||
|
case 'O':
|
||||||
|
case 'P':
|
||||||
|
case 'Q':
|
||||||
|
case 'R':
|
||||||
|
case 'S':
|
||||||
|
case 'T':
|
||||||
|
case 'U':
|
||||||
|
case 'V':
|
||||||
|
case 'W':
|
||||||
|
case 'X':
|
||||||
|
case 'Y':
|
||||||
|
case 'Z':
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -863,3 +912,4 @@ evry_util_md5_sum(const char *str)
|
||||||
|
|
||||||
return strdup(md5out);
|
return strdup(md5out);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,6 @@ typedef struct _Item Item;
|
||||||
#define SIZE_LIST 28
|
#define SIZE_LIST 28
|
||||||
#define SIZE_DETAIL 36
|
#define SIZE_DETAIL 36
|
||||||
|
|
||||||
|
|
||||||
struct _View
|
struct _View
|
||||||
{
|
{
|
||||||
Evry_View view;
|
Evry_View view;
|
||||||
|
@ -334,7 +333,6 @@ _item_show(View *v, Item *it, Evas_Object *list)
|
||||||
else it->have_thumb = EINA_TRUE;
|
else it->have_thumb = EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if ((it->get_thumb) || (CHECK_TYPE(it->item, EVRY_TYPE_FILE) && _check_item(it->item)))
|
if ((it->get_thumb) || (CHECK_TYPE(it->item, EVRY_TYPE_FILE) && _check_item(it->item)))
|
||||||
{
|
{
|
||||||
char *suffix;
|
char *suffix;
|
||||||
|
@ -386,7 +384,6 @@ _item_hide(Item *it)
|
||||||
it->visible = EINA_FALSE;
|
it->visible = EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
_place_items(Smart_Data *sd)
|
_place_items(Smart_Data *sd)
|
||||||
{
|
{
|
||||||
|
@ -782,7 +779,6 @@ _animator(void *data)
|
||||||
_animator_del(data);
|
_animator_del(data);
|
||||||
|
|
||||||
return ECORE_CALLBACK_CANCEL;
|
return ECORE_CALLBACK_CANCEL;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
@ -1439,7 +1435,6 @@ _cb_action_performed(void *data, int type __UNUSED__, void *event)
|
||||||
|
|
||||||
EINA_LIST_FOREACH (sd->items, l, it)
|
EINA_LIST_FOREACH (sd->items, l, it)
|
||||||
{
|
{
|
||||||
|
|
||||||
if ((it->item == ev->it1) ||
|
if ((it->item == ev->it1) ||
|
||||||
(it->item == ev->it2))
|
(it->item == ev->it2))
|
||||||
break;
|
break;
|
||||||
|
@ -1577,14 +1572,17 @@ _view_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
|
||||||
sd->mouse_x = 0;
|
sd->mouse_x = 0;
|
||||||
sd->mouse_y = 0;
|
sd->mouse_y = 0;
|
||||||
}
|
}
|
||||||
static void _cb_list_hide(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
|
|
||||||
|
static void
|
||||||
|
_cb_list_hide(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
|
||||||
{
|
{
|
||||||
View *v = data;
|
View *v = data;
|
||||||
|
|
||||||
v->hiding = EINA_TRUE;
|
v->hiding = EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void _cb_list_show(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
|
static void
|
||||||
|
_cb_list_show(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
|
||||||
{
|
{
|
||||||
View *v = data;
|
View *v = data;
|
||||||
|
|
||||||
|
@ -1723,3 +1721,4 @@ evry_view_shutdown(void)
|
||||||
evry_view_unregister(EVRY_VIEW(view));
|
evry_view_unregister(EVRY_VIEW(view));
|
||||||
E_FREE(view);
|
E_FREE(view);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -141,3 +141,4 @@ evry_view_help_shutdown(void)
|
||||||
evry_view_unregister(view);
|
evry_view_unregister(view);
|
||||||
E_FREE(view);
|
E_FREE(view);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
#include "e_mod_main.h"
|
#include "e_mod_main.h"
|
||||||
|
|
||||||
|
|
||||||
typedef struct _Tab Tab;
|
typedef struct _Tab Tab;
|
||||||
|
|
||||||
struct _Tab
|
struct _Tab
|
||||||
|
@ -54,6 +53,7 @@ _tab_cb_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
|
||||||
evry_browse_back(v->state->selector);
|
evry_browse_back(v->state->selector);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_tabs_cb_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
|
_tabs_cb_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
|
||||||
{
|
{
|
||||||
|
@ -71,6 +71,7 @@ _tabs_cb_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void
|
||||||
v->view->update(v->view);
|
v->view->update(v->view);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static Tab *
|
static Tab *
|
||||||
_add_tab(Tab_View *v, Evry_Plugin *p)
|
_add_tab(Tab_View *v, Evry_Plugin *p)
|
||||||
{
|
{
|
||||||
|
@ -198,7 +199,6 @@ _tabs_update(Tab_View *v)
|
||||||
e_box_thaw(v->o_tabs);
|
e_box_thaw(v->o_tabs);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_tabs_clear(Tab_View *v)
|
_tabs_clear(Tab_View *v)
|
||||||
{
|
{
|
||||||
|
@ -306,7 +306,6 @@ _plugin_prev(Tab_View *v)
|
||||||
if (p) _plugin_select(v, p);
|
if (p) _plugin_select(v, p);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
_tabs_key_down(Tab_View *v, const Ecore_Event_Key *ev)
|
_tabs_key_down(Tab_View *v, const Ecore_Event_Key *ev)
|
||||||
{
|
{
|
||||||
|
@ -349,7 +348,6 @@ _tabs_key_down(Tab_View *v, const Ecore_Event_Key *ev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Tab_View *
|
Tab_View *
|
||||||
evry_tab_view_new(Evry_View *view, const Evry_State *s, Evas *e)
|
evry_tab_view_new(Evry_View *view, const Evry_State *s, Evas *e)
|
||||||
{
|
{
|
||||||
|
@ -396,3 +394,4 @@ evry_tab_view_free(Tab_View *v)
|
||||||
|
|
||||||
E_FREE(v);
|
E_FREE(v);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,8 @@ void byteReverse(unsigned char *buf, unsigned longs);
|
||||||
/*
|
/*
|
||||||
* Note: this code is harmless on little-endian machines.
|
* Note: this code is harmless on little-endian machines.
|
||||||
*/
|
*/
|
||||||
void byteReverse(unsigned char *buf, unsigned longs)
|
void
|
||||||
|
byteReverse(unsigned char *buf, unsigned longs)
|
||||||
{
|
{
|
||||||
uint32_t t;
|
uint32_t t;
|
||||||
do {
|
do {
|
||||||
|
@ -40,13 +41,15 @@ void byteReverse(unsigned char *buf, unsigned longs)
|
||||||
buf += 4;
|
buf += 4;
|
||||||
} while (--longs);
|
} while (--longs);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Start MD5 accumulation. Set bit count to 0 and buffer to mysterious
|
* Start MD5 accumulation. Set bit count to 0 and buffer to mysterious
|
||||||
* initialization constants.
|
* initialization constants.
|
||||||
*/
|
*/
|
||||||
void MD5Init(MD5_CTX *ctx)
|
void
|
||||||
|
MD5Init(MD5_CTX *ctx)
|
||||||
{
|
{
|
||||||
ctx->buf[0] = 0x67452301;
|
ctx->buf[0] = 0x67452301;
|
||||||
ctx->buf[1] = 0xefcdab89;
|
ctx->buf[1] = 0xefcdab89;
|
||||||
|
@ -61,7 +64,8 @@ void MD5Init(MD5_CTX *ctx)
|
||||||
* Update context to reflect the concatenation of another buffer full
|
* Update context to reflect the concatenation of another buffer full
|
||||||
* of bytes.
|
* of bytes.
|
||||||
*/
|
*/
|
||||||
void MD5Update(MD5_CTX *ctx, unsigned char const *buf, unsigned len)
|
void
|
||||||
|
MD5Update(MD5_CTX *ctx, unsigned char const *buf, unsigned len)
|
||||||
{
|
{
|
||||||
uint32_t t;
|
uint32_t t;
|
||||||
|
|
||||||
|
@ -76,11 +80,13 @@ void MD5Update(MD5_CTX *ctx, unsigned char const *buf, unsigned len)
|
||||||
|
|
||||||
/* Handle any leading odd-sized chunks */
|
/* Handle any leading odd-sized chunks */
|
||||||
|
|
||||||
if (t) {
|
if (t)
|
||||||
|
{
|
||||||
unsigned char *p = (unsigned char *)ctx->in + t;
|
unsigned char *p = (unsigned char *)ctx->in + t;
|
||||||
|
|
||||||
t = 64 - t;
|
t = 64 - t;
|
||||||
if (len < t) {
|
if (len < t)
|
||||||
|
{
|
||||||
memcpy(p, buf, len);
|
memcpy(p, buf, len);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -109,7 +115,8 @@ void MD5Update(MD5_CTX *ctx, unsigned char const *buf, unsigned len)
|
||||||
* Final wrapup - pad to 64-byte boundary with the bit pattern
|
* Final wrapup - pad to 64-byte boundary with the bit pattern
|
||||||
* 1 0* (64-bit count of bits processed, MSB-first)
|
* 1 0* (64-bit count of bits processed, MSB-first)
|
||||||
*/
|
*/
|
||||||
void MD5Final(unsigned char digest[16], MD5_CTX *ctx)
|
void
|
||||||
|
MD5Final(unsigned char digest[16], MD5_CTX *ctx)
|
||||||
{
|
{
|
||||||
unsigned count;
|
unsigned count;
|
||||||
unsigned char *p;
|
unsigned char *p;
|
||||||
|
@ -126,7 +133,8 @@ void MD5Final(unsigned char digest[16], MD5_CTX *ctx)
|
||||||
count = 64 - 1 - count;
|
count = 64 - 1 - count;
|
||||||
|
|
||||||
/* Pad out to 56 mod 64 */
|
/* Pad out to 56 mod 64 */
|
||||||
if (count < 8) {
|
if (count < 8)
|
||||||
|
{
|
||||||
/* Two lots of padding: Pad the first block to 64 bytes */
|
/* Two lots of padding: Pad the first block to 64 bytes */
|
||||||
memset(p, 0, count);
|
memset(p, 0, count);
|
||||||
byteReverse(ctx->in, 16);
|
byteReverse(ctx->in, 16);
|
||||||
|
@ -134,7 +142,8 @@ void MD5Final(unsigned char digest[16], MD5_CTX *ctx)
|
||||||
|
|
||||||
/* Now fill the next block with 56 bytes */
|
/* Now fill the next block with 56 bytes */
|
||||||
memset(ctx->in, 0, 56);
|
memset(ctx->in, 0, 56);
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
/* Pad block to 56 bytes */
|
/* Pad block to 56 bytes */
|
||||||
memset(p, 0, count - 8);
|
memset(p, 0, count - 8);
|
||||||
}
|
}
|
||||||
|
@ -167,7 +176,8 @@ void MD5Final(unsigned char digest[16], MD5_CTX *ctx)
|
||||||
* reflect the addition of 16 longwords of new data. MD5Update blocks
|
* reflect the addition of 16 longwords of new data. MD5Update blocks
|
||||||
* the data and converts bytes into longwords for this routine.
|
* the data and converts bytes into longwords for this routine.
|
||||||
*/
|
*/
|
||||||
void MD5Transform(uint32_t buf[4], uint32_t const in[16])
|
void
|
||||||
|
MD5Transform(uint32_t buf[4], uint32_t const in[16])
|
||||||
{
|
{
|
||||||
register uint32_t a, b, c, d;
|
register uint32_t a, b, c, d;
|
||||||
|
|
||||||
|
@ -249,3 +259,4 @@ void MD5Transform(uint32_t buf[4], uint32_t const in[16])
|
||||||
buf[2] += c;
|
buf[2] += c;
|
||||||
buf[3] += d;
|
buf[3] += d;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue