circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add n: modifier to get length of a format, also automatically expand 

variable name arguments again if they contain a #{.
pull/2378/head
nicm 2020-08-20 16:57:40 +00:00
parent d8b6560cbf
commit d0957529ed
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
format.c
View File

@ -94,6 +94,7 @@ format_job_cmp(struct format_job *fj1, struct format_job *fj2)
#define FORMAT_WINDOWS 0x100 #define FORMAT_WINDOWS 0x100
#define FORMAT_PANES 0x200 #define FORMAT_PANES 0x200
#define FORMAT_PRETTY 0x400 #define FORMAT_PRETTY 0x400
#define FORMAT_LENGTH 0x800
/* Limit on recursion. */ /* Limit on recursion. */
#define FORMAT_LOOP_LIMIT 10 #define FORMAT_LOOP_LIMIT 10
@ -1647,7 +1648,7 @@ format_build_modifiers(struct format_tree *ft, const char **s, u_int *count)
/* /*
* Modifiers are a ; separated list of the forms: * Modifiers are a ; separated list of the forms:
* l,m,C,b,d,t,q,E,T,S,W,P,<,> * l,m,C,b,d,n,t,q,E,T,S,W,P,<,>
* =a * =a
* =/a * =/a
* =/a/ * =/a/
@ -1664,7 +1665,7 @@ format_build_modifiers(struct format_tree *ft, const char **s, u_int *count)
cp++; cp++;
/* Check single character modifiers with no arguments. */ /* Check single character modifiers with no arguments. */
if (strchr("lbdqETSWP<>", cp[0]) != NULL && if (strchr("lbdnqETSWP<>", cp[0]) != NULL &&
format_is_end(cp[1])) { format_is_end(cp[1])) {
format_add_modifier(&list, count, cp, 1, NULL, 0); format_add_modifier(&list, count, cp, 1, NULL, 0);
cp++; cp++;
@ -2122,6 +2123,9 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
case 'd': case 'd':
modifiers |= FORMAT_DIRNAME; modifiers |= FORMAT_DIRNAME;
break; break;
case 'n':
modifiers |= FORMAT_LENGTH;
break;
case 't': case 't':
modifiers |= FORMAT_TIMESTRING; modifiers |= FORMAT_TIMESTRING;
if (fm->argc < 1) if (fm->argc < 1)
@ -2301,13 +2305,17 @@ format_replace(struct format_tree *ft, const char *key, size_t keylen,
if (value == NULL) if (value == NULL)
value = xstrdup(""); value = xstrdup("");
} else { } else {
/* Neither: look up directly. */ if (strstr(copy, "#{") != 0) {
value = format_find(ft, copy, modifiers, time_format); format_log(ft, "expanding inner format '%s'", copy);
if (value == NULL) { value = format_expand(ft, copy);
format_log(ft, "format '%s' not found", copy); } else {
value = xstrdup(""); value = format_find(ft, copy, modifiers, time_format);
} else if (value == NULL) {
format_log(ft, "format '%s' found: %s", copy, value); format_log(ft, "format '%s' not found", copy);
value = xstrdup("");
} else
format_log(ft, "format '%s' found: %s", copy, value);
}
} }
done: done:
@ -2316,8 +2324,7 @@ done:
new = format_expand(ft, value); new = format_expand(ft, value);
free(value); free(value);
value = new; value = new;
} } else if (modifiers & FORMAT_EXPANDTIME) {
else if (modifiers & FORMAT_EXPANDTIME) {
new = format_expand_time(ft, value); new = format_expand_time(ft, value);
free(value); free(value);
value = new; value = new;
@ -2371,6 +2378,14 @@ done:
format_log(ft, "applied padding width %d: %s", width, value); format_log(ft, "applied padding width %d: %s", width, value);
} }
/* Replace with the length if needed. */
if (modifiers & FORMAT_LENGTH) {
xasprintf(&new, "%zu", strlen(value));
free(value);
value = new;
format_log(ft, "replacing with length: %s", new);
}
/* Expand the buffer and copy in the value. */ /* Expand the buffer and copy in the value. */
valuelen = strlen(value); valuelen = strlen(value);
while (*len - *off < valuelen + 1) { while (*len - *off < valuelen + 1) {

3
tmux.1
View File

@ -4574,6 +4574,9 @@ pads the string to a given width, for example
.Ql #{p10:pane_title} .Ql #{p10:pane_title}
will result in a width of at least 10 characters. will result in a width of at least 10 characters.
A positive width pads on the left, a negative on the right. A positive width pads on the left, a negative on the right.
.Ql n
expands to the length of the variable, for example
.Ql #{n:window_name} .
.Pp .Pp
Prefixing a time variable with Prefixing a time variable with
.Ql t:\& .Ql t:\&