version 1.27, 2015/10/26 22:03:04 |
version 1.28, 2015/11/12 11:05:34 |
|
|
char tmp[BUFSIZ]; |
char tmp[BUFSIZ]; |
size_t used; |
size_t used; |
int repeat, width, tablewidth, keywidth; |
int repeat, width, tablewidth, keywidth; |
|
u_int i; |
|
|
if (self->entry == &cmd_list_commands_entry) |
if (self->entry == &cmd_list_commands_entry) |
return (cmd_list_keys_commands(self, cmdq)); |
return (cmd_list_keys_commands(self, cmdq)); |
|
|
|
|
width = strlen(table->name); |
width = strlen(table->name); |
if (width > tablewidth) |
if (width > tablewidth) |
tablewidth =width; |
tablewidth = width; |
width = strlen(key); |
width = utf8_cstrwidth(key); |
if (width > keywidth) |
if (width > keywidth) |
keywidth = width; |
keywidth = width; |
} |
} |
|
|
r = "-r "; |
r = "-r "; |
else |
else |
r = " "; |
r = " "; |
used = xsnprintf(tmp, sizeof tmp, "%s-T %-*s %-*s ", r, |
used = xsnprintf(tmp, sizeof tmp, "%s-T %-*s %s", r, |
(int)tablewidth, table->name, (int)keywidth, key); |
(int)tablewidth, table->name, key); |
|
for (i = 0; i < keywidth - utf8_cstrwidth(key); i++) { |
|
if (strlcat(tmp, " ", sizeof tmp) < sizeof tmp) |
|
used++; |
|
} |
if (used < sizeof tmp) { |
if (used < sizeof tmp) { |
cmd_list_print(bd->cmdlist, tmp + used, |
cmd_list_print(bd->cmdlist, tmp + used, |
(sizeof tmp) - used); |
(sizeof tmp) - used); |