===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- src/usr.bin/tmux/server-client.c	2020/05/16 15:45:29	1.337
+++ src/usr.bin/tmux/server-client.c	2020/05/16 15:47:22	1.338
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-client.c,v 1.337 2020/05/16 15:45:29 nicm Exp $ */
+/* $OpenBSD: server-client.c,v 1.338 2020/05/16 15:47:22 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -213,23 +213,12 @@
 	c->queue = cmdq_new();
 
 	c->tty.fd = -1;
-	c->title = NULL;
 
-	c->session = NULL;
-	c->last_session = NULL;
-
 	c->tty.sx = 80;
 	c->tty.sy = 24;
 
 	status_init(c);
 
-	c->message_string = NULL;
-	TAILQ_INIT(&c->message_log);
-
-	c->prompt_string = NULL;
-	c->prompt_buffer = NULL;
-	c->prompt_index = 0;
-
 	RB_INIT(&c->files);
 
 	c->flags |= CLIENT_FOCUSED;
@@ -272,7 +261,6 @@
 void
 server_client_lost(struct client *c)
 {
-	struct message_entry	*msg, *msg1;
 	struct client_file	*cf;
 
 	c->flags |= CLIENT_DEAD;
@@ -313,11 +301,6 @@
 	free(c->message_string);
 	if (event_initialized(&c->message_timer))
 		evtimer_del(&c->message_timer);
-	TAILQ_FOREACH_SAFE(msg, &c->message_log, entry, msg1) {
-		free(msg->msg);
-		TAILQ_REMOVE(&c->message_log, msg, entry);
-		free(msg);
-	}
 
 	free(c->prompt_saved);
 	free(c->prompt_string);
@@ -1128,6 +1111,7 @@
 			c->tty.mouse_drag_update(c, m);
 			goto out;
 		}
+		event->key = key;
 	}
 
 	/* Find affected pane. */
@@ -2202,37 +2186,6 @@
 	log_debug("%s: file %d read done", c->name, cf->stream);
 	cf->error = msg->error;
 	file_fire_done(cf);
-}
-
-/* Add to client message log. */
-void
-server_client_add_message(struct client *c, const char *fmt, ...)
-{
-	struct message_entry	*msg, *msg1;
-	char			*s;
-	va_list			 ap;
-	u_int			 limit;
-
-	va_start(ap, fmt);
-	xvasprintf(&s, fmt, ap);
-	va_end(ap);
-
-	log_debug("message %s (client %p)", s, c);
-
-	msg = xcalloc(1, sizeof *msg);
-	msg->msg_time = time(NULL);
-	msg->msg_num = c->message_next++;
-	msg->msg = s;
-	TAILQ_INSERT_TAIL(&c->message_log, msg, entry);
-
-	limit = options_get_number(global_options, "message-limit");
-	TAILQ_FOREACH_SAFE(msg, &c->message_log, entry, msg1) {
-		if (msg->msg_num + limit >= c->message_next)
-			break;
-		free(msg->msg);
-		TAILQ_REMOVE(&c->message_log, msg, entry);
-		free(msg);
-	}
 }
 
 /* Get client working directory. */