aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2013-02-09 14:53:51 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2013-02-09 14:53:51 +0000
commit648ce2f56adc071f93516887cf4a4c32f631d54e (patch)
treec0d2438bd54d426e6dab3fbcd833ce3408adc215 /tmux.h
parent0648c587162da4eae0805e35805454c46be70321 (diff)
parent01da28efb112ef2096a80da616ca190d59ba9b52 (diff)
downloadrtmux-648ce2f56adc071f93516887cf4a4c32f631d54e.tar.gz
rtmux-648ce2f56adc071f93516887cf4a4c32f631d54e.tar.bz2
rtmux-648ce2f56adc071f93516887cf4a4c32f631d54e.zip
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'tmux.h')
-rw-r--r--tmux.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/tmux.h b/tmux.h
index 04b32793..1dd11ade 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1960,6 +1960,7 @@ void grid_move_cells(struct grid *, u_int, u_int, u_int, u_int);
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);
+u_int grid_reflow(struct grid *, const struct grid *, u_int);
/* grid-cell.c */
u_int grid_cell_width(const struct grid_cell *);
@@ -2053,11 +2054,12 @@ void screen_reset_tabs(struct screen *);
void screen_set_cursor_style(struct screen *, u_int);
void screen_set_cursor_colour(struct screen *, const char *);
void screen_set_title(struct screen *, const char *);
-void screen_resize(struct screen *, u_int, u_int);
+void screen_resize(struct screen *, u_int, u_int, int);
void screen_set_selection(struct screen *,
u_int, u_int, u_int, u_int, u_int, struct grid_cell *);
void screen_clear_selection(struct screen *);
int screen_check_selection(struct screen *, u_int, u_int);
+void screen_reflow(struct screen *, u_int);
/* window.c */
extern struct windows windows;