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

Merge branch 'obsd-master'

pull/3372/head
Thomas Adam 2022-11-02 08:01:11 +00:00
parent 36896f6dd0 9614f51560
commit dbfbd8a195
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
input-keys.c
View File

@ -430,7 +430,7 @@ input_key_write(const char *from, struct bufferevent *bev, const char *data,
int int
input_key(struct screen *s, struct bufferevent *bev, key_code key) input_key(struct screen *s, struct bufferevent *bev, key_code key)
{ {
struct input_key_entry *ike; struct input_key_entry *ike = NULL;
key_code justkey, newkey, outkey, modifiers; key_code justkey, newkey, outkey, modifiers;
struct utf8_data ud; struct utf8_data ud;
char tmp[64], modifier; char tmp[64], modifier;
@ -482,9 +482,10 @@ input_key(struct screen *s, struct bufferevent *bev, key_code key)
key &= ~KEYC_KEYPAD; key &= ~KEYC_KEYPAD;
if (~s->mode & MODE_KCURSOR) if (~s->mode & MODE_KCURSOR)
key &= ~KEYC_CURSOR; key &= ~KEYC_CURSOR;
if (~s->mode & MODE_KEXTENDED) if (s->mode & MODE_KEXTENDED)
key &= ~KEYC_EXTENDED; ike = input_key_get(key|KEYC_EXTENDED);
ike = input_key_get(key); if (ike == NULL)
ike = input_key_get(key);
if (ike == NULL && (key & KEYC_META) && (~key & KEYC_IMPLIED_META)) if (ike == NULL && (key & KEYC_META) && (~key & KEYC_IMPLIED_META))
ike = input_key_get(key & ~KEYC_META); ike = input_key_get(key & ~KEYC_META);
if (ike == NULL && (key & KEYC_CURSOR)) if (ike == NULL && (key & KEYC_CURSOR))

4
tty-keys.c
View File

@ -210,7 +210,7 @@ static const struct tty_default_key_raw tty_default_raw_keys[] = {
{ "\033[201~", KEYC_PASTE_END }, { "\033[201~", KEYC_PASTE_END },
/* Extended keys. */ /* Extended keys. */
{ "\033[1;5Z", '\011'|KEYC_CTRL|KEYC_SHIFT|KEYC_EXTENDED }, { "\033[1;5Z", '\011'|KEYC_CTRL|KEYC_SHIFT },
}; };
/* Default xterm keys. */ /* Default xterm keys. */
@ -977,7 +977,7 @@ tty_keys_extended_key(struct tty *tty, const char *buf, size_t len,
log_debug("%s: extended key %.*s is %llx (%s)", c->name, log_debug("%s: extended key %.*s is %llx (%s)", c->name,
(int)*size, buf, nkey, key_string_lookup_key(nkey, 1)); (int)*size, buf, nkey, key_string_lookup_key(nkey, 1));
} }
*key = nkey|KEYC_EXTENDED; *key = nkey;
return (0); return (0);
} }