Window splitting. Two vertical panes fixed 50% each. This is a huge diff, still a couple of bugs (notably heap corruption somewhere causing segfault on exit).

1 files changed, 211 insertions, 0 deletions

diff --git a/cmd-split-window.c b/cmd-split-window.c
new file mode 100644
index 00000000..5e9c0693
--- /dev/null
+++ b/cmd-split-window.c
@@ -0,0 +1,211 @@
+/* $Id: cmd-split-window.c,v 1.1 2009-01-11 23:31:46 nicm Exp $ */
+
+/*
+ * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "tmux.h"
+
+/*
+ * Create a new window.
+ */
+
+int	cmd_split_window_parse(struct cmd *, int, char **, char **);
+void	cmd_split_window_exec(struct cmd *, struct cmd_ctx *);
+void	cmd_split_window_send(struct cmd *, struct buffer *);
+void	cmd_split_window_recv(struct cmd *, struct buffer *);
+void	cmd_split_window_free(struct cmd *);
+void	cmd_split_window_init(struct cmd *, int);
+void	cmd_split_window_print(struct cmd *, char *, size_t);
+
+struct cmd_split_window_data {
+	char	*target;
+	char	*cmd;
+	int	 flag_detached;
+};
+
+const struct cmd_entry cmd_split_window_entry = {
+	"split-window", "splitw",
+	"[-d] [-t target-window] [command]",
+	0,
+	cmd_split_window_init,
+	cmd_split_window_parse,
+	cmd_split_window_exec,
+	cmd_split_window_send,
+	cmd_split_window_recv,
+	cmd_split_window_free,
+	cmd_split_window_print
+};
+
+void
+cmd_split_window_init(struct cmd *self, unused int arg)
+{
+	struct cmd_split_window_data	 *data;
+
+	self->data = data = xmalloc(sizeof *data);
+	data->target = NULL;
+	data->cmd = NULL;
+	data->flag_detached = 0;
+}
+
+int
+cmd_split_window_parse(struct cmd *self, int argc, char **argv, char **cause)
+{
+	struct cmd_split_window_data	*data;
+	int				 opt;
+
+	self->entry->init(self, 0);
+	data = self->data;
+
+	while ((opt = getopt(argc, argv, "dt:")) != -1) {
+		switch (opt) {
+		case 'd':
+			data->flag_detached = 1;
+			break;
+		case 't':
+			if (data->target == NULL)
+				data->target = xstrdup(optarg);
+			break;
+		default:
+			goto usage;
+		}
+	}
+	argc -= optind;
+	argv += optind;
+	if (argc != 0 && argc != 1)
+		goto usage;
+
+	if (argc == 1)
+		data->cmd = xstrdup(argv[0]);
+
+	return (0);
+
+usage:
+	xasprintf(cause, "usage: %s %s", self->entry->name, self->entry->usage);
+
+	self->entry->free(self);
+	return (-1);
+}
+
+void
+cmd_split_window_exec(struct cmd *self, struct cmd_ctx *ctx)
+{
+	struct cmd_split_window_data	*data = self->data;
+	struct session			*s;
+	struct winlink			*wl;
+	const char			*env[] = {
+		NULL /* TMUX= */, "TERM=screen", NULL
+	};
+	char		 		 buf[256];
+	char				*cmd, *cwd;
+	u_int				 i, sx, sy, hlimit;
+
+	if ((wl = cmd_find_window(ctx, data->target, &s)) == NULL)
+		return;
+
+	if (wl->window->panes[1] != NULL) {
+		ctx->error(ctx, "window is already split");
+		return;
+	}
+
+	if (session_index(s, &i) != 0)
+		fatalx("session not found");
+	xsnprintf(buf, sizeof buf, "TMUX=%ld,%u", (long) getpid(), i);
+	env[0] = buf;
+
+	cmd = data->cmd;
+	if (cmd == NULL)
+		cmd = options_get_string(&s->options, "default-command");
+	if (ctx->cmdclient == NULL || ctx->cmdclient->cwd == NULL)
+		cwd = options_get_string(&global_options, "default-path");
+	else
+		cwd = ctx->cmdclient->cwd;
+
+	hlimit = options_get_number(&s->options, "history-limit");
+	sx = wl->window->sx;
+	sy = wl->window->sy - (wl->window->sy / 2);
+	wl->window->panes[1] = window_pane_create(wl->window, sx, sy, hlimit);
+	if (window_pane_spawn(wl->window->panes[1], cmd, cwd, env) != 0) {
+		ctx->error(ctx, "command failed: %s", cmd);
+		return;
+	}
+	window_resize(wl->window, wl->window->sx, wl->window->sy);
+	server_redraw_window(wl->window);
+	
+	if (!data->flag_detached) {
+		wl->window->active = wl->window->panes[1];
+		session_select(s, wl->idx);
+		server_redraw_session(s);
+	} else
+		server_status_window(s);
+
+	if (ctx->cmdclient != NULL)
+		server_write_client(ctx->cmdclient, MSG_EXIT, NULL, 0);
+}
+
+void
+cmd_split_window_send(struct cmd *self, struct buffer *b)
+{
+	struct cmd_split_window_data	*data = self->data;
+
+	buffer_write(b, data, sizeof *data);
+	cmd_send_string(b, data->target);
+	cmd_send_string(b, data->cmd);
+}
+
+void
+cmd_split_window_recv(struct cmd *self, struct buffer *b)
+{
+	struct cmd_split_window_data	*data;
+
+	self->data = data = xmalloc(sizeof *data);
+	buffer_read(b, data, sizeof *data);
+	data->target = cmd_recv_string(b);
+	data->cmd = cmd_recv_string(b);
+}
+
+void
+cmd_split_window_free(struct cmd *self)
+{
+	struct cmd_split_window_data	*data = self->data;
+
+	if (data->target != NULL)
+		xfree(data->target);
+	if (data->cmd != NULL)
+		xfree(data->cmd);
+	xfree(data);
+}
+
+void
+cmd_split_window_print(struct cmd *self, char *buf, size_t len)
+{
+	struct cmd_split_window_data	*data = self->data;
+	size_t				 off = 0;
+
+	off += xsnprintf(buf, len, "%s", self->entry->name);
+	if (data == NULL)
+		return;
+	if (off < len && data->flag_detached)
+		off += xsnprintf(buf + off, len - off, " -d");
+	if (off < len && data->target != NULL)
+		off += xsnprintf(buf + off, len - off, " -t %s", data->target);
+	if (off < len && data->cmd != NULL)
+		off += xsnprintf(buf + off, len - off, " %s", data->cmd);
+}