Add -e flag to capture-pane to include embedded ANSI SGR escape sequences, from

George Nachman.
This commit is contained in:
Nicholas Marriott
2013-02-19 09:55:02 +00:00
parent a96dd1932a
commit 4d1d4d6e8e
5 changed files with 210 additions and 18 deletions

View File

@ -31,8 +31,8 @@ enum cmd_retval cmd_capture_pane_exec(struct cmd *, struct cmd_ctx *);
const struct cmd_entry cmd_capture_pane_entry = {
"capture-pane", "capturep",
"b:E:pS:t:", 0, 0,
"[-p] [-b buffer-index] [-E end-line] [-S start-line]"
"eb:E:pS:t:", 0, 0,
"[-ep] [-b buffer-index] [-E end-line] [-S start-line]"
CMD_TARGET_PANE_USAGE,
0,
NULL,
@ -46,12 +46,13 @@ cmd_capture_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
struct args *args = self->args;
struct client *c = ctx->cmdclient;
struct window_pane *wp;
char *buf, *line, *cause;
char *buf, *line, *cause;
struct screen *s;
struct grid *gd;
int buffer, n;
int buffer, n, with_codes;
u_int i, limit, top, bottom, tmp;
size_t len, linelen;
size_t len, linelen;
struct grid_cell *gc;
if (cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp) == NULL)
return (CMD_RETURN_ERROR);
@ -89,16 +90,19 @@ cmd_capture_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
top = tmp;
}
gc = NULL;
with_codes = args_has(args, 'e');
for (i = top; i <= bottom; i++) {
line = grid_string_cells(s->grid, 0, i, screen_size_x(s));
linelen = strlen(line);
line = grid_string_cells(s->grid, 0, i, screen_size_x(s),
&gc, with_codes);
linelen = strlen(line);
buf = xrealloc(buf, 1, len + linelen + 1);
memcpy(buf + len, line, linelen);
len += linelen;
buf[len++] = '\n';
buf = xrealloc(buf, 1, len + linelen + 1);
memcpy(buf + len, line, linelen);
len += linelen;
buf[len++] = '\n';
free(line);
free(line);
}
if (args_has(args, 'p')) {