tobias
d0505fd042
Merge xmalloc.[ch] files across base, skipping OpenSSH for now.
...
ok nicm
2015-11-17 18:25:03 +00:00
Thomas Adam
349a62ed4f
Merge branch 'obsd-master'
2015-11-17 00:01:09 +00:00
nicm
775fb562bd
0x7f is a valid key.
2015-11-16 22:57:51 +00:00
Thomas Adam
1686a15fb6
Merge branch 'obsd-master'
2015-11-16 00:01:10 +00:00
nicm
661d0dfac9
Make key_code unsigned long long not uint64_t which is more portable for
...
printf formats, and move UTF8_SIZE define down to near the rest of the
UTF-8 bits.
2015-11-15 22:50:38 +00:00
Thomas Adam
8213558cc7
Merge branch 'obsd-master'
...
Conflicts:
server.c
tmux.c
2015-11-15 22:49:25 +00:00
nicm
a582b62287
Accidentally turned off pledge, turn it back on.
2015-11-15 14:32:48 +00:00
Thomas Adam
bb820fa761
Merge branch 'obsd-master'
2015-11-14 14:01:08 +00:00
nicm
14d90e4901
The character is an int so use %x not %hhx.
2015-11-14 12:20:19 +00:00
nicm
3db0d50df4
The private use area at U+E000 to U+F8FF is not very useful if it is
...
width 0, make it width 1 instead.
2015-11-14 12:03:23 +00:00
Thomas Adam
f12d7f0d4b
Merge branch 'obsd-master'
2015-11-14 12:01:09 +00:00
nicm
205d15e82d
All these return values from utf8_* are confusing, use an enum.
2015-11-14 11:45:43 +00:00
Thomas Adam
7b4b78b419
Merge branch 'obsd-master'
2015-11-14 11:38:52 +00:00
Thomas Adam
7b749eff35
Merge branch 'obsd-master'
...
Conflicts:
server.c
tmux.c
2015-11-14 11:38:30 +00:00
nicm
f401791a56
Rename a variable in utf8_combine for consistency and use 0xfffd for
...
unknown Unicode.
2015-11-14 11:13:44 +00:00
nicm
dab63b029e
Couple of assignments to remove compiler warnings.
2015-11-14 10:57:59 +00:00
nicm
64333e3ef8
Be more strict about invalid UTF-8.
2015-11-14 10:56:31 +00:00
nicm
c56b81a2ce
Push stdout and stderr to clients more aggressively, and add an event to
...
continue if the send fails.
2015-11-14 09:41:06 +00:00
Nicholas Marriott
23266e8e09
Merge branch 'master' of github.com:tmux/tmux
2015-11-14 09:04:41 +00:00
Nicholas Marriott
31d880f751
Update the TODO file.
2015-11-14 09:04:13 +00:00
nicm
908e6bb68f
Log more of UTF-8 input.
2015-11-14 08:25:12 +00:00
Thomas Adam
276ca5f04c
Merge branch 'obsd-master'
2015-11-13 18:01:13 +00:00
nicm
c4893d8efd
Log option names in fatal() for missing option.
2015-11-13 16:06:43 +00:00
Nicholas Marriott
1016f112bf
Merge branch 'master' of github.com:tmux/tmux
2015-11-13 16:06:11 +00:00
Nicholas Marriott
b7397bf413
utf8 option is gone.
2015-11-13 16:05:58 +00:00
Thomas Adam
45a10dde95
Merge branch 'obsd-master'
2015-11-13 14:01:10 +00:00
nicm
88aa1c8dc3
Two spacing and spelling nits.
2015-11-13 12:18:52 +00:00
Thomas Adam
e2917b2627
Merge branch 'obsd-master'
2015-11-13 10:43:07 +00:00
Thomas Adam
3df4959f51
Merge branch 'obsd-master'
...
Conflicts:
Makefile
2015-11-13 10:42:45 +00:00
nicm
531869bd92
Add window_visible_layout which ignores zoomed panes and use it for
...
control mode (which needs to know all panes), from George Nachman.
2015-11-13 10:00:26 +00:00
nicm
c5689a5a40
Long overdue change to the way we store cells in the grid: now, instead
...
of storing a full grid_cell with UTF-8 data and everything, store a new
type grid_cell_entry. This can either be the cell itself (for ASCII
cells), or an offset into an extended array (per line) for UTF-8
data.
This avoid a large (8 byte) overhead on non-UTF-8 cells (by far the
majority for most users) without the complexity of the shadow array we
had before. Grid memory without any UTF-8 is about half.
The disadvantage that cells can no longer be modified in place and need
to be copied out of the grid and back but it turned out to be lot less
complicated than I expected.
2015-11-13 08:09:28 +00:00
Thomas Adam
a7027ed8e5
Merge branch 'obsd-master'
2015-11-13 00:01:15 +00:00
nicm
e71a915412
Rename overly-long utf8data to ud throughout.
2015-11-12 22:04:37 +00:00
Thomas Adam
b2f19c9d06
Merge branch 'obsd-master'
2015-11-12 16:01:09 +00:00
nicm
f2d03f4fdd
grid_put_utf8 is unused, remove it.
2015-11-12 14:50:57 +00:00
Thomas Adam
4f88344df3
Merge branch 'obsd-master'
2015-11-12 14:01:14 +00:00
nicm
a209ea3953
Add utf8_padcstr and use it to align columns in list-keys.
2015-11-12 12:43:36 +00:00
jmc
1da7475d0e
tweak previous; ok nicm
2015-11-12 12:36:34 +00:00
nicm
d6daf37df4
Tidy utf8.c a little: build table on first use, and make utf8_width take
...
a u_int rather than splitting and then combining again in utf8_split.
2015-11-12 12:19:57 +00:00
Thomas Adam
5f483499f3
Merge branch 'obsd-master'
2015-11-12 12:01:17 +00:00
nicm
0cc812ae34
tmux is UTF-8, so if $TMUX is set (tmux running in tmux), the client is
...
UTF-8. Also try to make the existing checks more readable.
2015-11-12 11:24:08 +00:00
nicm
c41673f3fa
If we know the terminal outside tmux is not UTF-8, replace UTF-8 in
...
error messages and whatnot with underscores the same as we do when we
draw UTF-8 characters as part of the screen.
2015-11-12 11:10:50 +00:00
nicm
1b86f520ea
Nuke the utf8 and status-utf8 options and make tmux only a UTF-8
...
terminal. We still support non-UTF-8 terminals outside tmux, but inside
it is always UTF-8 (as when the utf8 and status-utf8 options were on).
2015-11-12 11:09:11 +00:00
nicm
a0f3999ce7
Remove the mouse_utf8_flag format as well.
2015-11-12 11:07:10 +00:00
nicm
69e0b8326a
Support UTF-8 key bindings by expanding the key type from int to
...
uint64_t and converting UTF-8 to Unicode on input and the reverse on
output. (This allows key bindings, there are still omissions - the
largest being that the various prompts do not accept UTF-8.)
2015-11-12 11:05:34 +00:00
Thomas Adam
333da3b64b
Merge branch 'obsd-master'
2015-11-12 10:01:09 +00:00
nicm
7062b0e65d
Default history-file should be "" not NULL, from Greg Onufe.
2015-11-12 08:19:18 +00:00
Thomas Adam
f2e4aa8d1c
Merge branch 'obsd-master'
2015-11-12 00:01:10 +00:00
nicm
00c34df186
Drop mouse-utf8 option and always turn on UTF-8 mouse if the client says
...
it supports UTF-8.
2015-11-11 23:23:33 +00:00
Thomas Adam
35fd6d134a
Merge branch 'obsd-master'
...
Conflicts:
utf8.c
2015-11-11 08:14:36 +00:00
