Drop mouse-utf8 option and always turn on UTF-8 mouse if the client says

it supports UTF-8.

4 files changed, 10 insertions, 22 deletions

diff --git a/usr.bin/tmux/options-table.c b/usr.bin/tmux/options-table.c
index 461fa093d26..1ac4d6e1b07 100644
--- a/usr.bin/tmux/options-table.c
+++ b/usr.bin/tmux/options-table.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options-table.c,v 1.63 2015/09/25 23:30:24 nicm Exp $ */
+/* $OpenBSD: options-table.c,v 1.64 2015/11/11 23:23:33 nicm Exp $ */
 
 /*
  * Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -256,11 +256,6 @@ const struct options_table_entry session_options_table[] = {
 	  .default_num = 0
 	},
 
-	{ .name = "mouse-utf8",
-	  .type = OPTIONS_TABLE_FLAG,
-	  .default_num = 0
-	},
-
 	{ .name = "prefix",
 	  .type = OPTIONS_TABLE_KEY,
 	  .default_num = '\002',
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c
index 4e3fe2af15c..1639c3f26b3 100644
--- a/usr.bin/tmux/server-client.c
+++ b/usr.bin/tmux/server-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-client.c,v 1.166 2015/10/31 13:12:03 nicm Exp $ */
+/* $OpenBSD: server-client.c,v 1.167 2015/11/11 23:23:33 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -801,14 +801,12 @@ server_client_reset_state(struct client *c)
 		mode = (mode & ~ALL_MOUSE_MODES) | MODE_MOUSE_BUTTON;
 
 	/*
-	 * Set UTF-8 mouse input if required. If the terminal is UTF-8, the
-	 * user has set mouse-utf8 and any mouse mode is in effect, turn on
-	 * UTF-8 mouse input. If the receiving terminal hasn't requested it
-	 * (that is, it isn't in s->mode), then it'll be converted in
-	 * input_mouse.
+	 * Set UTF-8 mouse input if required. If the terminal is UTF-8 and any
+	 * mouse mode is in effect, turn on UTF-8 mouse input. If the receiving
+	 * terminal hasn't requested it (that is, it isn't in s->mode), then
+	 * it'll be converted in input_mouse.
 	 */
-	if ((c->tty.flags & TTY_UTF8) &&
-	    (mode & ALL_MOUSE_MODES) && options_get_number(oo, "mouse-utf8"))
+	if ((c->tty.flags & TTY_UTF8) && (mode & ALL_MOUSE_MODES))
 		mode |= MODE_MOUSE_UTF8;
 	else
 		mode &= ~MODE_MOUSE_UTF8;
diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1
index 12ae22e7ead..5f3aefcc6c1 100644
--- a/usr.bin/tmux/tmux.1
+++ b/usr.bin/tmux/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.455 2015/10/27 14:51:35 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.456 2015/11/11 23:23:33 nicm Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 .\"
@@ -14,7 +14,7 @@
 .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 27 2015 $
+.Dd $Mdocdate: November 11 2015 $
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -2655,10 +2655,6 @@ captures the mouse and allows mouse events to be bound as key bindings.
 See the
 .Sx MOUSE SUPPORT
 section for details.
-.It Xo Ic mouse-utf8
-.Op Ic on | off
-.Xc
-If enabled, request mouse input as UTF-8 on UTF-8 terminals.
 .It Ic prefix Ar key
 Set the key accepted as a prefix key.
 .It Ic prefix2 Ar key
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c
index 01216a5b54a..5a25776dfcf 100644
--- a/usr.bin/tmux/tmux.c
+++ b/usr.bin/tmux/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.149 2015/10/28 09:51:55 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.150 2015/11/11 23:23:33 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -294,7 +294,6 @@ main(int argc, char **argv)
 	/* Enable UTF-8 if the first client is on UTF-8 terminal. */
 	if (flags & CLIENT_UTF8) {
 		options_set_number(global_s_options, "status-utf8", 1);
-		options_set_number(global_s_options, "mouse-utf8", 1);
 		options_set_number(global_w_options, "utf8", 1);
 	}