From ede8312d59c5d08990f83f38682c26434823525b Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 11 Jul 2012 07:10:15 +0000 Subject: Make command exec functions return an enum rather than -1/0/1 values and add a new value to mean "leave client running but don't attach" to fix problems with using some commands in a command sequence. Most of the work by Thomas Adam, problem reported by "jspenguin" on SF bug 3535531. --- cmd-swap-window.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'cmd-swap-window.c') diff --git a/cmd-swap-window.c b/cmd-swap-window.c index 7583bdff..afd55e0b 100644 --- a/cmd-swap-window.c +++ b/cmd-swap-window.c @@ -38,7 +38,7 @@ const struct cmd_entry cmd_swap_window_entry = { cmd_swap_window_exec }; -int +enum cmd_retval cmd_swap_window_exec(struct cmd *self, struct cmd_ctx *ctx) { struct args *args = self->args; @@ -50,21 +50,21 @@ cmd_swap_window_exec(struct cmd *self, struct cmd_ctx *ctx) target_src = args_get(args, 's'); if ((wl_src = cmd_find_window(ctx, target_src, &src)) == NULL) - return (-1); + return (CMD_RETURN_ERROR); target_dst = args_get(args, 't'); if ((wl_dst = cmd_find_window(ctx, target_dst, &dst)) == NULL) - return (-1); + return (CMD_RETURN_ERROR); sg_src = session_group_find(src); sg_dst = session_group_find(dst); if (src != dst && sg_src != NULL && sg_dst != NULL && sg_src == sg_dst) { ctx->error(ctx, "can't move window, sessions are grouped"); - return (-1); + return (CMD_RETURN_ERROR); } if (wl_dst->window == wl_src->window) - return (0); + return (CMD_RETURN_NORMAL); w = wl_dst->window; wl_dst->window = wl_src->window; @@ -83,5 +83,5 @@ cmd_swap_window_exec(struct cmd *self, struct cmd_ctx *ctx) } recalculate_sizes(); - return (0); + return (CMD_RETURN_NORMAL); } -- cgit v1.2.3