MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove tui_set_win_with_focus

Browse Source 
I noticed that the TUI had two functions with similar names:
tui_set_win_focus_to and tui_set_win_with_focus.

However, one was just an implementation detail of the latter.  So,
this patch removes tui_set_win_with_focus entirely, to avoid any
temptation to call it.

gdb/ChangeLog
2020-02-22  Tom Tromey  <tom@tromey.com>

	* tui/tui-win.c (tui_set_win_focus_to): Move to tui-data.c.
	* tui/tui-data.h (tui_set_win_with_focus): Don't declare.
	* tui/tui-data.c (tui_set_win_with_focus): Remove.
	(tui_set_win_focus_to): Move from tui-win.c.

Change-Id: Idffddab773436bdf80d55480906d76b292981ef2
This commit is contained in:
Tom Tromey 2020-02-22 11:48:26 -07:00
parent 0240c8f11b
commit 935c78c046
4 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
2020-02-22 Tom Tromey <tom@tromey.com>
* tui/tui-win.c (tui_set_win_focus_to): Move to tui-data.c.
* tui/tui-data.h (tui_set_win_with_focus): Don't declare.
* tui/tui-data.c (tui_set_win_with_focus): Remove.
(tui_set_win_focus_to): Move from tui-win.c.
2020-02-22 Tom Tromey <tom@tromey.com>
* tui/tui-layout.c (make_standard_window, get_locator_window): New

12
gdb/tui/tui-data.c
View File

@ -23,6 +23,7 @@
#include "symtab.h"
#include "tui/tui.h"
#include "tui/tui-data.h"
#include "tui/tui-win.h"
#include "tui/tui-wingeneral.h"
#include "tui/tui-winsource.h"
#include "gdb_curses.h"
@ -59,11 +60,16 @@ tui_win_with_focus (void)
}
/* Set the window that has the logical focus. */
/* Set the logical focus to win_info. */
void
tui_set_win_with_focus (struct tui_win_info *win_info)
tui_set_win_focus_to (struct tui_win_info *win_info)
{
win_with_focus = win_info;
if (win_info != NULL)
{
tui_unhighlight_win (win_with_focus);
win_with_focus = win_info;
tui_highlight_win (win_info);
}
}

1
gdb/tui/tui-data.h
View File

@ -251,7 +251,6 @@ extern int tui_term_width (void);
extern void tui_set_term_width_to (int);
extern struct tui_locator_window *tui_locator_win_info_ptr (void);
extern struct tui_win_info *tui_win_with_focus (void);
extern void tui_set_win_with_focus (struct tui_win_info *);
extern bool tui_win_resized ();
extern void tui_set_win_resized_to (bool);

15
gdb/tui/tui-win.c
View File

@ -452,21 +452,6 @@ tui_update_gdb_sizes (void)
}
/* Set the logical focus to win_info. */
void
tui_set_win_focus_to (struct tui_win_info *win_info)
{
if (win_info != NULL)
{
struct tui_win_info *win_with_focus = tui_win_with_focus ();
tui_unhighlight_win (win_with_focus);
tui_set_win_with_focus (win_info);
tui_highlight_win (win_info);
}
}
void
tui_win_info::forward_scroll (int num_to_scroll)
{