Updated copyright notices for most files.

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

diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c
index 12fc4158482756d1a64ff8accf31f2c9df3fba2c..977820755abe2cee745b01624eae27e63404cf60 100644 (file)
--- a/gdb/tui/tui-wingeneral.c
+++ b/gdb/tui/tui-wingeneral.c
@@ -1,7 +1,7 @@
 /* General window behavior.
 
 /* General window behavior.
 

-   Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation,
-   Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2007, 2008
+   Free Software Foundation, Inc.

 
    Contributed by Hewlett-Packard Company.
 
 
    Contributed by Hewlett-Packard Company.
 


@@ -9,7 +9,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
 
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -18,9 +18,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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 "defs.h"
 #include "tui/tui.h"


@@ -28,54 +26,48 @@
 #include "tui/tui-wingeneral.h"
 #include "tui/tui-win.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
 ***********************/
 
 
 /***********************
 ** PUBLIC FUNCTIONS
 ***********************/
 

-/* Refresh the window.   */
+/* Refresh the window.  */

 void
 void

-tui_refresh_win (struct tui_gen_win_info * winInfo)
+tui_refresh_win (struct tui_gen_win_info *win_info)

 {
 {

-  if (winInfo->type == DATA_WIN && winInfo->contentSize > 0)
+  if (win_info->type == DATA_WIN && win_info->content_size > 0)

     {
       int i;
 
     {
       int i;
 

-      for (i = 0; (i < winInfo->contentSize); i++)
+      for (i = 0; (i < win_info->content_size); i++)

        {
        {

-         struct tui_gen_win_info * dataItemWinPtr;
+         struct tui_gen_win_info *data_item_win_ptr;

 
 

-         dataItemWinPtr = &((tui_win_content)
-                            winInfo->content)[i]->whichElement.dataWindow;
-         if (m_genWinPtrNotNull (dataItemWinPtr) &&
-             dataItemWinPtr->handle != (WINDOW *) NULL)
-           wrefresh (dataItemWinPtr->handle);
+         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 (winInfo->type == CMD_WIN)
+  else if (win_info->type == CMD_WIN)

     {
     {

-      /* Do nothing */
+      /* Do nothing.  */

     }
   else
     {
     }
   else
     {

-      if (winInfo->handle != (WINDOW *) NULL)
-       wrefresh (winInfo->handle);
+      if (win_info->handle != (WINDOW *) NULL)
+       wrefresh (win_info->handle);

     }
 
   return;
 }
 
 
     }
 
   return;
 }
 
 

-/* Function to delete the curses window, checking for NULL.   */
+/* Function to delete the curses window, checking for NULL.  */

 void
 void

-tui_delete_win (WINDOW * window)
+tui_delete_win (WINDOW *window)

 {
   if (window != (WINDOW *) NULL)
     delwin (window);
 {
   if (window != (WINDOW *) NULL)
     delwin (window);


@@ -86,64 +78,71 @@ tui_delete_win (WINDOW * window)
 
 /* Draw a border arround the window.  */
 void
 
 /* Draw a border arround the window.  */
 void

-boxWin (struct tui_gen_win_info * winInfo, int highlightFlag)
+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;
 
     {
       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);
         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);
       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);
     }
 }
 
 
 void
       wattroff (win, attrs);
     }
 }
 
 
 void

-tui_unhighlight_win (struct tui_win_info * 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->generic.handle != (WINDOW *) NULL)

     {
     {

-      boxWin ((struct tui_gen_win_info *) winInfo, NO_HILITE);
-      wrefresh (winInfo->generic.handle);
-      m_setWinHighlightOff (winInfo);
+      box_win ((struct tui_gen_win_info *) win_info, NO_HILITE);
+      wrefresh (win_info->generic.handle);
+      tui_set_win_highlight (win_info, 0);

     }
 }
 
 
 void
     }
 }
 
 
 void

-tui_highlight_win (struct tui_win_info * 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->generic.handle != (WINDOW *) NULL)

     {
     {

-      boxWin ((struct tui_gen_win_info *) winInfo, HILITE);
-      wrefresh (winInfo->generic.handle);
-      m_setWinHighlightOn (winInfo);
+      box_win ((struct tui_gen_win_info *) win_info, HILITE);
+      wrefresh (win_info->generic.handle);
+      tui_set_win_highlight (win_info, 1);

     }
 }
 
 void
     }
 }
 
 void

