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

Merge branch 'obsd-master'

pull/190/head
Thomas Adam 2015-11-12 00:01:10 +00:00
parent 35fd6d134a 00c34df186
commit f2e4aa8d1c
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

@ -255,11 +255,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',

12
server-client.c
View File

@ -809,14 +809,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;

4
tmux.1
View File

@ -2659,10 +2659,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

1
tmux.c
View File

@ -301,7 +301,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);
}