diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2012-07-11 07:10:15 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2012-07-11 07:10:15 +0000 |
| commit | ede8312d59c5d08990f83f38682c26434823525b (patch) | |
| tree | bdf66e80ca1d71548a554804f4ab6656a828a821 /cmd-split-window.c | |
| parent | df912e3540968a2a0b266e523ecc08bb2dc0ca20 (diff) | |
| download | rtmux-ede8312d59c5d08990f83f38682c26434823525b.tar.gz rtmux-ede8312d59c5d08990f83f38682c26434823525b.tar.bz2 rtmux-ede8312d59c5d08990f83f38682c26434823525b.zip | |
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.
Diffstat (limited to 'cmd-split-window.c')
| -rw-r--r-- | cmd-split-window.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd-split-window.c b/cmd-split-window.c index c8afdaba..88d451c8 100644 --- a/cmd-split-window.c +++ b/cmd-split-window.c @@ -28,8 +28,8 @@ * Split a window (add a new pane). */ -void cmd_split_window_key_binding(struct cmd *, int); -int cmd_split_window_exec(struct cmd *, struct cmd_ctx *); +void cmd_split_window_key_binding(struct cmd *, int); +enum cmd_retval cmd_split_window_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_split_window_entry = { "split-window", "splitw", @@ -50,7 +50,7 @@ cmd_split_window_key_binding(struct cmd *self, int key) args_set(self->args, 'h', NULL); } -int +enum cmd_retval cmd_split_window_exec(struct cmd *self, struct cmd_ctx *ctx) { struct args *args = self->args; @@ -71,7 +71,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_ctx *ctx) char *cp; if ((wl = cmd_find_pane(ctx, args_get(args, 't'), &s, &wp)) == NULL) - return (-1); + return (CMD_RETURN_ERROR); w = wl->window; environ_init(&env); @@ -156,7 +156,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_ctx *ctx) format_free(ft); } notify_window_layout_changed(w); - return (0); + return (CMD_RETURN_NORMAL); error: environ_free(&env); @@ -164,5 +164,5 @@ error: window_remove_pane(w, new_wp); ctx->error(ctx, "create pane failed: %s", cause); free(cause); - return (-1); + return (CMD_RETURN_ERROR); } |