From 0b9b873a5505de6fdfb8f02cfbaef5fc82831a5f Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 5 Jun 2008 21:25:00 +0000 Subject: Big reorganisation of command-line syntax. --- cmd-swap-window.c | 217 ++++++------------------------------------------------ 1 file changed, 24 insertions(+), 193 deletions(-) (limited to 'cmd-swap-window.c') diff --git a/cmd-swap-window.c b/cmd-swap-window.c index bb567b79..1f473e19 100644 --- a/cmd-swap-window.c +++ b/cmd-swap-window.c @@ -1,4 +1,4 @@ -/* $Id: cmd-swap-window.c,v 1.10 2008-06-05 17:12:11 nicm Exp $ */ +/* $Id: cmd-swap-window.c,v 1.11 2008-06-05 21:25:00 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -27,216 +27,47 @@ * Swap one window with another. */ -int cmd_swap_window_parse(struct cmd *, int, char **, char **); void cmd_swap_window_exec(struct cmd *, struct cmd_ctx *); -void cmd_swap_window_send(struct cmd *, struct buffer *); -void cmd_swap_window_recv(struct cmd *, struct buffer *); -void cmd_swap_window_free(struct cmd *); -void cmd_swap_window_print(struct cmd *, char *, size_t); - -struct cmd_swap_window_data { - char *cname; - char *sname; - int idx; - int srcidx; - char *srcname; - int flag_detached; -}; const struct cmd_entry cmd_swap_window_entry = { "swap-window", "swapw", - "[-d] [-c client-tty|-s session-name] [-i index] session-name index", - 0, - cmd_swap_window_parse, + "[-d] " CMD_SRCDST_WINDOW_USAGE, + CMD_DFLAG, + cmd_srcdst_init, + cmd_srcdst_parse, cmd_swap_window_exec, - cmd_swap_window_send, - cmd_swap_window_recv, - cmd_swap_window_free, - NULL, - cmd_swap_window_print + cmd_srcdst_send, + cmd_srcdst_recv, + cmd_srcdst_free, + cmd_srcdst_print }; -int -cmd_swap_window_parse(struct cmd *self, int argc, char **argv, char **cause) -{ - struct cmd_swap_window_data *data; - const char *errstr; - int opt; - - self->data = data = xmalloc(sizeof *data); - data->cname = NULL; - data->sname = NULL; - data->flag_detached = 0; - data->idx = -1; - data->srcidx = -1; - data->srcname = NULL; - - while ((opt = getopt(argc, argv, "c:di:s:")) != EOF) { - switch (opt) { - case 'c': - if (data->sname != NULL) - goto usage; - if (data->cname == NULL) - data->cname = xstrdup(optarg); - break; - case 'd': - data->flag_detached = 1; - 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 != 2) - goto usage; - - data->srcname = xstrdup(argv[0]); - data->srcidx = strtonum(argv[1], 0, INT_MAX, &errstr); - if (errstr != NULL) { - xasprintf(cause, "index %s", errstr); - goto error; - } - - return (0); - -usage: - xasprintf(cause, "usage: %s %s", self->entry->name, self->entry->usage); - -error: - self->entry->free(self); - return (-1); -} - void cmd_swap_window_exec(struct cmd *self, struct cmd_ctx *ctx) { - struct cmd_swap_window_data *data = self->data; - struct session *s, *src; - struct winlink *srcwl, *dstwl; - struct window *w; + struct cmd_srcdst_data *data = self->data; + struct session *src, *dst; + struct winlink *wl_src, *wl_dst; + struct window *w; - if (data == NULL) + if ((wl_src = cmd_find_window(ctx, data->src, &src)) == NULL) return; - - if ((s = cmd_find_session(ctx, data->cname, data->sname)) == NULL) - return; - - if ((src = session_find(data->srcname)) == NULL) { - ctx->error(ctx, "session not found: %s", data->srcname); + if ((wl_dst = cmd_find_window(ctx, data->dst, &dst)) == NULL) return; - } - - if (data->srcidx < 0) - data->srcidx = -1; - if (data->srcidx == -1) - srcwl = src->curw; - else { - srcwl = winlink_find_by_index(&src->windows, data->srcidx); - if (srcwl == NULL) { - ctx->error(ctx, "no window %d", data->srcidx); - return; - } - } - - if (data->idx < 0) - data->idx = -1; - if (data->idx == -1) - dstwl = s->curw; - else { - dstwl = winlink_find_by_index(&s->windows, data->idx); - if (dstwl == NULL) { - ctx->error(ctx, "no window %d", data->idx); - return; - } - } - w = dstwl->window; - dstwl->window = srcwl->window; - srcwl->window = w; + w = wl_dst->window; + wl_dst->window = wl_src->window; + wl_src->window = w; - if (!data->flag_detached) { - session_select(s, dstwl->idx); - if (src != s) - session_select(src, srcwl->idx); + if (!(data->flags & CMD_DFLAG)) { + session_select(dst, wl_dst->idx); + if (src != dst) + session_select(src, wl_src->idx); } server_redraw_session(src); - if (src != s) - server_redraw_session(s); + if (src != dst) + server_redraw_session(dst); if (ctx->cmdclient != NULL) server_write_client(ctx->cmdclient, MSG_EXIT, NULL, 0); } - -void -cmd_swap_window_send(struct cmd *self, struct buffer *b) -{ - struct cmd_swap_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->srcname); -} - -void -cmd_swap_window_recv(struct cmd *self, struct buffer *b) -{ - struct cmd_swap_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->srcname = cmd_recv_string(b); -} - -void -cmd_swap_window_free(struct cmd *self) -{ - struct cmd_swap_window_data *data = self->data; - - if (data->cname != NULL) - xfree(data->cname); - if (data->sname != NULL) - xfree(data->sname); - if (data->srcname != NULL) - xfree(data->srcname); - xfree(data); -} - -void -cmd_swap_window_print(struct cmd *self, char *buf, size_t len) -{ - struct cmd_swap_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->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->srcname != NULL) - off += xsnprintf(buf + off, len - off, " %s", data->srcname); - if (off < len && data->srcidx != -1) - off += xsnprintf(buf + off, len - off, " %d", data->srcidx); -} -- cgit