Remove two TUI comments

[deliverable/binutils-gdb.git] / gdb / tui / tui-data.c

diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c
index bb725c199ccfe79e9ca8388590c514eed76ecbfd..748d897821806271aa0955a7a62ebd67f7dcafed 100644 (file)
--- a/gdb/tui/tui-data.c
+++ b/gdb/tui/tui-data.c
@@ -27,25 +27,12 @@
 #include "tui/tui-winsource.h"
 #include "gdb_curses.h"
 
-/****************************
-** GLOBAL DECLARATIONS
-****************************/
 struct tui_win_info *tui_win_list[MAX_MAJOR_WINDOWS];
 
-/***************************
-** Private data
-****************************/
 static int term_height, term_width;
-static struct tui_locator_window _locator;
-static std::vector<tui_source_window_base *> source_windows;
 static struct tui_win_info *win_with_focus = NULL;
 
-static int win_resized = FALSE;
-
-
-/*********************************
-** PUBLIC FUNCTIONS
-**********************************/
+static bool win_resized = false;
 
 int
 tui_win_is_auxiliary (enum tui_win_type win_type)
@@ -53,13 +40,9 @@ tui_win_is_auxiliary (enum tui_win_type win_type)
   return (win_type > MAX_MAJOR_WINDOWS);
 }
 
-/******************************************
-** ACCESSORS & MUTATORS FOR PRIVATE DATA
-******************************************/
-
 /* Answer a whether the terminal window has been resized or not.  */
-int
-tui_win_resized (void)
+bool
+tui_win_resized ()
 {
   return win_resized;
 }
@@ -67,7 +50,7 @@ tui_win_resized (void)
 
 /* Set a whether the terminal window has been resized or not.  */
 void
-tui_set_win_resized_to (int resized)
+tui_set_win_resized_to (bool resized)
 {
   win_resized = resized;
 }
@@ -89,54 +72,6 @@ tui_set_win_with_focus (struct tui_win_info *win_info)
 }
 
 
-/* Accessor for the current source window.  Usually there is only one
-   source window (either source or disassembly), but both can be
-   displayed at the same time.  */
-std::vector<tui_source_window_base *> &
-tui_source_windows ()
-{
-  return source_windows;
-}
-
-
-/* Clear the list of source windows.  Usually there is only one source
-   window (either source or disassembly), but both can be displayed at
-   the same time.  */
-void
-tui_clear_source_windows ()
-{
-  source_windows.clear ();
-}
-
-
-/* Clear the pertinent detail in the source windows.  */
-void
-tui_clear_source_windows_detail ()
-{
-  for (tui_source_window_base *win : tui_source_windows ())
-    win->clear_detail ();
-}
-
-
-/* Add a window to the list of source windows.  Usually there is only
-   one source window (either source or disassembly), but both can be
-   displayed at the same time.  */
-void
-tui_add_to_source_windows (struct tui_source_window_base *win_info)
-{
-  if (source_windows.size () < 2)
-    source_windows.push_back (win_info);
-}
-
-/* Accessor for the locator win info.  Answers a pointer to the static
-   locator win info struct.  */
-struct tui_locator_window *
-tui_locator_win_info_ptr (void)
-{
-  return &_locator;
-}
-
-
 /* Accessor for the term_height.  */
 int
 tui_term_height (void)
@@ -169,11 +104,6 @@ tui_set_term_width_to (int w)
 }
 
 
-/*****************************
-** OTHER PUBLIC FUNCTIONS
-*****************************/
-
-
 /* Answer the next window in the list, cycling back to the top if
    necessary.  */
 struct tui_win_info *
@@ -189,7 +119,7 @@ tui_next_win (struct tui_win_info *cur_win)
   while (type != cur_win->type && (next_win == NULL))
     {
       if (tui_win_list[type]
-         && tui_win_list[type]->is_visible)
+         && tui_win_list[type]->is_visible ())
        next_win = tui_win_list[type];
       else
        {
@@ -219,7 +149,7 @@ tui_prev_win (struct tui_win_info *cur_win)
   while (type != cur_win->type && (prev == NULL))
     {
       if (tui_win_list[type]
-         && tui_win_list[type]->is_visible)
+         && tui_win_list[type]->is_visible ())
        prev = tui_win_list[type];
       else
        {
@@ -253,22 +183,6 @@ tui_partial_win_by_name (const char *name)
   return NULL;
 }
 
-
-void
-tui_initialize_static_data ()
-{
-  tui_gen_win_info *win = tui_locator_win_info_ptr ();
-  win->width =
-    win->height =
-    win->origin.x =
-    win->origin.y =
-    win->viewport_height =
-    win->last_visible_line = 0;
-  win->handle = NULL;
-  win->is_visible = false;
-  win->title = 0;
-}
-
 /* See tui-data.h.  */
 
 void
@@ -277,7 +191,7 @@ tui_delete_invisible_windows ()
   for (int win_type = SRC_WIN; (win_type < MAX_MAJOR_WINDOWS); win_type++)
     {
       if (tui_win_list[win_type] != NULL
-         && !tui_win_list[win_type]->is_visible)
+         && !tui_win_list[win_type]->is_visible ())
        {
          /* This should always be made visible before a call to this
             function.  */
@@ -300,5 +214,10 @@ tui_win_info::tui_win_info (enum tui_win_type type)
 tui_gen_win_info::~tui_gen_win_info ()
 {
   tui_delete_win (handle);
-  xfree (title);
+}
+
+void
+tui_win_info::rerender ()
+{
+  check_and_display_highlight_if_needed ();
 }