===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-resize-pane.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/tmux/cmd-resize-pane.c	2009/07/30 13:45:56	1.6
--- src/usr.bin/tmux/cmd-resize-pane.c	2009/11/13 19:53:29	1.7
***************
*** 1,4 ****
! /* $OpenBSD: cmd-resize-pane.c,v 1.6 2009/07/30 13:45:56 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-resize-pane.c,v 1.7 2009/11/13 19:53:29 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 31,39 ****
  
  const struct cmd_entry cmd_resize_pane_entry = {
  	"resize-pane", "resizep",
! 	"[-DU] " CMD_TARGET_PANE_USAGE " [adjustment]",
! 	CMD_ARG01,
! 	CMD_CHFLAG('D')|CMD_CHFLAG('L')|CMD_CHFLAG('R')|CMD_CHFLAG('U'),
  	cmd_resize_pane_init,
  	cmd_target_parse,
  	cmd_resize_pane_exec,
--- 31,38 ----
  
  const struct cmd_entry cmd_resize_pane_entry = {
  	"resize-pane", "resizep",
! 	"[-DLRU] " CMD_TARGET_PANE_USAGE " [adjustment]",
! 	CMD_ARG01, "DLRU",
  	cmd_resize_pane_init,
  	cmd_target_parse,
  	cmd_resize_pane_exec,
***************
*** 50,77 ****
  	data = self->data;
  
  	if (key == (KEYC_UP | KEYC_CTRL))
! 		data->chflags |= CMD_CHFLAG('U');
  	if (key == (KEYC_DOWN | KEYC_CTRL))
! 		data->chflags |= CMD_CHFLAG('D');
  	if (key == (KEYC_LEFT | KEYC_CTRL))
! 		data->chflags |= CMD_CHFLAG('L');
  	if (key == (KEYC_RIGHT | KEYC_CTRL))
! 		data->chflags |= CMD_CHFLAG('R');
  	
  	if (key == (KEYC_UP | KEYC_ESCAPE)) {
! 		data->chflags |= CMD_CHFLAG('U');
  		data->arg = xstrdup("5");
  	}
  	if (key == (KEYC_DOWN | KEYC_ESCAPE)) {
! 		data->chflags |= CMD_CHFLAG('D');
  		data->arg = xstrdup("5");
  	}
  	if (key == (KEYC_LEFT | KEYC_ESCAPE)) {
! 		data->chflags |= CMD_CHFLAG('L');
  		data->arg = xstrdup("5");
  	}
  	if (key == (KEYC_RIGHT | KEYC_ESCAPE)) {
! 		data->chflags |= CMD_CHFLAG('R');
  		data->arg = xstrdup("5");
  	}
  }
--- 49,76 ----
  	data = self->data;
  
  	if (key == (KEYC_UP | KEYC_CTRL))
! 		cmd_set_flag(&data->chflags, 'U');
  	if (key == (KEYC_DOWN | KEYC_CTRL))
! 		cmd_set_flag(&data->chflags, 'D');
  	if (key == (KEYC_LEFT | KEYC_CTRL))
! 		cmd_set_flag(&data->chflags, 'L');
  	if (key == (KEYC_RIGHT | KEYC_CTRL))
! 		cmd_set_flag(&data->chflags, 'R');
  	
  	if (key == (KEYC_UP | KEYC_ESCAPE)) {
! 		cmd_set_flag(&data->chflags, 'U');
  		data->arg = xstrdup("5");
  	}
  	if (key == (KEYC_DOWN | KEYC_ESCAPE)) {
! 		cmd_set_flag(&data->chflags, 'D');
  		data->arg = xstrdup("5");
  	}
  	if (key == (KEYC_LEFT | KEYC_ESCAPE)) {
! 		cmd_set_flag(&data->chflags, 'L');
  		data->arg = xstrdup("5");
  	}
  	if (key == (KEYC_RIGHT | KEYC_ESCAPE)) {
! 		cmd_set_flag(&data->chflags, 'R');
  		data->arg = xstrdup("5");
  	}
  }
***************
*** 98,112 ****
  		}
  	}
  
! 	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);
  
  	return (0);
--- 97,110 ----
  		}
  	}
  
! 	if (cmd_check_flag(data->chflags, 'L'))
! 		layout_resize_pane(wp, LAYOUT_LEFTRIGHT, -adjust);
! 	else if (cmd_check_flag(data->chflags, 'R'))
  		layout_resize_pane(wp, LAYOUT_LEFTRIGHT, adjust);
! 	else if (cmd_check_flag(data->chflags, 'U'))
! 		layout_resize_pane(wp, LAYOUT_TOPBOTTOM, -adjust);
! 	else if (cmd_check_flag(data->chflags, 'D'))
  		layout_resize_pane(wp, LAYOUT_TOPBOTTOM, adjust);
  	server_redraw_window(wl->window);
  
  	return (0);