From 96c37fa80a46e189b9b6535242aa1966f4d375c8 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Tue, 4 Jan 2011 02:03:41 +0000
Subject: Now that parsing is common, merge some of the small, related commands
 together to use the same code.

Also add some arguments (such as -n and -p) to some commands to match
existing commands.
---
 cmd-select-window.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 79 insertions(+), 8 deletions(-)

(limited to 'cmd-select-window.c')

diff --git a/cmd-select-window.c b/cmd-select-window.c
index c414af3a..0e1b9543 100644
--- a/cmd-select-window.c
+++ b/cmd-select-window.c
@@ -31,23 +31,56 @@ int	cmd_select_window_exec(struct cmd *, struct cmd_ctx *);
 
 const struct cmd_entry cmd_select_window_entry = {
 	"select-window", "selectw",
-	"t:", 0, 0,
-	CMD_TARGET_WINDOW_USAGE,
+	"lnpt:", 0, 0,
+	"[-lnp] " CMD_TARGET_WINDOW_USAGE,
+	0,
+	cmd_select_window_key_binding,
+	NULL,
+	cmd_select_window_exec
+};
+
+const struct cmd_entry cmd_next_window_entry = {
+	"next-window", "next",
+	"at:", 0, 0,
+	"[-a] " CMD_TARGET_SESSION_USAGE,
+	0,
+	cmd_select_window_key_binding,
+	NULL,
+	cmd_select_window_exec
+};
+
+const struct cmd_entry cmd_previous_window_entry = {
+	"previous-window", "prev",
+	"at:", 0, 0,
+	"[-a] " CMD_TARGET_SESSION_USAGE,
 	0,
 	cmd_select_window_key_binding,
 	NULL,
 	cmd_select_window_exec
 };
 
+const struct cmd_entry cmd_last_window_entry = {
+	"last-window", "last",
+	"t:", 0, 0,
+	CMD_TARGET_SESSION_USAGE,
+	0,
+	NULL,
+	NULL,
+	cmd_select_window_exec
+};
+
 void
 cmd_select_window_key_binding(struct cmd *self, int key)
 {
 	char	tmp[16];
 
-	xsnprintf(tmp, sizeof tmp, ":%d", key - '0');
-
 	self->args = args_create(0);
-	args_set(self->args, 't', tmp);
+	if (key >= '0' && key <= '9') {
+		xsnprintf(tmp, sizeof tmp, ":%d", key - '0');
+		args_set(self->args, 't', tmp);
+	}
+	if (key == ('n' | KEYC_ESCAPE) || key == ('p' | KEYC_ESCAPE))
+		args_set(self->args, 'a', NULL);
 }
 
 int
@@ -56,12 +89,50 @@ cmd_select_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 	struct args	*args = self->args;
 	struct winlink	*wl;
 	struct session	*s;
+	int		 next, previous, last, activity;
 
-	if ((wl = cmd_find_window(ctx, args_get(args, 't'), &s)) == NULL)
-		return (-1);
+	next = self->entry == &cmd_next_window_entry;
+	if (args_has(self->args, 'n'))
+		next = 1;
+	previous = self->entry == &cmd_previous_window_entry;
+	if (args_has(self->args, 'p'))
+		previous = 1;
+	last = self->entry == &cmd_last_window_entry;
+	if (args_has(self->args, 'l'))
+		last = 1;
+
+	if (next || previous || last) {
+		s = cmd_find_session(ctx, args_get(args, 't'));
+		if (s == NULL)
+			return (-1);
+
+		activity = args_has(self->args, 'a');
+		if (next) {
+			if (session_next(s, activity) != 0) {
+				ctx->error(ctx, "no next window");
+				return (-1);
+			}
+		} else if (previous) {
+			if (session_previous(s, activity) != 0) {
+				ctx->error(ctx, "no previous window");
+				return (-1);
+			}
+		} else {
+			if (session_last(s) != 0) {
+				ctx->error(ctx, "no last window");
+				return (-1);
+			}
+		}
 
-	if (session_select(s, wl->idx) == 0)
 		server_redraw_session(s);
+	} else {
+		wl = cmd_find_window(ctx, args_get(args, 't'), &s);
+		if (wl == NULL)
+			return (-1);
+
+		if (session_select(s, wl->idx) == 0)
+			server_redraw_session(s);
+	}
 	recalculate_sizes();
 
 	return (0);
-- 
cgit v1.2.3