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 /server-client.c | |
| parent | 35fd6d134a84cda69730310c89846f2bacb3cfbd (diff) | |
| parent | 00c34df1868ffde8ece952729ddf2e4df09667be (diff) | |
| download | rtmux-f2e4aa8d1cd4b918592078423d278b2b8db878c1.tar.gz rtmux-f2e4aa8d1cd4b918592078423d278b2b8db878c1.tar.bz2 rtmux-f2e4aa8d1cd4b918592078423d278b2b8db878c1.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 12 |
1 files changed, 5 insertions, 7 deletions
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; |