Merge branch 'obsd-master' into master

This commit is contained in:
Thomas Adam
2021-07-21 10:01:24 +01:00
6 changed files with 73 additions and 11 deletions

View File

@ -174,7 +174,7 @@ cmd_display_menu_get_position(struct client *tc, struct cmdq_item *item,
} else
format_add(ft, "popup_mouse_centre_y", "%ld", n);
n = (long)event->m.y + h;
if (n + h >= tty->sy)
if (n >= tty->sy)
format_add(ft, "popup_mouse_top", "%u", tty->sy - 1);
else
format_add(ft, "popup_mouse_top", "%ld", n);