Fix positioning of menu in choose modes and a couple of keys in tree mode.

1 files changed, 4 insertions, 0 deletions

diff --git a/menu.c b/menu.c
index 049c4836..f70b1d18 100644
--- a/menu.c
+++ b/menu.c
@@ -295,6 +295,10 @@ menu_display(struct menu *menu, int flags, struct cmdq_item *item, u_int px,
 
 	if (c->tty.sx < menu->width + 4 || c->tty.sy < menu->count + 2)
 		return (-1);
+	if (px + menu->width + 4 > c->tty.sx)
+		px = c->tty.sx - menu->width - 4;
+	if (py + menu->count + 2 > c->tty.sy)
+		py = c->tty.sy - menu->count - 2;
 
 	md = xcalloc(1, sizeof *md);
 	md->item = item;