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/2075/head
Thomas Adam 2020-01-29 16:01:24 +00:00
parent 8b22da69b6 531daba584
commit bc36700d05
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
input.c
View File

@ -773,6 +773,7 @@ input_save_state(struct input_ctx *ictx)
ictx->old_mode = s->mode; ictx->old_mode = s->mode;
} }
/* Restore screen state. */
static void static void
input_restore_state(struct input_ctx *ictx) input_restore_state(struct input_ctx *ictx)
{ {

6
tty.c
View File

@ -338,8 +338,10 @@ tty_start_tty(struct tty *tty)
tty->flags |= TTY_FOCUS; tty->flags |= TTY_FOCUS;
tty_puts(tty, "\033[?1004h"); tty_puts(tty, "\033[?1004h");
} }
tty_puts(tty, "\033[c\033[1337n"); /* DA and DSR */ if (~tty->flags & TTY_HAVEDA)
tty_puts(tty, "\033[c");
if (~tty->flags & TTY_HAVEDSR)
tty_puts(tty, "\033[1337n");
} else } else
tty->flags |= (TTY_HAVEDA|TTY_HAVEDSR); tty->flags |= (TTY_HAVEDA|TTY_HAVEDSR);