circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-16 09:28:51 +00:00
Code Issues Projects Releases Wiki Activity

Update key handling code. Simplify, support ctrl properly and add a new window option (xterm-keys) to output xterm key codes including ctrl and, if available, alt and shift.

Browse Source
This commit is contained in:
Nicholas Marriott 2009-01-09 16:45:58 +00:00
parent 622d4def22
commit ed1031b358
9 changed files with 322 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGES
View File

@ -1,3 +1,9 @@
09 January 2009
* Update key handling code. Simplify, support ctrl properly and add a new
window option (xterm-keys) to output xterm key codes including ctrl and,
if available, alt and shift.
08 January 2009 08 January 2009
* If built without DEBUG (the release versions), don't cause a fatal error if * If built without DEBUG (the release versions), don't cause a fatal error if
@ -820,7 +826,7 @@
(including mutt, emacs). No status bar yet and no key remapping or other (including mutt, emacs). No status bar yet and no key remapping or other
customisation. customisation.
$Id: CHANGES,v 1.183 2009-01-08 21:59:24 nicm Exp $ $Id: CHANGES,v 1.184 2009-01-09 16:45:58 nicm Exp $
LocalWords: showw utf UTF fulvio ciriaco joshe OSC APC gettime abc DEF OA clr LocalWords: showw utf UTF fulvio ciriaco joshe OSC APC gettime abc DEF OA clr
LocalWords: rivo nurges lscm Erdely eol smysession mysession ek dstname RB LocalWords: rivo nurges lscm Erdely eol smysession mysession ek dstname RB

