mirror of
https://github.com/tmux/tmux.git
synced 2024-12-13 01:48:47 +00:00
Merge branch 'obsd-master'
This commit is contained in:
commit
7b8ececd8d
11
input.c
11
input.c
@ -2242,22 +2242,27 @@ static int
|
||||
input_dcs_dispatch(struct input_ctx *ictx)
|
||||
{
|
||||
struct window_pane *wp = ictx->wp;
|
||||
struct options *oo = wp->options;
|
||||
struct screen_write_ctx *sctx = &ictx->ctx;
|
||||
u_char *buf = ictx->input_buf;
|
||||
size_t len = ictx->input_len;
|
||||
const char prefix[] = "tmux;";
|
||||
const u_int prefixlen = (sizeof prefix) - 1;
|
||||
long long allow_passthrough = 0;
|
||||
|
||||
if (wp == NULL)
|
||||
return (0);
|
||||
if (ictx->flags & INPUT_DISCARD)
|
||||
return (0);
|
||||
if (!options_get_number(ictx->wp->options, "allow-passthrough"))
|
||||
allow_passthrough = options_get_number(oo, "allow-passthrough");
|
||||
if (!allow_passthrough)
|
||||
return (0);
|
||||
log_debug("%s: \"%s\"", __func__, buf);
|
||||
|
||||
if (len >= prefixlen && strncmp(buf, prefix, prefixlen) == 0)
|
||||
screen_write_rawstring(sctx, buf + prefixlen, len - prefixlen);
|
||||
if (len >= prefixlen && strncmp(buf, prefix, prefixlen) == 0) {
|
||||
screen_write_rawstring(sctx, buf + prefixlen, len - prefixlen,
|
||||
allow_passthrough == 2);
|
||||
}
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
@ -87,6 +87,9 @@ static const char *options_table_detach_on_destroy_list[] = {
|
||||
static const char *options_table_extended_keys_list[] = {
|
||||
"off", "on", "always", NULL
|
||||
};
|
||||
static const char *options_table_allow_passthrough_list[] = {
|
||||
"off", "on", "all", NULL
|
||||
};
|
||||
|
||||
/* Status line format. */
|
||||
#define OPTIONS_TABLE_STATUS_FORMAT1 \
|
||||
@ -803,11 +806,14 @@ const struct options_table_entry options_table[] = {
|
||||
},
|
||||
|
||||
{ .name = "allow-passthrough",
|
||||
.type = OPTIONS_TABLE_FLAG,
|
||||
.type = OPTIONS_TABLE_CHOICE,
|
||||
.scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
|
||||
.choices = options_table_allow_passthrough_list,
|
||||
.default_num = 0,
|
||||
.text = "Whether applications are allowed to use the escape sequence "
|
||||
"to bypass tmux."
|
||||
"to bypass tmux. Can be 'off' (disallowed), 'on' (allowed "
|
||||
"if the pane is visible), or 'all' (allowed even if the pane "
|
||||
"is invisible)."
|
||||
},
|
||||
|
||||
{ .name = "allow-rename",
|
||||
|
@ -2100,13 +2100,15 @@ screen_write_setselection(struct screen_write_ctx *ctx, const char *flags,
|
||||
|
||||
/* Write unmodified string. */
|
||||
void
|
||||
screen_write_rawstring(struct screen_write_ctx *ctx, u_char *str, u_int len)
|
||||
screen_write_rawstring(struct screen_write_ctx *ctx, u_char *str, u_int len,
|
||||
int allow_invisible_panes)
|
||||
{
|
||||
struct tty_ctx ttyctx;
|
||||
|
||||
screen_write_initctx(ctx, &ttyctx, 0);
|
||||
ttyctx.ptr = str;
|
||||
ttyctx.num = len;
|
||||
ttyctx.allow_invisible_panes = allow_invisible_panes;
|
||||
|
||||
tty_write(tty_cmd_rawstring, &ttyctx);
|
||||
}
|
||||
|
8
tmux.1
8
tmux.1
@ -4464,11 +4464,17 @@ Available pane options are:
|
||||
.Pp
|
||||
.Bl -tag -width Ds -compact
|
||||
.It Xo Ic allow-passthrough
|
||||
.Op Ic on | off
|
||||
.Op Ic on | off | all
|
||||
.Xc
|
||||
Allow programs in the pane to bypass
|
||||
.Nm
|
||||
using a terminal escape sequence (\eePtmux;...\ee\e\e).
|
||||
If set to
|
||||
.Ic on ,
|
||||
passthrough sequences will be allowed only if the pane is visible.
|
||||
If set to
|
||||
.Ic all ,
|
||||
they will be allowed even if the pane is invisible.
|
||||
.Pp
|
||||
.It Xo Ic allow-rename
|
||||
.Op Ic on | off
|
||||
|
10
tmux.h
10
tmux.h
@ -1432,6 +1432,13 @@ struct tty_ctx {
|
||||
void *ptr;
|
||||
void *ptr2;
|
||||
|
||||
/*
|
||||
* Whether this command should be sent even when the pane is not
|
||||
* visible (used for a passthrough sequence when allow-passthrough is
|
||||
* "all").
|
||||
*/
|
||||
int allow_invisible_panes;
|
||||
|
||||
/*
|
||||
* Cursor and region position before the screen was updated - this is
|
||||
* where the command should be applied; the values in the screen have
|
||||
@ -2891,7 +2898,8 @@ void screen_write_collect_add(struct screen_write_ctx *,
|
||||
void screen_write_cell(struct screen_write_ctx *, const struct grid_cell *);
|
||||
void screen_write_setselection(struct screen_write_ctx *, const char *,
|
||||
u_char *, u_int);
|
||||
void screen_write_rawstring(struct screen_write_ctx *, u_char *, u_int);
|
||||
void screen_write_rawstring(struct screen_write_ctx *, u_char *, u_int,
|
||||
int);
|
||||
void screen_write_alternateon(struct screen_write_ctx *,
|
||||
struct grid_cell *, int);
|
||||
void screen_write_alternateoff(struct screen_write_ctx *,
|
||||
|
7
tty.c
7
tty.c
@ -1626,6 +1626,12 @@ tty_write(void (*cmdfn)(struct tty *, const struct tty_ctx *),
|
||||
if (ctx->set_client_cb == NULL)
|
||||
return;
|
||||
TAILQ_FOREACH(c, &clients, entry) {
|
||||
if (ctx->allow_invisible_panes) {
|
||||
if (c->session == NULL ||
|
||||
c->tty.term == NULL ||
|
||||
c->flags & CLIENT_SUSPENDED)
|
||||
continue;
|
||||
} else {
|
||||
if (!tty_client_ready(c))
|
||||
continue;
|
||||
state = ctx->set_client_cb(ctx, c);
|
||||
@ -1633,6 +1639,7 @@ tty_write(void (*cmdfn)(struct tty *, const struct tty_ctx *),
|
||||
break;
|
||||
if (state == 0)
|
||||
continue;
|
||||
}
|
||||
cmdfn(&c->tty, ctx);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user