===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -c -r1.88 -r1.89
*** src/usr.bin/tmux/window-copy.c	2013/03/22 10:31:22	1.88
--- src/usr.bin/tmux/window-copy.c	2013/03/22 15:52:42	1.89
***************
*** 1,4 ****
! /* $OpenBSD: window-copy.c,v 1.88 2013/03/22 10:31:22 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window-copy.c,v 1.89 2013/03/22 15:52:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 52,57 ****
--- 52,60 ----
  void	window_copy_update_cursor(struct window_pane *, u_int, u_int);
  void	window_copy_start_selection(struct window_pane *);
  int	window_copy_update_selection(struct window_pane *);
+ void   *window_copy_get_selection(struct window_pane *, size_t *);
+ void	window_copy_copy_buffer(struct window_pane *, int, void *, size_t);
+ void	window_copy_copy_pipe(struct window_pane *, int, const char *);
  void	window_copy_copy_selection(struct window_pane *, int);
  void	window_copy_clear_selection(struct window_pane *);
  void	window_copy_copy_line(
***************
*** 364,369 ****
--- 367,373 ----
  	u_int				 n;
  	int				 np, keys;
  	enum mode_key_cmd		 cmd;
+ 	const char			*arg;
  
  	np = data->numprefix;
  	if (np <= 0)
***************
*** 405,411 ****
  		return;
  	}
  
! 	cmd = mode_key_lookup(&data->mdata, key);
  	switch (cmd) {
  	case MODEKEYCOPY_CANCEL:
  		window_pane_reset_mode(wp);
--- 409,415 ----
  		return;
  	}
  
! 	cmd = mode_key_lookup(&data->mdata, key, &arg);
  	switch (cmd) {
  	case MODEKEYCOPY_CANCEL:
  		window_pane_reset_mode(wp);
***************
*** 533,538 ****
--- 537,549 ----
  		window_copy_clear_selection(wp);
  		window_copy_redraw_screen(wp);
  		break;
+ 	case MODEKEYCOPY_COPYPIPE:
+ 		if (sess != NULL) {
+ 			window_copy_copy_pipe(wp, data->numprefix, arg);
+ 			window_pane_reset_mode(wp);
+ 			return;
+ 		}
+ 		break;
  	case MODEKEYCOPY_COPYSELECTION:
  		if (sess != NULL) {
  			window_copy_copy_selection(wp, data->numprefix);
***************
*** 735,741 ****
  	size_t				 inputlen;
  	int				 np;
  
! 	switch (mode_key_lookup(&data->mdata, key)) {
  	case MODEKEYEDIT_CANCEL:
  		data->numprefix = -1;
  		return (-1);
--- 746,752 ----
  	size_t				 inputlen;
  	int				 np;
  
! 	switch (mode_key_lookup(&data->mdata, key, NULL)) {
  	case MODEKEYEDIT_CANCEL:
  		data->numprefix = -1;
  		return (-1);
***************
*** 1259,1277 ****
  	return (1);
  }
  
! void
! window_copy_copy_selection(struct window_pane *wp, int idx)
  {
  	struct window_copy_mode_data	*data = wp->modedata;
  	struct screen			*s = &data->screen;
  	char				*buf;
  	size_t				 off;
! 	u_int				 i, xx, yy, sx, sy, ex, ey, limit;
  	u_int				 firstsx, lastex, restex, restsx;
  	int				 keys;
  
  	if (!s->sel.flag)
! 		return;
  
  	buf = xmalloc(1);
  	off = 0;
--- 1270,1288 ----
  	return (1);
  }
  
! void *
! window_copy_get_selection(struct window_pane *wp, size_t *len)
  {
  	struct window_copy_mode_data	*data = wp->modedata;
  	struct screen			*s = &data->screen;
  	char				*buf;
  	size_t				 off;
! 	u_int				 i, xx, yy, sx, sy, ex, ey;
  	u_int				 firstsx, lastex, restex, restsx;
  	int				 keys;
  
  	if (!s->sel.flag)
! 		return (NULL);
  
  	buf = xmalloc(1);
  	off = 0;
***************
*** 1364,1382 ****
  	/* Don't bother if no data. */
  	if (off == 0) {
  		free(buf);
! 		return;
  	}
! 	off--;	/* remove final \n */
  
  	if (options_get_number(&global_options, "set-clipboard"))
! 		screen_write_setselection(&wp->ictx.ctx, buf, off);
  
- 	/* Add the buffer to the stack. */
  	if (idx == -1) {
  		limit = options_get_number(&global_options, "buffer-limit");
! 		paste_add(&global_buffers, buf, off, limit);
  	} else
! 		paste_replace(&global_buffers, idx, buf, off);
  }
  
  void
--- 1375,1432 ----
  	/* Don't bother if no data. */
  	if (off == 0) {
  		free(buf);
! 		return (NULL);
  	}
! 	*len = off - 1;	/* remove final \n */
! 	return (buf);
! }
  
+ void
+ window_copy_copy_buffer(struct window_pane *wp, int idx, void *buf, size_t len)
+ {
+ 	u_int	limit;
+ 
  	if (options_get_number(&global_options, "set-clipboard"))
! 		screen_write_setselection(&wp->ictx.ctx, buf, len);
  
  	if (idx == -1) {
  		limit = options_get_number(&global_options, "buffer-limit");
! 		paste_add(&global_buffers, buf, len, limit);
  	} else
! 		paste_replace(&global_buffers, idx, buf, len);
! }
! 
! void
! window_copy_copy_pipe(struct window_pane *wp, int idx, const char *arg)
! {
! 	void*	buf;
! 	size_t	len;
! 	FILE*	f;
! 
! 	buf = window_copy_get_selection(wp, &len);
! 	if (buf == NULL)
! 		return;
! 
! 	f = popen(arg, "w");
! 	if (f != NULL) {
! 		fwrite(buf, 1, len, f);
! 		pclose(f);
! 	}
! 
! 	window_copy_copy_buffer(wp, idx, buf, len);
! }
! 
! void
! window_copy_copy_selection(struct window_pane *wp, int idx)
! {
! 	void*	buf;
! 	size_t	len;
! 
! 	buf = window_copy_get_selection(wp, &len);
! 	if (buf == NULL)
! 		return;
! 
! 	window_copy_copy_buffer(wp, idx, buf, len);
  }
  
  void