===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-new-session.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/tmux/cmd-new-session.c	2009/08/08 21:52:43	1.10
--- src/usr.bin/tmux/cmd-new-session.c	2009/08/13 19:03:59	1.11
***************
*** 1,4 ****
! /* $OpenBSD: cmd-new-session.c,v 1.10 2009/08/08 21:52:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-new-session.c,v 1.11 2009/08/13 19:03:59 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 18,23 ****
--- 18,29 ----
  
  #include <sys/types.h>
  
+ #include <string.h>
+ #include <termios.h>
+ 
+ #define TTYDEFCHARS
+ #include <sys/ttydefaults.h>
+ 
  #include "tmux.h"
  
  /*
***************
*** 109,114 ****
--- 115,121 ----
  	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,199 ****
  	if (ctx->cmdclient != NULL)
  		environ_update(update, &ctx->cmdclient->environ, &env);
  
  	/* Create the new session. */
! 	s = session_create(data->newname, cmd, cwd, &env, sx, sy, &cause);
  	if (s == NULL) {
  		ctx->error(ctx, "create session failed: %s", cause);
  		xfree(cause);
--- 199,222 ----
  	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, &tio, sx, sy, &cause);
  	if (s == NULL) {
  		ctx->error(ctx, "create session failed: %s", cause);
  		xfree(cause);