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

Merge branch 'obsd-master' into master

This commit is contained in:
Thomas Adam 2021-04-13 08:01:22 +01:00
parent bedf2bd437 ff860e5fe4
commit 90614dfe05
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
screen-redraw.c
View File

@ -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);

11
tty-keys.c
View File

@ -953,11 +953,14 @@ tty_keys_extended_key(struct tty *tty, const char *buf, size_t len,
* Don't allow both KEYC_CTRL and as an implied modifier. Also convert
* C-X into C-x and so on.
*/
if (nkey & KEYC_CTRL){
if (nkey & KEYC_CTRL) {
onlykey = (nkey & KEYC_MASK_KEY);
if (onlykey < 32)
onlykey = (nkey & ~KEYC_CTRL);
else {
if (onlykey < 32) {
if (onlykey != 9)
onlykey = (nkey & ~KEYC_CTRL);
else
onlykey = (9|KEYC_CTRL);
} else {
if (onlykey >= 97 && onlykey <= 122)
onlykey -= 96;
else if (onlykey >= 64 && onlykey <= 95)