summaryrefslogtreecommitdiffstats
path: root/client.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2012-06-18 13:16:42 +0000
committerNicholas Marriott <nicm@openbsd.org>2012-06-18 13:16:42 +0000
commit2942eca8953561cef0764c1775666697ee032c34 (patch)
tree7189077d728a911a5f6e8dac6cfe88824d9dc8a5 /client.c
parent7c39850d1f55f101c42a2dd65664691927c459a1 (diff)
Add a skeleton mode to tmux (called "control mode") that let's tmux
commands be sent and output received on stdout. This can be used to integrate with other terminal emulators and should allow some other things to be made simpler later. More to come so doesn't do much yet and deliberately not documented.
Diffstat (limited to 'client.c')
-rw-r--r--client.c27
1 files changed, 26 insertions, 1 deletions
diff --git a/client.c b/client.c
index 1a318d3f..911a639f 100644
--- a/client.c
+++ b/client.c
@@ -169,6 +169,7 @@ client_main(int argc, char **argv, int flags)
pid_t ppid;
enum msgtype msg;
char *cause;
+ struct termios tio, saved_tio;
/* Set up the initial command. */
cmdflags = 0;
@@ -233,6 +234,23 @@ client_main(int argc, char **argv, int flags)
setblocking(STDIN_FILENO, 0);
event_set(&client_stdin, STDIN_FILENO, EV_READ|EV_PERSIST,
client_stdin_callback, NULL);
+ if (flags & IDENTIFY_TERMIOS) {
+ if (tcgetattr(STDIN_FILENO, &saved_tio) != 0) {
+ fprintf(stderr, "tcgetattr failed: %s\n",
+ strerror(errno));
+ return (1);
+ }
+ cfmakeraw(&tio);
+ tio.c_iflag = ICRNL|IXANY;
+ tio.c_oflag = OPOST|ONLCR;
+ tio.c_lflag = NOKERNINFO;
+ tio.c_cflag = CREAD|CS8|HUPCL;
+ tio.c_cc[VMIN] = 1;
+ tio.c_cc[VTIME] = 0;
+ cfsetispeed(&tio, cfgetispeed(&saved_tio));
+ cfsetospeed(&tio, cfgetospeed(&saved_tio));
+ tcsetattr(STDIN_FILENO, TCSANOW, &tio);
+ }
/* Establish signal handlers. */
set_signals(client_signal);
@@ -273,7 +291,8 @@ client_main(int argc, char **argv, int flags)
ppid = getppid();
if (client_exittype == MSG_DETACHKILL && ppid > 1)
kill(ppid, SIGHUP);
- }
+ } else if (flags & IDENTIFY_TERMIOS)
+ tcsetattr(STDOUT_FILENO, TCSAFLUSH, &saved_tio);
setblocking(STDIN_FILENO, 1);
return (client_exitval);
}
@@ -513,6 +532,12 @@ client_dispatch_wait(void *data)
shell_exec(shelldata.shell, shellcmd);
/* NOTREACHED */
+ case MSG_DETACH:
+ client_write_server(MSG_EXITING, NULL, 0);
+ break;
+ case MSG_EXITED:
+ imsg_free(&imsg);
+ return (-1);
default:
fatalx("unexpected message");
}