circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-06 17:49:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/tmux-openbsd/master'

Browse Source 
* refs/remotes/tmux-openbsd/master:
  Move per-client window sizes into control.c since the only user is for control mode.
  Change %% to escape single quotes (%1 remains with no quoting and %% with double quotes) to avoid a single quote being able to terminate quoted sections of commands. Fixes unexpected behaviour with session names containing single quotes reported by Aliz Hammond.
This commit is contained in:
Thomas Adam
2026-07-17 13:24:25 +01:00
parent a8ad3c7d43 2711780dff
commit 5bd10a8c2a
6 changed files with 226 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cmd-refresh-client.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: cmd-refresh-client.c,v 1.54 2026/07/05 08:24:00 nicm Exp $ */ /* $OpenBSD: cmd-refresh-client.c,v 1.55 2026/07/17 08:37:29 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -66,7 +66,6 @@ cmd_refresh_client_control_client_size(struct cmd *self, struct cmdq_item *item)
struct client *tc = cmdq_get_target_client(item); struct client *tc = cmdq_get_target_client(item);
const char *size = args_get(args, 'C'); const char *size = args_get(args, 'C');
u_int w, x, y; u_int w, x, y;
struct client_window *cw;
if (sscanf(size, "@%u:%ux%u", &w, &x, &y) == 3) { if (sscanf(size, "@%u:%ux%u", &w, &x, &y) == 3) {
if (x < WINDOW_MINIMUM || x > WINDOW_MAXIMUM || if (x < WINDOW_MINIMUM || x > WINDOW_MAXIMUM ||
@@ -76,22 +75,16 @@ cmd_refresh_client_control_client_size(struct cmd *self, struct cmdq_item *item)
} }
log_debug("%s: client %s window @%u: size %ux%u", __func__, log_debug("%s: client %s window @%u: size %ux%u", __func__,
tc->name, w, x, y); tc->name, w, x, y);
cw = server_client_add_client_window(tc, w); control_set_window_size(tc, w, x, y);
cw->sx = x;
cw->sy = y;
tc->flags |= CLIENT_WINDOWSIZECHANGED; tc->flags |= CLIENT_WINDOWSIZECHANGED;
recalculate_sizes_now(1); recalculate_sizes_now(1);
return (CMD_RETURN_NORMAL); return (CMD_RETURN_NORMAL);
} }
if (sscanf(size, "@%u:", &w) == 1) { if (sscanf(size, "@%u:", &w) == 1) {
cw = server_client_get_client_window(tc, w); log_debug("%s: client %s window @%u: no size", __func__,
if (cw != NULL) { tc->name, w);
log_debug("%s: client %s window @%u: no size", __func__, control_clear_window_size(tc, w);
tc->name, w); recalculate_sizes_now(1);
cw->sx = 0;
cw->sy = 0;
recalculate_sizes_now(1);
}
return (CMD_RETURN_NORMAL); return (CMD_RETURN_NORMAL);
} }

52
cmd.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: cmd.c,v 1.188 2026/07/15 13:02:33 nicm Exp $ */ /* $OpenBSD: cmd.c,v 1.189 2026/07/17 08:29:34 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -840,14 +840,19 @@ cmd_mouse_pane(struct mouse_event *m, struct session **sp,
return (wp); return (wp);
} }
/* Replace the first %% or %idx in template by s. */ /*
* Replace the first %% or any %idx in template by s. %% is intended for use in
* single quotes, so ' is escaped. %%% and %idx% are for double quotes, so a
* list of special characters is escaped. %idx is left unescaped.
*/
char * char *
cmd_template_replace(const char *template, const char *s, int idx) cmd_template_replace(const char *template, const char *s, int idx)
{ {
char ch, *buf; char ch, *buf;
const char *ptr, *cp, quote[] = "\"\\$;~"; const char *ptr, *cp, dquote[] = "\"\\$;~";
int replaced, quoted; int replaced;
size_t len, slen; size_t len, slen;
enum { NQ, SQ, DQ } quote;
if (strchr(template, '%') == NULL) if (strchr(template, '%') == NULL)
return (xstrdup(template)); return (xstrdup(template));
@@ -861,23 +866,39 @@ cmd_template_replace(const char *template, const char *s, int idx)
while (*ptr != '\0') { while (*ptr != '\0') {
switch (ch = *ptr++) { switch (ch = *ptr++) {
case '%': case '%':
if (*ptr < '1' || *ptr > '9' || *ptr - '0' != idx) { if (*ptr >= '1' && *ptr <= '9' && *ptr - '0' == idx) {
ptr++;
quote = NQ;
if (*ptr == '%') {
quote = DQ;
ptr++;
}
} else {
if (*ptr != '%' || replaced) if (*ptr != '%' || replaced)
break; break;
replaced = 1; replaced = 1;
}
ptr++;
quoted = (*ptr == '%');
if (quoted)
ptr++; ptr++;
quote = SQ;
if (*ptr == '%') {
quote = DQ;
ptr++;
}
}
slen = strlen(s); slen = strlen(s);
if (slen >= SIZE_MAX / 3 || len > SIZE_MAX - (slen * 3) - 1) if (slen >= SIZE_MAX / 4 ||
len > SIZE_MAX - (slen * 4) - 1)
fatalx("argument too long"); fatalx("argument too long");
buf = xrealloc(buf, len + (slen * 3) + 1); buf = xrealloc(buf, len + (slen * 4) + 1);
for (cp = s; *cp != '\0'; cp++) { for (cp = s; *cp != '\0'; cp++) {
if (quoted && strchr(quote, *cp) != NULL) if (quote == SQ && *cp == '\'') {
buf[len++] = '\'';
buf[len++] = '\\';
buf[len++] = '\'';
buf[len++] = '\'';
continue;
}
if (quote == DQ && strchr(dquote, *cp) != NULL)
buf[len++] = '\\'; buf[len++] = '\\';
buf[len++] = *cp; buf[len++] = *cp;
} }
@@ -891,5 +912,6 @@ cmd_template_replace(const char *template, const char *s, int idx)
buf[len] = '\0'; buf[len] = '\0';
} }
log_debug("%s: %s -> %s", __func__, template, buf);
return (buf); return (buf);
} }

91
control.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: control.c,v 1.61 2026/07/10 15:45:11 nicm Exp $ */ /* $OpenBSD: control.c,v 1.62 2026/07/17 08:37:29 nicm Exp $ */
/* /*
* Copyright (c) 2012 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2012 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -78,9 +78,20 @@ struct control_pane {
}; };
RB_HEAD(control_panes, control_pane); RB_HEAD(control_panes, control_pane);
/* Control client window size. */
struct control_window {
u_int window;
u_int sx;
u_int sy;
RB_ENTRY(control_window) entry;
};
RB_HEAD(control_windows, control_window);
/* Control client state. */ /* Control client state. */
struct control_state { struct control_state {
struct control_panes panes; struct control_panes panes;
struct control_windows windows;
TAILQ_HEAD(, control_pane) pending_list; TAILQ_HEAD(, control_pane) pending_list;
u_int pending_count; u_int pending_count;
@@ -120,6 +131,18 @@ control_pane_cmp(struct control_pane *cp1, struct control_pane *cp2)
} }
RB_GENERATE_STATIC(control_panes, control_pane, entry, control_pane_cmp); RB_GENERATE_STATIC(control_panes, control_pane, entry, control_pane_cmp);
/* Compare control windows. */
static int
control_window_cmp(struct control_window *cw1, struct control_window *cw2)
{
if (cw1->window < cw2->window)
return (-1);
if (cw1->window > cw2->window)
return (1);
return (0);
}
RB_GENERATE_STATIC(control_windows, control_window, entry, control_window_cmp);
/* Free a block. */ /* Free a block. */
static void static void
control_free_block(struct control_state *cs, struct control_block *cb) control_free_block(struct control_state *cs, struct control_block *cb)
@@ -161,6 +184,66 @@ control_add_pane(struct client *c, struct window_pane *wp)
return (cp); return (cp);
} }
/* Get window for this client. */
static struct control_window *
control_get_window(struct client *c, u_int window)
{
struct control_state *cs = c->control_state;
struct control_window cw = { .window = window };
if (cs == NULL)
return (NULL);
return (RB_FIND(control_windows, &cs->windows, &cw));
}
/* Set window size for this client. */
void
control_set_window_size(struct client *c, u_int window, u_int sx, u_int sy)
{
struct control_state *cs = c->control_state;
struct control_window *cw;
if (cs == NULL)
return;
cw = control_get_window(c, window);
if (cw == NULL) {
cw = xcalloc(1, sizeof *cw);
cw->window = window;
RB_INSERT(control_windows, &cs->windows, cw);
}
cw->sx = sx;
cw->sy = sy;
}
/* Get window size for this client. */
int
control_get_window_size(struct client *c, u_int window, u_int *sx, u_int *sy)
{
struct control_window *cw;
if ((cw = control_get_window(c, window)) == NULL)
return (0);
*sx = cw->sx;
*sy = cw->sy;
return (1);
}
/* Clear window size for this client. */
void
control_clear_window_size(struct client *c, u_int window)
{
struct control_state *cs = c->control_state;
struct control_window *cw;
if (cs == NULL)
return;
cw = control_get_window(c, window);
if (cw != NULL) {
RB_REMOVE(control_windows, &cs->windows, cw);
free(cw);
}
}
/* Discard output for a pane. */ /* Discard output for a pane. */
static void static void
control_discard_pane(struct client *c, struct control_pane *cp) control_discard_pane(struct client *c, struct control_pane *cp)
@@ -749,6 +832,7 @@ control_start(struct client *c)
cs = c->control_state = xcalloc(1, sizeof *cs); cs = c->control_state = xcalloc(1, sizeof *cs);
RB_INIT(&cs->panes); RB_INIT(&cs->panes);
RB_INIT(&cs->windows);
TAILQ_INIT(&cs->pending_list); TAILQ_INIT(&cs->pending_list);
TAILQ_INIT(&cs->all_blocks); TAILQ_INIT(&cs->all_blocks);
cs->subs = monitor_create_client(c, control_sub_change, NULL); cs->subs = monitor_create_client(c, control_sub_change, NULL);
@@ -800,6 +884,7 @@ control_stop(struct client *c)
{ {
struct control_state *cs = c->control_state; struct control_state *cs = c->control_state;
struct control_block *cb, *cb1; struct control_block *cb, *cb1;
struct control_window *cw, *cw1;
if (cs == NULL) if (cs == NULL)
return; return;
@@ -811,6 +896,10 @@ control_stop(struct client *c)
bufferevent_free(cs->read_event); bufferevent_free(cs->read_event);
control_reset_offsets(c); control_reset_offsets(c);
RB_FOREACH_SAFE(cw, control_windows, &cs->windows, cw1) {
RB_REMOVE(control_windows, &cs->windows, cw);
free(cw);
}
TAILQ_FOREACH_SAFE(cb, &cs->all_blocks, all_entry, cb1) TAILQ_FOREACH_SAFE(cb, &cs->all_blocks, all_entry, cb1)
control_free_block(cs, cb); control_free_block(cs, cb);

36
resize.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: resize.c,v 1.57 2026/07/13 13:01:14 nicm Exp $ */ /* $OpenBSD: resize.c,v 1.58 2026/07/17 08:37:29 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -134,9 +134,8 @@ clients_calculate_size(int type, int current, struct client *c,
int, int, struct session *, struct window *), u_int *sx, u_int *sy, int, int, struct session *, struct window *), u_int *sx, u_int *sy,
u_int *xpixel, u_int *ypixel) u_int *xpixel, u_int *ypixel)
{ {
struct client *loop; struct client *loop;
struct client_window *cw; u_int cx, cy, n = 0;
u_int cx, cy, n = 0;
/* /*
* Start comparing with 0 for largest and UINT_MAX for smallest or * Start comparing with 0 for largest and UINT_MAX for smallest or
@@ -187,20 +186,10 @@ clients_calculate_size(int type, int current, struct client *c,
continue; continue;
} }
/*
* If the client has a per-window size, use this instead if it is
* smaller.
*/
if (w != NULL)
cw = server_client_get_client_window(loop, w->id);
else
cw = NULL;
/* Work out this client's size. */ /* Work out this client's size. */
if (cw != NULL && cw->sx != 0 && cw->sy != 0) { if (w == NULL ||
cx = cw->sx; !control_get_window_size(loop, w->id, &cx, &cy) ||
cy = cw->sy; cx == 0 || cy == 0) {
} else {
cx = loop->tty.sx; cx = loop->tty.sx;
cy = loop->tty.sy - status_line_size(loop); cy = loop->tty.sy - status_line_size(loop);
} }
@@ -247,17 +236,16 @@ skip:
/* Look up per-window size if any. */ /* Look up per-window size if any. */
if (~loop->flags & CLIENT_WINDOWSIZECHANGED) if (~loop->flags & CLIENT_WINDOWSIZECHANGED)
continue; continue;
cw = server_client_get_client_window(loop, w->id); if (!control_get_window_size(loop, w->id, &cx, &cy))
if (cw == NULL)
continue; continue;
/* Clamp the size. */ /* Clamp the size. */
log_debug("%s: %s size for @%u is %ux%u", __func__, log_debug("%s: %s size for @%u is %ux%u", __func__,
loop->name, w->id, cw->sx, cw->sy); loop->name, w->id, cx, cy);
if (cw->sx != 0 && *sx > cw->sx) if (cx != 0 && *sx > cx)
*sx = cw->sx; *sx = cx;
if (cw->sy != 0 && *sy > cw->sy) if (cy != 0 && *sy > cy)
*sy = cw->sy; *sy = cy;
} }
} }
if (*sx != UINT_MAX && *sy != UINT_MAX) if (*sx != UINT_MAX && *sy != UINT_MAX)

