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

Rename TUI locator window -> status

Browse source 
The TUI status window is called the "locator" in the source, but
"status" in the documentation.  Whenever I've needed to find the code,
I've had to search to "locate" it (ha, ha).  This patch renames the
window to match the public name of the window.
This commit is contained in:
Tom Tromey 2023-12-08 10:32:07 -07:00
parent cf2ef009cd
commit e0dd0e4d94
8 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -70,7 +70,7 @@ tui_set_win_focus_to (struct tui_win_info *win_info)
tui_unhighlight_win (win_with_focus);
win_with_focus = win_info;
tui_highlight_win (win_info);
tui_show_locator_content ();
tui_show_status_content ();
}
}

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

@ -298,7 +298,7 @@ extern struct tui_win_info *tui_win_list[MAX_MAJOR_WINDOWS];
#define TUI_CMD_WIN \
(gdb::checked_static_cast<tui_cmd_window *> (tui_win_list[CMD_WIN]))
#define TUI_STATUS_WIN \
(gdb::checked_static_cast<tui_locator_window *> (tui_win_list[STATUS_WIN]))
(gdb::checked_static_cast<tui_status_window *> (tui_win_list[STATUS_WIN]))
/* All the windows that are currently instantiated, in layout
order. */

4
gdb/tui/tui-layout.c
View file

@ -306,7 +306,7 @@ tui_win_info::resize (int height_, int width_,
/* Helper function to create one of the built-in (non-locator)
/* Helper function to create one of the built-in (non-status)
windows. */
template<enum tui_win_type V, class T>
@ -369,7 +369,7 @@ initialize_known_windows ()
tui_disasm_window>);
known_window_types.emplace (STATUS_NAME,
make_standard_window<STATUS_WIN,
tui_locator_window>);
tui_status_window>);
}
/* See tui-layout.h. */

4
gdb/tui/tui-location.c
View file

@ -48,7 +48,7 @@ tui_location_tracker::set_location (struct gdbarch *gdbarch,
m_gdbarch = gdbarch;
if (location_changed_p)
tui_show_locator_content ();
tui_show_status_content ();
return location_changed_p;
}
@ -61,7 +61,7 @@ tui_location_tracker::set_location (struct symtab *symtab)
bool location_changed_p = set_fullname (symtab);
if (location_changed_p)
tui_show_locator_content ();
tui_show_status_content ();
return location_changed_p;
}

6
gdb/tui/tui-location.h
View file

@ -32,9 +32,9 @@
struct tui_location_tracker
{
/* Update the current location with the provided arguments. Returns true
if any of the locator's fields were actually changed, and false
otherwise. */
/* Update the current location with the provided arguments. Returns
true if any of the status window's fields were actually changed,
and false otherwise. */
bool set_location (struct gdbarch *gdbarch,
const struct symtab_and_line &sal,
const char *procname);

26
gdb/tui/tui-status.c
View file

@ -1,4 +1,4 @@
/* TUI display locator.
/* TUI status line.
Copyright (C) 1998-2023 Free Software Foundation, Inc.
@ -58,7 +58,7 @@ static const std::string SINGLE_KEY = "(SingleKey)";
std::string
tui_locator_window::make_status_line () const
tui_status_window::make_status_line () const
{
char line_buf[50];
int status_size;
@ -152,7 +152,7 @@ tui_locator_window::make_status_line () const
}
}
/* Now create the locator line from the string version of the
/* Now create the status line from the string version of the
elements. */
string_file string;
@ -242,7 +242,7 @@ tui_get_function_from_frame (frame_info_ptr fi)
}
void
tui_locator_window::rerender ()
tui_status_window::rerender ()
{
gdb_assert (handle != NULL);
@ -271,7 +271,7 @@ tui_locator_window::rerender ()
bool
tui_show_frame_info (frame_info_ptr fi)
{
bool locator_changed_p;
bool status_changed_p;
if (fi != nullptr)
{
@ -285,13 +285,13 @@ tui_show_frame_info (frame_info_ptr fi)
else
func_name = _("<unavailable>");
locator_changed_p
status_changed_p
= tui_location.set_location (get_frame_arch (fi), sal, func_name);
/* If the locator information has not changed, then frame information has
/* If the status information has not changed, then frame information has
not changed. If frame information has not changed, then the windows'
contents will not change. So don't bother refreshing the windows. */
if (!locator_changed_p)
if (!status_changed_p)
return false;
for (struct tui_source_window_base *win_info : tui_source_windows ())
@ -304,9 +304,9 @@ tui_show_frame_info (frame_info_ptr fi)
{
symtab_and_line sal {};
locator_changed_p = tui_location.set_location (NULL, sal, "");
status_changed_p = tui_location.set_location (NULL, sal, "");
if (!locator_changed_p)
if (!status_changed_p)
return false;
for (struct tui_source_window_base *win_info : tui_source_windows ())
@ -317,7 +317,7 @@ tui_show_frame_info (frame_info_ptr fi)
}
void
tui_show_locator_content ()
tui_show_status_content ()
{
if (tui_is_window_visible (STATUS_WIN))
TUI_STATUS_WIN->rerender ();
@ -338,7 +338,7 @@ void
_initialize_tui_stack ()
{
add_com ("update", class_tui, tui_update_command,
_("Update the source window and locator to "
"display the current execution point.\n\
_("\
Update the source window to display the current execution point.\n\
Usage: update"));
}

14
gdb/tui/tui-status.h
View file

@ -1,4 +1,4 @@
/* TUI display locator.
/* TUI status line.
Copyright (C) 1998-2023 Free Software Foundation, Inc.
@ -19,8 +19,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifndef TUI_TUI_STACK_H
#define TUI_TUI_STACK_H
#ifndef TUI_TUI_STATUS_H
#define TUI_TUI_STATUS_H
#include "tui/tui-data.h"
@ -28,11 +28,11 @@ class frame_info_ptr;
/* Locator window class. */
struct tui_locator_window
struct tui_status_window
: public tui_nofocus_window, tui_noscroll_window, tui_oneline_window,
tui_nobox_window
{
tui_locator_window () = default;
tui_status_window () = default;
const char *name () const override
{
@ -50,7 +50,7 @@ private:
std::string make_status_line () const;
};
extern void tui_show_locator_content (void);
extern void tui_show_status_content (void);
extern bool tui_show_frame_info (frame_info_ptr);
#endif /* TUI_TUI_STACK_H */
#endif /* TUI_TUI_STATUS_H */

2
gdb/tui/tui.c
View file

@ -291,7 +291,7 @@ tui_set_key_mode (enum tui_key_mode mode)
tui_current_key_mode = mode;
rl_set_keymap (mode == TUI_SINGLE_KEY_MODE
? tui_keymap : tui_readline_standard_keymap);
tui_show_locator_content ();
tui_show_status_content ();
}
/* Initialize readline and configure the keymap for the switching