From ff65e3754565f1d878c70257e96f6aea09c1c90e Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Tue, 11 Aug 2009 19:32:25 +0000
Subject: Drop the no_stop argument to tty_close and tty_free in favour of a
 flag in the tty struct.

---
 server-msg.c |  2 +-
 server.c     |  2 +-
 tmux.h       |  5 +++--
 tty.c        | 15 ++++++++++-----
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/server-msg.c b/server-msg.c
index 6cc69a0a..3e82f90a 100644
--- a/server-msg.c
+++ b/server-msg.c
@@ -90,7 +90,7 @@ server_msg_dispatch(struct client *c)
 				fatalx("bad MSG_EXITING size");
 
 			c->session = NULL;
-			tty_close(&c->tty, c->flags & CLIENT_SUSPENDED);
+			tty_close(&c->tty);
 			server_write_client(c, MSG_EXITED, NULL, 0);
 			break;
 		case MSG_UNLOCK:
diff --git a/server.c b/server.c
index acaf5207..15a5fc94 100644
--- a/server.c
+++ b/server.c
@@ -902,7 +902,7 @@ server_lost_client(struct client *c)
 			ARRAY_SET(&clients, i, NULL);
 	}
 
-	tty_free(&c->tty, c->flags & CLIENT_SUSPENDED);
+	tty_free(&c->tty);
 
 	screen_free(&c->status);
 
diff --git a/tmux.h b/tmux.h
index cdd8d6ad..060d2bd1 100644
--- a/tmux.h
+++ b/tmux.h
@@ -868,6 +868,7 @@ struct tty {
 #define TTY_FREEZE 0x2
 #define TTY_ESCAPE 0x4
 #define TTY_UTF8 0x8
+#define TTY_STARTED 0x10
 	int    		 flags;
 
 	int		 term_flags;
@@ -1164,8 +1165,8 @@ void	tty_set_title(struct tty *, const char *);
 void	tty_update_mode(struct tty *, int);
 void	tty_draw_line(struct tty *, struct screen *, u_int, u_int, u_int);
 int	tty_open(struct tty *, const char *, char **);
-void	tty_close(struct tty *, int);
-void	tty_free(struct tty *, int);
+void	tty_close(struct tty *);
+void	tty_free(struct tty *);
 void	tty_write(void (*)(struct tty *, struct tty_ctx *), struct tty_ctx *);
 void	tty_cmd_alignmenttest(struct tty *, struct tty_ctx *);
 void	tty_cmd_cell(struct tty *, struct tty_ctx *);
diff --git a/tty.c b/tty.c
index 33acb99d..1584444e 100644
--- a/tty.c
+++ b/tty.c
@@ -149,6 +149,8 @@ tty_start_tty(struct tty *tty)
 	tty->rupper = UINT_MAX;
 
 	tty->mode = MODE_CURSOR;
+
+	tty->flags |= TTY_STARTED;
 }
 
 void
@@ -156,6 +158,10 @@ tty_stop_tty(struct tty *tty)
 {
 	struct winsize	ws;
 
+	if (!(tty->flags & TTY_STARTED))
+		return;
+	tty->flags &= ~TTY_STARTED;
+
 	/*
 	 * Be flexible about error handling and try not kill the server just
 	 * because the fd is invalid. Things like ssh -t can easily leave us
@@ -281,7 +287,7 @@ tty_get_acs(struct tty *tty, u_char ch)
 }
 
 void
-tty_close(struct tty *tty, int no_stop)
+tty_close(struct tty *tty)
 {
 	if (tty->fd == -1)
 		return;
@@ -291,8 +297,7 @@ tty_close(struct tty *tty, int no_stop)
 		tty->log_fd = -1;
 	}
 
-	if (!no_stop)
-		tty_stop_tty(tty);
+	tty_stop_tty(tty);
 
 	tty_term_free(tty->term);
 	tty_keys_free(tty);
@@ -305,9 +310,9 @@ tty_close(struct tty *tty, int no_stop)
 }
 
 void
-tty_free(struct tty *tty, int no_stop)
+tty_free(struct tty *tty)
 {
-	tty_close(tty, no_stop);
+	tty_close(tty);
 
 	if (tty->path != NULL)
 		xfree(tty->path);
-- 
cgit