diff options
| author | Tom Tromey <tom@tromey.com> | 2019-11-10 10:33:07 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-11-10 10:33:07 -0700 |
| commit | 0b026263ea17155b57f7763901894be2cbb6c3ff (patch) | |
| tree | 08cf28cce14ce4ba3727a9081a8dfa30f1d43fa9 | |
| parent | b049ce2d39fa793bf8b530e7345b81531e21eb52 (diff) | |
| download | gdb-0b026263ea17155b57f7763901894be2cbb6c3ff.zip gdb-0b026263ea17155b57f7763901894be2cbb6c3ff.tar.gz gdb-0b026263ea17155b57f7763901894be2cbb6c3ff.tar.bz2 | |
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
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/tui/tui-command.h | 1 | ||||
| -rw-r--r-- | gdb/tui/tui-data.h | 3 | ||||
| -rw-r--r-- | 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); |