espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-03 21:34:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't erase TUI source window when switching focus

Browse Source 
PR tui/26719 points out that switching the focus can erase the TUI
source window.  This is a regression introduced by the patch to switch
the source window to using a pad.

This patch fixes the bug by arranging to call prefresh whenever the
window is refreshed.

2020-10-19  Tom Tromey  <tromey@adacore.com>

	PR tui/26719
	* tui/tui-winsource.h (struct tui_source_window_base)
	<refresh_window>: Rename from refresh_pad.
	* tui/tui-winsource.c (tui_source_window_base::refresh_window):
	Rename from refresh_pad.
	(tui_source_window_base::show_source_content)
	(tui_source_window_base::do_scroll_horizontal): Update.

gdb/testsuite/ChangeLog
2020-10-19  Tom Tromey  <tromey@adacore.com>

	PR tui/26719
	* gdb.tui/list.exp: Check source window contents after focus
	change.
This commit is contained in:
Tom Tromey
2020-10-19 07:45:05 -06:00
parent 3c6eb4d439
commit 22cc388e2b
5 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gdb/ChangeLog
View File

@ -1,3 +1,13 @@
2020-10-19 Tom Tromey <tromey@adacore.com>
PR tui/26719
* tui/tui-winsource.h (struct tui_source_window_base)
<refresh_window>: Rename from refresh_pad.
* tui/tui-winsource.c (tui_source_window_base::refresh_window):
Rename from refresh_pad.
(tui_source_window_base::show_source_content)
(tui_source_window_base::do_scroll_horizontal): Update.
2020-10-19 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
* thread.c (_initialize_thread): Fine-tune the help text of

6
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2020-10-19 Tom Tromey <tromey@adacore.com>
PR tui/26719
* gdb.tui/list.exp: Check source window contents after focus
change.
2020-10-17 Tom de Vries <tdevries@suse.de>
PR symtab/26317

2
gdb/testsuite/gdb.tui/list.exp
View File

@ -40,3 +40,5 @@ Term::check_contents "list -q main" "21 *return 0"
# to ensure that GDB has a valid idea of what is currently focused.
Term::command "focus next"
Term::check_contents "focus next" "Focus set to cmd window"
# PR tui/26719 - switching focus would clear the source window.
Term::check_contents "source is still visible" "21 *return 0"

8
gdb/tui/tui-winsource.c
View File

@ -250,8 +250,10 @@ tui_source_window_base::show_source_line (int lineno)
/* See tui-winsource.h. */
void
tui_source_window_base::refresh_pad ()
tui_source_window_base::refresh_window ()
{
tui_win_info::refresh_window ();
int pad_width = std::max (m_max_length, width);
int left_margin = 1 + TUI_EXECINFO_SIZE + extra_margin ();
int view_width = width - left_margin - 1;
@ -278,8 +280,6 @@ tui_source_window_base::show_source_content ()
for (int lineno = 0; lineno < m_content.size (); lineno++)
show_source_line (lineno);
refresh_pad ();
refresh_window ();
}
@ -377,7 +377,7 @@ tui_source_window_base::do_scroll_horizontal (int num_to_scroll)
if (offset < 0)
offset = 0;
m_horizontal_offset = offset;
refresh_pad ();
refresh_window ();
}
}

5
gdb/tui/tui-winsource.h
View File

@ -171,6 +171,8 @@ public:
/* Erase the source content. */
virtual void erase_source_content () = 0;
void refresh_window () override;
/* Return the start address and gdbarch. */
virtual void display_start_addr (struct gdbarch **gdbarch_p,
CORE_ADDR *addr_p) = 0;
@ -179,9 +181,6 @@ private:
void show_source_content ();
/* Re-display the pad in the window. */
void refresh_pad ();
/* Called when the user "set style enabled" setting is changed. */
void style_changed ();