diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-08-16 18:59:12 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-08-16 18:59:12 +0000 |
| commit | f415d43c3b5cb6f519b171949a6a3eeaacbf6540 (patch) | |
| tree | f591d6ce7494850f85da15e78c4d0b03525465cb /cmd-new-session.c | |
| parent | 8f9858ba2f2fa410b8e0c20a7763517b6610fcb0 (diff) | |
| download | rtmux-f415d43c3b5cb6f519b171949a6a3eeaacbf6540.tar.gz rtmux-f415d43c3b5cb6f519b171949a6a3eeaacbf6540.tar.bz2 rtmux-f415d43c3b5cb6f519b171949a6a3eeaacbf6540.zip | |
Sync OpenBSD patchset 254:
When creating a new session from the command-line where there is an external
terminal, copy the termios(4) special characters and use them for new windows
created in the new session. Suggested by Theo.
Diffstat (limited to 'cmd-new-session.c')
| -rw-r--r-- | cmd-new-session.c | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/cmd-new-session.c b/cmd-new-session.c index 181d9bb8..9fe267f7 100644 --- a/cmd-new-session.c +++ b/cmd-new-session.c @@ -1,4 +1,4 @@ -/* $Id: cmd-new-session.c,v 1.51 2009-08-09 17:48:55 tcunha Exp $ */ +/* $Id: cmd-new-session.c,v 1.52 2009-08-16 18:59:12 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -18,6 +18,12 @@ #include <sys/types.h> +#include <string.h> +#include <termios.h> + +#define TTYDEFCHARS +#include <sys/ttydefaults.h> + #include "tmux.h" /* @@ -109,6 +115,7 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx) struct cmd_new_session_data *data = self->data; struct session *s; struct environ env; + struct termios tio; const char *update; char *overrides, *cmd, *cwd, *cause; int detached; @@ -192,8 +199,24 @@ cmd_new_session_exec(struct cmd *self, struct cmd_ctx *ctx) if (ctx->cmdclient != NULL) environ_update(update, &ctx->cmdclient->environ, &env); + /* + * Fill in the termios settings used for new windows in this session; + * if there is a command client, use the control characters from it. + */ + if (ctx->cmdclient != NULL && ctx->cmdclient->tty.fd != -1) { + if (tcgetattr(ctx->cmdclient->tty.fd, &tio) != 0) + fatal("tcgetattr failed"); + } else + memcpy(tio.c_cc, ttydefchars, sizeof tio.c_cc); + tio.c_iflag = TTYDEF_IFLAG; + tio.c_oflag = TTYDEF_OFLAG; + tio.c_lflag = TTYDEF_LFLAG; + tio.c_cflag = TTYDEF_CFLAG; + tio.c_ispeed = TTYDEF_SPEED; + tio.c_ospeed = TTYDEF_SPEED; + /* Create the new session. */ - s = session_create(data->newname, cmd, cwd, &env, sx, sy, &cause); + s = session_create(data->newname, cmd, cwd, &env, &tio, sx, sy, &cause); if (s == NULL) { ctx->error(ctx, "create session failed: %s", cause); xfree(cause); |