From 45dfc5a074e2ceae11a6d4aeae597bee1e028503 Mon Sep 17 00:00:00 2001 From: nicm Date: Mon, 20 Oct 2014 22:29:25 +0000 Subject: Instead of setting up the default keys by building the key struct directly with a helper function in the cmd_entry, include a table of bind-key commands and pass them through the command parser and a temporary cmd_q. As well as being smaller, this will allow default bindings to be command sequences which will probably be needed soon. --- cmd-list-commands.c | 1 - 1 file changed, 1 deletion(-) (limited to 'cmd-list-commands.c') diff --git a/cmd-list-commands.c b/cmd-list-commands.c index 287df428..520feccb 100644 --- a/cmd-list-commands.c +++ b/cmd-list-commands.c @@ -31,7 +31,6 @@ const struct cmd_entry cmd_list_commands_entry = { "", 0, 0, "", 0, - NULL, cmd_list_commands_exec }; -- cgit From f5bc85591a1f7c26bf030f5781d63985b2ee4d23 Mon Sep 17 00:00:00 2001 From: nicm Date: Mon, 20 Oct 2014 22:44:30 +0000 Subject: Move list-commands into list-keys. --- cmd-list-commands.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'cmd-list-commands.c') diff --git a/cmd-list-commands.c b/cmd-list-commands.c index 520feccb..3caaebb2 100644 --- a/cmd-list-commands.c +++ b/cmd-list-commands.c @@ -26,14 +26,6 @@ enum cmd_retval cmd_list_commands_exec(struct cmd *, struct cmd_q *); -const struct cmd_entry cmd_list_commands_entry = { - "list-commands", "lscm", - "", 0, 0, - "", - 0, - cmd_list_commands_exec -}; - enum cmd_retval cmd_list_commands_exec(unused struct cmd *self, struct cmd_q *cmdq) { -- cgit From 8a5ceac3a9a21ec70c480d284dc1fc6907af2ce0 Mon Sep 17 00:00:00 2001 From: nicm Date: Mon, 20 Oct 2014 22:45:37 +0000 Subject: Argh, meant to remove this file... --- cmd-list-commands.c | 45 --------------------------------------------- 1 file changed, 45 deletions(-) delete mode 100644 cmd-list-commands.c (limited to 'cmd-list-commands.c') diff --git a/cmd-list-commands.c b/cmd-list-commands.c deleted file mode 100644 index 3caaebb2..00000000 --- a/cmd-list-commands.c +++ /dev/null @@ -1,45 +0,0 @@ -/* $OpenBSD$ */ - -/* - * Copyright (c) 2007 Nicholas Marriott - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER - * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include - -#include "tmux.h" - -/* - * List all commands with usages. - */ - -enum cmd_retval cmd_list_commands_exec(struct cmd *, struct cmd_q *); - -enum cmd_retval -cmd_list_commands_exec(unused struct cmd *self, struct cmd_q *cmdq) -{ - const struct cmd_entry **entryp; - - for (entryp = cmd_table; *entryp != NULL; entryp++) { - if ((*entryp)->alias != NULL) { - cmdq_print(cmdq, "%s (%s) %s", (*entryp)->name, - (*entryp)->alias, (*entryp)->usage); - } else { - cmdq_print(cmdq, "%s %s", (*entryp)->name, - (*entryp)->usage); - } - } - - return (CMD_RETURN_NORMAL); -} -- cgit