Merge refresh and refresh_window methods
[deliverable/binutils-gdb.git] / gdb / tui / tui-wingeneral.c
index 9239a0519a06f147c2cb6bfb2d3f5a46fb887fc6..2902b8006b75621c371ec3a1fc1072aa1c1d5a48 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,
@@ -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 <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "tui/tui.h"
 #include "tui/tui-wingeneral.h"
 #include "tui/tui-win.h"
 
-#ifdef HAVE_NCURSES_H       
-#include <ncurses.h>
-#else
-#ifdef HAVE_CURSES_H
-#include <curses.h>
-#endif
-#endif
+#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)
+  if (handle != NULL)
     {
-      int i;
+      touchwin (handle);
+      wrefresh (handle);
+    }
+}
 
-      for (i = 0; (i < win_info->content_size); i++)
-       {
-         struct tui_gen_win_info * dataItemWinPtr;
+/* See tui-data.h.  */
 
-         dataItemWinPtr = &((tui_win_content)
-                            win_info->content)[i]->which_element.data_window;
-         if (dataItemWinPtr != NULL
-             && dataItemWinPtr->handle != (WINDOW *) NULL)
-           wrefresh (dataItemWinPtr->handle);
-       }
-    }
-  else if (win_info->type == CMD_WIN)
-    {
-      /* Do nothing */
-    }
-  else
+void
+tui_data_window::refresh_window ()
+{
+  if (!regs_content.empty ())
     {
-      if (win_info->handle != (WINDOW *) NULL)
-       wrefresh (win_info->handle);
+      for (auto &&win : regs_content)
+       {
+         if (win != NULL)
+           win->refresh_window ();
+       }
     }
-
-  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 (struct tui_gen_win_info * win_info, int highlightFlag)
+static void
+box_win (struct tui_gen_win_info *win_info, 
+        int highlight_flag)
 {
   if (win_info && win_info->handle)
     {
@@ -94,16 +79,20 @@ boxWin (struct tui_gen_win_info * win_info, int highlightFlag)
       int attrs;
 
       win = win_info->handle;
-      if (highlightFlag == HILITE)
+      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);
+#else
+      box (win, tui_border_vline, tui_border_hline);
+#endif
       if (win_info->title)
         mvwaddstr (win, 0, 3, win_info->title);
       wattroff (win, attrs);
@@ -112,34 +101,36 @@ boxWin (struct tui_gen_win_info * win_info, int highlightFlag)
 
 
 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)
     {
-      boxWin ((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, NO_HILITE);
+      wrefresh (win_info->handle);
+      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)
     {
-      boxWin ((struct tui_gen_win_info *) win_info, HILITE);
-      wrefresh (win_info->generic.handle);
-      tui_set_win_highlight (win_info, 1);
+      box_win (win_info, HILITE);
+      wrefresh (win_info->handle);
+      win_info->set_highlight (true);
     }
 }
 
 void
-tui_check_and_display_highlight_if_needed (struct tui_win_info * win_info)
+tui_check_and_display_highlight_if_needed (struct tui_win_info *win_info)
 {
-  if (win_info != NULL && win_info->generic.type != CMD_WIN)
+  if (win_info != NULL && win_info->can_highlight)
     {
       if (win_info->is_highlighted)
        tui_highlight_win (win_info);
@@ -152,7 +143,7 @@ tui_check_and_display_highlight_if_needed (struct tui_win_info * win_info)
 
 
 void
-tui_make_window (struct tui_gen_win_info * win_info, int boxIt)
+tui_make_window (struct tui_gen_win_info *win_info, enum tui_box box_it)
 {
   WINDOW *handle;
 
@@ -161,11 +152,11 @@ tui_make_window (struct tui_gen_win_info * win_info, int boxIt)
                   win_info->origin.y,
                   win_info->origin.x);
   win_info->handle = handle;
-  if (handle != (WINDOW *) NULL)
+  if (handle != NULL)
     {
-      if (boxIt == BOX_WINDOW)
-       boxWin (win_info, NO_HILITE);
-      win_info->is_visible = TRUE;
+      if (box_it == BOX_WINDOW)
+       box_win (win_info, NO_HILITE);
+      win_info->is_visible = true;
       scrollok (handle, TRUE);
     }
 }
@@ -174,109 +165,95 @@ tui_make_window (struct tui_gen_win_info * win_info, 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->is_visible)
+      if (!is_visible)
        {
-         tui_make_window (win_info,
-                          (win_info->type != CMD_WIN
-                           && !tui_win_is_auxillary (win_info->type)));
-         win_info->is_visible = TRUE;
+         tui_make_window (this, (tui_win_is_auxiliary (type)
+                                 ? DONT_BOX_WINDOW : BOX_WINDOW));
+         is_visible = true;
        }
     }
-  else if (!visible &&
-          win_info->is_visible && win_info->handle != (WINDOW *) NULL)
+  else if (!visible
+          && is_visible
+          && handle != NULL)
     {
-      win_info->is_visible = 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).   */
-static void
-make_all_visible (int visible)
+void
+tui_source_window_base::make_visible (bool 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);
-       }
-    }
+  if (execution_info != nullptr)
+    execution_info->make_visible (visible);
+  tui_win_info::make_visible (visible);
+}
 
-  return;
+/* Makes all windows invisible (except the command and locator
+   windows).  */
+static void
+make_all_visible (bool visible)
+{
+  for (tui_win_info *win_info : all_tui_windows ())
+    win_info->make_visible (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_source_window_base::refresh_window ()
+{
+  execution_info->refresh_window ();
+  tui_win_info::refresh_window ();
 }
 
 /* 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++)
+  for (tui_win_info *win_info : all_tui_windows ())
     {
-      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 (win_info->is_visible)
+       win_info->refresh_window ();
     }
   if (locator->is_visible)
-    {
-      touchwin (locator->handle);
-      tui_refresh_win (locator);
-    }
-
-  return;
-}                              /* refreshAll */
+    locator->refresh_window ();
+}
 
 
 /*********************************
This page took 0.027817 seconds and 4 git commands to generate.