circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-04 07:08:50 +00:00
Code Issues Projects Releases Wiki Activity

Do not crash in tree modes if the pane is only 1 in width, reported by

Browse Source 
KOIE Hidetaka in GitHub issue 2015.
This commit is contained in:
nicm 2019-12-12 15:03:13 +00:00
parent 2b2b193791
commit dcf41ec927
1 changed files with 4 additions and 2 deletions

6
mode-tree.c
View File

@ -598,6 +598,8 @@ mode_tree_draw(struct mode_tree_data *mtd)
xasprintf(&text, "%-*s%s%s%s: ", keylen, key, start, mti->name, xasprintf(&text, "%-*s%s%s%s: ", keylen, key, start, mti->name,
tag); tag);
width = utf8_cstrwidth(text); width = utf8_cstrwidth(text);
if (width > w)
width = w;
free(start); free(start);
if (mti->tagged) { if (mti->tagged) {
@ -607,11 +609,11 @@ mode_tree_draw(struct mode_tree_data *mtd)
if (i != mtd->current) { if (i != mtd->current) {
screen_write_clearendofline(&ctx, 8); screen_write_clearendofline(&ctx, 8);
screen_write_puts(&ctx, &gc0, "%s", text); screen_write_nputs(&ctx, w, &gc0, "%s", text);
format_draw(&ctx, &gc0, w - width, mti->text, NULL); format_draw(&ctx, &gc0, w - width, mti->text, NULL);
} else { } else {
screen_write_clearendofline(&ctx, gc.bg); screen_write_clearendofline(&ctx, gc.bg);
screen_write_puts(&ctx, &gc, "%s", text); screen_write_nputs(&ctx, w, &gc, "%s", text);
format_draw(&ctx, &gc, w - width, mti->text, NULL); format_draw(&ctx, &gc, w - width, mti->text, NULL);
} }
free(text); free(text);