circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

it supports UTF-8.
pull/190/head
nicm 2015-11-11 23:23:33 +00:00
parent 6f3475c6c7
commit 00c34df186
4 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
options-table.c
View File

@ -256,11 +256,6 @@ const struct options_table_entry session_options_table[] = {
.default_num = 0 .default_num = 0
}, },
{ .name = "mouse-utf8",
.type = OPTIONS_TABLE_FLAG,
.default_num = 0
},
{ .name = "prefix", { .name = "prefix",
.type = OPTIONS_TABLE_KEY, .type = OPTIONS_TABLE_KEY,
.default_num = '\002', .default_num = '\002',

12
server-client.c
View File

@ -801,14 +801,12 @@ server_client_reset_state(struct client *c)
mode = (mode & ~ALL_MOUSE_MODES) | MODE_MOUSE_BUTTON; mode = (mode & ~ALL_MOUSE_MODES) | MODE_MOUSE_BUTTON;
/* /*
* Set UTF-8 mouse input if required. If the terminal is UTF-8, the * Set UTF-8 mouse input if required. If the terminal is UTF-8 and any
* user has set mouse-utf8 and any mouse mode is in effect, turn on * mouse mode is in effect, turn on UTF-8 mouse input. If the receiving
* UTF-8 mouse input. If the receiving terminal hasn't requested it * terminal hasn't requested it (that is, it isn't in s->mode), then
* (that is, it isn't in s->mode), then it'll be converted in * it'll be converted in input_mouse.
* input_mouse.
*/ */
if ((c->tty.flags & TTY_UTF8) && if ((c->tty.flags & TTY_UTF8) && (mode & ALL_MOUSE_MODES))
(mode & ALL_MOUSE_MODES) && options_get_number(oo, "mouse-utf8"))
mode |= MODE_MOUSE_UTF8; mode |= MODE_MOUSE_UTF8;
else else
mode &= ~MODE_MOUSE_UTF8; mode &= ~MODE_MOUSE_UTF8;

4
tmux.1
View File

@ -2655,10 +2655,6 @@ captures the mouse and allows mouse events to be bound as key bindings.
See the See the
.Sx MOUSE SUPPORT .Sx MOUSE SUPPORT
section for details. 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 .It Ic prefix Ar key
Set the key accepted as a prefix key. Set the key accepted as a prefix key.
.It Ic prefix2 Ar key .It Ic prefix2 Ar key

1
tmux.c
View File

@ -294,7 +294,6 @@ main(int argc, char **argv)
/* Enable UTF-8 if the first client is on UTF-8 terminal. */ /* Enable UTF-8 if the first client is on UTF-8 terminal. */
if (flags & CLIENT_UTF8) { if (flags & CLIENT_UTF8) {
options_set_number(global_s_options, "status-utf8", 1); 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); options_set_number(global_w_options, "utf8", 1);
} }