aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2010-06-28 22:10:42 +0000
committerNicholas Marriott <nicm@openbsd.org>2010-06-28 22:10:42 +0000
commit76bbdeb586ad93cfb16bd12db865b4c672a9168e (patch)
tree52ecf7ef2f819396844962ffaf1edbcb4e3bf6b1 /tmux.h
parent07a71fd432df5873515da82d2d620ec0d986b558 (diff)
downloadrtmux-76bbdeb586ad93cfb16bd12db865b4c672a9168e.tar.gz
rtmux-76bbdeb586ad93cfb16bd12db865b4c672a9168e.tar.bz2
rtmux-76bbdeb586ad93cfb16bd12db865b4c672a9168e.zip
Send all three of stdin, stdout, stderr from the client to the server, so that
commands can directly make use of them. This means that load-buffer and save-buffer can have "-" as the file to read from stdin or write to stdout. This is a protocol version bump so the tmux server will need to be restarted after upgrade (or an older client used).
Diffstat (limited to 'tmux.h')
-rw-r--r--tmux.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/tmux.h b/tmux.h
index 88a8e814..9b46a4f4 100644
--- a/tmux.h
+++ b/tmux.h
@@ -19,7 +19,7 @@
#ifndef TMUX_H
#define TMUX_H
-#define PROTOCOL_VERSION 5
+#define PROTOCOL_VERSION 6
#include <sys/param.h>
#include <sys/time.h>
@@ -68,7 +68,6 @@ extern char **environ;
*/
#define COMMAND_LENGTH 2048 /* packed argv size */
#define TERMINAL_LENGTH 128 /* length of TERM environment variable */
-#define PRINT_LENGTH 512 /* printed error/message size */
#define ENVIRON_LENGTH 1024 /* environment variable length */
/*
@@ -373,7 +372,9 @@ enum msgtype {
MSG_ENVIRON,
MSG_UNLOCK,
MSG_LOCK,
- MSG_SHELL
+ MSG_SHELL,
+ MSG_STDERR,
+ MSG_STDOUT,
};
/*
@@ -381,10 +382,6 @@ enum msgtype {
*
* Don't forget to bump PROTOCOL_VERSION if any of these change!
*/
-struct msg_print_data {
- char msg[PRINT_LENGTH];
-};
-
struct msg_command_data {
pid_t pid; /* pid from $TMUX or -1 */
u_int idx; /* index from $TMUX */
@@ -1080,6 +1077,10 @@ struct client {
char *cwd;
struct tty tty;
+ FILE *stdin_file;
+ FILE *stdout_file;
+ FILE *stderr_file;
+
struct event repeat_timer;
struct timeval status_timer;