Simplify TUI boxing
[deliverable/binutils-gdb.git] / gdb / tui / tui-wingeneral.c
index 2f32f646c74f8abfb8ed995e8cdc99bc7825f8ff..e2d06bcebad77962bf93799efb20035e00360413 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
 ***********************/
-/*
-   ** tuiRefreshWin()
-   **        Refresh the window
- */
+
+/* See tui-data.h.  */
+
 void
-tuiRefreshWin (TuiGenWinInfoPtr winInfo)
+tui_gen_win_info::refresh_window ()
 {
-  if (winInfo->type == DATA_WIN && winInfo->contentSize > 0)
-    {
-      int i;
-
-      for (i = 0; (i < winInfo->contentSize); i++)
-       {
-         TuiGenWinInfoPtr dataItemWinPtr;
-
-         dataItemWinPtr = &((TuiWinContent)
-                            winInfo->content)[i]->whichElement.dataWindow;
-         if (m_genWinPtrNotNull (dataItemWinPtr) &&
-             dataItemWinPtr->handle != (WINDOW *) NULL)
-           wrefresh (dataItemWinPtr->handle);
-       }
-    }
-  else if (winInfo->type == CMD_WIN)
-    {
-      /* Do nothing */
-    }
-  else
+  if (handle != NULL)
     {
-      if (winInfo->handle != (WINDOW *) NULL)
-       wrefresh (winInfo->handle);
+      touchwin (handle);
+      wrefresh (handle);
     }
+}
 
-  return;
-}                              /* tuiRefreshWin */
-
-
-/*
-   ** tuiDelwin()
-   **        Function to delete the curses window, checking for null
- */
+/* Function to delete the curses window, checking for NULL.  */
 void
-tuiDelwin (WINDOW * window)
+tui_delete_win (WINDOW *window)
 {
-  if (window != (WINDOW *) NULL)
+  if (window != NULL)
     delwin (window);
-
-  return;
-}                              /* tuiDelwin */
+}
 
 
 /* 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);
     }
 }
 
 
-/*
-   ** unhighlightWin().
- */
 void
-unhighlightWin (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);
+      win_info->refresh_window ();
+      win_info->set_highlight (false);
     }
-}                              /* unhighlightWin */
+}
 
 
-/*
-   ** highlightWin().
- */
 void
-highlightWin (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);
+      win_info->refresh_window ();
+      win_info->set_highlight (true);
     }
-}                              /* highlightWin */
-
+}
 
-/*
-   ** checkAndDisplayHighlightIfNecessay
- */
 void
-checkAndDisplayHighlightIfNeeded (TuiWinInfoPtr winInfo)
+tui_win_info::check_and_display_highlight_if_needed ()
 {
-  if (m_winPtrNotNull (winInfo) && winInfo->generic.type != CMD_WIN)
+  if (can_highlight)
     {
-      if (winInfo->isHighlighted)
-       highlightWin (winInfo);
+      if (is_highlighted)
+       tui_highlight_win (this);
       else
-       unhighlightWin (winInfo);
-
+       tui_unhighlight_win (this);
     }
-  return;
-}                              /* checkAndDisplayHighlightIfNeeded */
+}
 
 
-/*
-   ** makeWindow().
- */
 void
-makeWindow (TuiGenWinInfoPtr winInfo, int boxIt)
+tui_make_window (struct tui_gen_win_info *win_info)
 {
   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 (win_info->can_box ())
+       box_win (win_info, NO_HILITE);
+      win_info->is_visible = true;
       scrollok (handle, TRUE);
     }
 }
 
 
-/*
-   ** makeVisible().
-   **        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.
- */
+/* 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.  */
 void
-makeVisible (TuiGenWinInfoPtr winInfo, int visible)
+tui_gen_win_info::make_visible (bool visible)
 {
-  /* Don't tear down/recreate command window */
-  if (winInfo->type == CMD_WIN)
+  if (is_visible == visible)
     return;
+  is_visible = visible;
 
   if (visible)
+    tui_make_window (this);
+  else
     {
-      if (!winInfo->isVisible)
-       {
-         makeWindow (
-                      winInfo,
-          (winInfo->type != CMD_WIN && !m_winIsAuxillary (winInfo->type)));
-         winInfo->isVisible = TRUE;
-       }
-    }
-  else if (!visible &&
-          winInfo->isVisible && winInfo->handle != (WINDOW *) NULL)
-    {
-      winInfo->isVisible = FALSE;
-      tuiDelwin (winInfo->handle);
-      winInfo->handle = (WINDOW *) NULL;
+      tui_delete_win (handle);
+      handle = NULL;
     }
+}
 
-  return;
-}                              /* makeVisible */
-
+/* See tui-wingeneral.h.  */
 
-/*
-   ** makeAllVisible().
-   **        Makes all windows invisible (except the command and locator windows)
- */
 void
-makeAllVisible (int visible)
+tui_make_all_invisible (void)
 {
-  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))
-           makeVisible ((winList[i])->detail.sourceInfo.executionInfo,
-                        visible);
-         makeVisible ((TuiGenWinInfoPtr) winList[i], visible);
-       }
-    }
+  for (tui_win_info *win_info : all_tui_windows ())
+    win_info->make_visible (false);
+}
 
-  return;
-}                              /* makeAllVisible */
+/* Function to refresh all the windows currently displayed.  */
 
-/*
-   ** refreshAll().
-   **        Function to refresh all the windows currently displayed
- */
 void
-refreshAll (TuiWinInfoPtr * list)
+tui_refresh_all ()
 {
-  TuiWinType type;
-  TuiGenWinInfoPtr locator = locatorWinInfoPtr ();
+  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.isVisible)
-       {
-         if (type == SRC_WIN || type == DISASSEM_WIN)
-           {
-             touchwin (list[type]->detail.sourceInfo.executionInfo->handle);
-             tuiRefreshWin (list[type]->detail.sourceInfo.executionInfo);
-           }
-         touchwin (list[type]->generic.handle);
-         tuiRefreshWin (&list[type]->generic);
-       }
+      if (win_info->is_visible)
+       win_info->refresh_window ();
     }
-  if (locator->isVisible)
-    {
-      touchwin (locator->handle);
-      tuiRefreshWin (locator);
-    }
-
-  return;
-}                              /* refreshAll */
+  if (locator->is_visible)
+    locator->refresh_window ();
+}
 
 
 /*********************************
This page took 0.027958 seconds and 4 git commands to generate.