diff options
| -rw-r--r-- | usr.bin/tmux/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/cmd-capture-pane.c | 81 | ||||
| -rw-r--r-- | usr.bin/tmux/cmd.c | 3 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.1 | 11 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.h | 3 |
5 files changed, 96 insertions, 6 deletions
diff --git a/usr.bin/tmux/Makefile b/usr.bin/tmux/Makefile index b0a828ef2f9..c8533d8aa04 100644 --- a/usr.bin/tmux/Makefile +++ b/usr.bin/tmux/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2009/11/18 17:02:17 nicm Exp $ +# $OpenBSD: Makefile,v 1.31 2009/12/01 18:42:38 nicm Exp $ PROG= tmux SRCS= attributes.c cfg.c client.c clock.c \ @@ -29,7 +29,7 @@ SRCS= attributes.c cfg.c client.c clock.c \ cmd-switch-client.c cmd-unbind-key.c cmd-unlink-window.c \ cmd-set-environment.c cmd-show-environment.c cmd-choose-client.c \ cmd-up-pane.c cmd-display-message.c cmd-display-panes.c \ - cmd-pipe-pane.c cmd.c \ + cmd-pipe-pane.c cmd-capture-pane.c cmd.c \ colour.c environ.c grid-view.c grid-utf8.c grid.c input-keys.c \ imsg.c imsg-buffer.c input.c key-bindings.c key-string.c \ layout-set.c layout.c log.c job.c \ diff --git a/usr.bin/tmux/cmd-capture-pane.c b/usr.bin/tmux/cmd-capture-pane.c new file mode 100644 index 00000000000..a6c81f4ff6c --- /dev/null +++ b/usr.bin/tmux/cmd-capture-pane.c @@ -0,0 +1,81 @@ +/* $OpenBSD: cmd-capture-pane.c,v 1.1 2009/12/01 18:42:38 nicm Exp $ */ + +/* + * Copyright (c) 2009 Jonathan Alvarado <radobobo@users.sourceforge.net> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include <sys/types.h> + +#include <string.h> + +#include "tmux.h" + +/* + * Write the entire contents of a pane to a buffer. + */ + +int cmd_capture_pane_exec(struct cmd *, struct cmd_ctx *); + +const struct cmd_entry cmd_capture_pane_entry = { + "capture-pane", "capturep", + CMD_BUFFER_PANE_USAGE, + 0, "", + cmd_buffer_init, + cmd_buffer_parse, + cmd_capture_pane_exec, + cmd_buffer_free, + cmd_buffer_print +}; + +int +cmd_capture_pane_exec(struct cmd *self, struct cmd_ctx *ctx) +{ + struct cmd_buffer_data *data = self->data; + struct window_pane *wp; + char *buf, *line; + struct screen *s; + struct session *sess; + u_int i, limit; + size_t len, linelen; + + if (cmd_find_pane(ctx, data->target, &sess, &wp) == NULL) + return (-1); + s = &wp->base; + + buf = NULL; + len = 0; + + for (i = 0; i < screen_size_y(s); i++) { + line = grid_view_string_cells(s->grid, 0, i, screen_size_x(s)); + linelen = strlen(line); + + buf = xrealloc(buf, 1, len + linelen + 1); + memcpy(buf + len, line, linelen); + len += linelen; + buf[len++] = '\n'; + } + + limit = options_get_number(&sess->options, "buffer-limit"); + if (data->buffer == -1) { + paste_add(&sess->buffers, buf, len, limit); + return (0); + } + if (paste_replace(&sess->buffers, data->buffer, buf, len) != 0) { + ctx->error(ctx, "no buffer %d", data->buffer); + xfree(buf); + return (-1); + } + return (0); +} diff --git a/usr.bin/tmux/cmd.c b/usr.bin/tmux/cmd.c index 2fd5eb0029a..4da9e1f7ccc 100644 --- a/usr.bin/tmux/cmd.c +++ b/usr.bin/tmux/cmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.c,v 1.33 2009/11/21 17:52:18 nicm Exp $ */ +/* $OpenBSD: cmd.c,v 1.34 2009/12/01 18:42:38 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -31,6 +31,7 @@ const struct cmd_entry *cmd_table[] = { &cmd_attach_session_entry, &cmd_bind_key_entry, &cmd_break_pane_entry, + &cmd_capture_pane_entry, &cmd_choose_client_entry, &cmd_choose_session_entry, &cmd_choose_window_entry, diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1 index 447d3388ad7..8794aca6d62 100644 --- a/usr.bin/tmux/tmux.1 +++ b/usr.bin/tmux/tmux.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tmux.1,v 1.127 2009/11/24 19:16:11 nicm Exp $ +.\" $OpenBSD: tmux.1,v 1.128 2009/12/01 18:42:38 nicm Exp $ .\" .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> .\" @@ -14,7 +14,7 @@ .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: November 24 2009 $ +.Dd $Mdocdate: December 1 2009 $ .Dt TMUX 1 .Os .Sh NAME @@ -664,6 +664,13 @@ off from its containing window to make it the only pane in a new window. If .Fl d is given, the new window does not become the current window. +.It Xo Ic capture-pane +.Op Fl b Ar buffer-index +.Op Fl t Ar target-pane +.Xc +.D1 (alias: Ic capturep ) +Capture the contents of a pane to the specified buffer, or a new buffer if none +is specified. .It Xo .Ic choose-client .Op Fl t Ar target-window diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index efa93868ba1..669bd1430d3 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.189 2009/11/30 16:44:03 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.190 2009/12/01 18:42:38 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -1433,6 +1433,7 @@ extern const struct cmd_entry *cmd_table[]; extern const struct cmd_entry cmd_attach_session_entry; extern const struct cmd_entry cmd_bind_key_entry; extern const struct cmd_entry cmd_break_pane_entry; +extern const struct cmd_entry cmd_capture_pane_entry; extern const struct cmd_entry cmd_choose_client_entry; extern const struct cmd_entry cmd_choose_session_entry; extern const struct cmd_entry cmd_choose_window_entry; |