Sync OpenBSD patchset 454:

Tidy up table.
This commit is contained in:
Tiago Cunha 2009-10-28 22:56:50 +00:00
parent 98122860cc
commit a8300b7a44
1 changed files with 68 additions and 72 deletions

View File

@ -1,4 +1,4 @@
/* $Id: tty-keys.c,v 1.33 2009-10-28 22:53:03 tcunha Exp $ */ /* $Id: tty-keys.c,v 1.34 2009-10-28 22:56:50 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -39,6 +39,7 @@ struct tty_key_ent {
struct tty_key_ent tty_keys[] = { struct tty_key_ent tty_keys[] = {
/* Function keys. */ /* Function keys. */
{ TTYC_KF1, NULL, KEYC_F1, TTYKEY_CTRL }, { TTYC_KF1, NULL, KEYC_F1, TTYKEY_CTRL },
{ TTYC_KF1, NULL, KEYC_F1, TTYKEY_CTRL },
{ TTYC_KF2, NULL, KEYC_F2, TTYKEY_CTRL }, { TTYC_KF2, NULL, KEYC_F2, TTYKEY_CTRL },
{ TTYC_KF3, NULL, KEYC_F3, TTYKEY_CTRL }, { TTYC_KF3, NULL, KEYC_F3, TTYKEY_CTRL },
{ TTYC_KF4, NULL, KEYC_F4, TTYKEY_CTRL }, { TTYC_KF4, NULL, KEYC_F4, TTYKEY_CTRL },
@ -77,14 +78,14 @@ struct tty_key_ent tty_keys[] = {
{ 0, "\033[C", KEYC_RIGHT, TTYKEY_RAW }, { 0, "\033[C", KEYC_RIGHT, TTYKEY_RAW },
{ 0, "\033[D", KEYC_LEFT, TTYKEY_RAW }, { 0, "\033[D", KEYC_LEFT, TTYKEY_RAW },
{ 0, "\033Oa", KEYC_UP | KEYC_CTRL, TTYKEY_RAW }, { 0, "\033Oa", KEYC_UP|KEYC_CTRL, TTYKEY_RAW },
{ 0, "\033Ob", KEYC_DOWN | KEYC_CTRL, TTYKEY_RAW }, { 0, "\033Ob", KEYC_DOWN|KEYC_CTRL, TTYKEY_RAW },
{ 0, "\033Oc", KEYC_RIGHT | KEYC_CTRL, TTYKEY_RAW }, { 0, "\033Oc", KEYC_RIGHT|KEYC_CTRL, TTYKEY_RAW },
{ 0, "\033Od", KEYC_LEFT | KEYC_CTRL, TTYKEY_RAW }, { 0, "\033Od", KEYC_LEFT|KEYC_CTRL, TTYKEY_RAW },
{ 0, "\033[a", KEYC_UP | KEYC_SHIFT, TTYKEY_RAW }, { 0, "\033[a", KEYC_UP|KEYC_SHIFT, TTYKEY_RAW },
{ 0, "\033[b", KEYC_DOWN | KEYC_SHIFT, TTYKEY_RAW }, { 0, "\033[b", KEYC_DOWN|KEYC_SHIFT, TTYKEY_RAW },
{ 0, "\033[c", KEYC_RIGHT | KEYC_SHIFT, TTYKEY_RAW }, { 0, "\033[c", KEYC_RIGHT|KEYC_SHIFT, TTYKEY_RAW },
{ 0, "\033[d", KEYC_LEFT | KEYC_SHIFT, TTYKEY_RAW }, { 0, "\033[d", KEYC_LEFT|KEYC_SHIFT, TTYKEY_RAW },
{ TTYC_KCUU1, NULL, KEYC_UP, TTYKEY_CTRL }, { TTYC_KCUU1, NULL, KEYC_UP, TTYKEY_CTRL },
{ TTYC_KCUD1, NULL, KEYC_DOWN, TTYKEY_CTRL }, { TTYC_KCUD1, NULL, KEYC_DOWN, TTYKEY_CTRL },
@ -92,14 +93,9 @@ struct tty_key_ent tty_keys[] = {
{ TTYC_KCUF1, NULL, KEYC_RIGHT, TTYKEY_CTRL }, { TTYC_KCUF1, NULL, KEYC_RIGHT, TTYKEY_CTRL },
/* /*
* Numeric keypad. termcap and terminfo are totally confusing for this. * Numeric keypad. Just use the vt100 escape sequences here and always
* There are definitions for some keypad keys and for function keys, * put the terminal into keypad_xmit mode. Translation of numbers
* but these seem to now be used for the real function keys rather than * mode/applications mode is done in input-keys.c.
* for the keypad keys in application mode (which is different from
* what it says in the termcap file). So, we just hardcode the vt100
* escape sequences here and always put the terminal into keypad_xmit
* mode. Translation of numbers mode/applications mode is done in
* input-keys.c.
*/ */
{ 0, "\033Oo", KEYC_KP_SLASH, TTYKEY_RAW }, { 0, "\033Oo", KEYC_KP_SLASH, TTYKEY_RAW },
{ 0, "\033Oj", KEYC_KP_STAR, TTYKEY_RAW }, { 0, "\033Oj", KEYC_KP_STAR, TTYKEY_RAW },