diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | cmd-capture-pane.c | 121 | ||||
| -rw-r--r-- | cmd-choose-buffer.c | 4 | ||||
| -rw-r--r-- | cmd-copy-buffer.c | 205 | ||||
| -rw-r--r-- | cmd-delete-buffer.c | 10 | ||||
| -rw-r--r-- | cmd-generic.c | 11 | ||||
| -rw-r--r-- | cmd-list-buffers.c | 20 | ||||
| -rw-r--r-- | cmd-load-buffer.c | 73 | ||||
| -rw-r--r-- | cmd-paste-buffer.c | 9 | ||||
| -rw-r--r-- | cmd-save-buffer.c | 11 | ||||
| -rw-r--r-- | cmd-set-buffer.c | 11 | ||||
| -rw-r--r-- | cmd-set-option.c | 4 | ||||
| -rw-r--r-- | cmd-show-buffer.c | 17 | ||||
| -rw-r--r-- | cmd.c | 1 | ||||
| -rw-r--r-- | paste.c | 13 | ||||
| -rw-r--r-- | server.c | 3 | ||||
| -rw-r--r-- | session.c | 3 | ||||
| -rw-r--r-- | status.c | 2 | ||||
| -rw-r--r-- | tmux.1 | 32 | ||||
| -rw-r--r-- | tmux.c | 2 | ||||
| -rw-r--r-- | tmux.h | 9 | ||||
| -rw-r--r-- | window-copy.c | 12 |
22 files changed, 188 insertions, 387 deletions
@@ -5,7 +5,7 @@ SRCS= attributes.c cfg.c client.c clock.c \ cmd-attach-session.c cmd-bind-key.c \ cmd-break-pane.c cmd-choose-session.c cmd-choose-window.c \ cmd-clear-history.c cmd-clock-mode.c cmd-command-prompt.c \ - cmd-confirm-before.c cmd-copy-buffer.c cmd-copy-mode.c \ + cmd-confirm-before.c cmd-copy-mode.c \ cmd-choose-buffer.c cmd-delete-buffer.c cmd-detach-client.c \ cmd-find-window.c cmd-generic.c cmd-has-session.c cmd-kill-pane.c \ cmd-kill-server.c cmd-kill-session.c cmd-kill-window.c \ diff --git a/cmd-capture-pane.c b/cmd-capture-pane.c index 4d551706..df5875e7 100644 --- a/cmd-capture-pane.c +++ b/cmd-capture-pane.c @@ -18,6 +18,7 @@ #include <sys/types.h> +#include <stdlib.h> #include <string.h> #include "tmux.h" @@ -26,31 +27,93 @@ * Write the entire contents of a pane to a buffer. */ +int cmd_capture_pane_parse(struct cmd *, int, char **, char **); int cmd_capture_pane_exec(struct cmd *, struct cmd_ctx *); +void cmd_capture_pane_free(struct cmd *); +void cmd_capture_pane_init(struct cmd *, int); +size_t cmd_capture_pane_print(struct cmd *, char *, size_t); + +struct cmd_capture_pane_data { + char *target; + int buffer; +}; 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_init, + cmd_capture_pane_parse, cmd_capture_pane_exec, - cmd_buffer_free, - cmd_buffer_print + cmd_capture_pane_free, + cmd_capture_pane_print }; +/* ARGSUSED */ +void +cmd_capture_pane_init(struct cmd *self, unused int arg) +{ + struct cmd_capture_pane_data *data; + + self->data = data = xmalloc(sizeof *data); + data->buffer = -1; + data->target = NULL; +} + +int +cmd_capture_pane_parse(struct cmd *self, int argc, char **argv, char **cause) +{ + struct cmd_capture_pane_data *data; + const char *errstr; + int n, opt; + + self->entry->init(self, KEYC_NONE); + data = self->data; + + while ((opt = getopt(argc, argv, "b:t:")) != -1) { + switch (opt) { + case 'b': + if (data->buffer == -1) { + n = strtonum(optarg, 0, INT_MAX, &errstr); + if (errstr != NULL) { + xasprintf(cause, "buffer %s", errstr); + goto error; + } + data->buffer = n; + } + break; + case 't': + if (data->target == NULL) + data->target = xstrdup(optarg); + break; + default: + goto usage; + } + } + argc -= optind; + argv += optind; + + return (0); + +usage: + xasprintf(cause, "usage: %s %s", self->entry->name, self->entry->usage); + +error: + self->entry->free(self); + return (-1); +} + 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) + struct cmd_capture_pane_data *data = self->data; + struct window_pane *wp; + char *buf, *line; + struct screen *s; + u_int i, limit; + size_t len, linelen; + + if (cmd_find_pane(ctx, data->target, NULL, &wp) == NULL) return (-1); s = &wp->base; @@ -69,15 +132,41 @@ cmd_capture_pane_exec(struct cmd *self, struct cmd_ctx *ctx) xfree(line); } - limit = options_get_number(&sess->options, "buffer-limit"); + limit = options_get_number(&global_options, "buffer-limit"); if (data->buffer == -1) { - paste_add(&sess->buffers, buf, len, limit); + paste_add(&global_buffers, buf, len, limit); return (0); } - if (paste_replace(&sess->buffers, data->buffer, buf, len) != 0) { + if (paste_replace(&global_buffers, data->buffer, buf, len) != 0) { ctx->error(ctx, "no buffer %d", data->buffer); xfree(buf); return (-1); } return (0); } + +void +cmd_capture_pane_free(struct cmd *self) +{ + struct cmd_capture_pane_data *data = self->data; + + if (data->target != NULL) + xfree(data->target); + xfree(data); +} + +size_t +cmd_capture_pane_print(struct cmd *self, char *buf, size_t len) +{ + struct cmd_capture_pane_data *data = self->data; + size_t off = 0; + + off += xsnprintf(buf, len, "%s", self->entry->name); + if (data == NULL) + return (off); + if (off < len && data->buffer != -1) + off += xsnprintf(buf + off, len - off, " -b %d", data->buffer); + if (off < len && data->target != NULL) + off += xsnprintf(buf + off, len - off, " -t %s", data->target); + return (off); +} diff --git a/cmd-choose-buffer.c b/cmd-choose-buffer.c index 4008c54a..665f41b1 100644 --- a/cmd-choose-buffer.c +++ b/cmd-choose-buffer.c @@ -67,14 +67,14 @@ cmd_choose_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL) return (-1); - if (paste_get_top(&s->buffers) == NULL) + if (paste_get_top(&global_buffers) == NULL) return (0); if (window_pane_set_mode(wl->window->active, &window_choose_mode) != 0) return (0); idx = 0; - while ((pb = paste_walk_stack(&s->buffers, &idx)) != NULL) { + while ((pb = paste_walk_stack(&global_buffers, &idx)) != NULL) { tmp = paste_print(pb, 50); window_choose_add(wl->window->active, idx - 1, "%u: %zu bytes: \"%s\"", idx - 1, pb->size, tmp); diff --git a/cmd-copy-buffer.c b/cmd-copy-buffer.c deleted file mode 100644 index 5f407e0c..00000000 --- a/cmd-copy-buffer.c +++ /dev/null @@ -1,205 +0,0 @@ -/* $OpenBSD$ */ - -/* - * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org> - * - * 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 <stdlib.h> -#include <string.h> - -#include "tmux.h" - -/* - * Copies a session paste buffer to another session. - */ - -int cmd_copy_buffer_parse(struct cmd *, int, char **, char **); -int cmd_copy_buffer_exec(struct cmd *, struct cmd_ctx *); -void cmd_copy_buffer_free(struct cmd *); -void cmd_copy_buffer_init(struct cmd *, int); -size_t cmd_copy_buffer_print(struct cmd *, char *, size_t); - -struct cmd_copy_buffer_data { - char *dst_session; - char *src_session; - int dst_idx; - int src_idx; -}; - -const struct cmd_entry cmd_copy_buffer_entry = { - "copy-buffer", "copyb", - "[-a src-index] [-b dst-index] [-s src-session] [-t dst-session]", - 0, "", - cmd_copy_buffer_init, - cmd_copy_buffer_parse, - cmd_copy_buffer_exec, - cmd_copy_buffer_free, - cmd_copy_buffer_print -}; - -/* ARGSUSED */ -void -cmd_copy_buffer_init(struct cmd *self, unused int arg) -{ - struct cmd_copy_buffer_data *data; - - self->data = data = xmalloc(sizeof *data); - data->dst_session = NULL; - data->src_session = NULL; - data->dst_idx = -1; - data->src_idx = -1; -} - -int -cmd_copy_buffer_parse(struct cmd *self, int argc, char **argv, char **cause) -{ - struct cmd_copy_buffer_data *data; - const char *errstr; - int n, opt; - - self->entry->init(self, KEYC_NONE); - data = self->data; - - while ((opt = getopt(argc, argv, "a:b:s:t:")) != -1) { - switch (opt) { - case 'a': - if (data->src_idx == -1) { - n = strtonum(optarg, 0, INT_MAX, &errstr); - if (errstr != NULL) { - xasprintf(cause, "buffer %s", errstr); - goto error; - } - data->src_idx = n; - } - break; - case 'b': - if (data->dst_idx == -1) { - n = strtonum(optarg, 0, INT_MAX, &errstr); - if (errstr != NULL) { - xasprintf(cause, "buffer %s", errstr); - goto error; - } - data->dst_idx = n; - } - break; - case 's': - if (data->src_session == NULL) - data->src_session = xstrdup(optarg); - break; - case 't': - if (data->dst_session == NULL) - data->dst_session = xstrdup(optarg); - break; - default: - goto usage; - } - } - argc -= optind; - argv += optind; - - return (0); - -usage: - xasprintf(cause, "usage: %s %s", self->entry->name, self->entry->usage); - -error: - self->entry->free(self); - return (-1); -} - -int -cmd_copy_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) -{ - struct cmd_copy_buffer_data *data = self->data; - struct paste_buffer *pb; - struct paste_stack *dst_ps, *src_ps; - u_char *pdata; - struct session *dst_session, *src_session; - u_int limit; - - if ((dst_session = cmd_find_session(ctx, data->dst_session)) == NULL || - (src_session = cmd_find_session(ctx, data->src_session)) == NULL) - return (-1); - dst_ps = &dst_session->buffers; - src_ps = &src_session->buffers; - - if (data->src_idx == -1) { - if ((pb = paste_get_top(src_ps)) == NULL) { - ctx->error(ctx, "no buffers"); - return (-1); - } - } else { - if ((pb = paste_get_index(src_ps, data->src_idx)) == NULL) { - ctx->error(ctx, "no buffer %d", data->src_idx); - return (-1); - } - } - limit = options_get_number(&dst_session->options, "buffer-limit"); - - pdata = xmalloc(pb->size); - memcpy(pdata, pb->data, pb->size); - - if (data->dst_idx == -1) - paste_add(dst_ps, pdata, pb->size, limit); - else if (paste_replace(dst_ps, data->dst_idx, pdata, pb->size) != 0) { - ctx->error(ctx, "no buffer %d", data->dst_idx); - xfree(pdata); - return (-1); - } - - return (0); -} - -void -cmd_copy_buffer_free(struct cmd *self) -{ - struct cmd_copy_buffer_data *data = self->data; - - if (data->dst_session != NULL) - xfree(data->dst_session); - if (data->src_session != NULL) - xfree(data->src_session); - xfree(data); -} - -size_t -cmd_copy_buffer_print(struct cmd *self, char *buf, size_t len) -{ - struct cmd_copy_buffer_data *data = self->data; - size_t off = 0; - - off += xsnprintf(buf, len, "%s", self->entry->name); - if (data == NULL) - return (off); - if (off < len && data->src_idx != -1) { - off += xsnprintf(buf + off, len - off, " -a %d", - data->src_idx); - } - if (off < len && data->dst_idx != -1) { - off += xsnprintf(buf + off, len - off, " -b %d", - data->dst_idx); - } - if (off < len && data->src_session != NULL) { - off += cmd_prarg(buf + off, len - off, " -s ", - data->src_session); - } - if (off < len && data->dst_session != NULL) { - off += cmd_prarg(buf + off, len - off, " -t ", - data->dst_session); - } - return (off); -} diff --git a/cmd-delete-buffer.c b/cmd-delete-buffer.c index 1a5b6d82..0bfd77ae 100644 --- a/cmd-delete-buffer.c +++ b/cmd-delete-buffer.c @@ -30,7 +30,7 @@ int cmd_delete_buffer_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_delete_buffer_entry = { "delete-buffer", "deleteb", - CMD_BUFFER_SESSION_USAGE, + CMD_BUFFER_USAGE, 0, "", cmd_buffer_init, cmd_buffer_parse, @@ -43,14 +43,10 @@ int cmd_delete_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) { struct cmd_buffer_data *data = self->data; - struct session *s; - - if ((s = cmd_find_session(ctx, data->target)) == NULL) - return (-1); if (data->buffer == -1) - paste_free_top(&s->buffers); - else if (paste_free_index(&s->buffers, data->buffer) != 0) { + paste_free_top(&global_buffers); + else if (paste_free_index(&global_buffers, data->buffer) != 0) { ctx->error(ctx, "no buffer %d", data->buffer); return (-1); } diff --git a/cmd-generic.c b/cmd-generic.c index 8b536fa0..97e731c9 100644 --- a/cmd-generic.c +++ b/cmd-generic.c @@ -332,7 +332,6 @@ cmd_buffer_init(struct cmd *self, unused int key) self->data = data = xmalloc(sizeof *data); data->chflags = 0; - data->target = NULL; data->buffer = -1; data->arg = NULL; data->arg2 = NULL; @@ -349,7 +348,7 @@ cmd_buffer_parse(struct cmd *self, int argc, char **argv, char **cause) cmd_buffer_init(self, 0); data = self->data; - while ((opt = cmd_getopt(argc, argv, "b:t:", entry->chflags)) != -1) { + while ((opt = cmd_getopt(argc, argv, "b:", entry->chflags)) != -1) { if (cmd_parse_flags(opt, entry->chflags, &data->chflags) == 0) continue; switch (opt) { @@ -363,10 +362,6 @@ cmd_buffer_parse(struct cmd *self, int argc, char **argv, char **cause) data->buffer = n; } break; - case 't': - if (data->target == NULL) - data->target = xstrdup(optarg); - break; default: goto usage; } @@ -392,8 +387,6 @@ cmd_buffer_free(struct cmd *self) { struct cmd_buffer_data *data = self->data; - if (data->target != NULL) - xfree(data->target); if (data->arg != NULL) xfree(data->arg); if (data->arg2 != NULL) @@ -413,8 +406,6 @@ cmd_buffer_print(struct cmd *self, char *buf, size_t len) off += cmd_print_flags(buf, len, off, data->chflags); if (off < len && data->buffer != -1) off += xsnprintf(buf + off, len - off, " -b %d", data->buffer); - if (off < len && data->target != NULL) - off += cmd_prarg(buf + off, len - off, " -t ", data->target); if (off < len && data->arg != NULL) off += cmd_prarg(buf + off, len - off, " ", data->arg); if (off < len && data->arg2 != NULL) diff --git a/cmd-list-buffers.c b/cmd-list-buffers.c index c2b0edc9..efc86f97 100644 --- a/cmd-list-buffers.c +++ b/cmd-list-buffers.c @@ -30,29 +30,25 @@ int cmd_list_buffers_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_list_buffers_entry = { "list-buffers", "lsb", - CMD_TARGET_SESSION_USAGE, + "", 0, "", - cmd_target_init, - cmd_target_parse, + NULL, + NULL, cmd_list_buffers_exec, - cmd_target_free, - cmd_target_print + NULL, + NULL }; +/* ARGSUSED */ int -cmd_list_buffers_exec(struct cmd *self, struct cmd_ctx *ctx) +cmd_list_buffers_exec(unused struct cmd *self, struct cmd_ctx *ctx) { - struct cmd_target_data *data = self->data; - struct session *s; struct paste_buffer *pb; u_int idx; char *tmp; - if ((s = cmd_find_session(ctx, data->target)) == NULL) - return (-1); - idx = 0; - while ((pb = paste_walk_stack(&s->buffers, &idx)) != NULL) { + while ((pb = paste_walk_stack(&global_buffers, &idx)) != NULL) { tmp = paste_print(pb, 50); ctx->print(ctx, "%u: %zu bytes: \"%s\"", idx - 1, pb->size, tmp); diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c index abaa76ca..13413e4b 100644 --- a/cmd-load-buffer.c +++ b/cmd-load-buffer.c @@ -35,7 +35,7 @@ void cmd_load_buffer_callback(struct client *, void *); const struct cmd_entry cmd_load_buffer_entry = { "load-buffer", "loadb", - CMD_BUFFER_SESSION_USAGE " path", + CMD_BUFFER_USAGE " path", CMD_ARG1, "", cmd_buffer_init, cmd_buffer_parse, @@ -44,26 +44,16 @@ const struct cmd_entry cmd_load_buffer_entry = { cmd_buffer_print }; -struct cmd_load_buffer_cdata { - struct session *session; - int buffer; -}; - int cmd_load_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) { - struct cmd_buffer_data *data = self->data; - struct cmd_load_buffer_cdata *cdata; - struct session *s; - struct client *c = ctx->cmdclient; - FILE *f; - char *pdata, *new_pdata; - size_t psize; - u_int limit; - int ch; - - if ((s = cmd_find_session(ctx, data->target)) == NULL) - return (-1); + struct cmd_buffer_data *data = self->data; + struct client *c = ctx->cmdclient; + FILE *f; + char *pdata, *new_pdata; + size_t psize; + u_int limit; + int ch; if (strcmp(data->arg, "-") == 0) { if (c == NULL) { @@ -79,11 +69,7 @@ cmd_load_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) return (-1); } - cdata = xmalloc(sizeof *cdata); - cdata->session = s; - cdata->session->references++; - cdata->buffer = data->buffer; - c->stdin_data = cdata; + c->stdin_data = &data->buffer; c->stdin_callback = cmd_load_buffer_callback; c->references++; @@ -115,14 +101,13 @@ cmd_load_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) pdata[psize] = '\0'; fclose(f); - f = NULL; - limit = options_get_number(&s->options, "buffer-limit"); + limit = options_get_number(&global_options, "buffer-limit"); if (data->buffer == -1) { - paste_add(&s->buffers, pdata, psize, limit); + paste_add(&global_buffers, pdata, psize, limit); return (0); } - if (paste_replace(&s->buffers, data->buffer, pdata, psize) != 0) { + if (paste_replace(&global_buffers, data->buffer, pdata, psize) != 0) { ctx->error(ctx, "no buffer %d", data->buffer); return (-1); } @@ -140,11 +125,10 @@ error: void cmd_load_buffer_callback(struct client *c, void *data) { - struct cmd_load_buffer_cdata *cdata = data; - struct session *s = cdata->session; - char *pdata; - size_t psize; - u_int limit; + char *pdata; + size_t psize; + u_int limit; + int *buffer = data; /* * Event callback has already checked client is not dead and reduced @@ -152,34 +136,23 @@ cmd_load_buffer_callback(struct client *c, void *data) */ c->flags |= CLIENT_EXIT; - /* Does the target session still exist? */ - if (!session_alive(s)) - goto out; - psize = EVBUFFER_LENGTH(c->stdin_event->input); if (psize == 0) - goto out; + return; pdata = malloc(psize + 1); if (pdata == NULL) - goto out; + return; bufferevent_read(c->stdin_event, pdata, psize); pdata[psize] = '\0'; - limit = options_get_number(&s->options, "buffer-limit"); - if (cdata->buffer == -1) { - paste_add(&s->buffers, pdata, psize, limit); - goto out; - } - if (paste_replace(&s->buffers, cdata->buffer, pdata, psize) != 0) { + limit = options_get_number(&global_options, "buffer-limit"); + if (*buffer == -1) + paste_add(&global_buffers, pdata, psize, limit); + else if (paste_replace(&global_buffers, *buffer, pdata, psize) != 0) { /* No context so can't use server_client_msg_error. */ evbuffer_add_printf( - c->stderr_event->output, "no buffer %d\n", cdata->buffer); + c->stderr_event->output, "no buffer %d\n", *buffer); bufferevent_enable(c->stderr_event, EV_WRITE); - goto out; } - -out: - cdata->session->references--; - xfree(cdata); } diff --git a/cmd-paste-buffer.c b/cmd-paste-buffer.c index 75d9373f..439d7190 100644 --- a/cmd-paste-buffer.c +++ b/cmd-paste-buffer.c @@ -136,9 +136,10 @@ cmd_paste_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) return (-1); if (data->buffer == -1) - pb = paste_get_top(&s->buffers); + pb = paste_get_top(&global_buffers); else { - if ((pb = paste_get_index(&s->buffers, data->buffer)) == NULL) { + pb = paste_get_index(&global_buffers, data->buffer); + if (pb == NULL) { ctx->error(ctx, "no buffer %d", data->buffer); return (-1); } @@ -150,9 +151,9 @@ cmd_paste_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) /* Delete the buffer if -d. */ if (data->flag_delete) { if (data->buffer == -1) - paste_free_top(&s->buffers); + paste_free_top(&global_buffers); else - paste_free_index(&s->buffers, data->buffer); + paste_free_index(&global_buffers, data->buffer); } return (0); diff --git a/cmd-save-buffer.c b/cmd-save-buffer.c index 1d287cd2..7a30d12b 100644 --- a/cmd-save-buffer.c +++ b/cmd-save-buffer.c @@ -32,7 +32,7 @@ int cmd_save_buffer_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_save_buffer_entry = { "save-buffer", "saveb", - "[-a] " CMD_BUFFER_SESSION_USAGE " path", + "[-a] " CMD_BUFFER_USAGE " path", CMD_ARG1, "a", cmd_buffer_init, cmd_buffer_parse, @@ -45,21 +45,18 @@ int cmd_save_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) { struct cmd_buffer_data *data = self->data; - struct session *s; struct paste_buffer *pb; mode_t mask; FILE *f; - if ((s = cmd_find_session(ctx, data->target)) == NULL) - return (-1); - if (data->buffer == -1) { - if ((pb = paste_get_top(&s->buffers)) == NULL) { + if ((pb = paste_get_top(&global_buffers)) == NULL) { ctx->error(ctx, "no buffers"); return (-1); } } else { - if ((pb = paste_get_index(&s->buffers, data->buffer)) == NULL) { + pb = paste_get_index(&global_buffers, data->buffer); + if (pb == NULL) { ctx->error(ctx, "no buffer %d", data->buffer); return (-1); } diff --git a/cmd-set-buffer.c b/cmd-set-buffer.c index a93a0adf..376adb14 100644 --- a/cmd-set-buffer.c +++ b/cmd-set-buffer.c @@ -30,7 +30,7 @@ int cmd_set_buffer_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_set_buffer_entry = { "set-buffer", "setb", - CMD_BUFFER_SESSION_USAGE " data", + CMD_BUFFER_USAGE " data", CMD_ARG1, "", cmd_buffer_init, cmd_buffer_parse, @@ -43,23 +43,20 @@ int cmd_set_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) { struct cmd_buffer_data *data = self->data; - struct session *s; u_int limit; char *pdata; size_t psize; - if ((s = cmd_find_session(ctx, data->target)) == NULL) - return (-1); - limit = options_get_number(&s->options, "buffer-limit"); + limit = options_get_number(&global_options, "buffer-limit"); pdata = xstrdup(data->arg); psize = strlen(pdata); if (data->buffer == -1) { - paste_add(&s->buffers, pdata, psize, limit); + paste_add(&global_buffers, pdata, psize, limit); return (0); } - if (paste_replace(&s->buffers, data->buffer, pdata, psize) != 0) { + if (paste_replace(&global_buffers, data->buffer, pdata, psize) != 0) { ctx->error(ctx, "no buffer %d", data->buffer); xfree(pdata); return (-1); diff --git a/cmd-set-option.c b/cmd-set-option.c index 5c5c70ae..81e3cffa 100644 --- a/cmd-set-option.c +++ b/cmd-set-option.c @@ -74,6 +74,7 @@ const char *set_option_bell_action_list[] = { }; const struct set_option_entry set_option_table[] = { + { "buffer-limit", SET_OPTION_NUMBER, 1, INT_MAX, NULL }, { "escape-time", SET_OPTION_NUMBER, 0, INT_MAX, NULL }, { "exit-unattached", SET_OPTION_FLAG, 0, 0, NULL }, { "quiet", SET_OPTION_FLAG, 0, 0, NULL }, @@ -83,15 +84,14 @@ const struct set_option_entry set_option_table[] = { const struct set_option_entry set_session_option_table[] = { { "base-index", SET_OPTION_NUMBER, 0, INT_MAX, NULL }, { "bell-action", SET_OPTION_CHOICE, 0, 0, set_option_bell_action_list }, - { "buffer-limit", SET_OPTION_NUMBER, 1, INT_MAX, NULL }, { "default-command", SET_OPTION_STRING, 0, 0, NULL }, { "default-path", SET_OPTION_STRING, 0, 0, NULL }, { "default-shell", SET_OPTION_STRING, 0, 0, NULL }, { "default-terminal", SET_OPTION_STRING, 0, 0, NULL }, { "destroy-unattached", SET_OPTION_FLAG, 0, 0, NULL }, { "detach-on-destroy", SET_OPTION_FLAG, 0, 0, NULL }, - { "display-panes-colour", SET_OPTION_COLOUR, 0, 0, NULL }, { "display-panes-active-colour", SET_OPTION_COLOUR, 0, 0, NULL }, + { "display-panes-colour", SET_OPTION_COLOUR, 0, 0, NULL }, { "display-panes-time", SET_OPTION_NUMBER, 1, INT_MAX, NULL }, { "display-time", SET_OPTION_NUMBER, 1, INT_MAX, NULL }, { "history-limit", SET_OPTION_NUMBER, 0, INT_MAX, NULL }, diff --git a/cmd-show-buffer.c b/cmd-show-buffer.c index b8c3c05d..b6d0c231 100644 --- a/cmd-show-buffer.c +++ b/cmd-show-buffer.c @@ -30,7 +30,7 @@ int cmd_show_buffer_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_show_buffer_entry = { "show-buffer", "showb", - CMD_BUFFER_SESSION_USAGE, + CMD_BUFFER_USAGE, 0, "", cmd_buffer_init, cmd_buffer_parse, @@ -49,20 +49,21 @@ cmd_show_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) size_t size, len; u_int width; - if ((s = cmd_find_session(ctx, data->target)) == NULL) + if ((s = cmd_find_session(ctx, NULL)) == NULL) return (-1); if (data->buffer == -1) { - if ((pb = paste_get_top(&s->buffers)) == NULL) { + if ((pb = paste_get_top(&global_buffers)) == NULL) { ctx->error(ctx, "no buffers"); return (-1); } - } else if ((pb = paste_get_index(&s->buffers, data->buffer)) == NULL) { - ctx->error(ctx, "no buffer %d", data->buffer); - return (-1); + } else { + pb = paste_get_index(&global_buffers, data->buffer); + if (pb == NULL) { + ctx->error(ctx, "no buffer %d", data->buffer); + return (-1); + } } - if (pb == NULL) - return (0); size = pb->size; if (size > SIZE_MAX / 4 - 1) @@ -40,7 +40,6 @@ const struct cmd_entry *cmd_table[] = { &cmd_clock_mode_entry, &cmd_command_prompt_entry, &cmd_confirm_before_entry, - &cmd_copy_buffer_entry, &cmd_copy_mode_entry, &cmd_delete_buffer_entry, &cmd_detach_client_entry, @@ -29,19 +29,6 @@ * string! */ -void -paste_init_stack(struct paste_stack *ps) -{ - ARRAY_INIT(ps); -} - -void -paste_free_stack(struct paste_stack *ps) -{ - while (paste_free_top(ps) == 0) - ; -} - /* Return each item of the stack in turn. */ struct paste_buffer * paste_walk_stack(struct paste_stack *ps, uint *idx) @@ -51,6 +51,8 @@ int server_shutdown; struct event server_ev_accept; struct event server_ev_second; +struct paste_stack global_buffers; + int server_create_socket(void); void server_loop(void); int server_should_shutdown(void); @@ -150,6 +152,7 @@ server_start(void) RB_INIT(&sessions); RB_INIT(&dead_sessions); TAILQ_INIT(&session_groups); + ARRAY_INIT(&global_buffers); mode_key_init_trees(); key_bindings_init(); utf8_build(); @@ -105,8 +105,6 @@ session_create(const char *name, const char *cmd, const char *cwd, TAILQ_INIT(&s->lastw); RB_INIT(&s->windows); - paste_init_stack(&s->buffers); - options_init(&s->options, &global_s_options); environ_init(&s->environ); if (env != NULL) @@ -155,7 +153,6 @@ session_destroy(struct session *s) session_group_remove(s); environ_free(&s->environ); options_free(&s->options); - paste_free_stack(&s->buffers); while (!TAILQ_EMPTY(&s->lastw)) winlink_stack_remove(&s->lastw, TAILQ_FIRST(&s->lastw)); @@ -983,7 +983,7 @@ status_prompt_key(struct client *c, int key) c->flags |= CLIENT_STATUS; break; case MODEKEYEDIT_PASTE: - if ((pb = paste_get_top(&c->session->buffers)) == NULL) + if ((pb = paste_get_top(&global_buffers)) == NULL) break; for (n = 0; n < pb->size; n++) { ch = (u_char) pb->data[n]; @@ -1594,6 +1594,10 @@ Available window options are listed under .Pp Available server options are: .Bl -tag -width Ds +.It Ic buffer-limit Ar number +Set the number of buffers; as new buffers are added to the top of the stack, +old ones are removed from the bottom if necessary to maintain this maximum +length. .It Ic escape-time Set the time in milliseconds for which .Nm @@ -1626,10 +1630,6 @@ window of that session, means all bells are ignored and .Ic current means only bell in windows other than the current window are ignored. -.It Ic buffer-limit Ar number -Set the number of buffers kept for each session; as new buffers are added to -the top of the stack, old ones are removed from the bottom if necessary to -maintain this maximum length. .It Ic default-command Ar shell-command Set the command used for new windows (if not specified when the window is created) to |