src/usr.bin/tmux/cmd-list-keys.c - diff

Return to cmd-list-keys.c CVS log

Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/cmd-list-keys.c between version 1.64 and 1.65

version 1.64, 2021/08/20 17:50:42

version 1.65, 2021/08/20 19:50:16

Line 150

struct args *args = cmd_get_args(self);

struct key_table *table;

struct key_binding *bd;

const char *tablename, *r;

const char *tablename, *r, *keystr;

char *key, *cp, *tmp, *start, *empty;

key_code prefix, only = KEYC_UNKNOWN;

int repeat, width, tablewidth, keywidth, found = 0;

Line 159

if (cmd_get_entry(self) == &cmd_list_commands_entry)

return (cmd_list_keys_commands(self, item));

if (args->argc != 0) {

if ((keystr = args_string(args, 0)) != NULL) {

only = key_string_lookup_string(args->argv[0]);

only = key_string_lookup_string(keystr);

if (only == KEYC_UNKNOWN) {

cmdq_error(item, "invalid key: %s", args->argv[0]);

cmdq_error(item, "invalid key: %s", keystr);

return (CMD_RETURN_ERROR);

}

only &= (KEYC_MASK_KEY|KEYC_MASK_MODIFIERS);

Line 243

tmpsize = 256;

tmp = xmalloc(tmpsize);

table = key_bindings_first_table();

while (table != NULL) {

if (tablename != NULL && strcmp(table->name, tablename) != 0) {

Line 307

Line 308

out:

if (only != KEYC_UNKNOWN && !found) {

cmdq_error(item, "unknown key: %s", args->argv[0]);

cmdq_error(item, "unknown key: %s", args_string(args, 0));

return (CMD_RETURN_ERROR);

}

return (CMD_RETURN_NORMAL);

Line 320

Line 321

const struct cmd_entry **entryp;

const struct cmd_entry *entry;

struct format_tree *ft;

const char *template, *s, *command = NULL;

const char *template, *s, *command;

char *line;

if (args->argc != 0)

command = args->argv[0];

if ((template = args_get(args, 'F')) == NULL) {

template = "#{command_list_name}"

"#{?command_list_alias, (#{command_list_alias}),} "

Line 335

Line 333

ft = format_create(cmdq_get_client(item), item, FORMAT_NONE, 0);

format_defaults(ft, NULL, NULL, NULL, NULL);

command = args_string(args, 0);

for (entryp = cmd_table; *entryp != NULL; entryp++) {

entry = *entryp;

if (command != NULL &&