binutils-gdb/gdb/tui/tui-wingeneral.c
Andrew Burgess f237f998d1 gdb/tui: remove special handling of locator/status window
The locator window, or status window as it is sometimes called is
handled differently to all the other windows.

The reason for this is that the class representing this
window (tui_locator_window) does two jobs, first this class represents
a window just like any other that has space on the screen and fills
the space with content.  The second job is that this class serves as a
storage area to hold information about the current location that the
TUI windows represent, so the class has members like 'addr' and
'line_no', for example which are used within this class, and others
when they want to know which line/address the TUI windows should be
showing to the user.

Because of this dual purpose we must always have an instance of the
tui_locator_window so that there is somewhere to store this location
information.

The result of this is that the locator window must never be deleted
like other windows, which results in some special case code.

In this patch I propose splitting the two roles of the
tui_locator_window class.  The tui_locator_window class will retain
just its window drawing parts, and will be treated just like any other
window.  This should allow all special case code for this window to be
deleted.

The other role, that of tracking the current tui location will be
moved into a new class (tui_location_tracker), of which there will be
a single global instance.  All of the places where we previously use
the locator window to get location information will now be updated to
get this from the tui_location_tracker.

There should be no user visible changes after this commit.

gdb/ChangeLog:

	* Makefile.in (SUBDIR_TUI_SRCS): Add tui/tui-location.c.
	(HFILES_NO_SRCDIR): Add tui/tui-location.h.
	* tui/tui-data.h (TUI_STATUS_WIN): Define.
	(tui_locator_win_info_ptr): Delete declaration.
	* tui/tui-disasm.c: Add 'tui/tui-location.h' include.
	(tui_disasm_window::set_contents): Fetch state from tui_location
	global.
	(tui_get_begin_asm_address): Likewise.
	* tui/tui-layout.c (tui_apply_current_layout): Remove special case
	for locator window.
	(get_locator_window): Delete.
	(initialize_known_windows): Treat locator window just like all the
	rest.
	* tui/tui-source.c: Add 'tui/tui-location.h' include.
	(tui_source_window::set_contents): Fetch state from tui_location
	global.
	(tui_source_window::showing_source_p): Likewise.
	* tui/tui-stack.c: Add 'tui/tui-location.h' include.
	(_locator): Delete.
	(tui_locator_win_info_ptr): Delete.
	(tui_locator_window::make_status_line): Fetch state from
	tui_location global.
	(tui_locator_window::rerender): Remove check of 'handle',
	reindent function body.
	(tui_locator_window::set_locator_fullname): Delete.
	(tui_locator_window::set_locator_info): Delete.
	(tui_update_locator_fullname): Delete.
	(tui_show_frame_info): Likewise.
	(tui_show_locator_content): Access window through TUI_STATUS_WIN.
	* tui/tui-stack.h (tui_locator_window::set_locator_info): Moved to
	tui/tui-location.h and renamed to
	tui_location_tracker::set_location.
	(tui_locator_window::set_locator_fullname): Moved to
	tui/tui-location.h and renamed to
	tui_location_tracker::set_fullname.
	(tui_locator_window::full_name): Delete.
	(tui_locator_window::proc_name): Delete.
	(tui_locator_window::line_no): Delete.
	(tui_locator_window::addr): Delete.
	(tui_locator_window::gdbarch): Delete.
	(tui_update_locator_fullname): Delete declaration.
	* tui/tui-wingeneral.c (tui_refresh_all): Removed special handling
	for locator window.
	* tui/tui-winsource.c: Add 'tui/tui-location.h' include.
	(tui_display_main): Call function on tui_location directly.
	* tui/tui.h (enum tui_win_type): Add STATUS_WIN.
	* tui/tui-location.c: New file.
	* tui/tui-location.h: New file.
2021-01-28 17:00:30 +00:00

209 lines
4.6 KiB
C

