Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2019-05-26 21:02:26 +01:00
11 changed files with 229 additions and 62 deletions

4
tmux.h
View File

@@ -2221,6 +2221,7 @@ void grid_duplicate_lines(struct grid *, u_int, struct grid *, u_int,
void grid_reflow(struct grid *, 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);
u_int grid_line_length(struct grid *, u_int);
/* grid-view.c */
void grid_view_get_cell(struct grid *, u_int, u_int, struct grid_cell *);
@@ -2585,6 +2586,7 @@ struct utf8_data *utf8_fromcstr(const char *);
char *utf8_tocstr(struct utf8_data *);
u_int utf8_cstrwidth(const char *);
char *utf8_padcstr(const char *, u_int);
int utf8_cstrhas(const char *, const struct utf8_data *);
/* osdep-*.c */
char *osdep_get_name(int, char *);
@@ -2602,7 +2604,7 @@ __dead void printflike(1, 2) fatal(const char *, ...);
__dead void printflike(1, 2) fatalx(const char *, ...);
/* menu.c */
struct menu *menu_create(const char *, struct client *,
struct menu *menu_create(const char *, struct cmdq_item *, struct client *,
struct cmd_find_state *, const char *);
void menu_free(struct menu *);
int menu_display(struct menu *, int, struct cmdq_item *, u_int,