===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-resize-pane.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/tmux/cmd-resize-pane.c	2009/07/13 23:11:35	1.2
--- src/usr.bin/tmux/cmd-resize-pane.c	2009/07/19 13:21:40	1.3
***************
*** 1,4 ****
! /* $OpenBSD: cmd-resize-pane.c,v 1.2 2009/07/13 23:11:35 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-resize-pane.c,v 1.3 2009/07/19 13:21:40 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 32,38 ****
  const struct cmd_entry cmd_resize_pane_entry = {
  	"resize-pane", "resizep",
  	CMD_PANE_WINDOW_USAGE "[-DU] [adjustment]",
! 	CMD_ARG01, CMD_CHFLAG('D')|CMD_CHFLAG('U'),
  	cmd_resize_pane_init,
  	cmd_pane_parse,
  	cmd_resize_pane_exec,
--- 32,39 ----
  const struct cmd_entry cmd_resize_pane_entry = {
  	"resize-pane", "resizep",
  	CMD_PANE_WINDOW_USAGE "[-DU] [adjustment]",
! 	CMD_ARG01,
! 	CMD_CHFLAG('D')|CMD_CHFLAG('L')|CMD_CHFLAG('R')|CMD_CHFLAG('U'),
  	cmd_resize_pane_init,
  	cmd_pane_parse,
  	cmd_resize_pane_exec,
***************
*** 50,64 ****
  	cmd_pane_init(self, key);
  	data = self->data;
  
  	if (key == KEYC_ADDCTL(KEYC_DOWN))
  		data->chflags |= CMD_CHFLAG('D');
  
! 	if (key == KEYC_ADDESC(KEYC_UP))
  		data->arg = xstrdup("5");
  	if (key == KEYC_ADDESC(KEYC_DOWN)) {
  		data->chflags |= CMD_CHFLAG('D');
  		data->arg = xstrdup("5");
  	}
  }
  
  int
--- 51,81 ----
  	cmd_pane_init(self, key);
  	data = self->data;
  
+ 	if (key == KEYC_ADDCTL(KEYC_UP))
+ 		data->chflags |= CMD_CHFLAG('U');
  	if (key == KEYC_ADDCTL(KEYC_DOWN))
  		data->chflags |= CMD_CHFLAG('D');
+ 	if (key == KEYC_ADDCTL(KEYC_LEFT))
+ 		data->chflags |= CMD_CHFLAG('L');
+ 	if (key == KEYC_ADDCTL(KEYC_RIGHT))
+ 		data->chflags |= CMD_CHFLAG('R');
  
! 	if (key == KEYC_ADDESC(KEYC_UP)) {
! 		data->chflags |= CMD_CHFLAG('U');
  		data->arg = xstrdup("5");
+ 	}
  	if (key == KEYC_ADDESC(KEYC_DOWN)) {
  		data->chflags |= CMD_CHFLAG('D');
  		data->arg = xstrdup("5");
  	}
+ 	if (key == KEYC_ADDESC(KEYC_LEFT)) {
+ 		data->chflags |= CMD_CHFLAG('L');
+ 		data->arg = xstrdup("5");
+ 	}
+ 	if (key == KEYC_ADDESC(KEYC_RIGHT)) {
+ 		data->chflags |= CMD_CHFLAG('R');
+ 		data->arg = xstrdup("5");
+ 	}
  }
  
  int
***************
*** 92,103 ****
  		}
  	}
  
! 	if (!(data->chflags & CMD_CHFLAG('D')))
! 		adjust = -adjust;
! 	if (layout_resize(wp, adjust) != 0) {
! 		ctx->error(ctx, "layout %s "
! 		    "does not support resizing", layout_name(wp->window));
! 		return (-1);
  	}
  	server_redraw_window(wl->window);
  
--- 109,122 ----
  		}
  	}
  
! 	if (data->chflags & (CMD_CHFLAG('L')|CMD_CHFLAG('R'))) {
! 		if (data->chflags & CMD_CHFLAG('L'))
! 			adjust = -adjust;
! 		layout_resize_pane(wp, LAYOUT_LEFTRIGHT, adjust);
! 	} else {
! 		if (data->chflags & CMD_CHFLAG('U'))
! 			adjust = -adjust;
! 		layout_resize_pane(wp, LAYOUT_TOPBOTTOM, adjust);
  	}
  	server_redraw_window(wl->window);