aboutsummaryrefslogtreecommitdiff
path: root/tty.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2009-08-03 14:10:54 +0000
committerNicholas Marriott <nicm@openbsd.org>2009-08-03 14:10:54 +0000
commit1673735f0271c6f87e6ba0d85d8b4a1d0f2f3d35 (patch)
tree27a8faaf2b54de7cf47d822da839c6d62368a44a /tty.c
parente4bb08e1f5ebf47620758795efcbdd61849b73e8 (diff)
downloadrtmux-1673735f0271c6f87e6ba0d85d8b4a1d0f2f3d35.tar.gz
rtmux-1673735f0271c6f87e6ba0d85d8b4a1d0f2f3d35.tar.bz2
rtmux-1673735f0271c6f87e6ba0d85d8b4a1d0f2f3d35.zip
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 'tty.c')
-rw-r--r--tty.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/tty.c b/tty.c
index 48b10f7d..d3a4ba1d 100644
--- a/tty.c
+++ b/tty.c
@@ -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);