/* General window behavior.
- Copyright (C) 1998-2019 Free Software Foundation, Inc.
+ Copyright (C) 1998-2020 Free Software Foundation, Inc.
Contributed by Hewlett-Packard Company.
#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"
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,
}
}
wattroff (win, attrs);
+ tui_apply_style (win, ui_file_style ());
}
tui_unhighlight_win (struct tui_win_info *win_info)
{
if (win_info != NULL
- && win_info->can_highlight
+ && win_info->can_box ()
&& win_info->handle != NULL)
{
box_win (win_info, false);
tui_highlight_win (struct tui_win_info *win_info)
{
if (win_info != NULL
- && win_info->can_highlight
+ && win_info->can_box ()
&& win_info->handle != NULL)
{
box_win (win_info, true);
void
tui_win_info::check_and_display_highlight_if_needed ()
{
- if (can_highlight)
+ if (can_box ())
{
if (is_highlighted)
tui_highlight_win (this);
void
tui_gen_win_info::make_window ()
{
- handle.reset (newwin (height, width, origin.y, origin.x));
+ handle.reset (newwin (height, width, y, x));
if (handle != NULL)
scrollok (handle.get (), TRUE);
}