Sync OpenBSD patchset 211:

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:
Tiago Cunha
2009-08-09 15:26:24 +00:00
parent 75b6736cf4
commit 15f6a41a75
8 changed files with 107 additions and 37 deletions

7
tty.c
View File

@ -1,4 +1,4 @@
/* $Id: tty.c,v 1.119 2009-07-28 22:41:38 tcunha Exp $ */
/* $Id: tty.c,v 1.120 2009-08-09 15:26:24 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -57,7 +57,7 @@ tty_init(struct tty *tty, char *path, char *term)
}
int
tty_open(struct tty *tty, char **cause)
tty_open(struct tty *tty, const char *overrides, char **cause)
{
int mode;
@ -79,7 +79,8 @@ tty_open(struct tty *tty, char **cause)
else
tty->log_fd = -1;
if ((tty->term = tty_term_find(tty->termname, tty->fd, cause)) == NULL)
tty->term = tty_term_find(tty->termname, tty->fd, overrides, cause);
if (tty->term == NULL)
goto error;
tty->in = buffer_create(BUFSIZ);