=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/menu.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- src/usr.bin/tmux/menu.c 2021/09/09 19:37:17 1.37 +++ src/usr.bin/tmux/menu.c 2021/10/11 13:27:50 1.38 @@ -1,4 +1,4 @@ -/* $OpenBSD: menu.c,v 1.37 2021/09/09 19:37:17 nicm Exp $ */ +/* $OpenBSD: menu.c,v 1.38 2021/10/11 13:27:50 nicm Exp $ */ /* * Copyright (c) 2019 Nicholas Marriott @@ -140,17 +140,16 @@ return (&md->s); } -int -menu_check_cb(__unused struct client *c, void *data, u_int px, u_int py) +/* Return parts of the input range which are not obstructed by the menu. */ +void +menu_check_cb(__unused struct client *c, void *data, u_int px, u_int py, + u_int nx, struct overlay_ranges *r) { struct menu_data *md = data; struct menu *menu = md->menu; - if (px < md->px || px > md->px + menu->width + 3) - return (1); - if (py < md->py || py > md->py + menu->count + 1) - return (1); - return (0); + server_client_overlay_range(md->px, md->py, menu->width + 4, + menu->count + 2, px, py, nx, r); } void