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

break out keybind matching and replace original usage 

SVN revision: 75458
This commit is contained in:
Mike Blumenkrantz 2012-08-20 09:10:31 +00:00
parent 51fa21f70d
commit 6896025d1a
3 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/bin/e_utils.c
View File

@ -1524,3 +1524,38 @@ e_util_terminal_desktop_get(void)
}
return tdesktop;
}
EAPI E_Config_Binding_Key *
e_util_binding_match(const Eina_List *bindlist, Ecore_Event_Key *ev, unsigned int *num, const E_Config_Binding_Key *skip)
{
E_Config_Binding_Key *bi;
const Eina_List *l;
unsigned int mod = E_BINDING_MODIFIER_NONE;
if (num) *num = 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;
/* see comment in e_bindings on numlock
if (ev->modifiers & ECORE_X_LOCK_NUM)
mod |= ECORE_X_LOCK_NUM;
*/
EINA_LIST_FOREACH(bindlist ?: e_config->key_bindings, l, bi)
{
if (bi != skip)
{
if ((bi->modifiers == mod) && (!strcmp(bi->key, ev->keyname)))
return bi;
}
if (num) (*num)++;
}
*num = 0;
return NULL;
}

2
src/bin/e_utils.h
View File

@ -60,7 +60,7 @@ EAPI void e_util_win_auto_resize_fill(E_Win *win);
EAPI Eina_Bool e_util_module_config_check(const char *module_name, int loaded, int current);
EAPI int e_util_container_desk_count_get(E_Container *con);
EAPI E_Config_Binding_Key *e_util_binding_match(const Eina_List *bindlist, Ecore_Event_Key *ev, unsigned int *num, const E_Config_Binding_Key *skip);
EAPI Eina_Bool e_util_fullscreen_curreny_any(void);
EAPI Eina_Bool e_util_fullscreen_any(void);
EAPI const char *e_util_time_str_get(long int seconds);

41
src/modules/conf_keybindings/e_int_config_keybindings.c
View File

@ -1001,46 +1001,19 @@ _grab_key_down_cb(void *data,
}
else
{
E_Config_Binding_Key *bi = NULL, *bi2 = NULL;
E_Config_Binding_Key *bi = NULL;
Eina_List *l = NULL;
unsigned int mod = E_BINDING_MODIFIER_NONE;
int found = 0, n;
unsigned int n, found;
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;
/* see comment in e_bindings on numlock
if (ev->modifiers & ECORE_X_LOCK_NUM)
mod |= ECORE_X_LOCK_NUM;
*/
if (cfdata->locals.add)
{
found = 0;
for (l = cfdata->binding.key, n = 0; l && !found; l = l->next, n++)
{
bi = l->data;
if (bi->modifiers == mod && !strcmp(bi->key, ev->keyname))
found = 1;
}
}
found = !!e_util_binding_match(cfdata->binding.key, ev, &n, NULL);
else if (cfdata->locals.cur && cfdata->locals.cur[0])
{
found = 0;
sscanf(cfdata->locals.cur, "k%d", &n);
bi = eina_list_nth(cfdata->binding.key, n);
for (l = cfdata->binding.key, n = 0; l && !found; l = l->next, n++)
{
bi2 = l->data;
if (bi == bi2) continue;
if (bi2->modifiers == mod && !strcmp(bi2->key, ev->keyname))
found = 1;
}
found = !!e_util_binding_match(cfdata->binding.key, ev, &n, bi);
}
if (!found)
@ -1087,7 +1060,7 @@ _grab_key_down_cb(void *data,
{
char *label;
E_Ilist_Item *it;
int i = 0;
unsigned int i = 0;
sscanf(cfdata->locals.cur, "k%d", &n);
bi = eina_list_nth(cfdata->binding.key, n);
@ -1111,7 +1084,7 @@ _grab_key_down_cb(void *data,
}
else
{
int i = 0;
unsigned int i = 0;
E_Ilist_Item *it;
#if 0
/* this advice is rather irritating as one sees that the