Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-11-24 16:01:11 +00:00
6 changed files with 197 additions and 68 deletions

3
tmux.h
View File

@ -683,6 +683,8 @@ LIST_HEAD(joblist, job);
/* Screen selection. */
struct screen_sel {
int flag;
int hidden;
int rectflag;
enum {
LINE_SEL_NONE,
@ -2057,6 +2059,7 @@ 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 *);
void screen_hide_selection(struct screen *);
int screen_check_selection(struct screen *, u_int, u_int);
void screen_select_cell(struct screen *, struct grid_cell *,
const struct grid_cell *);