diff options
| author | nicm <nicm> | 2021-08-23 08:17:41 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2021-08-23 08:17:41 +0000 |
| commit | 3ed37a207988bc6e96dc673ae4564a4efd682ea6 (patch) | |
| tree | 3bd32d96063955286fbf35e7fd316b76d6fbbcf1 /cmd-display-menu.c | |
| parent | 2e9bafaf14ed255eb3f3ef36202f3f4d2c9eca39 (diff) | |
Limit width and height to tty correctly, GitHub issue 2843.
Diffstat (limited to 'cmd-display-menu.c')
| -rw-r--r-- | cmd-display-menu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd-display-menu.c b/cmd-display-menu.c index 347a7090..378c62e1 100644 --- a/cmd-display-menu.c +++ b/cmd-display-menu.c @@ -218,7 +218,7 @@ cmd_display_menu_get_position(struct client *tc, struct cmdq_item *item, else if (n < 0) n = 0; *px = n; - log_debug("%s: -x: %s = %s = %u", __func__, xp, p, *px); + log_debug("%s: -x: %s = %s = %u (-w %u)", __func__, xp, p, *px, w); free(p); /* Expand vertical position */ @@ -244,7 +244,7 @@ cmd_display_menu_get_position(struct client *tc, struct cmdq_item *item, else if (n < 0) n = 0; *py = n; - log_debug("%s: -y: %s = %s = %u", __func__, yp, p, *py); + log_debug("%s: -y: %s = %s = %u (-h %u)", __func__, yp, p, *py, h); free(p); return (1); @@ -359,10 +359,10 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item) } } - if (w > tty->sx - 1) - w = tty->sx - 1; - if (h > tty->sy - 1) - h = tty->sy - 1; + if (w > tty->sx) + w = tty->sx; + if (h > tty->sy) + h = tty->sy; if (!cmd_display_menu_get_position(tc, item, args, &px, &py, w, h)) return (CMD_RETURN_NORMAL); |