mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-10-26 12:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix how popup height is calculated to take embedded newlines into account.

Browse Source
This commit is contained in:
nicm
2020-03-28 09:39:44 +00:00
parent e0b17e796b
commit 4346098e97
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd-display-menu.c
View File

@@ -237,7 +237,7 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
} }
if (nlines != 0) if (nlines != 0)
h = nlines + 2; h = popup_height(nlines, lines) + 2;
else else
h = c->tty.sy / 2; h = c->tty.sy / 2;
if (args_has(args, 'h')) { if (args_has(args, 'h')) {
@@ -262,6 +262,10 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
} }
} }
if (w > c->tty.sx - 1)
w = c->tty.sx - 1;
if (h > c->tty.sy - 1)
h = c->tty.sy - 1;
cmd_display_menu_get_position(c, item, args, &px, &py, w, h); cmd_display_menu_get_position(c, item, args, &px, &py, w, h);
value = args_get(args, 'd'); value = args_get(args, 'd');

20
popup.c
View File

@@ -349,6 +349,22 @@ popup_job_complete_cb(struct job *job)
server_client_clear_overlay(pd->c); server_client_clear_overlay(pd->c);
} }
u_int
popup_height(u_int nlines, const char **lines)
{
char *copy, *next, *loop;
u_int i, height = 0;
for (i = 0; i < nlines; i++) {
copy = next = xstrdup(lines[i]);
while ((loop = strsep(&next, "\n")) != NULL)
height++;
free(copy);
}
return (height);
}
u_int u_int
popup_width(struct cmdq_item *item, u_int nlines, const char **lines, popup_width(struct cmdq_item *item, u_int nlines, const char **lines,
struct client *c, struct cmd_find_state *fs) struct client *c, struct cmd_find_state *fs)
@@ -372,8 +388,8 @@ popup_width(struct cmdq_item *item, u_int nlines, const char **lines,
width = tmpwidth; width = tmpwidth;
free(tmp); free(tmp);
} }
}
free(copy); free(copy);
}
format_free(ft); format_free(ft);
return (width); return (width);
@@ -394,8 +410,6 @@ popup_display(int flags, struct cmdq_item *item, u_int px, u_int py, u_int sx,
return (-1); return (-1);
if (c->tty.sx < sx || c->tty.sy < sy) if (c->tty.sx < sx || c->tty.sy < sy)
return (-1); return (-1);
if (nlines > sy - 2)
nlines = sy - 2;
pd = xcalloc(1, sizeof *pd); pd = xcalloc(1, sizeof *pd);
pd->item = item; pd->item = item;

1
tmux.h
View File

@@ -2763,6 +2763,7 @@ int menu_display(struct menu *, int, struct cmdq_item *, u_int,
#define POPUP_CLOSEEXIT 0x2 #define POPUP_CLOSEEXIT 0x2
u_int popup_width(struct cmdq_item *, u_int, const char **, u_int popup_width(struct cmdq_item *, u_int, const char **,
struct client *, struct cmd_find_state *); struct client *, struct cmd_find_state *);
u_int popup_height(u_int, const char **);
int popup_display(int, struct cmdq_item *, u_int, u_int, u_int, int popup_display(int, struct cmdq_item *, u_int, u_int, u_int,
u_int, u_int, const char **, const char *, const char *, u_int, u_int, const char **, const char *, const char *,
const char *, struct client *, struct cmd_find_state *); const char *, struct client *, struct cmd_find_state *);