circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 06:17:04 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 254:

Browse Source 
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.
This commit is contained in:
Tiago Cunha
2009-08-16 18:59:12 +00:00
parent 8f9858ba2f
commit f415d43c3b
7 changed files with 57 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cmd-new-session.c
View File

@ -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);