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

'everything' module: cleanups 

SVN revision: 41755
This commit is contained in:
Hannes Janetzek 2009-08-14 09:35:51 +00:00
parent 01edaca952
commit 30bb106ec8
6 changed files with 268 additions and 315 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

305
src/modules/everything/evry.c
View File

@ -93,13 +93,6 @@ struct _Evry_List_Window
};
/* static int _evry_cb_mouse_down(void *data, int type, void *event);
* static int _evry_cb_mouse_up(void *data, int type, void *event);
* static int _evry_cb_mouse_move(void *data, int type, void *event);
* static int _evry_cb_mouse_wheel(void *data, int type, void *event);
* static void _evry_cb_item_mouse_in(void *data, Evas *evas, Evas_Object *obj, void *event_info);
* static void _evry_cb_item_mouse_out(void *data, Evas *evas, Evas_Object *obj, void *event_info); */
static void _evry_matches_update(Evry_Selector *sel);
static void _evry_plugin_action(Evry_Selector *sel, int finished);
static void _evry_backspace(Evry_State *s);
@ -113,6 +106,7 @@ static void _evry_update_text_label(Evry_State *s);
static void _evry_browse_item(Evry_Selector *sel);
static void _evry_browse_back(Evry_Selector *sel);
static void _evry_selectors_switch(void);
static void _evry_plugin_list_insert(Evry_State *s, Evry_Plugin *p);
static Evry_Window *_evry_window_new(E_Zone *zone);
static void _evry_window_free(Evry_Window *win);
@ -148,6 +142,7 @@ static int _evry_list_scroll_timer(void *data);
static int _evry_list_item_idler(void *data);
static int _evry_plug_actions_init(void);
static void _evry_plug_actions_free(void);
static int _evry_plug_actions_begin(Evry_Plugin *p, const Evry_Item *it);
static int _evry_plug_actions_fetch(Evry_Plugin *p, const char *input);
static void _evry_plug_actions_cleanup(Evry_Plugin *p);
@ -164,6 +159,13 @@ static Evas_Object *_evry_plug_aggregator_item_icon_get(Evry_Plugin *p, const Ev
static int _evry_cb_key_down(void *data, int type, void *event);
static int _evry_cb_selection_notify(void *data, int type, void *event);
/* static int _evry_cb_mouse_down(void *data, int type, void *event);
* static int _evry_cb_mouse_up(void *data, int type, void *event);
* static int _evry_cb_mouse_move(void *data, int type, void *event);
* static int _evry_cb_mouse_wheel(void *data, int type, void *event);
* static void _evry_cb_item_mouse_in(void *data, Evas *evas, Evas_Object *obj, void *event_info);
* static void _evry_cb_item_mouse_out(void *data, Evas *evas, Evas_Object *obj, void *event_info); */
/* local subsystem globals */
static Evry_Window *win = NULL;
static Evry_List_Window *list = NULL;
@ -186,8 +188,8 @@ evry_init(void)
int
evry_shutdown(void)
{
// TODO free action_selector
evry_hide();
_evry_plug_actions_free();
return 1;
}
@ -307,7 +309,6 @@ evry_hide(void)
EINA_LIST_FREE(handlers, ev)
ecore_event_handler_del(ev);
handlers = NULL;
ecore_x_window_free(input_window);
e_grabinput_release(input_window, input_window);
@ -343,7 +344,7 @@ evry_item_new(Evry_Plugin *p, const char *label, void (*cb_free) (Evry_Item *ite
it->ref = 1;
/* item_cnt++; */
return it;
}
@ -359,7 +360,7 @@ evry_item_free(Evry_Item *it)
/* printf("%d, %d\t 0x%x 0x%x 0x%x free: %s\n",
* it->ref, item_cnt - 1,
* it->label, it->uri, it->mime,
* it->label); */
* it->label); */
/* item_cnt--; */
if (it->cb_free) it->cb_free(it);
@ -370,7 +371,7 @@ evry_item_free(Evry_Item *it)
if (it->o_bg) evas_object_del(it->o_bg);
if (it->o_icon) evas_object_del(it->o_icon);
E_FREE(it);
}
@ -380,6 +381,79 @@ _evry_item_ref(Evry_Item *it)
it->ref++;
}
void
evry_plugin_async_update(Evry_Plugin *p, int action)
{
Evry_State *s;
Evry_Plugin *agg;
if (!win) return;
s = selector->state;
agg = selector->aggregator;
/* received data from a plugin of the current selector ? */
if (!s || !eina_list_data_find(s->plugins, p)) return;
if (action == EVRY_ASYNC_UPDATE_ADD)
{
if (!p->items)
{
/* remove plugin */
if (!eina_list_data_find(s->cur_plugins, p)) return;
s->cur_plugins = eina_list_remove(s->cur_plugins, p);
if (s->plugin == p)
_evry_select_plugin(s, NULL);
}
else
{
/* add plugin to current plugins*/
_evry_plugin_list_insert(s, p);
if (!s->plugin || !eina_list_data_find_list(s->cur_plugins, s->plugin))
_evry_select_plugin(s, NULL);
}
/* update aggregator */
if (eina_list_count(s->cur_plugins) > 1)
{
agg->fetch(agg, NULL);
/* add aggregator */
if (!(s->cur_plugins->data == agg))
{
s->cur_plugins = eina_list_prepend(s->cur_plugins, agg);
if (s->plugin_auto_selected)
_evry_select_plugin(s, agg);
}
}
/* plugin is visible */
if ((s->plugin == p) || (s->plugin == agg))
{
_evry_selector_update(selector);
p = s->plugin;
_evry_list_clear_list(s);
_evry_list_show_items(s, p);
_evry_list_scroll_to(s, s->sel_item);
}
/* plugin box was updated: realign */
if (s->plugin)
{
_evry_list_tabs_update(s);
_evry_list_tab_scroll_to(s, s->plugin);
}
}
}
/* local subsystem functions */
static Evry_List_Window *
_evry_list_win_new(E_Zone *zone)
{
@ -597,7 +671,7 @@ _evry_selector_free(Evry_Selector *sel)
while (sel->states)
_evry_state_pop(sel);
EINA_LIST_FREE(sel->plugins, p)
{
if (p->tab) evas_object_del(p->tab);
@ -695,28 +769,23 @@ static void
_evry_selector_update(Evry_Selector *sel)
{
Evry_State *s = sel->state;
Evry_Item *it = NULL;
Evry_Item *it = s->sel_item;
if (s)
if (!s->plugin && it)
_evry_list_item_desel(s, NULL);
else if (it && !eina_list_data_find_list(s->plugin->items, it))
_evry_list_item_desel(s, NULL);
it = s->sel_item;
if (s->plugin && (!it || s->item_auto_selected))
{
it = s->sel_item;
if (!s->plugin && it)
_evry_list_item_desel(s, NULL);
else if (it && !eina_list_data_find_list(s->plugin->items, it))
_evry_list_item_desel(s, NULL);
it = s->sel_item;
if (s->plugin && (!it || s->item_auto_selected))
/* get first item */
if (s->plugin->items)
{
/* get first item */
if (s->plugin->items)
{
it = s->plugin->items->data;
s->item_auto_selected = EINA_TRUE;
_evry_list_item_sel(s, it);
}
it = s->plugin->items->data;
s->item_auto_selected = EINA_TRUE;
_evry_list_item_sel(s, it);
}
}
@ -743,8 +812,8 @@ _evry_selector_update(Evry_Selector *sel)
if (sel == selectors[0])
{
_evry_selector_actions_get(it);
_evry_selector_update(selectors[1]);
if (_evry_selector_actions_get(it))
_evry_selector_update(selectors[1]);
}
}
@ -754,7 +823,7 @@ _evry_list_update(Evry_State *s)
if (!list->visible) return;
_evry_list_clear_list(s);
_evry_list_tabs_update(s);
_evry_list_tabs_update(s);
if (!s->plugin) return;
@ -799,11 +868,7 @@ _evry_selector_actions_get(Evry_Item *it)
while (sel->state)
_evry_state_pop(sel);
if (!it)
{
_evry_state_new(sel, plugins);
return 1;
}
if (!it) return 0;
EINA_LIST_FOREACH(sel->plugins, l, p)
{
@ -873,7 +938,6 @@ _evry_state_new(Evry_Selector *sel, Eina_List *plugins)
s->input = malloc(INPUTLEN);
s->input[0] = 0;
s->plugins = plugins;
s->plugin_auto_selected = 1;
sel->states = eina_list_prepend(sel->states, s);
sel->state = s;
@ -888,10 +952,11 @@ _evry_state_pop(Evry_Selector *sel)
Evry_State *s;
s = sel->state;
_evry_list_item_desel(s, NULL);
free(s->input);
EINA_LIST_FREE(s->plugins, p)
p->cleanup(p);
@ -930,6 +995,7 @@ _evry_browse_item(Evry_Selector *sel)
if (plugins)
{
_evry_list_win_show();
_evry_state_new(sel, plugins);
_evry_matches_update(sel);
_evry_selector_update(sel);
@ -1224,7 +1290,7 @@ _evry_list_show_items(Evry_State *s, Evry_Plugin *p)
Evas_Object *o;
if (!p) return;
if (p->realize_items) p->realize_items(p, list->popup->evas);
if (list->scroll_timer)
@ -1248,7 +1314,7 @@ _evry_list_show_items(Evry_State *s, Evry_Plugin *p)
EINA_LIST_FOREACH(p->items, l, it)
{
o = it->o_bg;
if (!o)
{
o = edje_object_add(list->popup->evas);
@ -1268,7 +1334,7 @@ _evry_list_show_items(Evry_State *s, Evry_Plugin *p)
e_box_pack_end(list->o_list, o);
e_box_pack_options_set(o, 1, 1, 1, 0, 0.5, 0.5, mw, mh, 9999, mh);
evas_object_show(o);
if (it->o_icon && edje_object_part_exists(o, "e.swallow.icons"))
{
edje_object_part_swallow(o, "e.swallow.icons", it->o_icon);
@ -1325,15 +1391,14 @@ _evry_list_clear_list(Evry_State *s)
e_box_unpack(it->o_bg);
evas_object_hide(it->o_bg);
}
if (it->o_icon)
evas_object_hide(it->o_icon);
evry_item_free(it);
}
s->items = NULL;
}
e_box_thaw(list->o_list);
evas_event_thaw(list->popup->evas);
/* } */
@ -1354,17 +1419,17 @@ _evry_list_item_idler(void *data)
EINA_LIST_FOREACH(p->items, l, it)
{
if (!it->o_icon)
{
it->o_icon = p->icon_get(p, it, list->popup->evas);
if (it->o_icon) continue;
if (it->o_icon)
{
edje_object_part_swallow(it->o_bg, "e.swallow.icons", it->o_icon);
evas_object_show(it->o_icon);
cnt--;
}
it->o_icon = p->icon_get(p, it, list->popup->evas);
if (it->o_icon)
{
edje_object_part_swallow(it->o_bg, "e.swallow.icons", it->o_icon);
evas_object_show(it->o_icon);
cnt--;
}
if (cnt == 0) break;
}
e_box_thaw(list->o_list);
@ -1382,25 +1447,23 @@ _evry_matches_update(Evry_Selector *sel)
Evry_State *s = sel->state;
Evry_Plugin *p;
Eina_List *l;
Eina_Bool has_items = EINA_FALSE;
Eina_Bool has_items;
if (s->cur_plugins) eina_list_free(s->cur_plugins);
s->cur_plugins = NULL;
EINA_LIST_FREE(s->cur_plugins, p);
if (s->input)
{
EINA_LIST_FOREACH(s->plugins, l, p)
{
/* input matches plugin trigger? */
if (p->trigger)
if (!p->trigger) continue;
if ((strlen(s->input) >= strlen(p->trigger)) &&
(!strncmp(s->input, p->trigger, strlen(p->trigger))))
{
if ((strlen(s->input) >= strlen(p->trigger)) &&
(!strncmp(s->input, p->trigger, strlen(p->trigger))))
{
s->cur_plugins = eina_list_append(s->cur_plugins, p);
has_items = p->fetch(p, s->input);
break;
}
s->cur_plugins = eina_list_append(s->cur_plugins, p);
p->fetch(p, s->input);
break;
}
}
}
@ -1434,10 +1497,10 @@ _evry_matches_update(Evry_Selector *sel)
else
sel->aggregator->cleanup(sel->aggregator);
}
if (s->plugin && !eina_list_data_find_list(s->cur_plugins, s->plugin))
s->plugin = NULL;
_evry_select_plugin(s, s->plugin);
}
@ -1531,7 +1594,7 @@ _evry_list_tab_scroll_to(Evry_State *s, Evry_Plugin *p)
static void
_evry_list_item_desel(Evry_State *s, Evry_Item *it)
{
{
if (s->sel_item)
{
it = s->sel_item;
@ -1543,7 +1606,7 @@ _evry_list_item_desel(Evry_State *s, Evry_Item *it)
if (it->o_icon)
edje_object_signal_emit(it->o_icon, "e,state,unselected", "e");
}
evry_item_free(it);
s->sel_item = NULL;
}
@ -1567,7 +1630,7 @@ _evry_list_item_sel(Evry_State *s, Evry_Item *it)
if (s == selector->state)
_evry_list_scroll_to(s, it);
}
_evry_item_ref(it);
s->sel_item = it;
}
@ -1644,10 +1707,11 @@ static void
_evry_select_plugin(Evry_State *s, Evry_Plugin *p)
{
if (!s || !s->cur_plugins) return;
if (!p && s->cur_plugins)
{
p = s->cur_plugins->data;
s->plugin_auto_selected = EINA_TRUE;
}
if (p && list->visible)
@ -1684,7 +1748,7 @@ _evry_list_plugin_next(Evry_State *s)
if (p)
{
s->plugin_auto_selected = 0;
s->plugin_auto_selected = EINA_FALSE;
_evry_list_clear_list(s);
_evry_select_plugin(s, p);
_evry_list_show_items(s, p);
@ -1722,7 +1786,7 @@ _evry_list_plugin_next_by_name(Evry_State *s, const char *key)
if (p)
{
s->plugin_auto_selected = 0;
s->plugin_auto_selected = EINA_FALSE;
_evry_list_clear_list(s);
_evry_select_plugin(s, p);
_evry_list_show_items(s, p);
@ -1753,7 +1817,7 @@ _evry_list_plugin_prev(Evry_State *s)
if (p)
{
s->plugin_auto_selected = 0;
s->plugin_auto_selected = EINA_FALSE;
_evry_list_clear_list(s);
_evry_select_plugin(s, p);
_evry_list_show_items(s, p);
@ -1897,6 +1961,16 @@ _evry_plug_actions_init(void)
return 1;
}
static void
_evry_plug_actions_free(void)
{
Evry_Plugin *p = action_selector;
eina_stringshare_del(p->config->name);
E_FREE(p->config);
E_FREE(p);
}
static int
_evry_plug_actions_begin(Evry_Plugin *p, const Evry_Item *it)
{
@ -1939,7 +2013,6 @@ _evry_plug_actions_fetch(Evry_Plugin *p, const char *input)
{
EINA_LIST_FREE(p->items, it)
evry_item_free(it);
p->items = NULL;
}
snprintf(match1, sizeof(match1), "%s*", input);
@ -1979,8 +2052,6 @@ _evry_plug_actions_cleanup(Evry_Plugin *p)
EINA_LIST_FREE(p->items, it)
evry_item_free(it);
p->items = NULL;
if (sel->actions) eina_list_free(sel->actions);
sel->actions = NULL;
@ -2094,8 +2165,6 @@ _evry_plug_aggregator_cleanup(Evry_Plugin *p)
EINA_LIST_FREE(p->items, it)
evry_item_free(it);
p->items = NULL;
}
static Evas_Object *
@ -2126,76 +2195,6 @@ _evry_plugin_list_insert(Evry_State *s, Evry_Plugin *p)
s->cur_plugins = eina_list_append(s->cur_plugins, p);
}
void
evry_plugin_async_update(Evry_Plugin *p, int action)
{
Evry_State *s;
Evry_Plugin *agg;
if (!win) return;
s = selector->state;
agg = selector->aggregator;
/* received data from a plugin of the current selector ? */
if (!s || !eina_list_data_find(s->plugins, p)) return;
if (action == EVRY_ASYNC_UPDATE_ADD)
{
if (!p->items)
{
/* remove plugin and update selector. */
if (!eina_list_data_find(s->cur_plugins, p)) return;
s->cur_plugins = eina_list_remove(s->cur_plugins, p);
if (s->plugin == p)
_evry_select_plugin(s, NULL);
}
else
{
/* add plugin to current plugins*/
_evry_plugin_list_insert(s, p);
if (!s->plugin || !eina_list_data_find_list(s->cur_plugins, s->plugin))
_evry_select_plugin(s, NULL);
}
/* update aggregator */
if (eina_list_count(s->cur_plugins) > 1)
{
agg->fetch(agg, NULL);
/* add aggregator */
if (!(s->cur_plugins->data == agg))
{
s->cur_plugins = eina_list_prepend(s->cur_plugins, agg);
if (s->plugin_auto_selected)
_evry_select_plugin(s, agg);
}
}
/* plugin is visible */
if ((s->plugin == p) || (s->plugin == agg))
{
_evry_selector_update(selector);
p = s->plugin;
_evry_list_clear_list(s);
_evry_list_show_items(s, p);
_evry_list_scroll_to(s, s->sel_item);
}
/* plugin box was updated: realign */
if (s->plugin)
{
_evry_list_tabs_update(s);
_evry_list_tab_scroll_to(s, s->plugin);
}
}
}
/* taken from e_utils. just changed 48 to 72.. we need
evry_icon_theme_set(Evas_Object *obj, const char *icon,

41
src/modules/everything/evry_plug_aspell.c
View File

@ -126,7 +126,6 @@ static void
_clear_list(Evry_Plugin *plugin)
{
Evry_Item *it;
evry_plugin_async_update(plugin, EVRY_ASYNC_UPDATE_CLEAR);
EINA_LIST_FREE(plugin->items, it)
evry_item_free(it);
}
@ -287,45 +286,6 @@ _fetch(Evry_Plugin *plugin, const char *input)
return 1;
}
/* static int
* _action(Evry_Plugin *plugin, Evry_Item *it, const char *input __UNUSED__)
* {
* const char *label;
* int len;
*
* if (!it) return EVRY_ACTION_CONTINUE;
*
* label = it->label;
* len = eina_stringshare_strlen(label);
*
* if (!ecore_x_selection_primary_set(clipboard_win, label, len))
* fprintf(stderr, "ASPELL cannot set primary selection to %#x '%s'\n",
* clipboard_win, label);
* if (!ecore_x_selection_clipboard_set(clipboard_win, label, len))
* fprintf(stderr, "ASPELL cannot set clipboard selection to %#x '%s'\n",
* clipboard_win, label);
*
* if (plugin->items)
* {
* Eina_List *l, *l_next;
* Evry_Item *it2;
*
* evry_plugin_async_update(plugin, EVRY_ASYNC_UPDATE_CLEAR);
*
* EINA_LIST_FOREACH_SAFE(plugin->items, l, l_next, it2)
* {
* if (it == it2) continue;
* plugin->items = eina_list_remove_list(plugin->items, l);
* eina_stringshare_del(it2->label);
* E_FREE(it2);
* }
* }
*
* evry_plugin_async_update(plugin, EVRY_ASYNC_UPDATE_ADD);
*
* return EVRY_ACTION_FINISHED;
* } */
static void
_cleanup(Evry_Plugin *plugin)
{
@ -381,7 +341,6 @@ _init(void)
p->base.async_query = 1;
p->base.begin = _begin;
p->base.fetch = _fetch;
/* p->base.action = _action; */
p->base.cleanup = _cleanup;
evry_plugin_register(&p->base);

64
src/modules/everything/evry_plug_border.c
View File

@ -1,17 +1,32 @@
#include "Evry.h"
#include "e.h"
#include "e_mod_main.h"
static Evry_Plugin *p;
static void
_cleanup(Evry_Plugin *p)
{
Evry_Item *it;
EINA_LIST_FREE(p->items, it)
evry_item_free(it);
}
static void
_item_free(Evry_Item *it)
{
if (it->data[0]) e_object_unref(E_OBJECT(it->data[0]));
}
static void
_item_add(Evry_Plugin *p, E_Border *bd, int prio)
{
Evry_Item *it;
it = evry_item_new(p, e_border_name_get(bd), NULL);
/* e_object_ref(E_OBJECT(bd)); */
it = evry_item_new(p, e_border_name_get(bd), &_item_free);
e_object_ref(E_OBJECT(bd));
it->data[0] = bd;
it->priority = prio;
@ -30,26 +45,14 @@ _cb_sort(const void *data1, const void *data2)
return (it1->priority - it2->priority);
}
static void
_cleanup(Evry_Plugin *p)
{
Evry_Item *it;
EINA_LIST_FREE(p->items, it)
{
/* if (it->data[0]) e_object_unref(E_OBJECT(it->data[0])); */
evry_item_free(it);
}
}
static int
_fetch(Evry_Plugin *p, const char *input)
{
E_Manager *man;
E_Zone *zone;
char match1[4096];
char match2[4096];
char m1[128];
char m2[128];
E_Border *bd;
E_Border_List *bl;
@ -60,8 +63,8 @@ _fetch(Evry_Plugin *p, const char *input)
if (input)
{
snprintf(match1, sizeof(match1), "%s*", input);
snprintf(match2, sizeof(match2), "*%s*", input);
snprintf(m1, sizeof(m1), "%s*", input);
snprintf(m2, sizeof(m2), "*%s*", input);
}
bl = e_container_border_list_first(e_container_current_get(man));
@ -72,21 +75,21 @@ _fetch(Evry_Plugin *p, const char *input)
if (!input)
_item_add(p, bd, 1);
else if (bd->client.icccm.name &&
e_util_glob_case_match(bd->client.icccm.name, match1))
e_util_glob_case_match(bd->client.icccm.name, m1))
_item_add(p, bd, 1);
else if (e_util_glob_case_match(e_border_name_get(bd), match1))
else if (e_util_glob_case_match(e_border_name_get(bd), m1))
_item_add(p, bd, 1);
else if (bd->client.icccm.name &&
e_util_glob_case_match(bd->client.icccm.name, match2))
e_util_glob_case_match(bd->client.icccm.name, m2))
_item_add(p, bd, 2);
else if (e_util_glob_case_match(e_border_name_get(bd), match2))
else if (e_util_glob_case_match(e_border_name_get(bd), m2))
_item_add(p, bd, 2);
else if (bd->desktop)
{
if (e_util_glob_case_match(bd->desktop->exec, match1))
_item_add(p, bd, 1);
else if (e_util_glob_case_match(bd->desktop->name, match1))
if (e_util_glob_case_match(bd->desktop->name, m1))
_item_add(p, bd, 1);
else if (e_util_glob_case_match(bd->desktop->name, m2))
_item_add(p, bd, 2);
}
}
}
@ -125,14 +128,14 @@ _item_icon_get(Evry_Plugin *p __UNUSED__, const Evry_Item *it, Evas *e)
found = i;
}
}
e_icon_data_set(o, bd->client.netwm.icons[found].data,
bd->client.netwm.icons[found].width,
bd->client.netwm.icons[found].height);
e_icon_alpha_set(o, 1);
return o;
}
if (!o)
o = e_border_icon_add(bd, e);
@ -149,7 +152,6 @@ _init(void)
p->type_out = "BORDER";
p->need_query = 0;
p->fetch = &_fetch;
/* p->action = &_action; */
p->cleanup = &_cleanup;
p->icon_get = &_item_icon_get;
evry_plugin_register(p);

