X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Ftui%2Ftui-wingeneral.c;h=cf8d9fc395937df63d317c0c38a3c94f0d4ffde4;hb=268a13a5a3f7c6b9b6ffc5ac2d1b24eb41f3fbdc;hp=d293539ab281642deb72547f86c6c5e1ab8061eb;hpb=ec7d9e561ff8a802a917d05e2c294436cb07e19f;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c
index d293539ab2..cf8d9fc395 100644
--- a/gdb/tui/tui-wingeneral.c
+++ b/gdb/tui/tui-wingeneral.c
@@ -1,7 +1,6 @@
/* General window behavior.
- Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation,
- Inc.
+ Copyright (C) 1998-2019 Free Software Foundation, Inc.
Contributed by Hewlett-Packard Company.
@@ -9,7 +8,7 @@
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 2 of the License, or
+ 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,
@@ -18,9 +17,7 @@
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, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
#include "defs.h"
#include "tui/tui.h"
@@ -28,122 +25,115 @@
#include "tui/tui-wingeneral.h"
#include "tui/tui-win.h"
-#ifdef HAVE_NCURSES_H
-#include
-#else
-#ifdef HAVE_CURSES_H
-#include
-#endif
-#endif
+#include "gdb_curses.h"
/***********************
** PUBLIC FUNCTIONS
***********************/
-/* Refresh the window. */
+/* See tui-data.h. */
+
void
-tui_refresh_win (TuiGenWinInfoPtr winInfo)
+tui_gen_win_info::refresh_window ()
{
- if (winInfo->type == DATA_WIN && winInfo->contentSize > 0)
- {
- int i;
+ if (handle != NULL)
+ wrefresh (handle);
+}
- for (i = 0; (i < winInfo->contentSize); i++)
- {
- TuiGenWinInfoPtr dataItemWinPtr;
+/* See tui-data.h. */
- dataItemWinPtr = &((TuiWinContent)
- winInfo->content)[i]->whichElement.dataWindow;
- if (m_genWinPtrNotNull (dataItemWinPtr) &&
- dataItemWinPtr->handle != (WINDOW *) NULL)
- wrefresh (dataItemWinPtr->handle);
- }
- }
- else if (winInfo->type == CMD_WIN)
+void
+tui_data_window::refresh_window ()
+{
+ if (!regs_content.empty ())
{
- /* Do nothing */
+ for (auto &&win : regs_content)
+ {
+ if (win != NULL && win->handle != NULL)
+ wrefresh (win->handle);
+ }
}
else
- {
- if (winInfo->handle != (WINDOW *) NULL)
- wrefresh (winInfo->handle);
- }
-
- return;
+ tui_gen_win_info::refresh_window ();
}
-
-/* Function to delete the curses window, checking for NULL. */
+/* Function to delete the curses window, checking for NULL. */
void
-tui_delete_win (WINDOW * window)
+tui_delete_win (WINDOW *window)
{
- if (window != (WINDOW *) NULL)
+ if (window != NULL)
delwin (window);
-
- return;
}
/* Draw a border arround the window. */
-void
-boxWin (TuiGenWinInfoPtr winInfo, int highlightFlag)
+static void
+box_win (struct tui_gen_win_info *win_info,
+ int highlight_flag)
{
- if (winInfo && winInfo->handle)
+ if (win_info && win_info->handle)
{
WINDOW *win;
int attrs;
- win = winInfo->handle;
- if (highlightFlag == HILITE)
+ win = win_info->handle;
+ if (highlight_flag == HILITE)
attrs = tui_active_border_attrs;
else
attrs = tui_border_attrs;
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);
- if (winInfo->title)
- mvwaddstr (win, 0, 3, winInfo->title);
+#else
+ box (win, tui_border_vline, tui_border_hline);
+#endif
+ if (win_info->title)
+ mvwaddstr (win, 0, 3, win_info->title);
wattroff (win, attrs);
}
}
void
-tui_unhighlight_win (TuiWinInfoPtr winInfo)
+tui_unhighlight_win (struct tui_win_info *win_info)
{
- if (m_winPtrNotNull (winInfo) && winInfo->generic.handle != (WINDOW *) NULL)
+ if (win_info != NULL
+ && win_info->can_highlight
+ && win_info->handle != NULL)
{
- boxWin ((TuiGenWinInfoPtr) winInfo, NO_HILITE);
- wrefresh (winInfo->generic.handle);
- m_setWinHighlightOff (winInfo);
+ box_win (win_info, NO_HILITE);
+ wrefresh (win_info->handle);
+ win_info->set_highlight (false);
}
}
void
-tui_highlight_win (TuiWinInfoPtr winInfo)
+tui_highlight_win (struct tui_win_info *win_info)
{
- if (m_winPtrNotNull (winInfo) &&
- winInfo->canHighlight && winInfo->generic.handle != (WINDOW *) NULL)
+ if (win_info != NULL
+ && win_info->can_highlight
+ && win_info->handle != NULL)
{
- boxWin ((TuiGenWinInfoPtr) winInfo, HILITE);
- wrefresh (winInfo->generic.handle);
- m_setWinHighlightOn (winInfo);
+ box_win (win_info, HILITE);
+ wrefresh (win_info->handle);
+ win_info->set_highlight (true);
}
}
void
-tui_check_and_display_highlight_if_needed (TuiWinInfoPtr winInfo)
+tui_check_and_display_highlight_if_needed (struct tui_win_info *win_info)
{
- if (m_winPtrNotNull (winInfo) && winInfo->generic.type != CMD_WIN)
+ if (win_info != NULL && win_info->type != CMD_WIN)
{
- if (winInfo->isHighlighted)
- tui_highlight_win (winInfo);
+ if (win_info->is_highlighted)
+ tui_highlight_win (win_info);
else
- tui_unhighlight_win (winInfo);
+ tui_unhighlight_win (win_info);
}
return;
@@ -151,20 +141,20 @@ tui_check_and_display_highlight_if_needed (TuiWinInfoPtr winInfo)
void
-tui_make_window (TuiGenWinInfoPtr winInfo, int boxIt)
+tui_make_window (struct tui_gen_win_info *win_info, enum tui_box box_it)
{
WINDOW *handle;
- handle = newwin (winInfo->height,
- winInfo->width,
- winInfo->origin.y,
- winInfo->origin.x);
- winInfo->handle = handle;
- if (handle != (WINDOW *) NULL)
+ handle = newwin (win_info->height,
+ win_info->width,
+ win_info->origin.y,
+ win_info->origin.x);
+ win_info->handle = handle;
+ if (handle != NULL)
{
- if (boxIt == BOX_WINDOW)
- boxWin (winInfo, NO_HILITE);
- winInfo->isVisible = TRUE;
+ if (box_it == BOX_WINDOW)
+ box_win (win_info, NO_HILITE);
+ win_info->is_visible = true;
scrollok (handle, TRUE);
}
}
@@ -173,63 +163,61 @@ tui_make_window (TuiGenWinInfoPtr winInfo, int boxIt)
/* 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. */
-static void
-make_visible (struct tui_gen_win_info *win_info, int visible)
+void
+tui_gen_win_info::make_visible (bool visible)
{
- /* Don't tear down/recreate command window */
- if (win_info->type == CMD_WIN)
- return;
-
if (visible)
{
- if (!win_info->isVisible)
+ if (!is_visible)
{
- tui_make_window (win_info,
- (win_info->type != CMD_WIN
- && !m_winIsAuxillary (win_info->type)));
- win_info->isVisible = TRUE;
+ tui_make_window (this, (tui_win_is_auxiliary (type)
+ ? DONT_BOX_WINDOW : BOX_WINDOW));
+ is_visible = true;
}
}
- else if (!visible &&
- win_info->isVisible && win_info->handle != (WINDOW *) NULL)
+ else if (!visible
+ && is_visible
+ && handle != NULL)
{
- win_info->isVisible = FALSE;
- tui_delete_win (win_info->handle);
- win_info->handle = (WINDOW *) NULL;
+ is_visible = false;
+ tui_delete_win (handle);
+ handle = NULL;
}
-
- return;
}
void
tui_make_visible (struct tui_gen_win_info *win_info)
{
- make_visible (win_info, 1);
+ win_info->make_visible (true);
}
void
tui_make_invisible (struct tui_gen_win_info *win_info)
{
- make_visible (win_info, 0);
+ win_info->make_visible (false);
}
+/* See tui-data.h. */
-/* Makes all windows invisible (except the command and locator windows). */
+void
+tui_source_window_base::make_visible (bool visible)
+{
+ if (execution_info != nullptr)
+ execution_info->make_visible (visible);
+ tui_win_info::make_visible (visible);
+}
+
+/* Makes all windows invisible (except the command and locator
+ windows). */
static void
-make_all_visible (int visible)
+make_all_visible (bool visible)
{
int i;
for (i = 0; i < MAX_MAJOR_WINDOWS; i++)
{
- if (m_winPtrNotNull (winList[i]) &&
- ((winList[i])->generic.type) != CMD_WIN)
- {
- if (m_winIsSourceType ((winList[i])->generic.type))
- make_visible ((winList[i])->detail.sourceInfo.executionInfo,
- visible);
- make_visible ((TuiGenWinInfoPtr) winList[i], visible);
- }
+ if (tui_win_list[i] != NULL)
+ tui_win_list[i]->make_visible (visible);
}
return;
@@ -238,44 +226,53 @@ make_all_visible (int visible)
void
tui_make_all_visible (void)
{
- make_all_visible (1);
+ make_all_visible (true);
}
void
tui_make_all_invisible (void)
{
- make_all_visible (0);
+ make_all_visible (false);
+}
+
+/* See tui-data.h. */
+
+void
+tui_win_info::refresh ()
+{
+ touchwin (handle);
+ refresh_window ();
+}
+
+/* See tui-data.h. */
+
+void
+tui_source_window_base::refresh ()
+{
+ touchwin (execution_info->handle);
+ execution_info->refresh_window ();
+ tui_win_info::refresh ();
}
/* Function to refresh all the windows currently displayed. */
void
-tui_refresh_all (TuiWinInfoPtr * list)
+tui_refresh_all (struct tui_win_info **list)
{
- TuiWinType type;
- TuiGenWinInfoPtr locator = locatorWinInfoPtr ();
+ int type;
+ struct tui_locator_window *locator = tui_locator_win_info_ptr ();
for (type = SRC_WIN; (type < MAX_MAJOR_WINDOWS); type++)
{
- if (list[type] && list[type]->generic.isVisible)
- {
- if (type == SRC_WIN || type == DISASSEM_WIN)
- {
- touchwin (list[type]->detail.sourceInfo.executionInfo->handle);
- tui_refresh_win (list[type]->detail.sourceInfo.executionInfo);
- }
- touchwin (list[type]->generic.handle);
- tui_refresh_win (&list[type]->generic);
- }
+ if (list[type] && list[type]->is_visible)
+ list[type]->refresh ();
}
- if (locator->isVisible)
+ if (locator->is_visible)
{
touchwin (locator->handle);
- tui_refresh_win (locator);
+ locator->refresh_window ();
}
-
- return;
-} /* refreshAll */
+}
/*********************************