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

Merge e054b06174 into 096c4b3e63

Browse Source
This commit is contained in:
David Mandelberg 2025-03-28 22:03:42 -04:00 committed by GitHub
commit df31e9e55c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 3 deletions

14
mode-tree.c
View File

@ -694,6 +694,7 @@ mode_tree_draw(struct mode_tree_data *mtd)
const char *tag, *symbol; const char *tag, *symbol;
size_t size, n; size_t size, n;
int keylen, pad, namelen[mtd->maxdepth + 1]; int keylen, pad, namelen[mtd->maxdepth + 1];
int names_all_digits[mtd->maxdepth + 1];
if (mtd->line_size == 0) if (mtd->line_size == 0)
return; return;
@ -717,13 +718,20 @@ mode_tree_draw(struct mode_tree_data *mtd)
keylen = mti->keylen + 3; keylen = mti->keylen + 3;
} }
for (i = 0; i < mtd->maxdepth + 1; i++) for (i = 0; i < mtd->maxdepth + 1; i++) {
namelen[i] = 0; namelen[i] = 0;
names_all_digits[i] = 1;
}
for (i = 0; i < mtd->line_size; i++) { for (i = 0; i < mtd->line_size; i++) {
line = &mtd->line_list[i]; line = &mtd->line_list[i];
mti = line->item; mti = line->item;
if ((int)strlen(mti->name) > namelen[line->depth]) if ((int)strlen(mti->name) > namelen[line->depth])
namelen[line->depth] = strlen(mti->name); namelen[line->depth] = strlen(mti->name);
for (j = 0; mti->name[j] && names_all_digits[line->depth];
j++) {
if (mti->name[j] < '0' || mti->name[j] > '9')
names_all_digits[line->depth] = 0;
}
} }
for (i = 0; i < mtd->line_size; i++) { for (i = 0; i < mtd->line_size; i++) {
@ -776,8 +784,8 @@ mode_tree_draw(struct mode_tree_data *mtd)
else else
tag = ""; tag = "";
xasprintf(&text, "%-*s%s%*s%s%s", keylen, key, start, xasprintf(&text, "%-*s%s%*s%s%s", keylen, key, start,
namelen[line->depth], mti->name, tag, names_all_digits[line->depth] ? namelen[line->depth] : 0,
(mti->text != NULL) ? ": " : "" ); mti->name, tag, (mti->text != NULL) ? ": " : "" );
width = utf8_cstrwidth(text); width = utf8_cstrwidth(text);
if (width > w) if (width > w)
width = w; width = w;