diff options
| author | Marc André Tanner <mat@brain-dump.org> | 2015-07-09 15:37:02 +0200 |
|---|---|---|
| committer | Marc André Tanner <mat@brain-dump.org> | 2015-07-09 16:41:46 +0200 |
| commit | 160db043cc285d9e32b17502ab0fbd897d7bf420 (patch) | |
| tree | 3eeeb31ed01dcacc347c2976421dda42a3c455e4 | |
| parent | b88e0eff7e8ac64dd0aeb7ec93e9803689d068fe (diff) | |
| download | vis-160db043cc285d9e32b17502ab0fbd897d7bf420.tar.gz vis-160db043cc285d9e32b17502ab0fbd897d7bf420.tar.xz | |
ui: unify backspace handling
| -rw-r--r-- | config.def.h | 13 | ||||
| -rw-r--r-- | ui-curses.c | 13 |
2 files changed, 17 insertions, 9 deletions
diff --git a/config.def.h b/config.def.h index dff70d5..658a156 100644 --- a/config.def.h +++ b/config.def.h @@ -5,11 +5,6 @@ #define KEY(k) { .str = { '\0' }, .code = KEY_##k } #define CONTROL(k) NONE((k)&0x1F) #define META(k) { .str = { ESC, (k) }, .code = 0 } -#define BACKSPACE(func, name, arg) \ - { { KEY(BACKSPACE) }, (func), { .name = (arg) } }, \ - { { CONTROL('H') }, (func), { .name = (arg) } }, \ - { { NONE(127) }, (func), { .name = (arg) } }, \ - { { CONTROL('B') }, (func), { .name = (arg) } } /* a mode contains a set of key bindings which are currently valid. * @@ -98,7 +93,7 @@ static KeyBinding basic_movement[] = { }; static KeyBinding vis_movements[] = { - BACKSPACE( movement, i, MOVE_CHAR_PREV ), + { { KEY(BACKSPACE) }, movement, { .i = MOVE_CHAR_PREV } }, { { NONE('h') }, movement, { .i = MOVE_CHAR_PREV } }, { { NONE(' ') }, movement, { .i = MOVE_CHAR_NEXT } }, { { NONE('l') }, movement, { .i = MOVE_CHAR_NEXT } }, @@ -424,7 +419,7 @@ static KeyBinding vis_mode_normal[] = { }; static KeyBinding vis_mode_visual[] = { - BACKSPACE( operator, i, OP_DELETE ), + { { KEY(BACKSPACE) }, operator, { .i = OP_DELETE } }, { { KEY(DC) }, operator, { .i = OP_DELETE } }, { { NONE(ESC) }, switchmode, { .i = VIS_MODE_NORMAL } }, { { CONTROL('c') }, switchmode, { .i = VIS_MODE_NORMAL } }, @@ -483,7 +478,7 @@ static void vis_mode_visual_line_leave(Mode *new) { } static KeyBinding vis_mode_readline[] = { - BACKSPACE( call, f, editor_backspace_key ), + { { KEY(BACKSPACE) }, call, { .f = editor_backspace_key } }, { { NONE(ESC) }, switchmode, { .i = VIS_MODE_NORMAL } }, { { CONTROL('c') }, switchmode, { .i = VIS_MODE_NORMAL } }, { { CONTROL('D') }, delete , { .i = MOVE_CHAR_NEXT } }, @@ -493,7 +488,7 @@ static KeyBinding vis_mode_readline[] = { }; static KeyBinding vis_mode_prompt[] = { - BACKSPACE( prompt_backspace, s, NULL ), + { { KEY(BACKSPACE) }, prompt_backspace,{ .s = NULL } }, { { KEY(ENTER) }, prompt_enter, { NULL } }, { { CONTROL('J') }, prompt_enter, { NULL } }, { { KEY(UP) }, prompt_up, { NULL } }, diff --git a/ui-curses.c b/ui-curses.c index f333c1d..a57ab8f 100644 --- a/ui-curses.c +++ b/ui-curses.c @@ -28,6 +28,8 @@ int ESCDELAY; # define set_escdelay(d) (ESCDELAY = (d)) #endif +#define CONTROL(k) ((k)&0x1F) + #if 0 #define wresize(win, y, x) do { \ if (wresize(win, y, x) == ERR) { \ @@ -563,6 +565,17 @@ static Key ui_getkey(Ui *ui) { key.str[cur] = t; nodelay(stdscr, FALSE); } + + if (len == 1) { + switch (key.str[0]) { + case 127: + case CONTROL('H'): + case CONTROL('B'): + key.code = KEY_BACKSPACE; + key.str[0] = '\0'; + break; + } + } } return key; |