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

'everything' module: formatting, whitespace cleanup 

SVN revision: 41248
This commit is contained in:
Hannes Janetzek 2009-07-04 11:10:28 +00:00
parent 406acced00
commit 0236fd2006
8 changed files with 266 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,8 +72,6 @@ static int _evry_plug_act_select_action(Evry_Item *item, const char *input);
static void _evry_plug_act_select_cleanup(void);
static void _evry_plug_act_select_item_icon_get(Evry_Item *it, Evas *e);
/* local subsystem globals */
static E_Popup *popup = NULL;
static Ecore_X_Window input_window = 0;
@ -295,7 +293,6 @@ evry_hide(void)
input_window = 0;
}
EAPI void
evry_plugin_async_update(Evry_Plugin *p, int action)
{
@ -335,6 +332,8 @@ evry_plugin_async_update(Evry_Plugin *p, int action)
else if ((action == EVRY_ASYNC_UPDATE_CLEAR) && (s->cur_plugin == p))
{
_evry_list_clear();
/*XXX move this into list clear?*/
s->cur_items = NULL;
}
}
@ -347,7 +346,6 @@ _evry_cb_plugin_sort(const void *data1, const void *data2)
return p1->prio - p2->prio;
}
static int
_evry_push_state(void)
{
@ -397,12 +395,12 @@ _evry_push_state(void)
if (p->begin)
{
Evry_Item *sel_item = NULL;
Evry_Item *it = NULL;
if (s && (s->cur_plugin != action_selector))
sel_item = s->sel_item;
it = s->sel_item;
if (p->begin(sel_item))
if (p->begin(it))
list = eina_list_append(list, p);
}
else
@ -1179,7 +1177,6 @@ _evry_plugin_next(void)
}
}
static void
_evry_plugin_prev(void)
{
@ -1289,8 +1286,6 @@ _evry_plugin_selector_show(Evry_Plugin *p)
p->tab = o;
}
static int
_evry_plug_act_select_init(void)
{
@ -1391,7 +1386,5 @@ _evry_plug_act_select_item_icon_get(Evry_Item *it, Evas *e)
/* if (act->icon_get)
* it->o_icon = act->icon_get(act, e); */
}

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

@ -24,7 +24,6 @@ static Evry_Action *act;
static Inst *inst;
EAPI int
evry_plug_apps_init(void)
{
@ -99,7 +98,6 @@ _begin(Evry_Item *it)
return 1;
}
static int
_action(Evry_Item *it, const char *input)
{
@ -152,7 +150,6 @@ _action(Evry_Item *it, const char *input)
return EVRY_ACTION_CONTINUE;
}
static void
_list_free(void)
{
@ -182,7 +179,6 @@ _cleanup(void)
inst = NULL;
}
static int
_fetch(const char *input)
{
@ -397,7 +393,6 @@ _cb_sort(const void *data1, const void *data2)
return (it1->priority - it2->priority);
// TODO compare exe strings?
else return 0;
}
static int

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

@ -1,13 +1,6 @@
#include "e.h"
#include "e_mod_main.h"
typedef struct _Inst Inst;
struct _Inst
{
E_Border *border;
};
static int _fetch(const char *input);
static int _action(Evry_Item *item, const char *input);
static void _cleanup(void);
@ -17,6 +10,7 @@ static void _item_icon_get(Evry_Item *it, Evas *e);
static Evry_Plugin *p;
EAPI int
evry_plug_border_init(void)
{

2
src/modules/everything/evry_plug_border_act.c
View File

@ -15,10 +15,10 @@ static void _cleanup(void);
static void _item_icon_get(Evry_Item *it, Evas *e);
static void _item_add(const char *label, void (*action_cb) (E_Border *bd), const char *icon);
static Evry_Plugin *p;
static Inst *inst;
EAPI int
evry_plug_border_act_init(void)
{

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

@ -1,10 +1,10 @@
#include "e.h"
#include "e_mod_main.h"
/* TODO
* - dc support?
*/
#include "e.h"
#include "e_mod_main.h"
static int _begin(Evry_Item *it);
static int _fetch(const char *input);
static int _action(Evry_Item *item, const char *input);
@ -12,12 +12,9 @@ static void _cleanup(void);
static void _item_add(char *output, int prio);
static int _cb_sort(const void *data1, const void *data2);
static void _item_icon_get(Evry_Item *it, Evas *e);
static int _cb_data(void *data, int type, void *event);
static Evry_Plugin *p;
static Ecore_Exe *exe = NULL;
static Eina_List *history = NULL;
static Ecore_Event_Handler *data_handler = NULL;
@ -77,8 +74,9 @@ _begin(Evry_Item *it)
static void
_cleanup()
{
Evry_Item *it;
Evry_Item *it, *it2;
int i = 0;
Eina_List *l, *ll;
EINA_LIST_FREE(p->items, it)
{
@ -116,12 +114,36 @@ _action(Evry_Item *it, const char *input)
{
if (p->items)
{
Evry_Item *it2 = p->items->data;
Eina_List *l;
Evry_Item *it2;
_item_add((char *) it2->label, 1);
evry_plugin_async_update(p, EVRY_ASYNC_UPDATE_ADD);
evry_plugin_async_update(p, EVRY_ASYNC_UPDATE_CLEAR);
/* remove duplicates */
if (p->items->next)
{
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);
eina_stringshare_del(it2->label);
E_FREE(it2);
}
}
it = p->items->data;
_item_add((char *) it->label, 1);
}
evry_plugin_async_update(p, EVRY_ASYNC_UPDATE_ADD);
return EVRY_ACTION_CONTINUE;
}
else

1
src/modules/everything/evry_plug_config.c
View File

@ -10,6 +10,7 @@ static int _cb_sort(const void *data1, const void *data2);
static Evry_Plugin *p;
EAPI int
evry_plug_config_init(void)
{

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

@ -21,6 +21,7 @@ static Evry_Item *_item_fill(const char *directory, const char *file);
static Evry_Plugin *p;
static Eina_List *stack = NULL;
EAPI int
evry_plug_dir_browse_init(void)
{
@ -95,7 +96,6 @@ _list_free()
}
}
static void
_cleanup()
{