diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-05-26 21:02:26 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-05-26 21:02:26 +0100 |
| commit | 103e44d936fef961c2117febfa0140bb220ed2be (patch) | |
| tree | 2c24525b500a2c353a4137e330adbf3b15b86075 /tmux.h | |
| parent | 2e84d1cf033adf8fe4b562b3d3caf390c15798a5 (diff) | |
| parent | 097973e3d50c831c020fb0b689c3a2d66ba83b7c (diff) | |
Merge branch 'obsd-master'
Diffstat (limited to 'tmux.h')
| -rw-r--r-- | tmux.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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, |