diff options
author | nicm <nicm> | 2014-04-24 09:14:43 +0000 |
---|---|---|
committer | nicm <nicm> | 2014-04-24 09:14:43 +0000 |
commit | bec6c807cd580b003cd94b52a20caa2cbc7a0753 (patch) | |
tree | 99a3ae9d6e99ceb99da10ff388fa2c4957a505e2 /window-copy.c | |
parent | 7ab2690be8a451d123b12906b729e163ea37e0dd (diff) | |
download | rtmux-bec6c807cd580b003cd94b52a20caa2cbc7a0753.tar.gz rtmux-bec6c807cd580b003cd94b52a20caa2cbc7a0753.tar.bz2 rtmux-bec6c807cd580b003cd94b52a20caa2cbc7a0753.zip |
There is no longer a need for a paste_stack struct or for global_buffers
to be global. Move to paste.c.
Diffstat (limited to 'window-copy.c')
-rw-r--r-- | window-copy.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/window-copy.c b/window-copy.c index ef99ed9a..296443a2 100644 --- a/window-copy.c +++ b/window-copy.c @@ -776,7 +776,7 @@ window_copy_key_input(struct window_pane *wp, int key) *data->inputstr = '\0'; break; case MODEKEYEDIT_PASTE: - if ((pb = paste_get_top(&global_buffers)) == NULL) + if ((pb = paste_get_top()) == NULL) break; for (n = 0; n < pb->size; n++) { ch = (u_char) pb->data[n]; @@ -1465,8 +1465,8 @@ window_copy_copy_buffer(struct window_pane *wp, int idx, void *buf, size_t len) if (idx == -1) { limit = options_get_number(&global_options, "buffer-limit"); - paste_add(&global_buffers, buf, len, limit); - } else if (paste_replace(&global_buffers, idx, buf, len) != 0) + paste_add(buf, len, limit); + } else if (paste_replace(idx, buf, len) != 0) free(buf); } @@ -1524,13 +1524,13 @@ window_copy_append_selection(struct window_pane *wp, int idx) if (idx == -1) idx = 0; - if (idx == 0 && paste_get_top(&global_buffers) == NULL) { + if (idx == 0 && paste_get_top() == NULL) { limit = options_get_number(&global_options, "buffer-limit"); - paste_add(&global_buffers, buf, len, limit); + paste_add(buf, len, limit); return; } - pb = paste_get_index(&global_buffers, idx); + pb = paste_get_index(idx); if (pb != NULL) { buf = xrealloc(buf, 1, len + pb->size); memmove(buf + pb->size, buf, len); @@ -1538,7 +1538,7 @@ window_copy_append_selection(struct window_pane *wp, int idx) len += pb->size; } - if (paste_replace(&global_buffers, idx, buf, len) != 0) + if (paste_replace(idx, buf, len) != 0) free(buf); } |