3
cmd-list-clients.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd-list-clients.c,v 1.9 2009-01-07 20:11:51 nicm Exp $ */ /* $Id: cmd-list-clients.c,v 1.10 2009-01-09 16:45:58 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -47,7 +47,6 @@ cmd_list_clients_exec(unused struct cmd *self, struct cmd_ctx *ctx)
{ {
struct client *c; struct client *c;
u_int i; u_int i;
char options[256];
for (i = 0; i < ARRAY_LENGTH(&clients); i++) { for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
c = ARRAY_ITEM(&clients, i); c = ARRAY_ITEM(&clients, i);

3
cmd-set-window-option.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd-set-window-option.c,v 1.16 2009-01-07 19:53:17 nicm Exp $ */ /* $Id: cmd-set-window-option.c,v 1.17 2009-01-09 16:45:58 nicm Exp $ */
/* /*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -60,6 +60,7 @@ const struct set_option_entry set_window_option_table[NSETWINDOWOPTION] = {
{ "monitor-activity", SET_OPTION_FLAG, 0, 0, NULL }, { "monitor-activity", SET_OPTION_FLAG, 0, 0, NULL },
{ "remain-on-exit", SET_OPTION_FLAG, 0, 0, NULL }, { "remain-on-exit", SET_OPTION_FLAG, 0, 0, NULL },
{ "utf8", SET_OPTION_FLAG, 0, 0, NULL }, { "utf8", SET_OPTION_FLAG, 0, 0, NULL },
{ "xterm-keys", SET_OPTION_FLAG, 0, 0, NULL },
}; };
void void

150
input-keys.c
View File

@ -1,4 +1,4 @@
/* $Id: input-keys.c,v 1.17 2009-01-08 22:28:02 nicm Exp $ */ /* $Id: input-keys.c,v 1.18 2009-01-09 16:45:58 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -24,42 +24,47 @@
#include "tmux.h" #include "tmux.h"
#define INPUTKEY_KEYPAD 0x1 struct input_key_ent {
#define INPUTKEY_CURSOR 0x2
struct {
int key; int key;
const char *data; const char *data;
int flags; int flags;
} input_keys[] = { #define INPUTKEY_KEYPAD 0x1 /* keypad key */
#define INPUTKEY_CURSOR 0x2 /* cursor key */
#define INPUTKEY_MODIFIER 0x4 /* may be adjusted by modifiers */
#define INPUTKEY_XTERM 0x4 /* may have xterm argument appended */
};
struct input_key_ent input_keys[] = {
/* Function keys. */ /* Function keys. */
{ KEYC_F1, "\033OP", 0 }, { KEYC_F1, "\033OP", INPUTKEY_MODIFIER|INPUTKEY_XTERM },
{ KEYC_F2, "\033OQ", 0 }, { KEYC_F2, "\033OQ", INPUTKEY_MODIFIER|INPUTKEY_XTERM },
{ KEYC_F3, "\033OR", 0 }, { KEYC_F3, "\033OR", INPUTKEY_MODIFIER|INPUTKEY_XTERM },
{ KEYC_F4, "\033OS", 0 }, { KEYC_F4, "\033OS", INPUTKEY_MODIFIER|INPUTKEY_XTERM },
{ KEYC_F5, "\033[15~", 0 }, { KEYC_F5, "\033[15~", INPUTKEY_MODIFIER|INPUTKEY_XTERM },
{ KEYC_F6, "\033[17~", 0 }, { KEYC_F6, "\033[17~", INPUTKEY_MODIFIER|INPUTKEY_XTERM },
{ KEYC_F7, "\033[18~", 0 }, { KEYC_F7, "\033[18~", INPUTKEY_MODIFIER|INPUTKEY_XTERM },
{ KEYC_F8, "\033[19~", 0 }, { KEYC_F8, "\033[19~", INPUTKEY_MODIFIER|INPUTKEY_XTERM },
{ KEYC_F9, "\033[20~", 0 }, { KEYC_F9, "\033[20~", INPUTKEY_MODIFIER|INPUTKEY_XTERM },
{ KEYC_F10, "\033[21~", 0 }, { KEYC_F10, "\033[21~", INPUTKEY_MODIFIER|INPUTKEY_XTERM },
{ KEYC_F11, "\033[23~", 0 }, { KEYC_F11, "\033[23~", INPUTKEY_MODIFIER|INPUTKEY_XTERM },
{ KEYC_F12, "\033[24~", 0 }, { KEYC_F12, "\033[24~", INPUTKEY_MODIFIER|INPUTKEY_XTERM },
{ KEYC_IC, "\033[2~", 0 }, { KEYC_IC, "\033[2~", INPUTKEY_MODIFIER|INPUTKEY_XTERM },
{ KEYC_DC, "\033[3~", 0 }, { KEYC_DC, "\033[3~", INPUTKEY_MODIFIER|INPUTKEY_XTERM },
{ KEYC_HOME, "\033[1~", 0 }, { KEYC_HOME, "\033[1~", INPUTKEY_MODIFIER|INPUTKEY_XTERM },
{ KEYC_END, "\033[4~", 0 }, { KEYC_END, "\033[4~", INPUTKEY_MODIFIER|INPUTKEY_XTERM },
{ KEYC_NPAGE, "\033[6~", 0 }, { KEYC_NPAGE, "\033[6~", INPUTKEY_MODIFIER|INPUTKEY_XTERM },
{ KEYC_PPAGE, "\033[5~", 0 }, { KEYC_PPAGE, "\033[5~", INPUTKEY_MODIFIER|INPUTKEY_XTERM },
/* Arrow keys. Cursor versions must come first. */ /* Arrow keys. Cursor versions must come first. */
{ KEYC_UP, "\033OA", INPUTKEY_CURSOR }, { KEYC_UP, "\033OA", INPUTKEY_MODIFIER|INPUTKEY_CURSOR },
{ KEYC_DOWN, "\033OB", INPUTKEY_CURSOR }, { KEYC_DOWN, "\033OB", INPUTKEY_MODIFIER|INPUTKEY_CURSOR },
{ KEYC_LEFT, "\033OD", INPUTKEY_CURSOR }, { KEYC_LEFT, "\033OD", INPUTKEY_MODIFIER|INPUTKEY_CURSOR },
{ KEYC_RIGHT, "\033OC", INPUTKEY_CURSOR }, { KEYC_RIGHT, "\033OC", INPUTKEY_MODIFIER|INPUTKEY_CURSOR },
{ KEYC_UP, "\033[A", 0 }, { KEYC_UP, "\033[A", INPUTKEY_MODIFIER },
{ KEYC_DOWN, "\033[B", 0 }, { KEYC_DOWN, "\033[B", INPUTKEY_MODIFIER },
{ KEYC_LEFT, "\033[D", 0 }, { KEYC_LEFT, "\033[D", INPUTKEY_MODIFIER },
{ KEYC_RIGHT, "\033[C", 0 }, { KEYC_RIGHT, "\033[C", INPUTKEY_MODIFIER },
/* Keypad keys. Keypad versions must come first. */ /* Keypad keys. Keypad versions must come first. */
{ KEYC_KP0_1, "/", INPUTKEY_KEYPAD }, { KEYC_KP0_1, "/", INPUTKEY_KEYPAD },
@ -100,35 +105,92 @@ struct {
void void
input_key(struct window *w, int key) input_key(struct window *w, int key)
{ {
u_int i; struct input_key_ent *ike;
u_int i;
char ch;
size_t dlen;
log_debug2("writing key 0x%x", key); log_debug2("writing key 0x%x", key);
if (KEYC_ISESCAPE(key)) { if (key != KEYC_NONE && KEYC_REMOVEESC(key) < KEYC_OFFSET) {
buffer_write8(w->out, '\033'); if (KEYC_ISESC(key))
key = KEYC_REMOVEESCAPE(key); buffer_write8(w->out, '\033');
} buffer_write8(w->out, (uint8_t) KEYC_REMOVEESC(key));
if (key != KEYC_NONE && key < KEYC_OFFSET) {
buffer_write8(w->out, (uint8_t) key);
return; return;
} }
for (i = 0; i < nitems(input_keys); i++) { for (i = 0; i < nitems(input_keys); i++) {
if ((input_keys[i].flags & INPUTKEY_KEYPAD) && ike = &input_keys[i];
if ((ike->flags & INPUTKEY_KEYPAD) &&
!(w->screen->mode & MODE_KKEYPAD)) !(w->screen->mode & MODE_KKEYPAD))
continue; continue;
if ((input_keys[i].flags & INPUTKEY_CURSOR) && if ((ike->flags & INPUTKEY_CURSOR) &&
!(w->screen->mode & MODE_KCURSOR)) !(w->screen->mode & MODE_KCURSOR))
continue; continue;
if (input_keys[i].key == key)
if (ike->flags & INPUTKEY_MODIFIER) {
if (KEYC_ISCTL(key) && KEYC_ADDCTL(ike->key) == key)
break;
if (KEYC_ISESC(key) && KEYC_ADDESC(ike->key) == key)
break;
if (KEYC_ISSFT(key) && KEYC_ADDSFT(ike->key) == key)
break;
}
if (ike->key == key)
break; break;
} }
if (i == nitems(input_keys)) { if (i == nitems(input_keys)) {
log_debug2("key 0x%x missing", key); log_debug2("key 0x%x missing", key);
return; return;
} }
dlen = strlen(ike->data);
log_debug2("found key 0x%x: \"%s\"", key, input_keys[i].data); log_debug2("found key 0x%x: \"%s\"", key, ike->data);
buffer_write(w->out, input_keys[i].data, strlen(input_keys[i].data));
if (ike->flags & INPUTKEY_XTERM &&
options_get_number(&w->options, "xterm-keys")) {
/* In xterm keys mode, append modifier argument. */
ch = '\0';
if (KEYC_ISSFT(key) && KEYC_ISESC(key) && KEYC_ISCTL(key))
ch = '8';
else if (KEYC_ISESC(key) && KEYC_ISCTL(key))
ch = '7';
else if (KEYC_ISSFT(key) && KEYC_ISCTL(key))
ch = '6';
else if (KEYC_ISCTL(key))
ch = '5';
else if (KEYC_ISSFT(key) && KEYC_ISESC(key))
ch = '4';
else if (KEYC_ISESC(key))
ch = '3';
else if (KEYC_ISSFT(key))
ch = '2';
if (ch != '\0') {
log_debug("output argument is: %c", ch);
buffer_write(w->out, ike->data, dlen - 1);
buffer_write8(w->out, ';');
buffer_write8(w->out, ch);
buffer_write8(w->out, ike->data[dlen - 1]);
} else
buffer_write(w->out, ike->data, dlen);
return;
}
if (ike->flags & INPUTKEY_MODIFIER) {
/*
* If not in xterm keys or not an xterm key handle escape and
* control (shift not supported).
*/
if (KEYC_ISESC(key))
buffer_write8(w->out, '\033');
if (!KEYC_ISCTL(key)) {
buffer_write(w->out, ike->data, dlen);
return;
}
buffer_write(w->out, ike->data, dlen - 1);
buffer_write8(w->out, ike->data[dlen - 1] ^ 0x20);
return;
}
buffer_write(w->out, ike->data, dlen);
} }

41
key-string.c
View File

@ -1,4 +1,4 @@
/* $Id: key-string.c,v 1.10 2009-01-08 22:28:02 nicm Exp $ */ /* $Id: key-string.c,v 1.11 2009-01-09 16:45:58 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -22,6 +22,8 @@
#include "tmux.h" #include "tmux.h"
int key_string_search_table(const char *);
struct { struct {
const char *string; const char *string;
int key; int key;
@ -71,6 +73,18 @@ struct {
{ "KP.", KEYC_KP4_2 }, { "KP.", KEYC_KP4_2 },
}; };
int
key_string_search_table(const char *string)
{
u_int i;
for (i = 0; i < nitems(key_string_table); i++) {
if (strcasecmp(string, key_string_table[i].string) == 0)
return (key_string_table[i].key);
}
return (KEYC_NONE);
}
int int
key_string_lookup_string(const char *string) key_string_lookup_string(const char *string)
{ {
@ -91,6 +105,9 @@ key_string_lookup_string(const char *string)
return (string[2] - 64); return (string[2] - 64);
if (string[2] >= 97 && string[2] <= 122) if (string[2] >= 97 && string[2] <= 122)
return (string[2] - 96); return (string[2] - 96);
key = key_string_search_table(string + 2);
if (key != KEYC_NONE)
return (KEYC_ADDCTL(key));
return (KEYC_NONE); return (KEYC_NONE);
} }
@ -103,20 +120,19 @@ key_string_lookup_string(const char *string)
return (string[1] - 64); return (string[1] - 64);
if (string[1] >= 97 && string[1] <= 122) if (string[1] >= 97 && string[1] <= 122)
return (string[1] - 96); return (string[1] - 96);
key = key_string_search_table(string + 1);
if (key != KEYC_NONE)
return (KEYC_ADDCTL(key));
return (KEYC_NONE); return (KEYC_NONE);
} }
if (string[0] == 'M' && string[1] == '-') { if (string[0] == 'M' && string[1] == '-') {
if ((key = key_string_lookup_string(string + 2)) == KEYC_NONE) if ((key = key_string_lookup_string(string + 2)) == KEYC_NONE)
return (KEYC_NONE); return (KEYC_NONE);
return (KEYC_ADDESCAPE(key)); return (KEYC_ADDESC(key));
} }
for (i = 0; i < nitems(key_string_table); i++) { return (key_string_search_table(string));
if (strcasecmp(string, key_string_table[i].string) == 0)
return (key_string_table[i].key);
}
return (KEYC_NONE);
} }
const char * const char *
@ -129,12 +145,19 @@ key_string_lookup_key(int key)
if (key == 127) if (key == 127)
return (NULL); return (NULL);
if (KEYC_ISESCAPE(key)) { if (KEYC_ISESC(key)) {
if ((s = key_string_lookup_key(KEYC_REMOVEESCAPE(key))) == NULL) if ((s = key_string_lookup_key(KEYC_REMOVEESC(key))) == NULL)
return (NULL); return (NULL);
xsnprintf(tmp2, sizeof tmp2, "M-%s", s); xsnprintf(tmp2, sizeof tmp2, "M-%s", s);
return (tmp2); return (tmp2);
} }
if (KEYC_ISCTL(key)) {
if ((s = key_string_lookup_key(KEYC_REMOVECTL(key))) == NULL)
return (NULL);
xsnprintf(tmp2, sizeof tmp2, "C-%s", s);
return (tmp2);
}
if (key >= 32 && key <= 255) { if (key >= 32 && key <= 255) {
tmp[0] = key; tmp[0] = key;

8
mode-key.c
View File

@ -1,4 +1,4 @@
/* $Id: mode-key.c,v 1.4 2009-01-07 22:52:33 nicm Exp $ */ /* $Id: mode-key.c,v 1.5 2009-01-09 16:45:58 nicm Exp $ */
/* /*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -53,15 +53,15 @@ const struct mode_key_entry mode_key_table_emacs[] = {
{ MODEKEY_BOL, '\001' }, { MODEKEY_BOL, '\001' },
{ MODEKEY_CLEARSEL, '\007' }, { MODEKEY_CLEARSEL, '\007' },
{ MODEKEY_COPYSEL, '\027' }, { MODEKEY_COPYSEL, '\027' },
{ MODEKEY_COPYSEL, KEYC_ADDESCAPE('w') }, { MODEKEY_COPYSEL, KEYC_ADDESC('w') },
{ MODEKEY_DOWN, KEYC_DOWN }, { MODEKEY_DOWN, KEYC_DOWN },
{ MODEKEY_EOL, '\005' }, { MODEKEY_EOL, '\005' },
{ MODEKEY_LEFT, '\002' }, { MODEKEY_LEFT, '\002' },
{ MODEKEY_LEFT, KEYC_LEFT }, { MODEKEY_LEFT, KEYC_LEFT },
{ MODEKEY_NPAGE, KEYC_NPAGE }, { MODEKEY_NPAGE, KEYC_NPAGE },
{ MODEKEY_NWORD, KEYC_ADDESCAPE('f') }, { MODEKEY_NWORD, KEYC_ADDESC('f') },
{ MODEKEY_PPAGE, KEYC_PPAGE }, { MODEKEY_PPAGE, KEYC_PPAGE },
{ MODEKEY_PWORD, KEYC_ADDESCAPE('b') }, { MODEKEY_PWORD, KEYC_ADDESC('b') },
{ MODEKEY_QUIT, '\033' }, { MODEKEY_QUIT, '\033' },
{ MODEKEY_QUIT, 'q' }, { MODEKEY_QUIT, 'q' },
{ MODEKEY_RIGHT, '\006' }, { MODEKEY_RIGHT, '\006' },

3
tmux.c
View File

@ -1,4 +1,4 @@
/* $Id: tmux.c,v 1.84 2008-12-10 20:25:41 nicm Exp $ */ /* $Id: tmux.c,v 1.85 2009-01-09 16:45:58 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -236,6 +236,7 @@ main(int argc, char **argv)
options_set_number(&global_options, "message-fg", 0); options_set_number(&global_options, "message-fg", 0);
options_set_number(&global_options, "message-bg", 3); options_set_number(&global_options, "message-bg", 3);
options_init(&global_window_options, NULL); options_init(&global_window_options, NULL);
options_set_number(&global_window_options, "xterm-keys", 0);
options_set_number(&global_window_options, "monitor-activity", 0); options_set_number(&global_window_options, "monitor-activity", 0);
options_set_number(&global_window_options, "aggressive-resize", 0); options_set_number(&global_window_options, "aggressive-resize", 0);
options_set_number(&global_window_options, "remain-on-exit", 0); options_set_number(&global_window_options, "remain-on-exit", 0);

30
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.210 2009-01-08 22:28:02 nicm Exp $ */ /* $Id: tmux.h,v 1.211 2009-01-09 16:45:58 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -159,13 +159,23 @@ struct buffer {
#define BELL_CURRENT 2 #define BELL_CURRENT 2
/* Key codes. ncurses defines KEY_*. Grrr. */ /* Key codes. ncurses defines KEY_*. Grrr. */
#define KEYC_NONE 0x0ffff #define KEYC_NONE 0x00ffff
#define KEYC_OFFSET 0x10000 #define KEYC_OFFSET 0x010000
#define KEYC_ESCAPE 0x20000 #define KEYC_ESCAPE 0x020000
#define KEYC_CONTROL 0x080000
#define KEYC_SHIFT 0x100000
#define KEYC_ADDESCAPE(k) ((k) | KEYC_ESCAPE) #define KEYC_ADDESC(k) ((k) | KEYC_ESCAPE)
#define KEYC_REMOVEESCAPE(k) ((k) & ~KEYC_ESCAPE) #define KEYC_REMOVEESC(k) ((k) & ~KEYC_ESCAPE)
#define KEYC_ISESCAPE(k) ((k) != KEYC_NONE && ((k) & KEYC_ESCAPE)) #define KEYC_ISESC(k) ((k) != KEYC_NONE && ((k) & KEYC_ESCAPE))
#define KEYC_ADDCTL(k) ((k) | KEYC_CONTROL)
#define KEYC_REMOVECTL(k) ((k) & ~KEYC_CONTROL)
#define KEYC_ISCTL(k) ((k) != KEYC_NONE && ((k) & KEYC_CONTROL))
#define KEYC_ADDSFT(k) ((k) | KEYC_SHIFT)
#define KEYC_REMOVESFT(k) ((k) & ~KEYC_SHIFT)
#define KEYC_ISSFT(k) ((k) != KEYC_NONE && ((k) & KEYC_SHIFT))
/* Function keys. */ /* Function keys. */
#define KEYC_F1 (KEYC_OFFSET + 0x01) #define KEYC_F1 (KEYC_OFFSET + 0x01)
@ -550,6 +560,10 @@ struct tty_key {
int code; int code;
char *string; char *string;
int flags;
#define TTYKEY_MODIFIER 0x1
#define TTYKEY_RAW 0x2
RB_ENTRY(tty_key) entry; RB_ENTRY(tty_key) entry;
}; };
@ -743,7 +757,7 @@ struct set_option_entry {
extern const struct set_option_entry set_option_table[]; extern const struct set_option_entry set_option_table[];
extern const struct set_option_entry set_window_option_table[]; extern const struct set_option_entry set_window_option_table[];
#define NSETOPTION 17 #define NSETOPTION 17
#define NSETWINDOWOPTION 9 #define NSETWINDOWOPTION 10
/* Edit keys. */ /* Edit keys. */
enum mode_key { enum mode_key {

217
tty-keys.c
View File

@ -1,4 +1,4 @@
/* $Id: tty-keys.c,v 1.13 2009-01-08 22:28:02 nicm Exp $ */ /* $Id: tty-keys.c,v 1.14 2009-01-09 16:45:58 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -23,35 +23,41 @@
#include "tmux.h" #include "tmux.h"
struct { void tty_keys_add(struct tty *, const char *, int, int);
struct tty_key_ent {
const char *name; const char *name;
int code; int code;
} tty_keys[] = {
int flags;
};
struct tty_key_ent tty_keys[] = {
/* Function keys. */ /* Function keys. */
{ "kf1", KEYC_F1 }, { "kf1", KEYC_F1, TTYKEY_MODIFIER },
{ "kf2", KEYC_F2 }, { "kf2", KEYC_F2, TTYKEY_MODIFIER },
{ "kf3", KEYC_F3 }, { "kf3", KEYC_F3, TTYKEY_MODIFIER },
{ "kf4", KEYC_F4 }, { "kf4", KEYC_F4, TTYKEY_MODIFIER },
{ "kf5", KEYC_F5 }, { "kf5", KEYC_F5, TTYKEY_MODIFIER },
{ "kf6", KEYC_F6 }, { "kf6", KEYC_F6, TTYKEY_MODIFIER },
{ "kf7", KEYC_F7 }, { "kf7", KEYC_F7, TTYKEY_MODIFIER },
{ "kf8", KEYC_F8 }, { "kf8", KEYC_F8, TTYKEY_MODIFIER },
{ "kf9", KEYC_F9 }, { "kf9", KEYC_F9, TTYKEY_MODIFIER },
{ "kf10", KEYC_F10 }, { "kf10", KEYC_F10, TTYKEY_MODIFIER },
{ "kf11", KEYC_F11 }, { "kf11", KEYC_F11, TTYKEY_MODIFIER },
{ "kf12", KEYC_F12 }, { "kf12", KEYC_F12, TTYKEY_MODIFIER },
{ "kich1", KEYC_IC }, { "kich1", KEYC_IC, TTYKEY_MODIFIER },
{ "kdch1", KEYC_DC }, { "kdch1", KEYC_DC, TTYKEY_MODIFIER },
{ "khome", KEYC_HOME }, { "khome", KEYC_HOME, TTYKEY_MODIFIER },
{ "kend", KEYC_END }, { "kend", KEYC_END, TTYKEY_MODIFIER },
{ "knp", KEYC_NPAGE }, { "knp", KEYC_NPAGE, TTYKEY_MODIFIER },
{ "kpp", KEYC_PPAGE }, { "kpp", KEYC_PPAGE, TTYKEY_MODIFIER },
/* Arrow keys. */ /* Arrow keys. */
{ "kcuu1", KEYC_UP }, { "kcuu1", KEYC_UP, TTYKEY_MODIFIER },
{ "kcud1", KEYC_DOWN }, { "kcud1", KEYC_DOWN, TTYKEY_MODIFIER },
{ "kcub1", KEYC_LEFT }, { "kcub1", KEYC_LEFT, TTYKEY_MODIFIER },
{ "kcuf1", KEYC_RIGHT }, { "kcuf1", KEYC_RIGHT, TTYKEY_MODIFIER },
/* /*
* Numeric keypad. termcap and terminfo are totally confusing for this. * Numeric keypad. termcap and terminfo are totally confusing for this.
@ -63,22 +69,22 @@ struct {
* mode. Translation of numbers mode/applications mode is done in * mode. Translation of numbers mode/applications mode is done in
* input-keys.c. * input-keys.c.
*/ */
{ "-\033Oo", KEYC_KP0_1 }, { "\033Oo", KEYC_KP0_1, TTYKEY_RAW },
{ "-\033Oj", KEYC_KP0_2 }, { "\033Oj", KEYC_KP0_2, TTYKEY_RAW },
{ "-\033Om", KEYC_KP0_3 }, { "\033Om", KEYC_KP0_3, TTYKEY_RAW },
{ "-\033Ow", KEYC_KP1_0 }, { "\033Ow", KEYC_KP1_0, TTYKEY_RAW },
{ "-\033Ox", KEYC_KP1_1 }, { "\033Ox", KEYC_KP1_1, TTYKEY_RAW },
{ "-\033Oy", KEYC_KP1_2 }, { "\033Oy", KEYC_KP1_2, TTYKEY_RAW },
{ "-\033Ok", KEYC_KP1_3 }, { "\033Ok", KEYC_KP1_3, TTYKEY_RAW },
{ "-\033Ot", KEYC_KP2_0 }, { "\033Ot", KEYC_KP2_0, TTYKEY_RAW },
{ "-\033Ou", KEYC_KP2_1 }, { "\033Ou", KEYC_KP2_1, TTYKEY_RAW },
{ "-\033Ov", KEYC_KP2_2 }, { "\033Ov", KEYC_KP2_2, TTYKEY_RAW },
{ "-\033Oq", KEYC_KP3_0 }, { "\033Oq", KEYC_KP3_0, TTYKEY_RAW },
{ "-\033Or", KEYC_KP3_1 }, { "\033Or", KEYC_KP3_1, TTYKEY_RAW },
{ "-\033Os", KEYC_KP3_2 }, { "\033Os", KEYC_KP3_2, TTYKEY_RAW },
{ "-\033OM", KEYC_KP3_3 }, { "\033OM", KEYC_KP3_3, TTYKEY_RAW },
{ "-\033Op", KEYC_KP4_0 }, { "\033Op", KEYC_KP4_0, TTYKEY_RAW },
{ "-\033On", KEYC_KP4_2 }, { "\033On", KEYC_KP4_2, TTYKEY_RAW },
}; };
RB_GENERATE(tty_keys, tty_key, entry, tty_keys_cmp); RB_GENERATE(tty_keys, tty_key, entry, tty_keys_cmp);
@ -92,36 +98,54 @@ tty_keys_cmp(struct tty_key *k1, struct tty_key *k2)
} }
void void
tty_keys_init(struct tty *tty) tty_keys_add(struct tty *tty, const char *s, int code, int flags)
{ {
struct tty_key *tk; struct tty_key *tk;
u_int i;
const char *s; tk = xmalloc(sizeof *tk);
tk->string = xstrdup(s);
tk->code = code;
tk->flags = flags;
if (strlen(tk->string) > tty->ksize)
tty->ksize = strlen(tk->string);
RB_INSERT(tty_keys, &tty->ktree, tk);
log_debug(
"new key %x: size now %zu (%s)", code, tty->ksize, tk->string);
}
void
tty_keys_init(struct tty *tty)
{
struct tty_key_ent *tke;
u_int i;
const char *s;
char tmp[64];
RB_INIT(&tty->ktree); RB_INIT(&tty->ktree);
tty->ksize = 0; tty->ksize = 0;
for (i = 0; i < nitems(tty_keys); i++) { for (i = 0; i < nitems(tty_keys); i++) {
if (*tty_keys[i].name == '-') tke = &tty_keys[i];
s = tty_keys[i].name + 1;
if (tke->flags & TTYKEY_RAW)
s = tke->name;
else { else {
s = tigetstr(tty_keys[i].name); s = tigetstr(tke->name);
if (s == (char *) -1 || s == (char *) 0) if (s == (char *) -1 || s == (char *) 0)
continue; continue;
if (s[0] != '\033' || s[1] == '\0')
continue;
} }
if (s[0] != '\033' || s[1] == '\0')
continue;
tk = xmalloc(sizeof *tk); tty_keys_add(tty, s + 1, tke->code, tke->flags);
tk->string = xstrdup(s + 1); if (tke->flags & TTYKEY_MODIFIER) {
tk->code = tty_keys[i].code; if (strlcpy(tmp, s, sizeof tmp) >= sizeof tmp)
continue;
if (strlen(tk->string) > tty->ksize) tmp[strlen(tmp) - 1] ^= 0x20;
tty->ksize = strlen(tk->string); tty_keys_add(tty, tmp + 1, KEYC_ADDCTL(tke->code), 0);
RB_INSERT(tty_keys, &tty->ktree, tk); }
log_debug("found key %x: size now %zu (%s)",
tk->code, tty->ksize, tk->string);
} }
} }
@ -172,22 +196,24 @@ int
tty_keys_next(struct tty *tty, int *code) tty_keys_next(struct tty *tty, int *code)
{ {
struct tty_key *tk; struct tty_key *tk;
size_t size;
struct timeval tv; struct timeval tv;
char arg, *buf, tmp[32];
size_t len, size;
size = BUFFER_USED(tty->in); buf = BUFFER_OUT(tty->in);
if (size == 0) len = BUFFER_USED(tty->in);
if (len == 0)
return (1); return (1);
log_debug("keys are %zu (%.*s)", size, (int) size, BUFFER_OUT(tty->in)); log_debug("keys are %zu (%.*s)", len, (int) len, buf);
/* If a normal key, return it. */ /* If a normal key, return it. */
if (*BUFFER_OUT(tty->in) != '\033') { if (*buf != '\033') {
*code = buffer_read8(tty->in); *code = buffer_read8(tty->in);
return (0); return (0);
} }
/* Look for matching key string and return if found. */ /* Look for matching key string and return if found. */
tk = tty_keys_find(tty, BUFFER_OUT(tty->in) + 1, size - 1, &size); tk = tty_keys_find(tty, buf + 1, len - 1, &size);
if (tk != NULL) { if (tk != NULL) {
*code = tk->code; *code = tk->code;
buffer_remove(tty->in, size + 1); buffer_remove(tty->in, size + 1);
@ -196,6 +222,52 @@ tty_keys_next(struct tty *tty, int *code)
return (0); return (0);
} }
/* Not found. Look for an xterm argument and try again. */
if (len < sizeof tmp && len > 4 && buf[len - 3] == ';') {
memcpy(tmp, buf, len);
arg = tmp[len - 2];
tmp[len - 3] = tmp[len - 1]; /* restore last */
log_debug("argument is: %c", arg);
tk = tty_keys_find(tty, tmp + 1, len - 3, &size);
if (tk != NULL) {
*code = tk->code;
buffer_remove(tty->in, size + 3);
switch (arg) {
case '8':
*code = KEYC_ADDSFT(*code);
*code = KEYC_ADDESC(*code);
*code = KEYC_ADDCTL(*code);
break;
case '7':
*code = KEYC_ADDESC(*code);
*code = KEYC_ADDCTL(*code);
break;
case '6':
*code = KEYC_ADDSFT(*code);
*code = KEYC_ADDCTL(*code);
break;
case '5':
*code = KEYC_ADDCTL(*code);
break;
case '4':
*code = KEYC_ADDSFT(*code);
*code = KEYC_ADDESC(*code);
break;
case '3':
*code = KEYC_ADDESC(*code);
break;
case '2':
*code = KEYC_ADDSFT(*code);
break;
}
tty->flags &= ~TTY_ESCAPE;
return (0);
}
}
/* Escape but no key string. If the timer isn't started, start it. */ /* Escape but no key string. If the timer isn't started, start it. */
if (!(tty->flags & TTY_ESCAPE)) { if (!(tty->flags & TTY_ESCAPE)) {
tv.tv_sec = 0; tv.tv_sec = 0;
@ -217,30 +289,31 @@ tty_keys_next(struct tty *tty, int *code)
/* Remove the leading escape. */ /* Remove the leading escape. */
buffer_remove(tty->in, 1); buffer_remove(tty->in, 1);
size = BUFFER_USED(tty->in); buf = BUFFER_OUT(tty->in);
len = BUFFER_USED(tty->in);
/* If we have no following data, return escape. */ /* If we have no following data, return escape. */
if (size == 0) { if (len == 0) {
*code = '\033'; *code = '\033';
return (0); return (0);
} }
/* If a normal key follows, return it. */ /* If a normal key follows, return it. */
if (*BUFFER_OUT(tty->in) != '\033') { if (*buf != '\033') {
*code = KEYC_ADDESCAPE(buffer_read8(tty->in)); *code = KEYC_ADDESC(buffer_read8(tty->in));
return (0); return (0);
} }
/* Try to look up the key. */ /* Try to look up the key. */
tk = tty_keys_find(tty, BUFFER_OUT(tty->in) + 1, size - 1, &size); tk = tty_keys_find(tty, buf + 1, len - 1, &size);
if (tk != NULL) { if (tk != NULL) {
*code = KEYC_ADDESCAPE(tk->code); *code = KEYC_ADDESC(tk->code);
buffer_remove(tty->in, size + 1); buffer_remove(tty->in, size + 1);
return (0); return (0);
} }
/* If not found, return escape-escape. */ /* If not found, return escape-escape. */
*code = KEYC_ADDESCAPE('\033'); *code = KEYC_ADDESC('\033');
buffer_remove(tty->in, 1); buffer_remove(tty->in, 1);
return (0); return (0);
} }