aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

Factor kbd_stroke_lookup out of bind_act.

Browse Source
This commit is contained in:
Miciah Dashiel Butler Masters 2005-12-24 05:40:40 +00:00 committed by Miciah Dashiel Butler Masters
parent 92da153e13
commit 5714a8b54e
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/config/kbdbind.c
View File

@ -204,6 +204,17 @@ kbd_nm_lookup(enum keymap_id keymap_id, unsigned char *name)
return kbd_act_lookup(keymap_id, action_id); return kbd_act_lookup(keymap_id, action_id);
} }
static struct keybinding *
kbd_stroke_lookup(enum keymap_id keymap_id, unsigned char *keystroke_str)
{
struct term_event_keyboard kbd;
if (parse_keystroke(keystroke_str, &kbd) < 0)
return NULL;
return kbd_ev_lookup(keymap_id, &kbd, NULL);
}
static struct keymap keymap_table[] = { static struct keymap keymap_table[] = {
{ "main", KEYMAP_MAIN, N_("Main mapping") }, { "main", KEYMAP_MAIN, N_("Main mapping") },
@ -854,7 +865,6 @@ unsigned char *
bind_act(unsigned char *keymap_str, unsigned char *keystroke_str) bind_act(unsigned char *keymap_str, unsigned char *keystroke_str)
{ {
enum keymap_id keymap_id; enum keymap_id keymap_id;
struct term_event_keyboard kbd;
unsigned char *action; unsigned char *action;
struct keybinding *keybinding; struct keybinding *keybinding;
@ -862,10 +872,7 @@ bind_act(unsigned char *keymap_str, unsigned char *keystroke_str)
if (keymap_id < 0) if (keymap_id < 0)
return NULL; return NULL;
if (parse_keystroke(keystroke_str, &kbd) < 0) keybinding = kbd_stroke_lookup(keymap_id, keystroke_str);
return NULL;
keybinding = kbd_ev_lookup(keymap_id, &kbd, NULL);
if (!keybinding) return NULL; if (!keybinding) return NULL;
action = get_action_name(keymap_id, keybinding->action_id); action = get_action_name(keymap_id, keybinding->action_id);