summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/tty.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2020-04-09 12:16:16 +0000
committernicm <nicm@openbsd.org>2020-04-09 12:16:16 +0000
commitab7caece48523dabdbca84386419ff3850b6d95b (patch)
treee6f81258b41747b34f90f37055aa3603803cb4f6 /usr.bin/tmux/tty.c
parentfind -exec +: use sysconf to find the kernel's idea of ARG_MAX (diff)
downloadwireguard-openbsd-ab7caece48523dabdbca84386419ff3850b6d95b.tar.xz
wireguard-openbsd-ab7caece48523dabdbca84386419ff3850b6d95b.zip
Wait until the initial command sequence is done before sending a device
attributes request and other bits that prompt a reply from the terminal. This means that stray relies are not left on the terminal if the command has attached and then immediately detached and tmux will not be around to receive them. Prompted by a problem report from espie@.
Diffstat (limited to 'usr.bin/tmux/tty.c')
-rw-r--r--usr.bin/tmux/tty.c24
1 files changed, 17 insertions, 7 deletions
diff --git a/usr.bin/tmux/tty.c b/usr.bin/tmux/tty.c
index 6835e97cb6f..4b2be318a9c 100644
--- a/usr.bin/tmux/tty.c
+++ b/usr.bin/tmux/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.346 2020/03/24 08:09:44 nicm Exp $ */
+/* $OpenBSD: tty.c,v 1.347 2020/04/09 12:16:16 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -340,12 +340,7 @@ tty_start_tty(struct tty *tty)
tty->flags |= TTY_FOCUS;
tty_puts(tty, "\033[?1004h");
}
- if (~tty->flags & TTY_HAVEDA)
- tty_puts(tty, "\033[c");
- if (~tty->flags & TTY_HAVEDSR)
- tty_puts(tty, "\033[1337n");
- } else
- tty->flags |= (TTY_HAVEDA|TTY_HAVEDSR);
+ }
evtimer_set(&tty->start_timer, tty_start_timer_callback, tty);
evtimer_add(&tty->start_timer, &tv);
@@ -362,6 +357,21 @@ tty_start_tty(struct tty *tty)
}
void
+tty_send_requests(struct tty *tty)
+{
+ if (~tty->flags & TTY_STARTED)
+ return;
+
+ if (tty_term_flag(tty->term, TTYC_XT)) {
+ if (~tty->flags & TTY_HAVEDA)
+ tty_puts(tty, "\033[c");
+ if (~tty->flags & TTY_HAVEDSR)
+ tty_puts(tty, "\033[1337n");
+ } else
+ tty->flags |= (TTY_HAVEDA|TTY_HAVEDSR);
+}
+
+void
tty_stop_tty(struct tty *tty)
{
struct winsize ws;