diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2009-08-03 14:10:54 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2009-08-03 14:10:54 +0000 |
| commit | 1673735f0271c6f87e6ba0d85d8b4a1d0f2f3d35 (patch) | |
| tree | 27a8faaf2b54de7cf47d822da839c6d62368a44a /cmd-attach-session.c | |
| parent | e4bb08e1f5ebf47620758795efcbdd61849b73e8 (diff) | |
Add a terminal-overrides session option allowing individual terminfo(5) entries
to be overridden. The 88col/256col checks are now moved into the default
setting and out of the code.
Also remove a couple of old workarounds for xterm and rxvt which are no longer
necessary (tmux can emulate them if missing).
Diffstat (limited to 'cmd-attach-session.c')
| -rw-r--r-- | cmd-attach-session.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmd-attach-session.c b/cmd-attach-session.c index 3278ea7f..4604ee27 100644 --- a/cmd-attach-session.c +++ b/cmd-attach-session.c @@ -43,7 +43,7 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_ctx *ctx) struct cmd_target_data *data = self->data; struct session *s; struct client *c; - char *cause; + char *overrides, *cause; u_int i; if (ARRAY_LENGTH(&sessions) == 0) { @@ -80,7 +80,9 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_ctx *ctx) return (-1); } - if (tty_open(&ctx->cmdclient->tty, &cause) != 0) { + overrides = + options_get_string(&s->options, "terminal-overrides"); + if (tty_open(&ctx->cmdclient->tty, overrides, &cause) != 0) { ctx->error(ctx, "terminal open failed: %s", cause); xfree(cause); return (-1); |