circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Key flags are only used for initialisation so they are not needed in the main 

tty_key struct.
This commit is contained in:
Nicholas Marriott 2009-11-05 10:44:36 +00:00
parent 25c604fb1c
commit a790e16fa2
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tmux.h
View File

@ -939,10 +939,6 @@ struct tty_key {
int key; int key;
char *string; char *string;
int flags;
#define TTYKEY_CTRL 0x1
#define TTYKEY_RAW 0x2
RB_ENTRY(tty_key) entry; RB_ENTRY(tty_key) entry;
}; };

11
tty-keys.c
View File

@ -29,7 +29,7 @@
* Handle keys input from the outside terminal. * Handle keys input from the outside terminal.
*/ */
void tty_keys_add(struct tty *, const char *, int, int); void tty_keys_add(struct tty *, const char *, int);
void tty_keys_callback(int, short, void *); void tty_keys_callback(int, short, void *);
int tty_keys_mouse(char *, size_t, size_t *, struct mouse_event *); int tty_keys_mouse(char *, size_t, size_t *, struct mouse_event *);
@ -39,6 +39,8 @@ struct tty_key_ent {
int key; int key;
int flags; int flags;
#define TTYKEY_CTRL 0x1
#define TTYKEY_RAW 0x2
}; };
struct tty_key_ent tty_keys[] = { struct tty_key_ent tty_keys[] = {
@ -195,14 +197,13 @@ tty_keys_cmp(struct tty_key *k1, struct tty_key *k2)
} }
void void
tty_keys_add(struct tty *tty, const char *s, int key, int flags) tty_keys_add(struct tty *tty, const char *s, int key)
{ {
struct tty_key *tk, *tl; struct tty_key *tk, *tl;
tk = xmalloc(sizeof *tk); tk = xmalloc(sizeof *tk);
tk->string = xstrdup(s); tk->string = xstrdup(s);
tk->key = key; tk->key = key;
tk->flags = flags;
if ((tl = RB_INSERT(tty_keys, &tty->ktree, tk)) != NULL) { if ((tl = RB_INSERT(tty_keys, &tty->ktree, tk)) != NULL) {
xfree(tk->string); xfree(tk->string);
@ -240,12 +241,12 @@ tty_keys_init(struct tty *tty)
continue; continue;
} }
tty_keys_add(tty, s + 1, tke->key, tke->flags); tty_keys_add(tty, s + 1, tke->key);
if (tke->flags & TTYKEY_CTRL) { if (tke->flags & TTYKEY_CTRL) {
if (strlcpy(tmp, s, sizeof tmp) >= sizeof tmp) if (strlcpy(tmp, s, sizeof tmp) >= sizeof tmp)
continue; continue;
tmp[strlen(tmp) - 1] ^= 0x20; tmp[strlen(tmp) - 1] ^= 0x20;
tty_keys_add(tty, tmp + 1, tke->key | KEYC_CTRL, 0); tty_keys_add(tty, tmp + 1, tke->key | KEYC_CTRL);
} }
} }
} }