binutils-gdb/gdb/tui/tui-wingeneral.c
Tom Tromey 865a5aec04 Remove tui_delete_invisible_windows and tui_make_all_invisible
tui_delete_invisible_windows is only needed after applying a layout,
and tui_make_all_invisible is only needed before applying a layout.

This patch removes these functions, in favor of doing this management
directly in tui_apply_current_layout.  This is needed so that the
lifetimes of non-built-in windows will be properly managed.

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

	* tui/tui-wingeneral.h (tui_make_all_invisible): Don't declare.
	* tui/tui-wingeneral.c (tui_make_all_invisible): Remove.
	* tui/tui-win.c (tui_resize_all): Don't call
	tui_delete_invisible_windows.
	* tui/tui-layout.c (tui_apply_current_layout): Delete windows when
	done.
	(tui_set_layout): Update.
	(tui_add_win_to_layout): Don't call tui_delete_invisible_windows.
	* tui/tui-data.h (tui_delete_invisible_windows): Don't declare.
	* tui/tui-data.c (tui_delete_invisible_windows): Remove.

Change-Id: Ia3603b021dcb7ec31700a4a32640cd09b00b8f3b
2020-02-22 11:48:37 -07:00

220 lines
4.9 KiB
C

/* General window behavior.
Copyright (C) 1998-2020 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_gen_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_gen_win_info::make_window ()
{
handle.reset (newwin (height, width, y, x));
if (handle != NULL)
{
if (suppress_output)
wnoutrefresh (handle.get ());
scrollok (handle.get (), TRUE);
}
}
void
tui_win_info::make_window ()
{
tui_gen_win_info::make_window ();
if (handle != NULL && 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_gen_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 ()
{
struct tui_locator_window *locator = tui_locator_win_info_ptr ();
for (tui_win_info *win_info : all_tui_windows ())
{
if (win_info->is_visible ())
win_info->refresh_window ();
}
if (locator->is_visible ())
locator->refresh_window ();
}