diff options
| -rw-r--r-- | src/command/commands.c | 4 | ||||
| -rw-r--r-- | src/ui/console.c | 86 | ||||
| -rw-r--r-- | src/ui/ui.h | 3 | ||||
| -rw-r--r-- | tests/unittests/ui/stub_ui.c | 4 |
4 files changed, 47 insertions, 50 deletions
diff --git a/src/command/commands.c b/src/command/commands.c index 780778c2..9f9c099d 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -1368,11 +1368,11 @@ cmd_help(ProfWin *window, const char *const command, gchar **args) Command *command = g_hash_table_lookup(commands, cmd_with_slash); if (command) { - cons_show_help(command); + cons_show_help(cmd_with_slash, &command->help); } else { CommandHelp *commandHelp = plugins_get_help(cmd_with_slash); if (commandHelp) { - cons_show_plugin_help(cmd_with_slash, commandHelp); + cons_show_help(cmd_with_slash, commandHelp); } else { cons_show("No such command."); } diff --git a/src/ui/console.c b/src/ui/console.c index aaf502f2..d58c699e 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -120,7 +120,7 @@ cons_show_padded(int pad, const char *const msg, ...) } void -cons_show_plugin_help(const char *const cmd, CommandHelp *help) +cons_show_help(const char *const cmd, CommandHelp *help) { ProfWin *console = wins_get_console(); @@ -162,48 +162,48 @@ cons_show_plugin_help(const char *const cmd, CommandHelp *help) } } -void -cons_show_help(Command *command) -{ - ProfWin *console = wins_get_console(); - - cons_show(""); - win_vprint(console, '-', 0, NULL, 0, THEME_WHITE_BOLD, "", "%s", &command->cmd[1]); - win_print(console, '-', 0, NULL, NO_EOL, THEME_WHITE_BOLD, "", ""); - int i; - for (i = 0; i < strlen(command->cmd) - 1 ; i++) { - win_print(console, '-', 0, NULL, NO_EOL | NO_DATE, THEME_WHITE_BOLD, "", "-"); - } - win_print(console, '-', 0, NULL, NO_DATE, THEME_WHITE_BOLD, "", ""); - cons_show(""); - - win_print(console, '-', 0, NULL, 0, THEME_WHITE_BOLD, "", "Synopsis"); - ui_show_lines(console, command->help.synopsis); - cons_show(""); - - win_print(console, '-', 0, NULL, 0, THEME_WHITE_BOLD, "", "Description"); - win_println(console, 0, command->help.desc); - - int maxlen = 0; - for (i = 0; command->help.args[i][0] != NULL; i++) { - if (strlen(command->help.args[i][0]) > maxlen) - maxlen = strlen(command->help.args[i][0]); - } - - if (i > 0) { - cons_show(""); - win_print(console, '-', 0, NULL, 0, THEME_WHITE_BOLD, "", "Arguments"); - for (i = 0; command->help.args[i][0] != NULL; i++) { - win_vprint(console, '-', maxlen + 3, NULL, 0, 0, "", "%-*s: %s", maxlen + 1, command->help.args[i][0], command->help.args[i][1]); - } - } - - if (g_strv_length((gchar**)command->help.examples) > 0) { - cons_show(""); - win_print(console, '-', 0, NULL, 0, THEME_WHITE_BOLD, "", "Examples"); - ui_show_lines(console, command->help.examples); - } -} +//void +//cons_show_help(Command *command) +//{ +// ProfWin *console = wins_get_console(); +// +// cons_show(""); +// win_vprint(console, '-', 0, NULL, 0, THEME_WHITE_BOLD, "", "%s", &command->cmd[1]); +// win_print(console, '-', 0, NULL, NO_EOL, THEME_WHITE_BOLD, "", ""); +// int i; +// for (i = 0; i < strlen(command->cmd) - 1 ; i++) { +// win_print(console, '-', 0, NULL, NO_EOL | NO_DATE, THEME_WHITE_BOLD, "", "-"); +// } +// win_print(console, '-', 0, NULL, NO_DATE, THEME_WHITE_BOLD, "", ""); +// cons_show(""); +// +// win_print(console, '-', 0, NULL, 0, THEME_WHITE_BOLD, "", "Synopsis"); +// ui_show_lines(console, command->help.synopsis); +// cons_show(""); +// +// win_print(console, '-', 0, NULL, 0, THEME_WHITE_BOLD, "", "Description"); +// win_println(console, 0, command->help.desc); +// +// int maxlen = 0; +// for (i = 0; command->help.args[i][0] != NULL; i++) { +// if (strlen(command->help.args[i][0]) > maxlen) +// maxlen = strlen(command->help.args[i][0]); +// } +// +// if (i > 0) { +// cons_show(""); +// win_print(console, '-', 0, NULL, 0, THEME_WHITE_BOLD, "", "Arguments"); +// for (i = 0; command->help.args[i][0] != NULL; i++) { +// win_vprint(console, '-', maxlen + 3, NULL, 0, 0, "", "%-*s: %s", maxlen + 1, command->help.args[i][0], command->help.args[i][1]); +// } +// } +// +// if (g_strv_length((gchar**)command->help.examples) > 0) { +// cons_show(""); +// win_print(console, '-', 0, NULL, 0, THEME_WHITE_BOLD, "", "Examples"); +// ui_show_lines(console, command->help.examples); +// } +//} void cons_bad_cmd_usage(const char *const cmd) diff --git a/src/ui/ui.h b/src/ui/ui.h index a29c8f36..f8cb1de7 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -230,8 +230,7 @@ void cons_show(const char *const msg, ...); void cons_show_padded(int pad, const char *const msg, ...); void cons_about(void); void cons_help(void); -void cons_show_help(Command *command); -void cons_show_plugin_help(const char *const cmd, CommandHelp *help); +void cons_show_help(const char *const cmd, CommandHelp *help); void cons_bad_cmd_usage(const char *const cmd); void cons_navigation_help(void); void cons_prefs(void); diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c index 13321025..c0d199f0 100644 --- a/tests/unittests/ui/stub_ui.c +++ b/tests/unittests/ui/stub_ui.c @@ -321,9 +321,7 @@ void cons_show(const char * const msg, ...) void cons_show_padded(int pad, const char * const msg, ...) {} -void cons_show_help(Command *command) {} -void cons_show_plugin_help(const char *const cmd, CommandHelp *help) {} - +void cons_show_help(const char *const cmd, CommandHelp *help) {} void cons_about(void) {} void cons_help(void) {} |