/* General window behavior.
Copyright (C) 1998-2021 Free Software Foundation, Inc.
Contributed by Hewlett-Packard Company.
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include "tui/tui.h"
#include "tui/tui-data.h"
#include "tui/tui-io.h"
#include "tui/tui-wingeneral.h"
#include "tui/tui-win.h"
#include "tui/tui-stack.h"
#include "cli/cli-style.h"
#include "gdb_curses.h"
/* This is true if we're currently suppressing output, via
wnoutrefresh. This is needed in case we create a new window while
in this mode. */
static bool suppress_output;
/* See tui-data.h. */
tui_suppress_output::tui_suppress_output ()
: m_saved_suppress (suppress_output)
{
suppress_output = true;
for (const auto &win : all_tui_windows ())
win->no_refresh ();
}
/* See tui-data.h. */
tui_suppress_output::~tui_suppress_output ()
{
suppress_output = m_saved_suppress;
if (!suppress_output)
doupdate ();
for (const auto &win : all_tui_windows ())
win->refresh_window ();
}
/* See tui-data.h. */
void
tui_wrefresh (WINDOW *win)
{
if (!suppress_output)
wrefresh (win);
}
/* See tui-data.h. */
void
tui_win_info::refresh_window ()
{
if (handle != NULL)
tui_wrefresh (handle.get ());
}
/* Draw a border arround the window. */
static void
box_win (struct tui_win_info *win_info,
bool highlight_flag)
{
WINDOW *win;
int attrs;
win = win_info->handle.get ();
if (highlight_flag)
attrs = tui_active_border_attrs;
else
attrs = tui_border_attrs;
/* tui_apply_style resets the style entirely, so be sure to call it
before applying ATTRS. */
if (cli_styling)
tui_apply_style (win, (highlight_flag
? tui_active_border_style.style ()
: tui_border_style.style ()));
wattron (win, attrs);
#ifdef HAVE_WBORDER
wborder (win, tui_border_vline, tui_border_vline,
tui_border_hline, tui_border_hline,
tui_border_ulcorner, tui_border_urcorner,
tui_border_llcorner, tui_border_lrcorner);
#else
box (win, tui_border_vline, tui_border_hline);
#endif
if (!win_info->title.empty ())
{
/* Emit "+-TITLE-+" -- so 2 characters on the right and 2 on
the left. */
int max_len = win_info->width - 2 - 2;
if (win_info->title.size () <= max_len)
mvwaddstr (win, 0, 2, win_info->title.c_str ());
else
{
std::string truncated
= "..." + win_info->title.substr (win_info->title.size ()
- max_len + 3);
mvwaddstr (win, 0, 2, truncated.c_str ());
}
}
wattroff (win, attrs);
tui_apply_style (win, ui_file_style ());
}
void
tui_unhighlight_win (struct tui_win_info *win_info)
{
if (win_info != NULL
&& win_info->can_box ()
&& win_info->handle != NULL)
{
box_win (win_info, false);
win_info->refresh_window ();
win_info->set_highlight (false);
}
}
void
tui_highlight_win (struct tui_win_info *win_info)
{
if (win_info != NULL
&& win_info->can_box ()
&& win_info->handle != NULL)
{
box_win (win_info, true);
win_info->refresh_window ();
win_info->set_highlight (true);
}
}
void
tui_win_info::check_and_display_highlight_if_needed ()
{
if (can_box ())
{
if (is_highlighted)
tui_highlight_win (this);
else
tui_unhighlight_win (this);
}
}
void
tui_win_info::make_window ()
{
handle.reset (newwin (height, width, y, x));
if (handle != NULL)
{
if (suppress_output)
wnoutrefresh (handle.get ());
scrollok (handle.get (), TRUE);
if (can_box ())
box_win (this, false);
}
}
/* We can't really make windows visible, or invisible. So we have to
delete the entire window when making it visible, and create it
again when making it visible. */
void
tui_win_info::make_visible (bool visible)
{
if (is_visible () == visible)
return;
if (visible)
make_window ();
else
handle.reset (nullptr);
}
/* Function to refresh all the windows currently displayed. */
void
tui_refresh_all ()
{
for (tui_win_info *win_info : all_tui_windows ())
{
if (win_info->is_visible ())
win_info->refresh_window ();
}
}