aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2019-04-02 11:02:44 +0100
committerThomas Adam <thomas@xteddy.org>2019-04-02 11:02:44 +0100
commitbfc1f0ca62356e1e32e34baa1f8ade168fa72de0 (patch)
treeee0c4542d22df704aea440e468cc923a96462af5 /tmux.h
parentf03776c262ff68f4f5c3fefefd559256d534179d (diff)
parent7bcc0d16f24506bed6568ba36bcd278cfc06d069 (diff)
downloadrtmux-bfc1f0ca62356e1e32e34baa1f8ade168fa72de0.tar.gz
rtmux-bfc1f0ca62356e1e32e34baa1f8ade168fa72de0.tar.bz2
rtmux-bfc1f0ca62356e1e32e34baa1f8ade168fa72de0.zip
Merge branch 'obsd-master'
Diffstat (limited to 'tmux.h')
-rw-r--r--tmux.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/tmux.h b/tmux.h
index c1f18857..48d8efc0 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1613,7 +1613,7 @@ struct paste_buffer *paste_walk(struct paste_buffer *);
struct paste_buffer *paste_get_top(const char **);
struct paste_buffer *paste_get_name(const char *);
void paste_free(struct paste_buffer *);
-void paste_add(char *, size_t);
+void paste_add(const char *, char *, size_t);
int paste_rename(const char *, const char *, char **);
int paste_set(char *, size_t, const char *, char **);
char *paste_make_sample(struct paste_buffer *);
@@ -2103,8 +2103,8 @@ char *grid_string_cells(struct grid *, u_int, u_int, u_int,
void grid_duplicate_lines(struct grid *, u_int, struct grid *, u_int,
u_int);
void grid_reflow(struct grid *, u_int);
-u_int grid_to_offset(struct grid *, u_int, u_int);
-void grid_from_offset(struct grid *, u_int, u_int *, u_int *);
+void grid_wrap_position(struct grid *, u_int, u_int, u_int *, u_int *);
+void grid_unwrap_position(struct grid *, u_int *, u_int *, u_int, u_int);
/* grid-view.c */
void grid_view_get_cell(struct grid *, u_int, u_int, struct grid_cell *);