Merge branch 'obsd-master'

1 files changed, 4 insertions, 3 deletions

diff --git a/tmux.h b/tmux.h
index 148f1963..b109bffd 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1114,9 +1114,6 @@ struct tty {
 	u_int		 rleft;
 	u_int		 rright;
 
-	char		*termname;
-	struct tty_term	*term;
-
 	int		 fd;
 	struct bufferevent *event;
 
@@ -1133,6 +1130,8 @@ struct tty {
 #define TTY_FOCUS 0x40
 	int		 flags;
 
+	struct tty_term	*term;
+	char		*term_name;
 	int		 term_flags;
 	enum {
 		TTY_VT100,
@@ -1154,6 +1153,8 @@ struct tty {
 	struct event	 key_timer;
 	struct tty_key	*key_tree;
 };
+#define TTY_TYPES \
+	{ "VT100", "VT101", "VT102", "VT220", "VT320", "VT420", "UNKNOWN" }
 
 /* TTY command context. */
 struct tty_ctx {