Thomas Adam
cf688db4b5
Merge branch 'obsd-master'
2015-11-19 16:01:12 +00:00
nicm
98967c5ec9
The activity flag could already be set, so queue the callback always (if
...
not already queued) rather than only if the flag is being added. Fixes a
problem reported by tim@
2015-11-19 14:55:25 +00:00
Thomas Adam
45b4e337cb
Merge branch 'obsd-master'
2015-11-18 18:01:13 +00:00
nicm
82760a9960
Use format_expand_time for display-message.
2015-11-18 16:49:13 +00:00
Nicholas Marriott
c15487318b
unused -> __unused.
2015-11-18 16:45:44 +00:00
Nicholas Marriott
a58eaec540
Merge branch 'master' of github.com:tmux/tmux
2015-11-18 16:42:25 +00:00
Thomas Adam
7fe8edc396
Merge branch 'obsd-master'
2015-11-18 16:01:23 +00:00
Nicholas Marriott
8b4b3ff4fc
Add __unused, will be needed shortly.
2015-11-18 14:37:08 +00:00
nicm
577c0e3e5a
Use __unused rather than rolling our own.
2015-11-18 14:27:44 +00:00
nicm
5a5b950e8b
Add s/foo/bar/: prefix for formats to substitute bar for foo.
2015-11-18 14:13:55 +00:00
Nicholas Marriott
f8a1f8843c
Add -Wno-attributes.
2015-11-18 14:10:48 +00:00
Nicholas Marriott
9bba26f8c5
Add reallocarray prototype.
2015-11-18 14:09:17 +00:00
Thomas Adam
8fa822b521
Merge branch 'obsd-master'
2015-11-18 14:01:12 +00:00
nicm
64571368dc
Sync the entire xmalloc.[ch] with the other users, but with the addition
...
of xrealloc, xvasprintf, xvsnprintf.
2015-11-18 13:06:54 +00:00
Nicholas Marriott
93742ed5df
Merge branch 'master' of github.com:tmux/tmux
2015-11-18 12:55:22 +00:00
Nicholas Marriott
a77960c540
Add reallocarray to compat.
2015-11-18 12:54:29 +00:00
Thomas Adam
4b703d3049
Merge branch 'obsd-master'
2015-11-18 10:01:11 +00:00
nicm
ca5e6bf5f2
Don't update activity time twice for new sessions, and add some logging.
2015-11-18 09:22:29 +00:00
Thomas Adam
44cad8f4ed
Merge branch 'obsd-master'
2015-11-17 20:01:12 +00:00
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
