===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-select-pane.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/tmux/cmd-select-pane.c	2010/01/03 12:51:05	1.9
--- src/usr.bin/tmux/cmd-select-pane.c	2010/03/22 19:07:52	1.10
***************
*** 1,4 ****
! /* $OpenBSD: cmd-select-pane.c,v 1.9 2010/01/03 12:51:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-select-pane.c,v 1.10 2010/03/22 19:07:52 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 24,42 ****
   * Select pane.
   */
  
  int	cmd_select_pane_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_select_pane_entry = {
  	"select-pane", "selectp",
! 	CMD_TARGET_PANE_USAGE,
! 	0, "",
! 	cmd_target_init,
  	cmd_target_parse,
  	cmd_select_pane_exec,
  	cmd_target_free,
  	cmd_target_print
  };
  
  int
  cmd_select_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
--- 24,63 ----
   * Select pane.
   */
  
+ void	cmd_select_pane_init(struct cmd *, int);
  int	cmd_select_pane_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_select_pane_entry = {
  	"select-pane", "selectp",
! 	"[-DLRU] " CMD_TARGET_PANE_USAGE,
! 	0, "DLRU",
! 	cmd_select_pane_init,
  	cmd_target_parse,
  	cmd_select_pane_exec,
  	cmd_target_free,
  	cmd_target_print
  };
  
+ void
+ cmd_select_pane_init(struct cmd *self, int key)
+ {
+ 	struct cmd_target_data	*data;
+ 
+ 	cmd_target_init(self, key);
+ 	data = self->data;
+ 
+ 	if (key == KEYC_UP)
+ 		cmd_set_flag(&data->chflags, 'U');
+ 	if (key == KEYC_DOWN)
+ 		cmd_set_flag(&data->chflags, 'D');
+ 	if (key == KEYC_LEFT)
+ 		cmd_set_flag(&data->chflags, 'L');
+ 	if (key == KEYC_RIGHT)
+ 		cmd_set_flag(&data->chflags, 'R');
+ 	if (key == 'o')
+ 		data->target = xstrdup(":.+");
+ }
+ 
  int
  cmd_select_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
***************
*** 51,56 ****
--- 72,91 ----
  		ctx->error(ctx, "pane not visible: %s", data->target);
  		return (-1);
  	}
+ 
+ 	if (cmd_check_flag(data->chflags, 'L'))
+ 		wp = window_pane_find_left(wp);
+ 	else if (cmd_check_flag(data->chflags, 'R'))
+ 		wp = window_pane_find_right(wp);
+ 	else if (cmd_check_flag(data->chflags, 'U'))
+ 		wp = window_pane_find_up(wp);
+ 	else if (cmd_check_flag(data->chflags, 'D'))
+ 		wp = window_pane_find_down(wp);
+ 	if (wp == NULL) {
+ 		ctx->error(ctx, "pane not found");
+ 		return (-1);
+ 	}
+ 
  	window_set_active_pane(wl->window, wp);
  	server_status_window(wl->window);
  	server_redraw_window_borders(wl->window);