mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	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.
This commit is contained in:
		@@ -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);
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user