diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-10-12 09:45:49 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-10-12 09:45:49 +0100 |
| commit | b9dc855016cf79c8bb8469c272dbc6bca24deadc (patch) | |
| tree | a2049bea7b17ededbd12b77110d47353ed832e46 /screen.c | |
| parent | 27126f87976c63161fcae2ab1eb9c6df726a84ff (diff) | |
| parent | 5c49e1d0c1afaf98512b2ffd1f31d91fecff9851 (diff) | |
| download | rtmux-b9dc855016cf79c8bb8469c272dbc6bca24deadc.tar.gz rtmux-b9dc855016cf79c8bb8469c272dbc6bca24deadc.tar.bz2 rtmux-b9dc855016cf79c8bb8469c272dbc6bca24deadc.zip | |
Merge branch 'obsd-master'
Conflicts:
format.c
osdep-openbsd.c
Diffstat (limited to 'screen.c')
| -rw-r--r-- | screen.c | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -24,8 +24,10 @@ #include "tmux.h" -void screen_resize_x(struct screen *, u_int); -void screen_resize_y(struct screen *, u_int); +static void screen_resize_x(struct screen *, u_int); +static void screen_resize_y(struct screen *, u_int); + +static void screen_reflow(struct screen *, u_int); /* Create a new screen. */ void @@ -139,7 +141,7 @@ screen_resize(struct screen *s, u_int sx, u_int sy, int reflow) screen_reflow(s, sx); } -void +static void screen_resize_x(struct screen *s, u_int sx) { struct grid *gd = s->grid; @@ -161,7 +163,7 @@ screen_resize_x(struct screen *s, u_int sx) gd->sx = sx; } -void +static void screen_resize_y(struct screen *s, u_int sy) { struct grid *gd = s->grid; @@ -221,8 +223,8 @@ screen_resize_y(struct screen *s, u_int sy) needed = sy - oldy; /* - * Try to pull as much as possible out of scrolled history, if is - * is enabled. + * Try to pull as much as possible out of scrolled history, if + * is is enabled. */ available = gd->hscrolled; if (gd->flags & GRID_HISTORY && available > 0) { @@ -370,7 +372,7 @@ screen_check_selection(struct screen *s, u_int px, u_int py) } /* Reflow wrapped lines. */ -void +static void screen_reflow(struct screen *s, u_int new_x) { struct grid *old = s->grid; |