espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-26 22:07:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove can_highlight from TUI windows

Browse Source 
Each TUI window has a "can_highlight" member.  However, this has the
same meaning as "can_box" -- a window can be highlighted if and only
if it can be boxed.  So, this patch removes can_highlight in favor of
simply using can_box.

gdb/ChangeLog
2019-11-10  Tom Tromey  <tom@tromey.com>

	* tui/tui-wingeneral.c (tui_unhighlight_win): Use can_box.
	(tui_highlight_win): Likewise.
	(tui_win_info::check_and_display_highlight_if_needed): Likewise.
	* tui/tui-data.h (struct tui_win_info) <can_highlight>: Remove.
	* tui/tui-command.h (struct tui_cmd_window) <tui_cmd_window>:
	Don't set can_highlight.

Change-Id: I35916859070efcdfcc6e692c71cc6070956dcfce
This commit is contained in:
Tom Tromey
2019-11-10 10:33:07 -07:00
parent b049ce2d39
commit 0b026263ea
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gdb/ChangeLog
View File

@ -1,3 +1,12 @@
2019-11-10 Tom Tromey <tom@tromey.com>
* tui/tui-wingeneral.c (tui_unhighlight_win): Use can_box.
(tui_highlight_win): Likewise.
(tui_win_info::check_and_display_highlight_if_needed): Likewise.
* tui/tui-data.h (struct tui_win_info) <can_highlight>: Remove.
* tui/tui-command.h (struct tui_cmd_window) <tui_cmd_window>:
Don't set can_highlight.
2019-11-10 Tom Tromey <tom@tromey.com> 2019-11-10 Tom Tromey <tom@tromey.com>
* cli/cli-style.h (class cli_style_option) <cli_style_option>: * cli/cli-style.h (class cli_style_option) <cli_style_option>:

1
gdb/tui/tui-command.h
View File

@ -30,7 +30,6 @@ struct tui_cmd_window : public tui_win_info
tui_cmd_window () tui_cmd_window ()
: tui_win_info (CMD_WIN) : tui_win_info (CMD_WIN)
{ {
can_highlight = false;
} }
DISABLE_COPY_AND_ASSIGN (tui_cmd_window); DISABLE_COPY_AND_ASSIGN (tui_cmd_window);

3
gdb/tui/tui-data.h
View File

@ -211,9 +211,6 @@ public:
/* Window title to display. */ /* Window title to display. */
std::string title; std::string title;
/* Can this window ever be highlighted? */
bool can_highlight = true;
/* Is this window highlighted? */ /* Is this window highlighted? */
bool is_highlighted = false; bool is_highlighted = false;
}; };

6
gdb/tui/tui-wingeneral.c
View File

@ -84,7 +84,7 @@ void
tui_unhighlight_win (struct tui_win_info *win_info) tui_unhighlight_win (struct tui_win_info *win_info)
{ {
if (win_info != NULL if (win_info != NULL
&& win_info->can_highlight && win_info->can_box ()
&& win_info->handle != NULL) && win_info->handle != NULL)
{ {
box_win (win_info, false); box_win (win_info, false);
@ -98,7 +98,7 @@ void
tui_highlight_win (struct tui_win_info *win_info) tui_highlight_win (struct tui_win_info *win_info)
{ {
if (win_info != NULL if (win_info != NULL
&& win_info->can_highlight && win_info->can_box ()
&& win_info->handle != NULL) && win_info->handle != NULL)
{ {
box_win (win_info, true); box_win (win_info, true);
@ -110,7 +110,7 @@ tui_highlight_win (struct tui_win_info *win_info)
void void
tui_win_info::check_and_display_highlight_if_needed () tui_win_info::check_and_display_highlight_if_needed ()
{ {
if (can_highlight) if (can_box ())
{ {
if (is_highlighted) if (is_highlighted)
tui_highlight_win (this); tui_highlight_win (this);