aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2019-06-20 15:22:53 -0600
committerTom Tromey <tom@tromey.com>2019-06-25 07:48:44 -0600
commitbbc228ee056cd006e971d5f1cb70ae0f69c1eb36 (patch)
treea7ea33278d5630ed20388d69a133cb95ecfe926f
parent5fcee43a960f0735c53a7c24823b2e4bc1460b9f (diff)
downloadgdb-bbc228ee056cd006e971d5f1cb70ae0f69c1eb36.zip
gdb-bbc228ee056cd006e971d5f1cb70ae0f69c1eb36.tar.gz
gdb-bbc228ee056cd006e971d5f1cb70ae0f69c1eb36.tar.bz2
Don't check window type in tui_set_win_focus_to
This changes tui_set_win_focus_to so that it no longer checks the window type. Instead, now tui_unhighlight_win also checks whether the window can be highlighted. gdb/ChangeLog 2019-06-25 Tom Tromey <tom@tromey.com> * tui/tui-win.c (tui_set_win_focus_to): Don't check window type. * tui/tui-wingeneral.c (tui_unhighlight_win): Check can_highlight.
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/tui/tui-win.c7
-rw-r--r--gdb/tui/tui-wingeneral.c1
3 files changed, 9 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bd8af64..48cfc36 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2019-06-25 Tom Tromey <tom@tromey.com>
+ * tui/tui-win.c (tui_set_win_focus_to): Don't check window type.
+ * tui/tui-wingeneral.c (tui_unhighlight_win): Check
+ can_highlight.
+
+2019-06-25 Tom Tromey <tom@tromey.com>
+
* tui/tui-win.c (tui_source_window_base::update_tab_width): Call
make_visible_with_new_height method.
(tui_win_info::make_visible_with_new_height): New method.
diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index 5ba6836..b2eb0a6 100644
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -458,12 +458,9 @@ tui_set_win_focus_to (struct tui_win_info *win_info)
{
struct tui_win_info *win_with_focus = tui_win_with_focus ();
- if (win_with_focus != NULL
- && win_with_focus->type != CMD_WIN)
- tui_unhighlight_win (win_with_focus);
+ tui_unhighlight_win (win_with_focus);
tui_set_win_with_focus (win_info);
- if (win_info->type != CMD_WIN)
- tui_highlight_win (win_info);
+ tui_highlight_win (win_info);
}
}
diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c
index cfa4a08..98eb5ab 100644
--- a/gdb/tui/tui-wingeneral.c
+++ b/gdb/tui/tui-wingeneral.c
@@ -108,6 +108,7 @@ void
tui_unhighlight_win (struct tui_win_info *win_info)
{
if (win_info != NULL
+ && win_info->can_highlight
&& win_info->handle != NULL)
{
box_win (win_info, NO_HILITE);