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

outdent! 

SVN revision: 55732
This commit is contained in:
Mike Blumenkrantz 2010-12-23 00:57:47 +00:00
parent 7bf11e8075
commit 18a3bc72ef
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1074,24 +1074,21 @@ _grab_key_down_cb(void *data,
found = 1; found = 1;
} }
} }
else else if (cfdata->locals.cur && cfdata->locals.cur[0])
{ {
if (cfdata->locals.cur && cfdata->locals.cur[0]) found = 0;
{ sscanf(cfdata->locals.cur, "k%d", &n);
found = 0; bi = eina_list_nth(cfdata->binding.key, n);
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++) for (l = cfdata->binding.key, n = 0; l && !found; l = l->next, n++)
{ {
bi2 = l->data; bi2 = l->data;
if (bi == bi2) continue; if (bi == bi2) continue;
if (bi2->modifiers == mod && !strcmp(bi2->key, ev->keyname)) if (bi2->modifiers == mod && !strcmp(bi2->key, ev->keyname))
found = 1; found = 1;
}
} }
} }
if (!found) if (!found)
{ {
if (cfdata->locals.add) if (cfdata->locals.add)
@ -1107,17 +1104,14 @@ _grab_key_down_cb(void *data,
cfdata->binding.key = eina_list_append(cfdata->binding.key, bi); cfdata->binding.key = eina_list_append(cfdata->binding.key, bi);
} }
else else if (cfdata->locals.cur && cfdata->locals.cur[0])
{ {
if (cfdata->locals.cur && cfdata->locals.cur[0]) sscanf(cfdata->locals.cur, "k%d", &n);
{ bi = eina_list_nth(cfdata->binding.key, n);
sscanf(cfdata->locals.cur, "k%d", &n);
bi = eina_list_nth(cfdata->binding.key, n);
bi->modifiers = mod; bi->modifiers = mod;
if (bi->key) eina_stringshare_del(bi->key); if (bi->key) eina_stringshare_del(bi->key);
bi->key = eina_stringshare_add(ev->keyname); bi->key = eina_stringshare_add(ev->keyname);
}
} }
if (cfdata->locals.add) if (cfdata->locals.add)