src/usr.bin/tmux/cmd-new-session.c - diff

Return to cmd-new-session.c CVS log

Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/cmd-new-session.c between version 1.18 and 1.19

version 1.18, 2009/09/15 07:45:16

version 1.19, 2009/09/16 12:35:04

Line 21

#include <string.h>

#include <termios.h>

#define TTYDEFCHARS

#include <sys/ttydefaults.h>

#include "tmux.h"

Line 116

Line 113

struct session *s;

struct window *w;

struct environ env;

struct termios tio;

struct termios tio, *tiop;

const char *update;

char *overrides, *cmd, *cwd, *cause;

int detached, idx;

Line 151

Line 148

detached = 1;

* Fill in the termios settings used for new windows in this session;

* Save the termios settings, part of which is used for new windows in

* if there is a command client, use the control characters from it.

* this session.

* This is read again with tcgetattr() rather than using tty.tio as if

* detached, tty_open won't be called. Because of this, it must be done

Line 162

Line 159

if (ctx->cmdclient != NULL && ctx->cmdclient->tty.fd != -1) {

if (tcgetattr(ctx->cmdclient->tty.fd, &tio) != 0)

fatal("tcgetattr failed");

tiop = &tio;

} else

memcpy(tio.c_cc, ttydefchars, sizeof tio.c_cc);

tiop = NULL;

tio.c_cc[VERASE] = '\177';

tio.c_iflag = TTYDEF_IFLAG;

tio.c_oflag = TTYDEF_OFLAG;

tio.c_lflag = TTYDEF_LFLAG;

tio.c_cflag = TTYDEF_CFLAG;

cfsetispeed(&tio, TTYDEF_SPEED);

cfsetospeed(&tio, TTYDEF_SPEED);

/* Open the terminal if necessary. */

if (!detached && ctx->cmdclient != NULL) {

Line 227

Line 218

/* Create the new session. */

idx = -1 - options_get_number(&global_s_options, "base-index");

s = session_create(

data->newname, cmd, cwd, &env, &tio, idx, sx, sy, &cause);

data->newname, cmd, cwd, &env, tiop, idx, sx, sy, &cause);

if (s == NULL) {

ctx->error(ctx, "create session failed: %s", cause);

xfree(cause);