zhangyiss/editline
1
0
Fork 0
mirror of https://github.com/troglobit/editline.git synced 2025-05-06 04:21:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

readline(): Check custom key bindings as well.

Browse Source 
Make sure to also check custom key bindings.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson 2013-07-08 16:19:17 +02:00
parent 8e81add050
commit 111fc5e1fb
1 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/editline.c
View File

@ -122,6 +122,7 @@ char **(*rl_attempted_completion_function)(const char *token, int start, int end
/* Declarations. */ /* Declarations. */
static char *editinput(void); static char *editinput(void);
static int is_ctl_map_key(int key);
#ifdef CONFIG_USE_TERMCAP #ifdef CONFIG_USE_TERMCAP
extern char *tgetstr(const char *, char **); extern char *tgetstr(const char *, char **);
extern int tgetent(char *, const char *); extern int tgetent(char *, const char *);
@ -930,6 +931,9 @@ static el_status_t tty_special(int c)
return kill_line(); return kill_line();
} }
if (is_ctl_map_key(c))
return CSdispatch;
if (c == rl_eof && rl_point == 0 && rl_end == 0) if (c == rl_eof && rl_point == 0 && rl_end == 0)
return CSeof; return CSeof;
@ -1612,30 +1616,49 @@ static el_keymap_t MetaMap[64]= {
{ 0, NULL } { 0, NULL }
}; };
static void el_bind_key_in_map(int key, el_keymap_func_t function, el_keymap_t map[], size_t mapsz) static size_t find_key_in_map(int key, el_keymap_t map[], size_t mapsz)
{ {
size_t i; size_t i;
for (i = 0; Map[i].Function != NULL; i++) for (i = 0; map[i].Function != NULL; i++) {
{
if (map[i].Key == key) if (map[i].Key == key)
{ return i;
map[i].Function = function;
return;
}
} }
/* A new key so have to add it to end */ if (i < mapsz)
if (i == mapsz) return i;
{
fprintf(stderr,"editline: failed binding key 0x%x, keymap full.\n", key); return mapsz;
}
static int is_ctl_map_key(int key)
{
size_t mapsz = ARRAY_ELEMENTS(Map);
return mapsz != find_key_in_map(key, Map, mapsz);
}
static void el_bind_key_in_map(int key, el_keymap_func_t function, el_keymap_t map[], size_t mapsz)
{
size_t creat, pos = find_key_in_map(key, map, mapsz);
if (pos == mapsz) {
fprintf(stderr,"editline: Failed binding key 0x%x, keymap full.\n", key);
return; return;
} }
map[i].Key = key; /* Add at end, create new? */
map[i].Function = function; creat = map[pos].Function == NULL;
map[i + 1].Function = NULL; /* Terminate list */ /* A new key so have to add it to end */
map[pos].Key = key;
map[pos].Function = function;
/* Terminate list */
if (creat) {
map[pos + 1].Key = 0;
map[pos + 1].Function = NULL;
}
} }
void el_bind_key(int key, el_keymap_func_t function) void el_bind_key(int key, el_keymap_func_t function)