forked from enlightenment/enlightenment
parent
9f2d45a90e
commit
f5a5cb17b0
|
@ -169,10 +169,8 @@ static int _evry_plug_aggregator_fetch(Evry_Plugin *p, const char *input);
|
||||||
static int _evry_plug_aggregator_action(Evry_Plugin *p, const Evry_Item *item, const char *input);
|
static int _evry_plug_aggregator_action(Evry_Plugin *p, const Evry_Item *item, const char *input);
|
||||||
static void _evry_plug_aggregator_cleanup(Evry_Plugin *p);
|
static void _evry_plug_aggregator_cleanup(Evry_Plugin *p);
|
||||||
static Evas_Object *_evry_plug_aggregator_item_icon_get(Evry_Plugin *p, const Evry_Item *it, Evas *e);
|
static Evas_Object *_evry_plug_aggregator_item_icon_get(Evry_Plugin *p, const Evry_Item *it, Evas *e);
|
||||||
/* static int _evry_cb_plugin_sort_by_trigger(const void *data1, const void *data2); */
|
|
||||||
|
|
||||||
/* local subsystem globals */
|
/* local subsystem globals */
|
||||||
|
|
||||||
static Evry_Window *win = NULL;
|
static Evry_Window *win = NULL;
|
||||||
static Evry_List_Window *list = NULL;
|
static Evry_List_Window *list = NULL;
|
||||||
static Ecore_X_Window input_window = 0;
|
static Ecore_X_Window input_window = 0;
|
||||||
|
@ -180,7 +178,6 @@ static Eina_List *handlers = NULL;
|
||||||
static Ecore_Timer *update_timer = NULL;
|
static Ecore_Timer *update_timer = NULL;
|
||||||
static Evry_Selector *selectors[3];
|
static Evry_Selector *selectors[3];
|
||||||
static Evry_Selector *selector = NULL;
|
static Evry_Selector *selector = NULL;
|
||||||
|
|
||||||
static Evry_Plugin *action_selector = NULL;
|
static Evry_Plugin *action_selector = NULL;
|
||||||
|
|
||||||
/* externally accessible functions */
|
/* externally accessible functions */
|
||||||
|
@ -350,12 +347,6 @@ evry_item_free(Evry_Item *it)
|
||||||
E_FREE(it);
|
E_FREE(it);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* static void
|
|
||||||
* _evry_list_cb_list_shown(void *data, Evas_Object *obj, const char *emission, const char *source)
|
|
||||||
* {
|
|
||||||
* _evry_list_scroll_to(selector->state, selector->state->sel_item);
|
|
||||||
* } */
|
|
||||||
|
|
||||||
static Evry_List_Window *
|
static Evry_List_Window *
|
||||||
_evry_list_win_new(E_Zone *zone)
|
_evry_list_win_new(E_Zone *zone)
|
||||||
{
|
{
|
||||||
|
@ -842,8 +833,6 @@ _evry_selector_objects_get(const char *type)
|
||||||
while (sel->state)
|
while (sel->state)
|
||||||
_evry_state_pop(sel);
|
_evry_state_pop(sel);
|
||||||
|
|
||||||
// TODO let 'object' plugins take subject and action
|
|
||||||
// into account. selectors[0]->state->sel_item;
|
|
||||||
it = selectors[0]->state->sel_item;
|
it = selectors[0]->state->sel_item;
|
||||||
|
|
||||||
EINA_LIST_FOREACH(sel->plugins, l, p)
|
EINA_LIST_FOREACH(sel->plugins, l, p)
|
||||||
|
@ -1030,11 +1019,9 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
|
||||||
ev = event;
|
ev = event;
|
||||||
if (ev->event_window != input_window) return 1;
|
if (ev->event_window != input_window) return 1;
|
||||||
|
|
||||||
if (!strcmp(ev->key, "Up"))
|
if (!strcmp(ev->key, "Up"))
|
||||||
/* if (!strcmp(ev->key, "K")) */
|
|
||||||
_evry_list_item_prev(s);
|
_evry_list_item_prev(s);
|
||||||
else if (!strcmp(ev->key, "Down"))
|
else if (!strcmp(ev->key, "Down"))
|
||||||
/* else if (!strcmp(ev->key, "J")) */
|
|
||||||
_evry_list_item_next(s);
|
_evry_list_item_next(s);
|
||||||
else if (!strcmp(ev->key, "Right") &&
|
else if (!strcmp(ev->key, "Right") &&
|
||||||
(ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT))
|
(ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT))
|
||||||
|
@ -1043,10 +1030,8 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
|
||||||
(ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT))
|
(ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT))
|
||||||
_evry_list_plugin_prev(s);
|
_evry_list_plugin_prev(s);
|
||||||
else if (!strcmp(ev->key, "Right"))
|
else if (!strcmp(ev->key, "Right"))
|
||||||
/* else if (!strcmp(ev->key, "L")) */
|
|
||||||
_evry_browse_item(selector);
|
_evry_browse_item(selector);
|
||||||
else if (!strcmp(ev->key, "Left"))
|
else if (!strcmp(ev->key, "Left"))
|
||||||
/* else if (!strcmp(ev->key, "H")) */
|
|
||||||
_evry_browse_back(selector);
|
_evry_browse_back(selector);
|
||||||
else if ((!strcmp(ev->key, "Return")) &&
|
else if ((!strcmp(ev->key, "Return")) &&
|
||||||
((ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) ||
|
((ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) ||
|
||||||
|
@ -1079,7 +1064,6 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
|
||||||
((strlen(s->input) < (INPUTLEN - strlen(ev->compose)))))
|
((strlen(s->input) < (INPUTLEN - strlen(ev->compose)))))
|
||||||
{
|
{
|
||||||
strcat(s->input, ev->compose);
|
strcat(s->input, ev->compose);
|
||||||
/* _evry_update_timer(s); */
|
|
||||||
_evry_update(s);
|
_evry_update(s);
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -1098,7 +1082,6 @@ _evry_backspace(Evry_State *s)
|
||||||
{
|
{
|
||||||
s->input[pos] = 0;
|
s->input[pos] = 0;
|
||||||
_evry_update(s);
|
_evry_update(s);
|
||||||
/* _evry_update_timer(s); */
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1163,7 +1146,6 @@ _evry_plugin_action(Evry_Selector *sel, int finished)
|
||||||
|
|
||||||
if (update_timer)
|
if (update_timer)
|
||||||
{
|
{
|
||||||
/* XXX what if an async plugin is selected */
|
|
||||||
if (!selector->state->plugin->async_query)
|
if (!selector->state->plugin->async_query)
|
||||||
{
|
{
|
||||||
_evry_matches_update(selector);
|
_evry_matches_update(selector);
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
#include "e_mod_main.h"
|
#include "e_mod_main.h"
|
||||||
|
|
||||||
/* typedef struct _E_Config_Dialog_Data E_Config_Dialog_Data; */
|
/* typedef struct _E_Config_Dialog_Data E_Config_Dialog_Data; */
|
||||||
|
|
Loading…
Reference in New Issue