FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove tui_source_window::content_in_use

Browse source 
Now that source window clearing has been simplified, we don't need a
special flag to say whether the source window is in use -- we can
simply check whether the contents are set.  This patch implements this
idea, removing the content_in_use field.

gdb/ChangeLog
2019-07-17  Tom Tromey  <tom@tromey.com>

	* tui/tui-winsource.c (tui_clear_source_content)
	(tui_show_source_content): Update.
	* tui/tui-source.c (tui_source_window::showing_source_p): Check
	whether content is empty.
	* tui/tui-data.h (struct tui_source_window_base) <content_in_use>:
	Remove.
This commit is contained in:
Tom Tromey 2019-06-28 22:57:37 -06:00
parent f31ec9af48
commit f6cc34a91c
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gdb/ChangeLog
View file

@ -1,3 +1,12 @@
2019-07-17 Tom Tromey <tom@tromey.com>
* tui/tui-winsource.c (tui_clear_source_content)
(tui_show_source_content): Update.
* tui/tui-source.c (tui_source_window::showing_source_p): Check
whether content is empty.
* tui/tui-data.h (struct tui_source_window_base) <content_in_use>:
Remove.
2019-07-17 Tom Tromey <tom@tromey.com>
* tui/tui-winsource.c (tui_erase_source_content): Clear the

2
gdb/tui/tui-data.h
View file

@ -398,8 +398,6 @@ public:
LINE_NO in this source window; false otherwise. */
virtual bool location_matches_p (struct bp_location *loc, int line_no) = 0;
/* Can it be used, or is it already used? */
bool content_in_use = false;
/* Does the locator belong to this window? */
bool m_has_locator = false;
/* Execution information window. */

2
gdb/tui/tui-source.c
View file

@ -227,7 +227,7 @@ tui_show_symtab_source (tui_source_window_base *win_info,
bool
tui_source_window::showing_source_p (const char *fullname) const
{
return (content_in_use
return (!content.empty ()
&& (filename_cmp (tui_locator_win_info_ptr ()->full_name,
fullname) == 0));
}

2
gdb/tui/tui-winsource.c
View file

@ -211,7 +211,6 @@ tui_clear_source_content (struct tui_source_window_base *win_info)
{
int i;
win_info->content_in_use = false;
tui_erase_source_content (win_info);
for (i = 0; i < win_info->content.size (); i++)
{
@ -297,7 +296,6 @@ tui_show_source_content (struct tui_source_window_base *win_info)
tui_check_and_display_highlight_if_needed (win_info);
win_info->refresh_window ();
win_info->content_in_use = true;
}
/* See tui-data.h. */