===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-capture-pane.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** src/usr.bin/tmux/cmd-capture-pane.c	2013/03/24 09:54:10	1.19
--- src/usr.bin/tmux/cmd-capture-pane.c	2013/03/25 10:02:17	1.20
***************
*** 1,4 ****
! /* $OpenBSD: cmd-capture-pane.c,v 1.19 2013/03/24 09:54:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Jonathan Alvarado <radobobo@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-capture-pane.c,v 1.20 2013/03/25 10:02:17 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Jonathan Alvarado <radobobo@users.sourceforge.net>
***************
*** 31,38 ****
  
  const struct cmd_entry cmd_capture_pane_entry = {
  	"capture-pane", "capturep",
! 	"b:CeE:JpS:t:", 0, 0,
! 	"[-CeJp] [-b buffer-index] [-E end-line] [-S start-line]"
  	CMD_TARGET_PANE_USAGE,
  	0,
  	NULL,
--- 31,38 ----
  
  const struct cmd_entry cmd_capture_pane_entry = {
  	"capture-pane", "capturep",
! 	"ab:CeE:JpS:t:", 0, 0,
! 	"[-aCeJp] [-b buffer-index] [-E end-line] [-S start-line]"
  	CMD_TARGET_PANE_USAGE,
  	0,
  	NULL,
***************
*** 50,65 ****
  	struct screen		*s;
  	struct grid		*gd;
  	int			 buffer, n, with_codes, escape_c0, join_lines;
! 	u_int			 i, limit, top, bottom, tmp;
  	size_t			 len, linelen;
  	struct grid_cell	*gc;
  	const struct grid_line	*gl;
  
  	if (cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp) == NULL)
  		return (CMD_RETURN_ERROR);
- 	s = &wp->base;
- 	gd = s->grid;
  
  	buf = NULL;
  	len = 0;
  
--- 50,77 ----
  	struct screen		*s;
  	struct grid		*gd;
  	int			 buffer, n, with_codes, escape_c0, join_lines;
! 	u_int			 i, limit, top, bottom, tmp, sx;
  	size_t			 len, linelen;
  	struct grid_cell	*gc;
  	const struct grid_line	*gl;
  
  	if (cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp) == NULL)
  		return (CMD_RETURN_ERROR);
  
+ 	if (args_has(args, 'a')) {
+ 		s = NULL;
+ 		gd = wp->saved_grid;
+ 		sx = screen_size_x(&wp->base);
+ 		if (gd == NULL) {
+ 			cmdq_error(cmdq, "no alternate screen");
+ 			return (CMD_RETURN_ERROR);
+ 		}
+ 	} else {
+ 		s = &wp->base;
+ 		sx = screen_size_x(s);
+ 		gd = s->grid;
+ 	}
+ 
  	buf = NULL;
  	len = 0;
  
***************
*** 97,111 ****
  
  	gc = NULL;
  	for (i = top; i <= bottom; i++) {
! 		line = grid_string_cells(s->grid, 0, i, screen_size_x(s),
! 		    &gc, with_codes, escape_c0);
  		linelen = strlen(line);
  
  		buf = xrealloc(buf, 1, len + linelen + 1);
  		memcpy(buf + len, line, linelen);
  		len += linelen;
  
! 		gl = grid_peek_line(s->grid, i);
  		if (!join_lines || !(gl->flags & GRID_LINE_WRAPPED))
  			buf[len++] = '\n';
  
--- 109,123 ----
  
  	gc = NULL;
  	for (i = top; i <= bottom; i++) {
! 		line = grid_string_cells(gd, 0, i, sx, &gc, with_codes,
! 		    escape_c0);
  		linelen = strlen(line);
  
  		buf = xrealloc(buf, 1, len + linelen + 1);
  		memcpy(buf + len, line, linelen);
  		len += linelen;
  
! 		gl = grid_peek_line(gd, i);
  		if (!join_lines || !(gl->flags & GRID_LINE_WRAPPED))
  			buf[len++] = '\n';