From 52793e7a3fc7f53b173ee887c221ff4ed38499e8 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 13 Aug 2009 19:03:59 +0000 Subject: 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. --- window.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'window.c') diff --git a/window.c b/window.c index cfef2b24..eccaa4e5 100644 --- a/window.c +++ b/window.c @@ -269,7 +269,8 @@ window_create1(u_int sx, u_int sy) struct window * window_create(const char *name, const char *cmd, const char *cwd, - struct environ *env, u_int sx, u_int sy, u_int hlimit, char **cause) + struct environ *env, struct termios *tio, u_int sx, u_int sy, u_int hlimit, + char **cause) { struct window *w; struct window_pane *wp; @@ -277,7 +278,7 @@ window_create(const char *name, const char *cmd, const char *cwd, w = window_create1(sx, sy); wp = window_add_pane(w, hlimit); layout_init(w); - if (window_pane_spawn(wp, cmd, cwd, env, cause) != 0) { + if (window_pane_spawn(wp, cmd, cwd, env, tio, cause) != 0) { window_destroy(w); return (NULL); } @@ -470,8 +471,8 @@ window_pane_destroy(struct window_pane *wp) } int -window_pane_spawn(struct window_pane *wp, - const char *cmd, const char *cwd, struct environ *env, char **cause) +window_pane_spawn(struct window_pane *wp, const char *cmd, + const char *cwd, struct environ *env, struct termios *tio, char **cause) { struct winsize ws; int mode; @@ -505,7 +506,7 @@ window_pane_spawn(struct window_pane *wp, tv.tv_usec = NAME_INTERVAL * 1000L; timeradd(&wp->window->name_timer, &tv, &wp->window->name_timer); - switch (wp->pid = forkpty(&wp->fd, wp->tty, NULL, &ws)) { + switch (wp->pid = forkpty(&wp->fd, wp->tty, tio, &ws)) { case -1: wp->fd = -1; xasprintf(cause, "%s: %s", cmd, strerror(errno)); -- cgit