circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-01 20:57:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2020-06-05 10:01:22 +01:00
parent 976cf6c60f 4e5e2c19d0
commit a06cf900c7
7 changed files with 138 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
server-client.c
View File

@ -1091,7 +1091,7 @@ server_client_update_latest(struct client *c)
w->latest = c;
if (options_get_number(w->options, "window-size") == WINDOW_SIZE_LATEST)
recalculate_size(w);
recalculate_size(w, 0);
}
/*
@ -1539,7 +1539,7 @@ server_client_check_pane_buffer(struct window_pane *wp)
__func__, c->name, wpo->used - wp->base_offset, new_size,
wp->id);
if (new_size > SERVER_CLIENT_PANE_LIMIT) {
control_flush(c);
control_discard(c);
c->flags |= CLIENT_EXIT;
}
if (wpo->used < minimum)
@ -1783,7 +1783,7 @@ server_client_check_exit(struct client *c)
return;
if (c->flags & CLIENT_CONTROL) {
control_flush(c);
control_discard(c);
if (!control_all_done(c))
return;
}
@ -2364,6 +2364,23 @@ server_client_get_cwd(struct client *c, struct session *s)
return ("/");
}
/* Get control client flags. */
static uint64_t
server_client_control_flags(struct client *c, const char *next)
{
if (strcmp(next, "pause-after") == 0) {
c->pause_age = 0;
return (CLIENT_CONTROL_PAUSEAFTER);
}
if (sscanf(next, "pause-after=%u", &c->pause_age) == 1) {
c->pause_age *= 1000;
return (CLIENT_CONTROL_PAUSEAFTER);
}
if (strcmp(next, "no-output") == 0)
return (CLIENT_CONTROL_NOOUTPUT);
return (0);
}
/* Set client flags. */
void
server_client_set_flags(struct client *c, const char *flags)
@ -2378,11 +2395,10 @@ server_client_set_flags(struct client *c, const char *flags)
if (not)
next++;
flag = 0;
if (c->flags & CLIENT_CONTROL) {
if (strcmp(next, "no-output") == 0)
flag = CLIENT_CONTROL_NOOUTPUT;
}
if (c->flags & CLIENT_CONTROL)
flag = server_client_control_flags(c, next);
else
flag = 0;
if (strcmp(next, "read-only") == 0)
flag = CLIENT_READONLY;
else if (strcmp(next, "ignore-size") == 0)
@ -2407,7 +2423,8 @@ server_client_set_flags(struct client *c, const char *flags)
const char *
server_client_get_flags(struct client *c)
{
static char s[256];
static char s[256];
char tmp[32];
*s = '\0';
if (c->flags & CLIENT_ATTACHED)
@ -2418,6 +2435,11 @@ server_client_get_flags(struct client *c)
strlcat(s, "ignore-size,", sizeof s);
if (c->flags & CLIENT_CONTROL_NOOUTPUT)
strlcat(s, "no-output,", sizeof s);
if (c->flags & CLIENT_CONTROL_PAUSEAFTER) {
xsnprintf(tmp, sizeof tmp, "pause-after=%u,",
c->pause_age / 1000);
strlcat(s, tmp, sizeof s);
}
if (c->flags & CLIENT_READONLY)
strlcat(s, "read-only,", sizeof s);
if (c->flags & CLIENT_ACTIVEPANE)