diff options
author | Thomas Adam <thomas@xteddy.org> | 2015-11-12 00:01:10 +0000 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2015-11-12 00:01:10 +0000 |
commit | f2e4aa8d1cd4b918592078423d278b2b8db878c1 (patch) | |
tree | 4bf21fece78e6870e0b0ea8cdc34813a262e5c57 | |
parent | 35fd6d134a84cda69730310c89846f2bacb3cfbd (diff) | |
parent | 00c34df1868ffde8ece952729ddf2e4df09667be (diff) |
Merge branch 'obsd-master'
-rw-r--r-- | options-table.c | 5 | ||||
-rw-r--r-- | server-client.c | 12 | ||||
-rw-r--r-- | tmux.1 | 4 | ||||
-rw-r--r-- | tmux.c | 1 |
4 files changed, 5 insertions, 17 deletions
diff --git a/options-table.c b/options-table.c index e901e249..fcf62bae 100644 --- a/options-table.c +++ b/options-table.c @@ -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', diff --git a/server-client.c b/server-client.c index eeec51d0..0c6ed9d0 100644 --- a/server-client.c +++ b/server-client.c @@ -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; @@ -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 @@ -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); } |