160
src/modules/everything/evry_plug_calc.c
View File

@ -6,7 +6,7 @@ static int _cb_data(void *data, int type, void *event);
static int _cb_error(void *data, int type, void *event);
static int _cb_del(void *data, int type, void *event);
static Evry_Plugin *p;
static Evry_Plugin *p1;
static Ecore_Exe *exe = NULL;
static Eina_List *history = NULL;
static Ecore_Event_Handler *data_handler = NULL;
@ -16,9 +16,11 @@ static Ecore_Event_Handler *del_handler = NULL;
static int error = 0;
static int
_begin(Evry_Plugin *p, const Evry_Item *it __UNUSED__)
_begin(Evry_Plugin *p, const Evry_Item *item __UNUSED__)
{
Evry_Item *it;
data_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DATA, _cb_data, p);
error_handler = ecore_event_handler_add(ECORE_EXE_EVENT_ERROR, _cb_error, p);
@ -30,6 +32,21 @@ _begin(Evry_Plugin *p, const Evry_Item *it __UNUSED__)
ECORE_EXE_PIPE_ERROR |
ECORE_EXE_PIPE_ERROR_LINE_BUFFERED,
NULL);
if (history)
{
const char *result;
EINA_LIST_FREE(history, result)
{
it = evry_item_new(p, result, NULL);
p->items = eina_list_prepend(p->items, it);
eina_stringshare_del(result);
}
}
it = evry_item_new(p, "0", NULL);
p->items = eina_list_prepend(p->items, it);
return !!exe;
}
@ -40,9 +57,12 @@ _cleanup(Evry_Plugin *p)
int items = 10;
EINA_LIST_FREE(p->items, it)
if (items-- > 0)
history = eina_list_append(history, it);
else evry_item_free(it);
{
if (items-- > 0)
history = eina_list_prepend(history, eina_stringshare_add(it->label));
evry_item_free(it);
}
ecore_event_handler_del(data_handler);
ecore_event_handler_del(error_handler);
@ -56,38 +76,33 @@ _cleanup(Evry_Plugin *p)
static int
_action(Evry_Plugin *p, const Evry_Item *it, const char *input __UNUSED__)
{
if (p->items)
Eina_List *l;
Evry_Item *it2;
/* remove duplicates */
if (p->items->next)
{
Eina_List *l;
Evry_Item *it2;
evry_plugin_async_update(p, EVRY_ASYNC_UPDATE_CLEAR);
/* remove duplicates */
if (p->items->next)
{
it = p->items->data;
EINA_LIST_FOREACH(p->items->next, l, it2)
{
if (!strcmp(it->label, it2->label))
break;
it2 = NULL;
}
if (it2)
{
p->items = eina_list_remove(p->items, it2);
if (it2->label) eina_stringshare_del(it2->label);
E_FREE(it2);
}
}
it = p->items->data;
_item_add(p, (char *) it->label, 1);
EINA_LIST_FOREACH(p->items->next, l, it2)
{
if (!strcmp(it->label, it2->label))
break;
it2 = NULL;
}
if (it2)
{
p->items = eina_list_remove(p->items, it2);
evry_item_free(it2);
}
}
it = p->items->data;
it2 = evry_item_new(p, it->label, NULL);
p->items = eina_list_prepend(p->items, it2);
evry_plugin_async_update(p, EVRY_ASYNC_UPDATE_ADD);
return EVRY_ACTION_FINISHED;
@ -98,13 +113,6 @@ _fetch(Evry_Plugin *p, const char *input)
{
char buf[1024];
if (history)
{
p->items = history;
history = NULL;
}
if (!strncmp(input, "=scale=", 7))
snprintf(buf, 1024, "%s\n", input + (strlen(p->trigger)));
else
@ -123,38 +131,24 @@ _fetch(Evry_Plugin *p, const char *input)
return 1;
}
static void
_item_add(Evry_Plugin *p, char *result, int prio)
{
Evry_Item *it;
it = evry_item_new(p, result, NULL);
if (!it) return;
p->items = eina_list_prepend(p->items, it);
}
static int
_cb_data(void *data __UNUSED__, int type __UNUSED__, void *event)
_cb_data(void *data, int type __UNUSED__, void *event)
{
Ecore_Exe_Event_Data *ev = event;
Ecore_Exe_Event_Data_Line *l;
Evry_Plugin *p = data;
Evry_Item *it;
if (ev->exe != exe) return 1;
evry_plugin_async_update(p, EVRY_ASYNC_UPDATE_CLEAR);
for (l = ev->lines; l && l->line; l++)
if (ev->lines)
{
if (p->items)
{
Evry_Item *it = p->items->data;
if (it->label)
eina_stringshare_del(it->label);
it->label = eina_stringshare_add(l->line);
}
else
_item_add(p, l->line, 1);
it = p->items->data;
p->items = eina_list_remove(p->items, it);
evry_item_free(it);
it = evry_item_new(p, ev->lines->line, NULL);
p->items = eina_list_prepend(p->items, it);
}
evry_plugin_async_update(p, EVRY_ASYNC_UPDATE_ADD);
@ -190,20 +184,20 @@ _cb_del(void *data __UNUSED__, int type __UNUSED__, void *event)
static Eina_Bool
_init(void)
{
p = E_NEW(Evry_Plugin, 1);
p->name = "Calculator";
p->type = type_subject;
p->type_in = "NONE";
p->type_out = "TEXT";
p->trigger = "=";
p->icon = "accessories-calculator";
p->need_query = 0;
p->async_query = 1;
p->begin = &_begin;
p->fetch = &_fetch;
p->action = &_action;
p->cleanup = &_cleanup;
evry_plugin_register(p);
p1 = E_NEW(Evry_Plugin, 1);
p1->name = "Calculator";
p1->type = type_subject;
p1->type_in = "NONE";
p1->type_out = "TEXT";
p1->trigger = "=";
p1->icon = "accessories-calculator";
p1->need_query = 0;
p1->async_query = 1;
p1->begin = &_begin;
p1->fetch = &_fetch;
p1->action = &_action;
p1->cleanup = &_cleanup;
evry_plugin_register(p1);
return EINA_TRUE;
}
@ -212,15 +206,13 @@ static void
_shutdown(void)
{
Evry_Item *it;
char *result;
/* EINA_LIST_FREE(p->items, it)
* evry_item_free(it); */
EINA_LIST_FREE(history, result)
eina_stringshare_del(result);
EINA_LIST_FREE(history, it)
evry_item_free(it);
evry_plugin_unregister(p);
E_FREE(p);
evry_plugin_unregister(p1);
E_FREE(p1);
}

5
src/modules/everything/evry_plug_dir_browse.c
View File

@ -257,6 +257,8 @@ _fetch(Evry_Plugin *p, const char *input)
/* XXX free s->items? */
if (!strncmp(input, "/", 1))
{
if (s->command) return 1;
it = evry_item_new(p, "/", NULL);
if (!it) return 0;
it->uri = eina_stringshare_add("/");
@ -273,6 +275,8 @@ _fetch(Evry_Plugin *p, const char *input)
char *tmp;
int prio = 0;
if (s->command) return 1;
if (!strcmp(s->directory, "/")) return 0;
snprintf(dir, 4096, "%s", s->directory);
@ -309,7 +313,6 @@ _fetch(Evry_Plugin *p, const char *input)
EINA_LIST_FREE(p->items, it)
evry_item_free(it);
p->items = NULL;
s->command = EINA_FALSE;
}

8
src/modules/everything/evry_plug_tracker.c
View File

@ -122,7 +122,6 @@ _cleanup(Evry_Plugin *p)
EINA_LIST_FREE(inst->items, it)
evry_item_free(it);
inst->items = NULL;
p->items = NULL;
}
@ -239,9 +238,6 @@ _dbus_cb_reply(void *data, DBusMessage *msg, DBusError *error)
EINA_LIST_FREE(inst->items, it)
evry_item_free(it);
inst->items = NULL;
p->items = NULL;
if (inst->input)
eina_stringshare_del(inst->input);
inst->input = NULL;
@ -249,6 +245,8 @@ _dbus_cb_reply(void *data, DBusMessage *msg, DBusError *error)
if (inst->matched)
eina_stringshare_del(inst->matched);
inst->matched = NULL;
p->items = NULL;
}
evry_plugin_async_update(p, EVRY_ASYNC_UPDATE_ADD);
@ -404,7 +402,7 @@ _init(void)
_plugin_new("Music", type_subject, "Music", 20, 0);
_plugin_new("Videos", type_subject, "Videos", 20, 0);
_plugin_new("Documents", type_subject, "Documents", 20, 0);
_plugin_new("Find Files", type_object, "Files", 20, 1);
_plugin_new("Folders", type_object, "Folders", 20, 0);