binutils-gdb/gdb/cli/cli-style.c
Philippe Waroquiers ecad3b215d Fix 'help set/show style' strange layouts/results.
The layout for 'help set address|variable' is strange, e.g.:
  (gdb) help set style address
  style address

  List of show Address display styling
  Configure address colors and display intensity subcommands:

  show Address display styling
  Configure address colors and display intensity background -- Set the background color for this property
  show Address display styling
  Configure address colors and display intensity foreground -- Set the foreground color for this property
  show Address display styling
  Configure address colors and display intensity intensity -- Set the display intensity color for this property

  Type "help show Address display styling
  Configure address colors and display intensity" followed by show Address display styling
  Configure address colors and display intensity subcommand name for full documentation.
  Type "apropos word" to search for commands related to "word".
  Command name abbreviations are allowed if unambiguous.
  (gdb)

The help for 'set style function|filename' gives help for 'Show':
  (gdb) help set style filename
  Filename display styling
  Configure filename colors and display intensity.

  List of show style filename subcommands:

  show style filename background -- Set the background color for this property
  show style filename foreground -- Set the foreground color for this property
  show style filename intensity -- Set the display intensity color for this property

The help for 'show style function|filename' is equally strange, as it speaks
about commands, instead of sub commands:
  (gdb) help show style filename
  Filename display styling
  Configure filename colors and display intensity.

  List of commands:

  background -- Show the background color for this property
  foreground -- Show the foreground color for this property
  intensity -- Show the display intensity color for this property

  Type "help" followed by command name for full documentation.
  Type "apropos word" to search for commands related to "word".
  Command name abbreviations are allowed if unambiguous.
  (gdb)

This patch fixes all this.

Note that the 'set style' and 'show style' have the same prefix_doc:
  (gdb) help show style
  Style-specific settings
  Configure various style-related variables, such as colors
  ...
  (gdb) help set style
  Style-specific settings
  Configure various style-related variables, such as colors
  ...

Other similar commands (such as set|show history) have typically
a more specific prefix:
  (gdb) help show history
  Generic command for showing command history parameters.
  ...
  (gdb) help set history
  Generic command for setting command history parameters.
  ...

This could be fixed by having set_prefix_doc and show_prefix_doc instead of
the single prefix_doc argument to cli_style_option::add_setshow_commands.
That could be improved if deemed better.

2018-12-29  Philippe Waroquiers  <philippe.waroquiers@skynet.be>

	* cli/cli-style.c (cli_style_option::add_setshow_commands):
	Initialize m_set_prefix with "set", instead of re-assigning
	m_show_prefix.  Use m_set_prefix for set_list and m_show_prefix
	for show_list.
	(_initialize_cli_style): Correct the order of arguments in
	variable_name_style.add_setshow_commands and
	address_style.add_setshow_commands calls.
2018-12-30 09:26:21 +01:00

286 lines
7.4 KiB
C

