===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-select-layout.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/tmux/cmd-select-layout.c	2009/07/13 23:11:35	1.2
--- src/usr.bin/tmux/cmd-select-layout.c	2009/07/19 13:21:40	1.3
***************
*** 1,4 ****
! /* $OpenBSD: cmd-select-layout.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-select-layout.c,v 1.3 2009/07/19 13:21:40 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 49,66 ****
  	data = self->data;
  
  	switch (key) {
- 	case KEYC_ADDESC('0'):
- 		data->arg = xstrdup("manual-vertical");
- 		break;
  	case KEYC_ADDESC('1'):
  		data->arg = xstrdup("even-horizontal");
  		break;
  	case KEYC_ADDESC('2'):
  		data->arg = xstrdup("even-vertical");
  		break;
! 	case KEYC_ADDESC('9'):
! 		data->arg = xstrdup("active-only");
  		break;
  	}
  }
  
--- 49,66 ----
  	data = self->data;
  
  	switch (key) {
  	case KEYC_ADDESC('1'):
  		data->arg = xstrdup("even-horizontal");
  		break;
  	case KEYC_ADDESC('2'):
  		data->arg = xstrdup("even-vertical");
  		break;
! 	case KEYC_ADDESC('3'):
! 		data->arg = xstrdup("main-horizontal");
  		break;
+ 	case KEYC_ADDESC('4'):
+ 		data->arg = xstrdup("main-vertical");
+ 		break;
  	}
  }
  
***************
*** 74,86 ****
  	if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
  		return (-1);
  
! 	if ((layout = layout_lookup(data->arg)) == -1) {
! 		ctx->error(ctx, "unknown or ambiguous layout: %s", data->arg);
! 		return (-1);
! 	}
  
! 	if (layout_select(wl->window, layout) == 0)
! 		ctx->info(ctx, "layout now: %s", layout_name(wl->window));
  
  	return (0);
  }
--- 74,86 ----
  	if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
  		return (-1);
  
! 	if ((layout = layout_set_lookup(data->arg)) == -1) {
!  		ctx->error(ctx, "unknown or ambiguous layout: %s", data->arg);
!  		return (-1);
!  	}
  
! 	layout = layout_set_select(wl->window, layout);
! 	ctx->info(ctx, "arranging in: %s", layout_set_name(layout));
  
  	return (0);
  }