public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] Remove can_highlight from TUI windows
@ 2019-11-10 17:34 Tom Tromey
0 siblings, 0 replies; only message in thread
From: Tom Tromey @ 2019-11-10 17:34 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=0b026263ea17155b57f7763901894be2cbb6c3ff
commit 0b026263ea17155b57f7763901894be2cbb6c3ff
Author: Tom Tromey <tom@tromey.com>
Date: Sun Nov 10 10:33:07 2019 -0700
Remove can_highlight from TUI windows
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
Diff:
---
gdb/ChangeLog | 9 +++++++++
gdb/tui/tui-command.h | 1 -
gdb/tui/tui-data.h | 3 ---
gdb/tui/tui-wingeneral.c | 6 +++---
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bac7f44..6f377f3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,14 @@
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>
+
* cli/cli-style.h (class cli_style_option) <cli_style_option>:
Remove unused declaration.
diff --git a/gdb/tui/tui-command.h b/gdb/tui/tui-command.h
index 7951694..6a276df 100644
--- a/gdb/tui/tui-command.h
+++ b/gdb/tui/tui-command.h
@@ -30,7 +30,6 @@ struct tui_cmd_window : public tui_win_info
tui_cmd_window ()
: tui_win_info (CMD_WIN)
{
- can_highlight = false;
}
DISABLE_COPY_AND_ASSIGN (tui_cmd_window);
diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index 8af1573..0e45da5 100644
--- a/gdb/tui/tui-data.h
+++ b/gdb/tui/tui-data.h
@@ -211,9 +211,6 @@ public:
/* Window title to display. */
std::string title;
- /* Can this window ever be highlighted? */
- bool can_highlight = true;
-
/* Is this window highlighted? */
bool is_highlighted = false;
};
diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c
index b6dd3f9..f6a6903 100644
--- a/gdb/tui/tui-wingeneral.c
+++ b/gdb/tui/tui-wingeneral.c
@@ -84,7 +84,7 @@ void
tui_unhighlight_win (struct tui_win_info *win_info)
{
if (win_info != NULL
- && win_info->can_highlight
+ && win_info->can_box ()
&& win_info->handle != NULL)
{
box_win (win_info, false);
@@ -98,7 +98,7 @@ void
tui_highlight_win (struct tui_win_info *win_info)
{
if (win_info != NULL
- && win_info->can_highlight
+ && win_info->can_box ()
&& win_info->handle != NULL)
{
box_win (win_info, true);
@@ -110,7 +110,7 @@ tui_highlight_win (struct tui_win_info *win_info)
void
tui_win_info::check_and_display_highlight_if_needed ()
{
- if (can_highlight)
+ if (can_box ())
{
if (is_highlighted)
tui_highlight_win (this);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-11-10 17:34 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-10 17:34 [binutils-gdb] Remove can_highlight from TUI windows Tom Tromey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).