=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v retrieving revision 1.905 retrieving revision 1.906 diff -u -r1.905 -r1.906 --- src/usr.bin/tmux/tmux.h 2019/05/25 07:18:20 1.905 +++ src/usr.bin/tmux/tmux.h 2019/05/26 17:34:45 1.906 @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.905 2019/05/25 07:18:20 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.906 2019/05/26 17:34:45 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -2219,6 +2219,7 @@ 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 *); @@ -2583,6 +2584,7 @@ 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 *); /* procname.c */ char *get_proc_name(int, char *); @@ -2598,7 +2600,7 @@ __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,