aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2021-02-22 08:01:22 +0000
committerThomas Adam <thomas@xteddy.org>2021-02-22 08:01:22 +0000
commitcb7e6698f3241cecfac31a045b907988a4c286f1 (patch)
treef1be1377641c3495ae0635e15cd96baa91431ce1 /tmux.h
parent742e67080586e212f3c6adbdc1c59bf56b0712b1 (diff)
parente858270006a9041b9016ed9e6cc12d622ac8fe31 (diff)
downloadrtmux-cb7e6698f3241cecfac31a045b907988a4c286f1.tar.gz
rtmux-cb7e6698f3241cecfac31a045b907988a4c286f1.tar.bz2
rtmux-cb7e6698f3241cecfac31a045b907988a4c286f1.zip
Merge branch 'obsd-master' into master
Diffstat (limited to 'tmux.h')
-rw-r--r--tmux.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/tmux.h b/tmux.h
index 626d2978..7d08e0db 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1945,7 +1945,7 @@ char *paste_make_sample(struct paste_buffer *);
#define FORMAT_WINDOW 0x40000000U
struct format_tree;
struct format_modifier;
-typedef char *(*format_cb)(struct format_tree *);
+typedef void *(*format_cb)(struct format_tree *);
const char *format_skip(const char *, const char *);
int format_true(const char *);
struct format_tree *format_create(struct client *, struct cmdq_item *, int,
@@ -2590,6 +2590,10 @@ void grid_reader_cursor_next_word(struct grid_reader *, const char *);
void grid_reader_cursor_next_word_end(struct grid_reader *, const char *);
void grid_reader_cursor_previous_word(struct grid_reader *, const char *,
int);
+int grid_reader_cursor_jump(struct grid_reader *,
+ const struct utf8_data *);
+int grid_reader_cursor_jump_back(struct grid_reader *,
+ const struct utf8_data *);
/* grid-view.c */
void grid_view_get_cell(struct grid *, u_int, u_int, struct grid_cell *);
@@ -2710,7 +2714,6 @@ void screen_alternate_off(struct screen *, struct grid_cell *, int);
/* window.c */
extern struct windows windows;
extern struct window_pane_tree all_window_panes;
-extern const struct window_mode *all_window_modes[];
int window_cmp(struct window *, struct window *);
RB_PROTOTYPE(windows, window, entry, window_cmp);
int winlink_cmp(struct winlink *, struct winlink *);