mirror of
https://github.com/tmux/tmux.git
synced 2024-11-16 17:39:09 +00:00
Merge branch 'obsd-master' into master
This commit is contained in:
commit
90614dfe05
@ -604,8 +604,8 @@ screen_redraw_screen(struct client *c)
|
||||
return;
|
||||
|
||||
screen_redraw_set_context(c, &ctx);
|
||||
tty_update_mode(&c->tty, c->tty.mode, NULL);
|
||||
tty_sync_start(&c->tty);
|
||||
tty_update_mode(&c->tty, c->tty.mode, NULL);
|
||||
|
||||
if (flags & (CLIENT_REDRAWWINDOW|CLIENT_REDRAWBORDERS)) {
|
||||
log_debug("%s: redrawing borders", c->name);
|
||||
@ -640,8 +640,8 @@ screen_redraw_pane(struct client *c, struct window_pane *wp)
|
||||
return;
|
||||
|
||||
screen_redraw_set_context(c, &ctx);
|
||||
tty_update_mode(&c->tty, c->tty.mode, NULL);
|
||||
tty_sync_start(&c->tty);
|
||||
tty_update_mode(&c->tty, c->tty.mode, NULL);
|
||||
|
||||
screen_redraw_draw_pane(&ctx, wp);
|
||||
|
||||
|
@ -955,9 +955,12 @@ tty_keys_extended_key(struct tty *tty, const char *buf, size_t len,
|
||||
*/
|
||||
if (nkey & KEYC_CTRL) {
|
||||
onlykey = (nkey & KEYC_MASK_KEY);
|
||||
if (onlykey < 32)
|
||||
if (onlykey < 32) {
|
||||
if (onlykey != 9)
|
||||
onlykey = (nkey & ~KEYC_CTRL);
|
||||
else {
|
||||
else
|
||||
onlykey = (9|KEYC_CTRL);
|
||||
} else {
|
||||
if (onlykey >= 97 && onlykey <= 122)
|
||||
onlykey -= 96;
|
||||
else if (onlykey >= 64 && onlykey <= 95)
|
||||
|
Loading…
Reference in New Issue
Block a user