diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2012-03-17 21:27:52 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2012-03-17 21:27:52 +0000 |
| commit | ea09b4b1f6b1b80c87652fcbf752040535796e56 (patch) | |
| tree | 1360c282399877a2bb33eb7e917ac27c11bf8398 /usr.bin/tmux | |
| parent | 8e1e288298c86c3acec73643d68fdb522d196819 (diff) | |
Break out termios initialization into a separate function, from George
Nachman.
Diffstat (limited to 'usr.bin/tmux')
| -rw-r--r-- | usr.bin/tmux/tmux.h | 3 | ||||
| -rw-r--r-- | usr.bin/tmux/tty.c | 23 |
2 files changed, 17 insertions, 9 deletions
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index c3a98e91b44..6042c5e76b2 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.321 2012/03/15 10:36:00 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.322 2012/03/17 21:27:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -1444,6 +1444,7 @@ void environ_update(const char *, struct environ *, struct environ *); void environ_push(struct environ *); /* tty.c */ +void tty_init_termios(int, struct termios *, struct bufferevent *); void tty_raw(struct tty *, const char *); void tty_attributes(struct tty *, const struct grid_cell *); void tty_reset(struct tty *); diff --git a/usr.bin/tmux/tty.c b/usr.bin/tmux/tty.c index eca6afa841c..91108068b5c 100644 --- a/usr.bin/tmux/tty.c +++ b/usr.bin/tmux/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.126 2012/03/17 19:29:46 nicm Exp $ */ +/* $OpenBSD: tty.c,v 1.127 2012/03/17 21:27:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -175,18 +175,19 @@ tty_error_callback( } void -tty_start_tty(struct tty *tty) +tty_init_termios(int fd, struct termios *orig_tio, struct bufferevent *bufev) { struct termios tio; - if (tty->fd == -1 || tcgetattr(tty->fd, &tty->tio) != 0) + if (fd == -1 || tcgetattr(fd, orig_tio) != 0) return; - setblocking(tty->fd, 0); + setblocking(fd, 0); - bufferevent_enable(tty->event, EV_READ|EV_WRITE); + if (bufev != NULL) + bufferevent_enable(bufev, EV_READ|EV_WRITE); - memcpy(&tio, &tty->tio, sizeof tio); + memcpy(&tio, orig_tio, sizeof tio); tio.c_iflag &= ~(IXON|IXOFF|ICRNL|INLCR|IGNCR|IMAXBEL|ISTRIP); tio.c_iflag |= IGNBRK; tio.c_oflag &= ~(OPOST|ONLCR|OCRNL|ONLRET); @@ -194,8 +195,14 @@ tty_start_tty(struct tty *tty) ECHOPRT|ECHOKE|ECHOCTL|ISIG); tio.c_cc[VMIN] = 1; tio.c_cc[VTIME] = 0; - if (tcsetattr(tty->fd, TCSANOW, &tio) == 0) - tcflush(tty->fd, TCIOFLUSH); + if (tcsetattr(fd, TCSANOW, &tio) == 0) + tcflush(fd, TCIOFLUSH); +} + +void +tty_start_tty(struct tty *tty) +{ + tty_init_termios(tty->fd, &tty->tio, tty->event); tty_putcode(tty, TTYC_SMCUP); |