Rename a private data member in tui_source_window
[deliverable/binutils-gdb.git] / gdb / tui / tui-wingeneral.c
index c99f97847fa54793b785796ffcc2416e74689eb6..235c17c5fa28a36b68f37dd883bec32c7f89601e 100644 (file)
@@ -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,
    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 <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "tui/tui.h"
 #include "tui/tui-data.h"
 #include "tui/tui-wingeneral.h"
 #include "tui/tui-win.h"
+#include "tui/tui-stack.h"
 
 #include "gdb_curses.h"
 
 ** PUBLIC FUNCTIONS
 ***********************/
 
-/* Refresh the window.   */
+/* See tui-data.h.  */
+
 void
-tui_refresh_win (struct tui_gen_win_info * win_info)
+tui_gen_win_info::refresh_window ()
 {
-  if (win_info->type == DATA_WIN && win_info->content_size > 0)
-    {
-      int i;
-
-      for (i = 0; (i < win_info->content_size); i++)
-       {
-         struct tui_gen_win_info * data_item_win_ptr;
-
-         data_item_win_ptr = &((tui_win_content)
-                            win_info->content)[i]->which_element.data_window;
-         if (data_item_win_ptr != NULL
-             && data_item_win_ptr->handle != (WINDOW *) NULL)
-           wrefresh (data_item_win_ptr->handle);
-       }
-    }
-  else if (win_info->type == CMD_WIN)
-    {
-      /* Do nothing */
-    }
-  else
-    {
-      if (win_info->handle != (WINDOW *) NULL)
-       wrefresh (win_info->handle);
-    }
-
-  return;
+  if (handle != NULL)
+    wrefresh (handle);
 }
 
-
-/* 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
-box_win (struct tui_gen_win_info * win_info, int highlight_flag)
+static void
+box_win (struct tui_win_info *win_info, 
+        bool highlight_flag)
 {
-  if (win_info && win_info->handle)
-    {
-      WINDOW *win;
-      int attrs;
+  WINDOW *win;
+  int attrs;
 
-      win = win_info->handle;
-      if (highlight_flag == HILITE)
-        attrs = tui_active_border_attrs;
-      else
-        attrs = tui_border_attrs;
+  win = win_info->handle;
+  if (highlight_flag)
+    attrs = tui_active_border_attrs;
+  else
+    attrs = tui_border_attrs;
 
-      wattron (win, 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);
+  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);
+  box (win, tui_border_vline, tui_border_hline);
 #endif
-      if (win_info->title)
-        mvwaddstr (win, 0, 3, win_info->title);
-      wattroff (win, attrs);
+  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, 3, win_info->title.c_str ());
+      else
+       {
+         std::string truncated
+           = "..." + win_info->title.substr (win_info->title.size ()
+                                             - max_len + 3);
+         mvwaddstr (win, 0, 3, truncated.c_str ());
+       }
     }
+  wattroff (win, attrs);
 }
 
 
 void
-tui_unhighlight_win (struct tui_win_info * win_info)
+tui_unhighlight_win (struct tui_win_info *win_info)
 {
-  if (win_info != NULL && win_info->generic.handle != (WINDOW *) NULL)
+  if (win_info != NULL 
+      && win_info->can_highlight
+      && win_info->handle != NULL)
     {
-      box_win ((struct tui_gen_win_info *) win_info, NO_HILITE);
-      wrefresh (win_info->generic.handle);
-      tui_set_win_highlight (win_info, 0);
+      box_win (win_info, false);
+      win_info->refresh_window ();
+      win_info->set_highlight (false);
     }
 }
 
 
 void
-tui_highlight_win (struct tui_win_info * win_info)
+tui_highlight_win (struct tui_win_info *win_info)
 {
   if (win_info != NULL
       && win_info->can_highlight
-      && win_info->generic.handle != (WINDOW *) NULL)
+      && win_info->handle != NULL)
     {
-      box_win ((struct tui_gen_win_info *) win_info, HILITE);
-      wrefresh (win_info->generic.handle);
-      tui_set_win_highlight (win_info, 1);
+      box_win (win_info, true);
+      win_info->refresh_window ();
+      win_info->set_highlight (true);
     }
 }
 
 void
-tui_check_and_display_highlight_if_needed (struct tui_win_info * win_info)
+tui_win_info::check_and_display_highlight_if_needed ()
 {
-  if (win_info != NULL && win_info->generic.type != CMD_WIN)
+  if (can_highlight)
     {
-      if (win_info->is_highlighted)
-       tui_highlight_win (win_info);
+      if (is_highlighted)
+       tui_highlight_win (this);
       else
-       tui_unhighlight_win (win_info);
-
+       tui_unhighlight_win (this);
     }
-  return;
 }
 
 
 void
-tui_make_window (struct tui_gen_win_info * win_info, int box_it)
+tui_gen_win_info::make_window ()
 {
-  WINDOW *handle;
-
-  handle = newwin (win_info->height,
-                  win_info->width,
-                  win_info->origin.y,
-                  win_info->origin.x);
-  win_info->handle = handle;
-  if (handle != (WINDOW *) NULL)
-    {
-      if (box_it == BOX_WINDOW)
-       box_win (win_info, NO_HILITE);
-      win_info->is_visible = TRUE;
-      scrollok (handle, TRUE);
-    }
+  handle = newwin (height, width, origin.y, origin.x);
+  if (handle != NULL)
+    scrollok (handle, 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.  */
-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)
+  if (is_visible () == visible)
     return;
 
   if (visible)
