===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-select-layout.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -c -r1.18 -r1.19
*** src/usr.bin/tmux/cmd-select-layout.c	2013/01/30 17:00:17	1.18
--- src/usr.bin/tmux/cmd-select-layout.c	2013/03/24 09:54:10	1.19
***************
*** 1,4 ****
! /* $OpenBSD: cmd-select-layout.c,v 1.18 2013/01/30 17:00:17 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-select-layout.c,v 1.19 2013/03/24 09:54:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 25,31 ****
   */
  
  void		 cmd_select_layout_key_binding(struct cmd *, int);
! enum cmd_retval	 cmd_select_layout_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_select_layout_entry = {
  	"select-layout", "selectl",
--- 25,31 ----
   */
  
  void		 cmd_select_layout_key_binding(struct cmd *, int);
! enum cmd_retval	 cmd_select_layout_exec(struct cmd *, struct cmd_q *);
  
  const struct cmd_entry cmd_select_layout_entry = {
  	"select-layout", "selectl",
***************
*** 83,96 ****
  }
  
  enum cmd_retval
! cmd_select_layout_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args	*args = self->args;
  	struct winlink	*wl;
  	const char	*layoutname;
  	int		 next, previous, layout;
  
! 	if ((wl = cmd_find_window(ctx, args_get(args, 't'), NULL)) == NULL)
  		return (CMD_RETURN_ERROR);
  
  	next = self->entry == &cmd_next_layout_entry;
--- 83,96 ----
  }
  
  enum cmd_retval
! cmd_select_layout_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args	*args = self->args;
  	struct winlink	*wl;
  	const char	*layoutname;
  	int		 next, previous, layout;
  
! 	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), NULL)) == NULL)
  		return (CMD_RETURN_ERROR);
  
  	next = self->entry == &cmd_next_layout_entry;
***************
*** 106,112 ****
  		else
  			layout = layout_set_previous(wl->window);
  		server_redraw_window(wl->window);
! 		ctx->info(ctx, "arranging in: %s", layout_set_name(layout));
  		return (CMD_RETURN_NORMAL);
  	}
  
--- 106,112 ----
  		else
  			layout = layout_set_previous(wl->window);
  		server_redraw_window(wl->window);
! 		cmdq_info(cmdq, "arranging in: %s", layout_set_name(layout));
  		return (CMD_RETURN_NORMAL);
  	}
  
***************
*** 117,134 ****
  	if (layout != -1) {
  		layout = layout_set_select(wl->window, layout);
  		server_redraw_window(wl->window);
! 		ctx->info(ctx, "arranging in: %s", layout_set_name(layout));
  		return (CMD_RETURN_NORMAL);
  	}
  
  	if (args->argc != 0) {
  		layoutname = args->argv[0];
  		if (layout_parse(wl->window, layoutname) == -1) {
! 			ctx->error(ctx, "can't set layout: %s", layoutname);
  			return (CMD_RETURN_ERROR);
  		}
  		server_redraw_window(wl->window);
! 		ctx->info(ctx, "arranging in: %s", layoutname);
  	}
  	return (CMD_RETURN_NORMAL);
  }
--- 117,134 ----
  	if (layout != -1) {
  		layout = layout_set_select(wl->window, layout);
  		server_redraw_window(wl->window);
! 		cmdq_info(cmdq, "arranging in: %s", layout_set_name(layout));
  		return (CMD_RETURN_NORMAL);
  	}
  
  	if (args->argc != 0) {
  		layoutname = args->argv[0];
  		if (layout_parse(wl->window, layoutname) == -1) {
! 			cmdq_error(cmdq, "can't set layout: %s", layoutname);
  			return (CMD_RETURN_ERROR);
  		}
  		server_redraw_window(wl->window);
! 		cmdq_info(cmdq, "arranging in: %s", layoutname);
  	}
  	return (CMD_RETURN_NORMAL);
  }