From 023d8d38ec7d59bbf635253f10e82e0b62ba59ca Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Mon, 13 Jul 2009 17:47:46 +0000 Subject: Tidy up and improve target (-t) argument parsing: - move the code back into cmd.c and merge with the existing functions where possible; - accept "-tttyp0" as well as "-t/dev/ttyp0" for clients; - when looking up session names, try an exact match first, and if that fails look for it as an fnmatch pattern and then as the start of a name - if more that one session matches an error is given; so if there is one session called "mysession", -tmysession, -tmysess, -tmysess* are equivalent but if there is also "mysession2", the last two are errors; - similarly for windows, if the argument is not a valid index or exact window name match, try it against the window names as an fnmatch pattern and a prefix. --- cmd-move-window.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'cmd-move-window.c') diff --git a/cmd-move-window.c b/cmd-move-window.c index 9f356a64..c9117c4b 100644 --- a/cmd-move-window.c +++ b/cmd-move-window.c @@ -54,19 +54,8 @@ cmd_move_window_exec(struct cmd *self, struct cmd_ctx *ctx) if ((wl_src = cmd_find_window(ctx, data->src, &src)) == NULL) return (-1); - - if (arg_parse_window(data->dst, &dst, &idx) != 0) { - ctx->error(ctx, "bad window: %s", data->dst); - return (-1); - } - if (dst == NULL) - dst = ctx->cursession; - if (dst == NULL) - dst = cmd_current_session(ctx); - if (dst == NULL) { - ctx->error(ctx, "session not found: %s", data->dst); + if ((idx = cmd_find_index(ctx, data->dst, &dst)) == -2) return (-1); - } wl_dst = NULL; if (idx != -1) -- cgit