Big reorganisation of command-line syntax.

1 files changed, 15 insertions, 142 deletions

diff --git a/cmd-rename-window.c b/cmd-rename-window.c
index 145683cf..f8a87560 100644
--- a/cmd-rename-window.c
+++ b/cmd-rename-window.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-rename-window.c,v 1.21 2008-06-05 17:12:10 nicm Exp $ */
+/* $Id: cmd-rename-window.c,v 1.22 2008-06-05 21:25:00 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -24,166 +24,39 @@
 #include "tmux.h"
 
 /*
- * Rename window by index.
+ * Rename a window.
  */
 
-int	cmd_rename_window_parse(struct cmd *, int, char **, char **);
 void	cmd_rename_window_exec(struct cmd *, struct cmd_ctx *);
-void	cmd_rename_window_send(struct cmd *, struct buffer *);
-void	cmd_rename_window_recv(struct cmd *, struct buffer *);
-void	cmd_rename_window_free(struct cmd *);
-void	cmd_rename_window_print(struct cmd *, char *, size_t);
-
-struct cmd_rename_window_data {
-	char	*cname;
-	char	*sname;
-	int	 idx;
-	char	*newname;
-};
 
 const struct cmd_entry cmd_rename_window_entry = {
 	"rename-window", "renamew",
-	"[-c client-tty|-s session-name] [-i index] new-name",
-	0,
-	cmd_rename_window_parse,
+	CMD_TARGET_WINDOW_USAGE " new-name",
+	CMD_ONEARG,
+	cmd_target_init,
+	cmd_target_parse,
 	cmd_rename_window_exec,
-	cmd_rename_window_send,
-	cmd_rename_window_recv,
-	cmd_rename_window_free,
-	NULL,
-	cmd_rename_window_print
+	cmd_target_send,
+	cmd_target_recv,
+	cmd_target_free,
+	cmd_target_print
 };
 
-int
-cmd_rename_window_parse(struct cmd *self, int argc, char **argv, char **cause)
-{
-	struct cmd_rename_window_data	*data;
-	const char			*errstr;
-	int				 opt;
-
-	self->data = data = xmalloc(sizeof *data);
-	data->cname = NULL;
-	data->sname = NULL;
-	data->idx = -1;
-	data->newname = NULL;
-
-	while ((opt = getopt(argc, argv, "c:i:s:")) != EOF) {
-		switch (opt) {
-		case 'c':
-			if (data->sname != NULL)
-				goto usage;
-			if (data->cname == NULL)
-				data->cname = xstrdup(optarg);
-			break;
-		case 'i':
-			data->idx = strtonum(optarg, 0, INT_MAX, &errstr);
-			if (errstr != NULL) {
-				xasprintf(cause, "index %s", errstr);
-				goto error;
-			}
-			break;
-		case 's':
-			if (data->cname != NULL)
-				goto usage;
-			if (data->sname == NULL)
-				data->sname = xstrdup(optarg);
-			break;
-		default:
-			goto usage;
-		}
-	}
-	argc -= optind;
-	argv += optind;
-	if (argc != 1)
-		goto usage;
-
-	data->newname = xstrdup(argv[0]);
-
-	return (0);
-
-usage:
-	xasprintf(cause, "usage: %s %s", self->entry->name, self->entry->usage);
-
-error:
-	self->entry->free(self);
-	return (-1);
-}
-
 void
 cmd_rename_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
-	struct cmd_rename_window_data	*data = self->data;
-	struct session			*s;
-	struct winlink			*wl;
-
-	if (data == NULL)
-		return;
+	struct cmd_target_data	*data = self->data;
+	struct session		*s;
+	struct winlink		*wl;
 
-	wl = cmd_find_window(ctx, data->cname, data->sname, data->idx, &s);
-	if (wl == NULL)
+	if ((wl = cmd_find_window(ctx, data->target, &s)) == NULL)
 		return;
 
 	xfree(wl->window->name);
-	wl->window->name = xstrdup(data->newname);
+	wl->window->name = xstrdup(data->arg);
 
 	server_status_session(s);
 
 	if (ctx->cmdclient != NULL)
 		server_write_client(ctx->cmdclient, MSG_EXIT, NULL, 0);
 }
-
-void
-cmd_rename_window_send(struct cmd *self, struct buffer *b)
-{
-	struct cmd_rename_window_data	*data = self->data;
-
-	buffer_write(b, data, sizeof *data);
-	cmd_send_string(b, data->cname);
-	cmd_send_string(b, data->sname);
-	cmd_send_string(b, data->newname);
-}
-
-void
-cmd_rename_window_recv(struct cmd *self, struct buffer *b)
-{
-	struct cmd_rename_window_data	*data;
-
-	self->data = data = xmalloc(sizeof *data);
-	buffer_read(b, data, sizeof *data);
-	data->cname = cmd_recv_string(b);
-	data->sname = cmd_recv_string(b);
-	data->newname = cmd_recv_string(b);
-}
-
-void
-cmd_rename_window_free(struct cmd *self)
-{
-	struct cmd_rename_window_data	*data = self->data;
-
-	if (data->cname != NULL)
-		xfree(data->cname);
-	if (data->sname != NULL)
-		xfree(data->sname);
-	if (data->newname != NULL)
-		xfree(data->newname);
-	xfree(data);
-}
-
-void
-cmd_rename_window_print(struct cmd *self, char *buf, size_t len)
-{
-	struct cmd_rename_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->cname != NULL)
-		off += xsnprintf(buf + off, len - off, " -c %s", data->cname);
-	if (off < len && data->sname != NULL)
-		off += xsnprintf(buf + off, len - off, " -s %s", data->sname);
-	if (off < len && data->idx != -1)
-		off += xsnprintf(buf + off, len - off, " -i %d", data->idx);
-	if (off < len && data->newname != NULL)
-		off += xsnprintf(buf + off, len - off, " %s", data->newname);
-}