diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-07-21 22:41:01 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-07-21 22:41:01 +0000 |
| commit | 7f10175db1d4aed08b8255ee52590632b4bd7f06 (patch) | |
| tree | eed8d92beebd32e17290fbddcd89e340411db8f8 | |
| parent | 2d263036cd1898bec0b94d2065d0844222661f49 (diff) | |
Adjust field width to fit longest key when listing.
| -rw-r--r-- | usr.bin/tmux/cmd-list-keys.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/usr.bin/tmux/cmd-list-keys.c b/usr.bin/tmux/cmd-list-keys.c index dd28f45607d..dc4bc5d9d0b 100644 --- a/usr.bin/tmux/cmd-list-keys.c +++ b/usr.bin/tmux/cmd-list-keys.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-list-keys.c,v 1.2 2009/07/13 23:11:35 nicm Exp $ */ +/* $OpenBSD: cmd-list-keys.c,v 1.3 2009/07/21 22:41:00 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -18,6 +18,8 @@ #include <sys/types.h> +#include <string.h> + #include "tmux.h" /* @@ -45,6 +47,18 @@ cmd_list_keys_exec(unused struct cmd *self, struct cmd_ctx *ctx) struct key_binding *bd; const char *key; char tmp[BUFSIZ]; + int width, keywidth; + + width = 0; + SPLAY_FOREACH(bd, key_bindings, &key_bindings) { + if ((key = key_string_lookup_key(bd->key)) == NULL) + continue; + + keywidth = strlen(key) + 1; + if (keywidth > width) + width = keywidth; + } + SPLAY_FOREACH(bd, key_bindings, &key_bindings) { if ((key = key_string_lookup_key(bd->key)) == NULL) @@ -52,7 +66,8 @@ cmd_list_keys_exec(unused struct cmd *self, struct cmd_ctx *ctx) *tmp = '\0'; cmd_list_print(bd->cmdlist, tmp, sizeof tmp); - ctx->print(ctx, "%11s: %s", key, tmp); + + ctx->print(ctx, "%*s: %s", width, key, tmp); } return (0); |