===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-swap-window.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/tmux/cmd-swap-window.c	2009/11/13 19:53:29	1.5
--- src/usr.bin/tmux/cmd-swap-window.c	2011/01/04 00:42:47	1.6
***************
*** 1,4 ****
! /* $OpenBSD: cmd-swap-window.c,v 1.5 2009/11/13 19:53:29 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-swap-window.c,v 1.6 2011/01/04 00:42:47 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 30,56 ****
  
  const struct cmd_entry cmd_swap_window_entry = {
  	"swap-window", "swapw",
  	"[-d] " CMD_SRCDST_WINDOW_USAGE,
! 	0, "d",
! 	cmd_srcdst_init,
! 	cmd_srcdst_parse,
! 	cmd_swap_window_exec,
! 	cmd_srcdst_free,
! 	cmd_srcdst_print
  };
  
  int
  cmd_swap_window_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
! 	struct cmd_srcdst_data	*data = self->data;
  	struct session		*src, *dst;
  	struct session_group	*sg_src, *sg_dst;
  	struct winlink		*wl_src, *wl_dst;
  	struct window		*w;
  
! 	if ((wl_src = cmd_find_window(ctx, data->src, &src)) == NULL)
  		return (-1);
! 	if ((wl_dst = cmd_find_window(ctx, data->dst, &dst)) == NULL)
  		return (-1);
  
  	sg_src = session_group_find(src);
--- 30,58 ----
  
  const struct cmd_entry cmd_swap_window_entry = {
  	"swap-window", "swapw",
+ 	"ds:t:", 0, 0,
  	"[-d] " CMD_SRCDST_WINDOW_USAGE,
! 	0,
! 	NULL,
! 	NULL,
! 	cmd_swap_window_exec
  };
  
  int
  cmd_swap_window_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
! 	struct args		*args = self->args;
! 	const char		*target_src, *target_dst;
  	struct session		*src, *dst;
  	struct session_group	*sg_src, *sg_dst;
  	struct winlink		*wl_src, *wl_dst;
  	struct window		*w;
  
! 	target_src = args_get(args, 's');
! 	if ((wl_src = cmd_find_window(ctx, target_src, &src)) == NULL)
  		return (-1);
! 	target_dst = args_get(args, 't');
! 	if ((wl_dst = cmd_find_window(ctx, target_dst, &dst)) == NULL)
  		return (-1);
  
  	sg_src = session_group_find(src);
***************
*** 68,74 ****
  	wl_dst->window = wl_src->window;
  	wl_src->window = w;
  
! 	if (!cmd_check_flag(data->chflags, 'd')) {
  		session_select(dst, wl_dst->idx);
  		if (src != dst)
  			session_select(src, wl_src->idx);
--- 70,76 ----
  	wl_dst->window = wl_src->window;
  	wl_src->window = w;
  
! 	if (!args_has(self->args, 'd')) {
  		session_select(dst, wl_dst->idx);
  		if (src != dst)
  			session_select(src, wl_src->idx);