-tui_check_and_display_highlight_if_needed (struct tui_win_info * winInfo)
+tui_check_and_display_highlight_if_needed (struct tui_win_info *win_info)

 {
 {

-  if (m_winPtrNotNull (winInfo) && winInfo->generic.type != CMD_WIN)
+  if (win_info != NULL && win_info->generic.type != CMD_WIN)

     {
     {

-      if (winInfo->isHighlighted)
-       tui_highlight_win (winInfo);
+      if (win_info->is_highlighted)
+       tui_highlight_win (win_info);

       else
       else

-       tui_unhighlight_win (winInfo);
+       tui_unhighlight_win (win_info);

 
     }
   return;
 
     }
   return;


@@ -151,20 +150,20 @@ tui_check_and_display_highlight_if_needed (struct tui_win_info * winInfo)
 
 
 void
 
 
 void

-tui_make_window (struct tui_gen_win_info * winInfo, int boxIt)
+tui_make_window (struct tui_gen_win_info *win_info, int box_it)

 {
   WINDOW *handle;
 
 {
   WINDOW *handle;
 

-  handle = newwin (winInfo->height,
-                  winInfo->width,
-                  winInfo->origin.y,
-                  winInfo->origin.x);
-  winInfo->handle = 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 (handle != (WINDOW *) NULL)
     {

-      if (boxIt == BOX_WINDOW)
-       boxWin (winInfo, NO_HILITE);
-      winInfo->isVisible = TRUE;
+      if (box_it == BOX_WINDOW)
+       box_win (win_info, NO_HILITE);
+      win_info->is_visible = TRUE;

       scrollok (handle, TRUE);
     }
 }
       scrollok (handle, TRUE);
     }
 }


@@ -176,24 +175,25 @@ tui_make_window (struct tui_gen_win_info * winInfo, int boxIt)
 static void
 make_visible (struct tui_gen_win_info *win_info, int visible)
 {
 static void
 make_visible (struct tui_gen_win_info *win_info, int visible)
 {

-  /* Don't tear down/recreate command window */
+  /* Don't tear down/recreate command window.  */

   if (win_info->type == CMD_WIN)
     return;
 
   if (visible)
     {
   if (win_info->type == CMD_WIN)
     return;
 
   if (visible)
     {

-      if (!win_info->isVisible)
+      if (!win_info->is_visible)

        {
          tui_make_window (win_info,
                           (win_info->type != CMD_WIN
        {
          tui_make_window (win_info,
                           (win_info->type != CMD_WIN

-                           && !m_winIsAuxillary (win_info->type)));
-         win_info->isVisible = TRUE;
+                           && !tui_win_is_auxillary (win_info->type)));
+         win_info->is_visible = TRUE;

        }
     }
        }
     }

-  else if (!visible &&
-          win_info->isVisible && win_info->handle != (WINDOW *) NULL)
+  else if (!visible
+          && win_info->is_visible
+          && win_info->handle != (WINDOW *) NULL)

     {
     {

-      win_info->isVisible = FALSE;
+      win_info->is_visible = FALSE;

       tui_delete_win (win_info->handle);
       win_info->handle = (WINDOW *) NULL;
     }
       tui_delete_win (win_info->handle);
       win_info->handle = (WINDOW *) NULL;
     }


@@ -214,7 +214,8 @@ tui_make_invisible (struct tui_gen_win_info *win_info)
 }
 
 
 }
 
 

-/* Makes all windows invisible (except the command and locator windows).   */
+/* Makes all windows invisible (except the command and locator
+   windows).  */

 static void
 make_all_visible (int visible)
 {
 static void
 make_all_visible (int visible)
 {


@@ -222,13 +223,13 @@ make_all_visible (int visible)
 
   for (i = 0; i < MAX_MAJOR_WINDOWS; i++)
     {
 
   for (i = 0; i < MAX_MAJOR_WINDOWS; i++)
     {

-      if (m_winPtrNotNull (winList[i]) &&
-         ((winList[i])->generic.type) != CMD_WIN)
+      if (tui_win_list[i] != NULL
+         && ((tui_win_list[i])->generic.type) != CMD_WIN)

        {
        {

-         if (m_winIsSourceType ((winList[i])->generic.type))
-           make_visible ((winList[i])->detail.sourceInfo.executionInfo,
+         if (tui_win_is_source_type ((tui_win_list[i])->generic.type))
+           make_visible ((tui_win_list[i])->detail.source_info.execution_info,

                          visible);
                          visible);

-         make_visible ((struct tui_gen_win_info *) winList[i], visible);
+         make_visible ((struct tui_gen_win_info *) tui_win_list[i], visible);

        }
     }
 
        }
     }
 


@@ -250,32 +251,30 @@ tui_make_all_invisible (void)
 /* Function to refresh all the windows currently displayed.  */
 
 void
 /* Function to refresh all the windows currently displayed.  */
 
 void

-tui_refresh_all (struct tui_win_info * * list)
+tui_refresh_all (struct tui_win_info **list)

 {
   enum tui_win_type type;
 {
   enum tui_win_type type;

-  struct tui_gen_win_info * locator = tui_locator_win_info_ptr ();
+  struct tui_gen_win_info *locator = tui_locator_win_info_ptr ();

 
   for (type = SRC_WIN; (type < MAX_MAJOR_WINDOWS); type++)
     {
 
   for (type = SRC_WIN; (type < MAX_MAJOR_WINDOWS); type++)
     {

-      if (list[type] && list[type]->generic.isVisible)
+      if (list[type] && list[type]->generic.is_visible)

        {
          if (type == SRC_WIN || type == DISASSEM_WIN)
            {
        {
          if (type == SRC_WIN || type == DISASSEM_WIN)
            {

-             touchwin (list[type]->detail.sourceInfo.executionInfo->handle);
-             tui_refresh_win (list[type]->detail.sourceInfo.executionInfo);
+             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);
        }
     }
            }
          touchwin (list[type]->generic.handle);
          tui_refresh_win (&list[type]->generic);
        }
     }

-  if (locator->isVisible)
+  if (locator->is_visible)

     {
       touchwin (locator->handle);
       tui_refresh_win (locator);
     }
     {
       touchwin (locator->handle);
       tui_refresh_win (locator);
     }

-
-  return;
-}                              /* refreshAll */
+}

 
 
 /*********************************
 
 
 /*********************************