Introduce max_height method

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

diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c
index f15cf314f019a80fdd013ebea31656b33a1b688c..3298eb8248c34c6f8e8a87980f60835a34d6fb90 100644 (file)
--- a/gdb/tui/tui-data.c
+++ b/gdb/tui/tui-data.c
@@ -38,7 +38,7 @@ static enum tui_layout_type current_layout = UNDEFINED_LAYOUT;
 static int term_height, term_width;
 static struct tui_gen_win_info _locator;
 static struct tui_gen_win_info exec_info[2];
-static std::vector<tui_win_info *> source_windows;
+static std::vector<tui_source_window_base *> source_windows;
 static struct tui_win_info *win_with_focus = NULL;
 static struct tui_layout_def layout_def = {
   SRC_WIN,                     /* DISPLAY_MODE */
@@ -63,12 +63,6 @@ static void free_content_elements (tui_win_content,
 ** PUBLIC FUNCTIONS
 **********************************/
 
-int
-tui_win_is_source_type (enum tui_win_type win_type)
-{
-  return (win_type == SRC_WIN || win_type == DISASSEM_WIN);
-}
-
 int
 tui_win_is_auxillary (enum tui_win_type win_type)
 {
@@ -130,7 +124,7 @@ 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_win_info *> &
+std::vector<tui_source_window_base *> &
 tui_source_windows ()
 {
   return source_windows;
@@ -151,7 +145,7 @@ tui_clear_source_windows ()
 void
 tui_clear_source_windows_detail ()
 {
-  for (tui_win_info *win : tui_source_windows ())
+  for (tui_source_window_base *win : tui_source_windows ())
     win->clear_detail ();
 }
 
@@ -160,7 +154,7 @@ tui_clear_source_windows_detail ()
    one source window (either source or disassembly), but both can be
    displayed at the same time.  */
 void
-tui_add_to_source_windows (struct tui_win_info *win_info)
+tui_add_to_source_windows (struct tui_source_window_base *win_info)
 {
   if (source_windows.size () < 2)
     source_windows.push_back (win_info);
@@ -190,12 +184,12 @@ tui_cmd_window::clear_detail ()
 void
 tui_data_window::clear_detail ()
 {
-  detail.data_display_info.data_content = NULL;
-  detail.data_display_info.data_content_count = 0;
-  detail.data_display_info.regs_content = NULL;
-  detail.data_display_info.regs_content_count = 0;
-  detail.data_display_info.regs_column_count = 1;
-  detail.data_display_info.display_regs = FALSE;
+  data_content = NULL;
+  data_content_count = 0;
+  regs_content = NULL;
+  regs_content_count = 0;
+  regs_column_count = 1;
+  display_regs = false;
 }
 
 /* Accessor for the source execution info ptr.  */
@@ -426,8 +420,8 @@ tui_init_generic_part (struct tui_gen_win_info *win)
     win->last_visible_line = 0;
   win->handle = NULL;
   win->content = NULL;
-  win->content_in_use =
-    win->is_visible = FALSE;
+  win->content_in_use = FALSE;
+  win->is_visible = false;
   win->title = 0;
 }
 
@@ -495,23 +489,6 @@ tui_source_window_base::tui_source_window_base (enum tui_win_type type)
   start_line_or_addr.u.addr = 0;
 }
 
-tui_data_window::tui_data_window ()
-  : tui_win_info (DATA_WIN)
-{
-  detail.data_display_info.data_content = (tui_win_content) NULL;
-  detail.data_display_info.data_content_count = 0;
-  detail.data_display_info.regs_content = (tui_win_content) NULL;
-  detail.data_display_info.regs_content_count = 0;
-  detail.data_display_info.regs_column_count = 1;
-  detail.data_display_info.display_regs = FALSE;
-  detail.data_display_info.current_group = 0;
-}
-
-tui_cmd_window::tui_cmd_window ()
-  : tui_win_info (CMD_WIN)
-{
-}
-
 struct tui_win_info *
 tui_alloc_win_info (enum tui_win_type type)
 {
@@ -614,16 +591,14 @@ tui_data_window::~tui_data_window ()
 {
   if (generic.content != NULL)
     {
-      tui_free_data_content (detail.data_display_info.regs_content,
-                            detail.data_display_info.regs_content_count);
-      detail.data_display_info.regs_content = NULL;
-      detail.data_display_info.regs_content_count = 0;
-      tui_free_data_content (detail.data_display_info.data_content,
-                            detail.data_display_info.data_content_count);
-      detail.data_display_info.data_content = NULL;
-      detail.data_display_info.data_content_count = 0;
-      detail.data_display_info.regs_column_count = 1;
-      detail.data_display_info.display_regs = FALSE;
+      tui_free_data_content (regs_content, regs_content_count);
+      regs_content = NULL;
+      regs_content_count = 0;
+      tui_free_data_content (data_content, data_content_count);
+      data_content = NULL;
+      data_content_count = 0;
+      regs_column_count = 1;
+      display_regs = false;
       generic.content = NULL;
       generic.content_size = 0;
     }
@@ -645,11 +620,10 @@ tui_win_info::~tui_win_info ()
 void
 tui_free_all_source_wins_content ()
 {
-  for (tui_win_info *win_info : tui_source_windows ())
+  for (tui_source_window_base *win_info : tui_source_windows ())
     {
       tui_free_win_content (&(win_info->generic));
-      tui_source_window_base *base = (tui_source_window_base *) win_info;
-      tui_free_win_content (base->execution_info);
+      tui_free_win_content (win_info->execution_info);
     }
 }