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

- make Esc pop all states first and then hide. i.e. esc jump back to start when browsing dirs ;) 

- make the global binding for 'everything' act like esc, when everything is active.
- global key bindings for a plugin jump to that plugin when everything is active.
- handle KP_Enter as Return


SVN revision: 48517
This commit is contained in:
Hannes Janetzek 2010-05-01 19:27:26 +00:00
parent 42a2c6ae0b
commit a406f496b1
4 changed files with 112 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/modules/everything/e_mod_main.c
View File

@ -127,22 +127,21 @@ e_modapi_init(E_Module *m)
if (act)
{
act->func.go = _e_mod_action_cb;
e_action_predef_name_set(_("Everything Launcher"),
_("Show Everything Dialog"),
"everything", "", NULL, 0);
e_action_predef_name_set
(_("Everything Launcher"),
_("Show Everything Dialog"),
"everything", "", NULL, 0);
}
maug = e_int_menus_menu_augmentation_add("main/1",
_e_mod_menu_add,
NULL, NULL, NULL);
maug = e_int_menus_menu_augmentation_add
("main/1", _e_mod_menu_add, NULL, NULL, NULL);
e_configure_registry_category_add("extensions", 80, _("Extensions"),
NULL, "preferences-extensions");
e_configure_registry_category_add
("extensions", 80, _("Extensions"), NULL, "preferences-extensions");
e_configure_registry_item_add("extensions/run_everything", 40,
_("Everything Configuration"),
NULL, "system-run",
evry_config_dialog);
e_configure_registry_item_add
("extensions/run_everything", 40, _("Everything Configuration"),
NULL, "system-run", evry_config_dialog);
evry_init();
if (!EVRY_EVENT_ITEMS_UPDATE)
@ -190,7 +189,8 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
if (act)
{
e_action_predef_name_del(_("Everything Launcher"), _("Show Everything Dialog"));
e_action_predef_name_del(_("Everything Launcher"),
_("Show Everything Dialog"));
e_action_del("everything");
}

2
src/modules/everything/e_mod_main.h
View File

@ -88,7 +88,7 @@ void evry_plug_text_shutdown(void);
int evry_init(void);
int evry_shutdown(void);
int evry_show(E_Zone *zone, const char *params);
void evry_hide(void);
void evry_hide(int clear);
Evry_Plugin *evry_plug_aggregator_new(Evry_Selector *selector, int type);

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

@ -101,7 +101,7 @@ evry_init(void)
int
evry_shutdown(void)
{
evry_hide();
evry_hide(0);
return 1;
}
@ -164,8 +164,26 @@ _cb_show_timer(void *data)
int
evry_show(E_Zone *zone, const char *params)
{
if (win) return 0;
if (win)
{
Eina_List *l;
Evry_Plugin *p;
if (!(params && eina_list_count(selectors[0]->states) == 1))
evry_hide(1);
if (selector && params)
{
EINA_LIST_FOREACH(selectors[0]->plugins, l, p)
if (!strcmp(params, p->name)) break;
_evry_plugin_select(selector->state, p);
_evry_selector_update(selector);
_evry_view_update(selector->state, p);
}
return 1;
}
E_OBJECT_CHECK_RETURN(zone, 0);
E_OBJECT_TYPE_CHECK_RETURN(zone, E_ZONE_TYPE, 0);
@ -243,12 +261,35 @@ evry_show(E_Zone *zone, const char *params)
}
void
evry_hide(void)
evry_hide(int clear)
{
Ecore_Event_Handler *ev;
if (!win) return;
if (clear && selector && eina_list_count(selectors[0]->states) > 1)
{
if (selector == selectors[1])
_evry_selectors_switch(-1);
else if (selector == selectors[2])
_evry_selectors_switch(1);
/* just to be sure */
selector = selectors[0];
while (selector->states->next)
_evry_state_pop(selector);
Evry_State *s = selector->state;
selector->aggregator->fetch(selector->aggregator, s->input);
_evry_selector_update(selector);
_evry_update_text_label(s);
_evry_view_show(s->view);
s->view->update(s->view, 1);
return;
}
/* _evry_view_clear(selector->state); */
if (_show_timer)
ecore_timer_del(_show_timer);
@ -1060,21 +1101,21 @@ static int
_evry_selector_subjects_get(const char *plugin_name)
{
Eina_List *l, *plugins = NULL;
Evry_Plugin *p, *plugin;
Evry_Plugin *p, *pp;
Evry_Selector *sel = selectors[0];
EINA_LIST_FOREACH(sel->plugins, l, plugin)
EINA_LIST_FOREACH(sel->plugins, l, p)
{
if (plugin_name && strcmp(plugin_name, plugin->name))
if (plugin_name && strcmp(plugin_name, p->name))
continue;
if (plugin->begin)
if (p->begin)
{
if ((p = plugin->begin(plugin, NULL)))
plugins = eina_list_append(plugins, p);
if ((pp = p->begin(p, NULL)))
plugins = eina_list_append(plugins, pp);
}
else
plugins = eina_list_append(plugins, plugin);
plugins = eina_list_append(plugins, p);
}
if (!plugins) return 0;
@ -1361,19 +1402,56 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
if (!strcmp(ev->key, "Escape"))
{
evry_hide();
evry_hide(0);
return 1;
}
else if (ev->modifiers)
{
E_Action *act;
Eina_List *l;
E_Config_Binding_Key *bind;
E_Binding_Modifier mod;
for (l = e_config->key_bindings; l; l = l->next)
{
bind = l->data;
if (bind->action && strcmp(bind->action, "everything")) continue;
mod = 0;
if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
mod |= E_BINDING_MODIFIER_SHIFT;
if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)
mod |= E_BINDING_MODIFIER_CTRL;
if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT)
mod |= E_BINDING_MODIFIER_ALT;
if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
mod |= E_BINDING_MODIFIER_WIN;
if (bind->key && (!strcmp(bind->key, ev->keyname)) &&
((bind->modifiers == mod) || (bind->any_mod)))
{
if (!(act = e_action_find(bind->action))) continue;
if (act->func.go)
act->func.go(E_OBJECT(win->popup->zone), bind->params);
}
}
}
if (!selector || !selector->state)
return 1;
s = selector->state;
win->request_selection = EINA_FALSE;
s = selector->state;
old = ev->key;
if (((evry_conf->quick_nav == 1) && (ev->modifiers & ECORE_EVENT_MODIFIER_ALT)) ||
if (!strcmp(ev->key, "KP_Enter"))
{
key = eina_stringshare_add("Return");
}
else if (((evry_conf->quick_nav == 1) && (ev->modifiers & ECORE_EVENT_MODIFIER_ALT)) ||
((evry_conf->quick_nav == 2) && (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)))
{
if (!strcmp(ev->key, "k") || (!strcmp(ev->key, "K")))
@ -1418,7 +1496,6 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
ev->key = key;
}
else
{
key = eina_stringshare_add(ev->key);
ev->key = key;
@ -1795,7 +1872,7 @@ _evry_plugin_action(Evry_Selector *sel, int finished)
* s_object->plugin->action(s_obj->plugin, s_act->cur_item, s_obj->cur_item); */
if (finished)
evry_hide();
evry_hide(0);
}
static void

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

@ -138,6 +138,11 @@ _hist_cleanup_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata
if (hi->type) eina_stringshare_del(hi->type);
hi->type = eina_stringshare_add("E_SETTINGS");
}
else if (!strcmp(hi->plugin, "Actions"))
{
if (hi->type) eina_stringshare_del(hi->type);
hi->type = eina_stringshare_add("ACTION");
}
}
/* item is transient or too old */