+    make_window ();
+  else
     {
-      if (!win_info->is_visible)
-       {
-         tui_make_window (win_info,
-                          (win_info->type != CMD_WIN
-                           && !tui_win_is_auxillary (win_info->type)));
-         win_info->is_visible = TRUE;
-       }
-    }
-  else if (!visible &&
-          win_info->is_visible && win_info->handle != (WINDOW *) NULL)
-    {
-      win_info->is_visible = FALSE;
-      tui_delete_win (win_info->handle);
-      win_info->handle = (WINDOW *) NULL;
-    }
-
-  return;
-}
-
-void
-tui_make_visible (struct tui_gen_win_info *win_info)
-{
-  make_visible (win_info, 1);
-}
-
-void
-tui_make_invisible (struct tui_gen_win_info *win_info)
-{
-  make_visible (win_info, 0);
-}
-
-
-/* Makes all windows invisible (except the command and locator windows).   */
-static void
-make_all_visible (int visible)
-{
-  int i;
-
-  for (i = 0; i < MAX_MAJOR_WINDOWS; i++)
-    {
-      if (tui_win_list[i] != NULL
-         && ((tui_win_list[i])->generic.type) != CMD_WIN)
-       {
-         if (tui_win_is_source_type ((tui_win_list[i])->generic.type))
-           make_visible ((tui_win_list[i])->detail.source_info.execution_info,
-                         visible);
-         make_visible ((struct tui_gen_win_info *) tui_win_list[i], visible);
-       }
+      tui_delete_win (handle);
+      handle = NULL;
     }
-
-  return;
 }
 
-void
-tui_make_all_visible (void)
-{
-  make_all_visible (1);
-}
+/* See tui-wingeneral.h.  */
 
 void
 tui_make_all_invisible (void)
 {
-  make_all_visible (0);
+  for (tui_win_info *win_info : all_tui_windows ())
+    win_info->make_visible (false);
 }
 
 /* Function to refresh all the windows currently displayed.  */
 
 void
-tui_refresh_all (struct tui_win_info * * list)
+tui_refresh_all ()
 {
-  enum tui_win_type type;
-  struct tui_gen_win_info * locator = tui_locator_win_info_ptr ();
+  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.is_visible)
-       {
-         if (type == SRC_WIN || type == DISASSEM_WIN)
-           {
-             touchwin (list[type]->detail.source_info.execution_info->handle);
-             tui_refresh_win (list[type]->detail.source_info.execution_info);
-           }
-         touchwin (list[type]->generic.handle);
-         tui_refresh_win (&list[type]->generic);
-       }
-    }
-  if (locator->is_visible)
+  for (tui_win_info *win_info : all_tui_windows ())
     {
-      touchwin (locator->handle);
-      tui_refresh_win (locator);
+      if (win_info->is_visible ())
+       win_info->refresh_window ();
     }
+  if (locator->is_visible ())
+    locator->refresh_window ();
 }
 
 
This page took 0.03536 seconds and 4 git commands to generate.