/* CLI colorizing
Copyright (C) 2018 Free Software Foundation, Inc.
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include "cli/cli-cmds.h"
#include "cli/cli-style.h"
#include "source-cache.h"
/* True if styling is enabled. */
#if defined(_WIN32) || defined (__CYGWIN__)
int cli_styling = 0;
#else
int cli_styling = 1;
#endif
/* Name of colors; must correspond to ui_file_style::basic_color. */
static const char * const cli_colors[] = {
"none",
"black",
"red",
"green",
"yellow",
"blue",
"magenta",
"cyan",
"white",
nullptr
};
/* Names of intensities; must correspond to
ui_file_style::intensity. */
static const char * const cli_intensities[] = {
"normal",
"bold",
"dim",
nullptr
};
/* See cli-style.h. */
cli_style_option file_name_style (ui_file_style::GREEN);
/* See cli-style.h. */
cli_style_option function_name_style (ui_file_style::YELLOW);
/* See cli-style.h. */
cli_style_option variable_name_style (ui_file_style::CYAN);
/* See cli-style.h. */
cli_style_option address_style (ui_file_style::BLUE);
/* See cli-style.h. */
cli_style_option::cli_style_option (ui_file_style::basic_color fg)
: m_foreground (cli_colors[fg - ui_file_style::NONE]),
m_background (cli_colors[0]),
m_intensity (cli_intensities[ui_file_style::NORMAL])
{
}
/* Return the color number corresponding to COLOR. */
static int
color_number (const char *color)
{
for (int i = 0; i < ARRAY_SIZE (cli_colors); ++i)
{
if (color == cli_colors[i])
return i - 1;
}
gdb_assert_not_reached ("color not found");
}
/* See cli-style.h. */
ui_file_style
cli_style_option::style () const
{
int fg = color_number (m_foreground);
int bg = color_number (m_background);
ui_file_style::intensity intensity = ui_file_style::NORMAL;
for (int i = 0; i < ARRAY_SIZE (cli_intensities); ++i)
{
if (m_intensity == cli_intensities[i])
{
intensity = (ui_file_style::intensity) i;
break;
}
}
return ui_file_style (fg, bg, intensity);
}
/* See cli-style.h. */
void
cli_style_option::do_set (const char *args, int from_tty)
{
}
/* See cli-style.h. */
void
cli_style_option::do_show (const char *args, int from_tty)
{
}
/* See cli-style.h. */
void
cli_style_option::do_show_foreground (struct ui_file *file, int from_tty,
struct cmd_list_element *cmd,
const char *value)
{
const char *name = (const char *) get_cmd_context (cmd);
fprintf_filtered (file, _("The \"%s\" foreground color is: %s\n"),
name, value);
}
/* See cli-style.h. */
void
cli_style_option::do_show_background (struct ui_file *file, int from_tty,
struct cmd_list_element *cmd,
const char *value)
{
const char *name = (const char *) get_cmd_context (cmd);
fprintf_filtered (file, _("The \"%s\" background color is: %s\n"),
name, value);
}
/* See cli-style.h. */
void
cli_style_option::do_show_intensity (struct ui_file *file, int from_tty,
struct cmd_list_element *cmd,
const char *value)
{
const char *name = (const char *) get_cmd_context (cmd);
fprintf_filtered (file, _("The \"%s\" display intensity is: %s\n"),
name, value);
}
/* See cli-style.h. */
void
cli_style_option::add_setshow_commands (const char *name,
enum command_class theclass,
const char *prefix_doc,
const char *prefixname,
struct cmd_list_element **set_list,
struct cmd_list_element **show_list)
{
m_set_prefix = std::string ("set ") + prefixname + " ";
m_show_prefix = std::string ("show ") + prefixname + " ";
add_prefix_cmd (name, no_class, do_set, prefix_doc, &m_set_list,
m_set_prefix.c_str (), 0, set_list);
add_prefix_cmd (name, no_class, do_show, prefix_doc, &m_show_list,
m_show_prefix.c_str (), 0, show_list);
add_setshow_enum_cmd ("foreground", theclass, cli_colors,
&m_foreground,
_("Set the foreground color for this property"),
_("Show the foreground color for this property"),
nullptr,
nullptr,
do_show_foreground,
&m_set_list, &m_show_list, (void *) name);
add_setshow_enum_cmd ("background", theclass, cli_colors,
&m_background,
_("Set the background color for this property"),
_("Show the background color for this property"),
nullptr,
nullptr,
do_show_background,
&m_set_list, &m_show_list, (void *) name);
add_setshow_enum_cmd ("intensity", theclass, cli_intensities,
&m_intensity,
_("Set the display intensity color for this property"),
_("\
Show the display intensity color for this property"),
nullptr,
nullptr,
do_show_intensity,
&m_set_list, &m_show_list, (void *) name);
}
static void
set_style (const char *arg, int from_tty)
{
}
static void
show_style (const char *arg, int from_tty)
{
}
static void
set_style_enabled (const char *args, int from_tty, struct cmd_list_element *c)
{
g_source_cache.clear ();
}
static void
show_style_enabled (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value)
{
if (cli_styling)
fprintf_filtered (file, _("CLI output styling is enabled.\n"));
else
fprintf_filtered (file, _("CLI output styling is disabled.\n"));
}
void
_initialize_cli_style ()
{
static cmd_list_element *style_set_list;
static cmd_list_element *style_show_list;
add_prefix_cmd ("style", no_class, set_style, _("\
Style-specific settings\n\
Configure various style-related variables, such as colors"),
&style_set_list, "set style ", 0, &setlist);
add_prefix_cmd ("style", no_class, show_style, _("\
Style-specific settings\n\
Configure various style-related variables, such as colors"),
&style_show_list, "show style ", 0, &showlist);
add_setshow_boolean_cmd ("enabled", no_class, &cli_styling, _("\
Set whether CLI styling is enabled."), _("\
Show whether CLI is enabled."), _("\
If enabled, output to the terminal is styled."),
set_style_enabled, show_style_enabled,
&style_set_list, &style_show_list);
file_name_style.add_setshow_commands ("filename", no_class,
_("\
Filename display styling\n\
Configure filename colors and display intensity."),
"style filename",
&style_set_list,
&style_show_list);
function_name_style.add_setshow_commands ("function", no_class,
_("\
Function name display styling\n\
Configure function name colors and display intensity"),
"style function",
&style_set_list,
&style_show_list);
variable_name_style.add_setshow_commands ("variable", no_class,
_("\
Variable name display styling\n\
Configure variable name colors and display intensity"),
"style variable",
&style_set_list,
&style_show_list);
address_style.add_setshow_commands ("address", no_class,
_("\
Address display styling\n\
Configure address colors and display intensity"),
"style address",
&style_set_list,
&style_show_list);
}