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

When the pause-after flag is set, send an alternative %extended-output 

form instead of %output with the age of the output.
pull/2270/head
nicm 2020-06-10 06:23:43 +00:00
parent fee585ea14
commit fddcad6957
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
control.c
View File

@ -462,8 +462,8 @@ control_flush_all_blocks(struct client *c)
/* Append data to buffer. */
static struct evbuffer *
control_append_data(struct control_pane *cp, struct evbuffer *message,
struct window_pane *wp, size_t size)
control_append_data(struct client *c, struct control_pane *cp, uint64_t age,
struct evbuffer *message, struct window_pane *wp, size_t size)
{
u_char *new_data;
size_t new_size;
@ -473,7 +473,12 @@ control_append_data(struct control_pane *cp, struct evbuffer *message,
message = evbuffer_new();
if (message == NULL)
fatalx("out of memory");
evbuffer_add_printf(message, "%%output %%%u ", wp->id);
if (c->flags & CLIENT_CONTROL_PAUSEAFTER) {
evbuffer_add_printf(message,
"%%extended-output %%%u %llu : ", wp->id,
(unsigned long long)age);
} else
evbuffer_add_printf(message, "%%output %%%u ", wp->id);
}
new_data = window_pane_get_new_data(wp, &cp->offset, &new_size);
@ -512,6 +517,7 @@ control_write_pending(struct client *c, struct control_pane *cp, size_t limit)
struct evbuffer *message = NULL;
size_t used = 0, size;
struct control_block *cb, *cb1;
uint64_t age, t = get_timer();
wp = control_window_pane(c, cp->pane);
if (wp == NULL) {
@ -525,15 +531,20 @@ control_write_pending(struct client *c, struct control_pane *cp, size_t limit)
while (used != limit && !TAILQ_EMPTY(&cp->blocks)) {
cb = TAILQ_FIRST(&cp->blocks);
log_debug("%s: %s: output block %zu for %%%u (used %zu/%zu)",
__func__, c->name, cb->size, cp->pane, used, limit);
if (cb->t < t)
age = t - cb->t;
else
age = 0;
log_debug("%s: %s: output block %zu (age %llu) for %%%u "
"(used %zu/%zu)", __func__, c->name, cb->size, age,
cp->pane, used, limit);
size = cb->size;
if (size > limit - used)
size = limit - used;
used += size;
message = control_append_data(cp, message, wp, size);
message = control_append_data(c, cp, age, message, wp, size);
cb->size -= size;
if (cb->size == 0) {

11
tmux.1
View File

@ -5910,6 +5910,17 @@ or an error occurred.
If present,
.Ar reason
describes why the client exited.
.It Ic %extended-output Ar pane-id Ar age Ar ... : Ar value
New form of
.Ic %output
sent when the
.Ar pause-after
flag is set.
.Ar age
is the time in milliseconds for which tmux had buffered the output before it was sent.
Any subsequent arguments up until a single
.Ql \&:
are for future use and should be ignored.
.It Ic %layout-change Ar window-id Ar window-layout Ar window-visible-layout Ar window-flags
The layout of a window with ID
.Ar window-id