circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-04 18:08:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

Browse Source
This commit is contained in:
Thomas Adam 2021-02-08 16:01:21 +00:00
commit 8d7f341a85
2 changed files with 77 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tmux.1
View File

@ -1653,6 +1653,9 @@ The following commands are supported in copy mode:
.It Li "page-down" Ta "C-f" Ta "PageDown"
.It Li "page-down-and-cancel" Ta "" Ta ""
.It Li "page-up" Ta "C-b" Ta "PageUp"
.It Li "pipe [<command>] [<prefix>]" Ta "" Ta ""
.It Li "pipe-no-clear [<command>] [<prefix>]" Ta "" Ta ""
.It Li "pipe-and-cancel [<command>] [<prefix>]" Ta "" Ta ""
.It Li "previous-matching-bracket" Ta "" Ta "M-C-b"
.It Li "previous-paragraph" Ta "{" Ta "M-{"
.It Li "previous-space" Ta "B" Ta ""
@ -1708,7 +1711,9 @@ so buffers are named
.Ql buffer1
and so on).
Pipe commands take a command argument which is the command to which the
copied text is piped.
selected text is piped.
.Ql copy-pipe
variants also copy the selection.
The
.Ql -and-cancel
variants of some commands exit copy mode after they have completed (for copy

77
window-copy.c
View File

@ -92,6 +92,8 @@ static void window_copy_synchronize_cursor(struct window_mode_entry *, int);
static void *window_copy_get_selection(struct window_mode_entry *, size_t *);
static void window_copy_copy_buffer(struct window_mode_entry *,
const char *, void *, size_t);
static void window_copy_pipe(struct window_mode_entry *,
struct session *, const char *);
static void window_copy_copy_pipe(struct window_mode_entry *,
struct session *, const char *, const char *);
static void window_copy_copy_selection(struct window_mode_entry *,
@ -1874,6 +1876,44 @@ window_copy_cmd_copy_pipe_and_cancel(struct window_copy_cmd_state *cs)
return (WINDOW_COPY_CMD_CANCEL);
}
static enum window_copy_cmd_action
window_copy_cmd_pipe_no_clear(struct window_copy_cmd_state *cs)
{
struct window_mode_entry *wme = cs->wme;
struct client *c = cs->c;
struct session *s = cs->s;
struct winlink *wl = cs->wl;
struct window_pane *wp = wme->wp;
char *command = NULL;
if (s != NULL && cs->args->argc > 1 && *cs->args->argv[1] != '\0')
command = format_single(NULL, cs->args->argv[1], c, s, wl, wp);
window_copy_pipe(wme, s, command);
free(command);
return (WINDOW_COPY_CMD_NOTHING);
}
static enum window_copy_cmd_action
window_copy_cmd_pipe(struct window_copy_cmd_state *cs)
{
struct window_mode_entry *wme = cs->wme;
window_copy_cmd_pipe_no_clear(cs);
window_copy_clear_selection(wme);
return (WINDOW_COPY_CMD_REDRAW);
}
static enum window_copy_cmd_action
window_copy_cmd_pipe_and_cancel(struct window_copy_cmd_state *cs)
{
struct window_mode_entry *wme = cs->wme;
window_copy_cmd_pipe_no_clear(cs);
window_copy_clear_selection(wme);
return (WINDOW_COPY_CMD_CANCEL);
}
static enum window_copy_cmd_action
window_copy_cmd_goto_line(struct window_copy_cmd_state *cs)
{
@ -2267,6 +2307,12 @@ static const struct {
window_copy_cmd_page_down_and_cancel },
{ "page-up", 0, 0, WINDOW_COPY_CMD_CLEAR_EMACS_ONLY,
window_copy_cmd_page_up },
{ "pipe-no-clear", 0, 1, WINDOW_COPY_CMD_CLEAR_NEVER,
window_copy_cmd_pipe_no_clear },
{ "pipe", 0, 1, WINDOW_COPY_CMD_CLEAR_ALWAYS,
window_copy_cmd_pipe },
{ "pipe-and-cancel", 0, 1, WINDOW_COPY_CMD_CLEAR_ALWAYS,
window_copy_cmd_pipe_and_cancel },
{ "previous-matching-bracket", 0, 0, WINDOW_COPY_CMD_CLEAR_ALWAYS,
window_copy_cmd_previous_matching_bracket },
{ "previous-paragraph", 0, 0, WINDOW_COPY_CMD_CLEAR_EMACS_ONLY,
@ -3840,22 +3886,41 @@ window_copy_copy_buffer(struct window_mode_entry *wme, const char *prefix,
paste_add(prefix, buf, len);
}
static void
window_copy_copy_pipe(struct window_mode_entry *wme, struct session *s,
const char *prefix, const char *cmd)
static void *
window_copy_pipe_run(struct window_mode_entry *wme, struct session *s,
const char *cmd, size_t *len)
{
void *buf;
size_t len;
struct job *job;
buf = window_copy_get_selection(wme, &len);
buf = window_copy_get_selection(wme, len);
if (cmd == NULL || *cmd == '\0')
cmd = options_get_string(global_options, "copy-command");
if (cmd != NULL && *cmd != '\0') {
job = job_run(cmd, s, NULL, NULL, NULL, NULL, NULL, JOB_NOWAIT,
-1, -1);
bufferevent_write(job_get_event(job), buf, len);
bufferevent_write(job_get_event(job), buf, *len);
}
return (buf);
}
static void
window_copy_pipe(struct window_mode_entry *wme, struct session *s,
const char *cmd)
{
size_t len;
window_copy_pipe_run(wme, s, cmd, &len);
}
static void
window_copy_copy_pipe(struct window_mode_entry *wme, struct session *s,
const char *prefix, const char *cmd)
{
void *buf;
size_t len;
buf = window_copy_pipe_run(wme, s, cmd, &len);
if (buf != NULL)
window_copy_copy_buffer(wme, prefix, buf, len);
}