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).
This commit is contained in:
Nicholas Marriott
2009-08-03 14:10:54 +00:00
parent e4bb08e1f5
commit 1673735f02
9 changed files with 137 additions and 29 deletions

View File

@ -108,7 +108,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
{
struct cmd_new_session_data *data = self->data;
struct session *s;
char *cmd, *cwd, *cause;
char *overrides, *cmd, *cwd, *cause;
int detached;
u_int sx, sy;
@ -147,7 +147,9 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx)
return (-1);
}
if (tty_open(&ctx->cmdclient->tty, &cause) != 0) {
overrides =
options_get_string(&global_s_options, "terminal-overrides");
if (tty_open(&ctx->cmdclient->tty, overrides, &cause) != 0) {
ctx->error(ctx, "open terminal failed: %s", cause);
xfree(cause);
return (-1);