121
server-client.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: server-client.c,v 1.495 2026/07/17 08:13:23 nicm Exp $ */ /* $OpenBSD: server-client.c,v 1.496 2026/07/17 08:37:29 nicm Exp $ */
/* /*
* Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -44,24 +44,46 @@ static void server_client_set_path(struct client *);
static void server_client_set_progress_bar(struct client *); static void server_client_set_progress_bar(struct client *);
static void server_client_reset_state(struct client *); static void server_client_reset_state(struct client *);
static void server_client_update_latest(struct client *); static void server_client_update_latest(struct client *);
static void server_client_remove_active_pane_client(struct client *);
static void server_client_dispatch(struct imsg *, void *); static void server_client_dispatch(struct imsg *, void *);
static int server_client_dispatch_command(struct client *, struct imsg *); static int server_client_dispatch_command(struct client *, struct imsg *);
static int server_client_dispatch_identify(struct client *, struct imsg *); static int server_client_dispatch_identify(struct client *, struct imsg *);
static int server_client_dispatch_shell(struct client *); static int server_client_dispatch_shell(struct client *);
static void server_client_report_theme(struct client *, enum client_theme); static void server_client_report_theme(struct client *, enum client_theme);
/* Compare client windows. */ /* Client active pane. */
struct client_active_pane {
struct client *client;
u_int window;
struct window_pane *pane;
RB_ENTRY(client_active_pane) entry;
};
RB_HEAD(client_active_panes, client_active_pane);
/* Compare client active panes. */
static int static int
server_client_window_cmp(struct client_window *cw1, server_client_active_pane_cmp(struct client_active_pane *cap1,
struct client_window *cw2) struct client_active_pane *cap2)
{ {
if (cw1->window < cw2->window) uintptr_t c1 = (uintptr_t)cap1->client;
uintptr_t c2 = (uintptr_t)cap2->client;
if (c1 < c2)
return (-1); return (-1);
if (cw1->window > cw2->window) if (c1 > c2)
return (1);
if (cap1->window < cap2->window)
return (-1);
if (cap1->window > cap2->window)
return (1); return (1);
return (0); return (0);
} }
RB_GENERATE(client_windows, client_window, entry, server_client_window_cmp); RB_GENERATE_STATIC(client_active_panes, client_active_pane, entry,
server_client_active_pane_cmp);
static struct client_active_panes client_active_panes =
RB_INITIALIZER(&client_active_panes);
/* Number of attached clients. */ /* Number of attached clients. */
u_int u_int
@@ -305,7 +327,6 @@ server_client_create(int fd)
c->out_fd = -1; c->out_fd = -1;
c->queue = cmdq_new(); c->queue = cmdq_new();
RB_INIT(&c->windows);
RB_INIT(&c->files); RB_INIT(&c->files);
c->tty.sx = 80; c->tty.sx = 80;
@@ -496,7 +517,6 @@ void
server_client_lost(struct client *c) server_client_lost(struct client *c)
{ {
struct client_file *cf, *cf1; struct client_file *cf, *cf1;
struct client_window *cw, *cw1;
if (cfg_client == c) if (cfg_client == c)
cfg_client = NULL; cfg_client = NULL;
@@ -505,15 +525,12 @@ server_client_lost(struct client *c)
server_client_clear_overlay(c); server_client_clear_overlay(c);
status_prompt_clear(c); status_prompt_clear(c);
status_message_clear(c); status_message_clear(c);
server_client_remove_active_pane_client(c);
RB_FOREACH_SAFE(cf, client_files, &c->files, cf1) { RB_FOREACH_SAFE(cf, client_files, &c->files, cf1) {
cf->error = EINTR; cf->error = EINTR;
file_fire_done(cf); file_fire_done(cf);
} }
RB_FOREACH_SAFE(cw, client_windows, &c->windows, cw1) {
RB_REMOVE(client_windows, &c->windows, cw);
free(cw);
}
TAILQ_REMOVE(&clients, c, entry); TAILQ_REMOVE(&clients, c, entry);
log_debug("lost client %p", c); log_debug("lost client %p", c);
@@ -3084,28 +3101,29 @@ server_client_get_flags(struct client *c)
return (s); return (s);
} }
/* Get client window. */ /* Get client active pane. */
struct client_window * static struct client_active_pane *
server_client_get_client_window(struct client *c, u_int id) server_client_get_active_pane(struct client *c, u_int id)
{ {
struct client_window cw = { .window = id }; struct client_active_pane cap = { .client = c, .window = id };
return (RB_FIND(client_windows, &c->windows, &cw)); return (RB_FIND(client_active_panes, &client_active_panes, &cap));
} }
/* Add client window. */ /* Add client active pane. */
struct client_window * static struct client_active_pane *
server_client_add_client_window(struct client *c, u_int id) server_client_add_active_pane(struct client *c, u_int id)
{ {
struct client_window *cw; struct client_active_pane *cap;
cw = server_client_get_client_window(c, id); cap = server_client_get_active_pane(c, id);
if (cw == NULL) { if (cap == NULL) {
cw = xcalloc(1, sizeof *cw); cap = xcalloc(1, sizeof *cap);
cw->window = id; cap->client = c;
RB_INSERT(client_windows, &c->windows, cw); cap->window = id;
RB_INSERT(client_active_panes, &client_active_panes, cap);
} }
return (cw); return (cap);
} }
/* Get client active pane. */ /* Get client active pane. */
@@ -3114,7 +3132,7 @@ server_client_get_pane(struct client *c)
{ {
struct session *s = c->session; struct session *s = c->session;
struct window *w; struct window *w;
struct client_window *cw; struct client_active_pane *cap;
if (s == NULL) if (s == NULL)
return (NULL); return (NULL);
@@ -3124,10 +3142,10 @@ server_client_get_pane(struct client *c)
return (w->modal); return (w->modal);
if (~c->flags & CLIENT_ACTIVEPANE) if (~c->flags & CLIENT_ACTIVEPANE)
return (w->active); return (w->active);
cw = server_client_get_client_window(c, w->id); cap = server_client_get_active_pane(c, w->id);
if (cw == NULL) if (cap == NULL)
return (w->active); return (w->active);
return (cw->pane); return (cap->pane);
} }
/* Set client active pane. */ /* Set client active pane. */
@@ -3135,32 +3153,47 @@ void
server_client_set_pane(struct client *c, struct window_pane *wp) server_client_set_pane(struct client *c, struct window_pane *wp)
{ {
struct session *s = c->session; struct session *s = c->session;
struct client_window *cw; struct client_active_pane *cap;
if (s == NULL) if (s == NULL)
return; return;
if (wp->window->modal != NULL && wp != wp->window->modal) if (wp->window->modal != NULL && wp != wp->window->modal)
return; return;
cw = server_client_add_client_window(c, s->curw->window->id); cap = server_client_add_active_pane(c, s->curw->window->id);
cw->pane = wp; cap->pane = wp;
log_debug("%s pane now %%%u", c->name, wp->id); log_debug("%s pane now %%%u", c->name, wp->id);
} }
/* Remove pane from client lists. */ /* Remove active pane entries for a client. */
static void
server_client_remove_active_pane_client(struct client *c)
{
struct client_active_pane *cap, *cap1;
RB_FOREACH_SAFE(cap, client_active_panes, &client_active_panes, cap1) {
if (cap->client == c) {
RB_REMOVE(client_active_panes, &client_active_panes, cap);
free(cap);
}
}
}
/* Remove pane from client state. */
void void
server_client_remove_pane(struct window_pane *wp) server_client_remove_pane(struct window_pane *wp)
{ {
struct client *c; struct client *c;
struct window *w = wp->window; struct client_active_pane *cap, *cap1;
struct client_window *cw;
RB_FOREACH_SAFE(cap, client_active_panes, &client_active_panes, cap1) {
if (cap->pane == wp) {
RB_REMOVE(client_active_panes, &client_active_panes, cap);
free(cap);
}
}
TAILQ_FOREACH(c, &clients, entry) { TAILQ_FOREACH(c, &clients, entry) {
cw = server_client_get_client_window(c, w->id);
if (cw != NULL && cw->pane == wp) {
RB_REMOVE(client_windows, &c->windows, cw);
free(cw);
}
if (c->tty.mouse_last_pane == (int)wp->id) { if (c->tty.mouse_last_pane == (int)wp->id) {
c->tty.mouse_last_pane = -1; c->tty.mouse_last_pane = -1;
c->tty.mouse_drag_update = NULL; c->tty.mouse_drag_update = NULL;

22
tmux.h
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: tmux.h,v 1.1406 2026/07/15 13:02:33 nicm Exp $ */ /* $OpenBSD: tmux.h,v 1.1407 2026/07/17 08:37:29 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -2074,18 +2074,6 @@ struct client_file {
}; };
RB_HEAD(client_files, client_file); RB_HEAD(client_files, client_file);
/* Client window. */
struct client_window {
u_int window;
struct window_pane *pane;
u_int sx;
u_int sy;
RB_ENTRY(client_window) entry;
};
RB_HEAD(client_windows, client_window);
/* Maximum time to be pasting. */ /* Maximum time to be pasting. */
#define CLIENT_PASTE_TIME_LIMIT 5 #define CLIENT_PASTE_TIME_LIMIT 5
@@ -2189,8 +2177,6 @@ struct client {
const char *user; const char *user;
struct cmdq_list *queue; struct cmdq_list *queue;
struct client_windows windows;
struct control_state *control_state; struct control_state *control_state;
u_int pause_age; u_int pause_age;
@@ -3282,7 +3268,6 @@ void printflike(1, 2) server_add_message(const char *, ...);
int server_create_socket(uint64_t, char **); int server_create_socket(uint64_t, char **);
/* server-client.c */ /* server-client.c */
RB_PROTOTYPE(client_windows, client_window, entry, server_client_window_cmp);
u_int server_client_how_many(void); u_int server_client_how_many(void);
void server_client_set_overlay(struct client *, u_int, overlay_check_cb, void server_client_set_overlay(struct client *, u_int, overlay_check_cb,
overlay_mode_cb, overlay_draw_cb, overlay_key_cb, overlay_mode_cb, overlay_draw_cb, overlay_key_cb,
@@ -3310,8 +3295,6 @@ void server_client_loop(void);
const char *server_client_get_cwd(struct client *, struct session *); const char *server_client_get_cwd(struct client *, struct session *);
void server_client_set_flags(struct client *, const char *); void server_client_set_flags(struct client *, const char *);
const char *server_client_get_flags(struct client *); const char *server_client_get_flags(struct client *);
struct client_window *server_client_get_client_window(struct client *, u_int);
struct client_window *server_client_add_client_window(struct client *, u_int);
struct window_pane *server_client_get_pane(struct client *); struct window_pane *server_client_get_pane(struct client *);
void server_client_set_pane(struct client *, struct window_pane *); void server_client_set_pane(struct client *, struct window_pane *);
void server_client_remove_pane(struct window_pane *); void server_client_remove_pane(struct window_pane *);
@@ -4009,6 +3992,9 @@ void control_set_pane_on(struct client *, struct window_pane *);
void control_set_pane_off(struct client *, struct window_pane *); void control_set_pane_off(struct client *, struct window_pane *);
void control_continue_pane(struct client *, struct window_pane *); void control_continue_pane(struct client *, struct window_pane *);
void control_pause_pane(struct client *, struct window_pane *); void control_pause_pane(struct client *, struct window_pane *);
void control_set_window_size(struct client *, u_int, u_int, u_int);
int control_get_window_size(struct client *, u_int, u_int *, u_int *);
void control_clear_window_size(struct client *, u_int);
struct window_pane_offset *control_pane_offset(struct client *, struct window_pane_offset *control_pane_offset(struct client *,
struct window_pane *, int *); struct window_pane *, int *);
void control_reset_offsets(struct client *); void control_reset_offsets(struct client *);