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

Add ability to have seperate NumLock key bindings for on & off states. 

SVN revision: 27417
This commit is contained in:
Christopher Michael 2006-12-11 10:19:46 +00:00
parent 57a782b2c3
commit 5f749052d9
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/e_int_config_keybindings.c
View File

@ -910,7 +910,7 @@ _key_binding_sort_cb(void *d1, void *d2)
if (bi2->modifiers & E_BINDING_MODIFIER_ALT) j++; if (bi2->modifiers & E_BINDING_MODIFIER_ALT) j++;
if (bi2->modifiers & E_BINDING_MODIFIER_SHIFT) j++; if (bi2->modifiers & E_BINDING_MODIFIER_SHIFT) j++;
if (bi2->modifiers & E_BINDING_MODIFIER_WIN) j++; if (bi2->modifiers & E_BINDING_MODIFIER_WIN) j++;
if (i < j) return -1; if (i < j) return -1;
else if (i > j) return 1; else if (i > j) return 1;
@ -1004,7 +1004,7 @@ _grab_key_down_cb(void *data, int type, void *event)
cfdata = data; cfdata = data;
if (ev->win != cfdata->locals.bind_win) return 1; if (ev->win != cfdata->locals.bind_win) return 1;
if (!strcmp(ev->keyname, "Escape") && if (!strcmp(ev->keyname, "Escape") &&
!(ev->modifiers & ECORE_X_MODIFIER_SHIFT) && !(ev->modifiers & ECORE_X_MODIFIER_SHIFT) &&
!(ev->modifiers & ECORE_X_MODIFIER_CTRL) && !(ev->modifiers & ECORE_X_MODIFIER_CTRL) &&
@ -1041,7 +1041,9 @@ _grab_key_down_cb(void *data, int type, void *event)
mod |= E_BINDING_MODIFIER_ALT; mod |= E_BINDING_MODIFIER_ALT;
if (ev->modifiers & ECORE_X_MODIFIER_WIN) if (ev->modifiers & ECORE_X_MODIFIER_WIN)
mod |= E_BINDING_MODIFIER_WIN; mod |= E_BINDING_MODIFIER_WIN;
if (ev->modifiers & ECORE_X_LOCK_NUM)
mod |= ECORE_X_LOCK_NUM;
if (cfdata->locals.add) if (cfdata->locals.add)
{ {
found = 0; found = 0;
@ -1305,7 +1307,7 @@ _key_binding_text_get(E_Config_Binding_Key *bi)
if (b[0]) strcat(b, " + "); if (b[0]) strcat(b, " + ");
strcat(b, _("WIN")); strcat(b, _("WIN"));
} }
if (bi->key && bi->key[0]) if (bi->key && bi->key[0])
{ {
char *l; char *l;
@ -1317,6 +1319,12 @@ _key_binding_text_get(E_Config_Binding_Key *bi)
free(l); free(l);
} }
if (bi->modifiers & ECORE_X_LOCK_NUM)
{
if (b[0]) strcat(b, " ");
strcat(b, _("OFF"));
}
if (!b[0]) return strdup(TEXT_NONE_ACTION_KEY); if (!b[0]) return strdup(TEXT_NONE_ACTION_KEY);
return strdup(b); return strdup(b);
} }