2004-02-06 Andrew Cagney <cagney@redhat.com>

	* tui/tui-windata.h: Update copyright.  Include "tui-data.h".
	(tui_erase_data_content): Rename tuiEraseDataContent.
	(tui_display_all_data): Rename tuiDisplayAllData.
	(tui_check_data_values): Rename tuiCheckDataValues.
	(tui_display_data_from_line): Rename tuiDisplayDataFromLine.
	(tui_first_data_item_displayed): Rename tuiFirstDataItemDisplayed.
	(tui_first_data_element_no_in_line): Rename
	tuiFirstDataElementNoInLine.
	(tui_delete_data_content_windows): Rename
	tuiDeleteDataContentWindows.
	(tui_refresh_data_win): Rename tuiRefreshDataWin.
	(tui_display_data_from): Rename tuiDisplayDataFrom.
	(tui_vertical_data_scroll): Rename tuiVerticalDataScroll.
	* tui/tui-windata.c, tui/tui-hooks.c: Update references.
	* tui/tui-win.c, tui/tui-regs.c: Update references.
	* tui/tui-layout.c, tui/tui.c: Update references.

7 files changed, 47 insertions, 70 deletions

diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c
index a8f08ee..b982941 100644
--- a/gdb/tui/tui-hooks.c
+++ b/gdb/tui/tui-hooks.c
@@ -156,7 +156,7 @@ tui_register_changed_hook (int regno)
   if (fi && tui_refreshing_registers == 0)
     {
       tui_refreshing_registers = 1;
-      tuiCheckDataValues (fi);
+      tui_check_data_values (fi);
       tui_refreshing_registers = 0;
     }
 }
@@ -256,7 +256,7 @@ tui_selected_frame_level_changed_hook (int level)
       if (tui_is_window_visible (DATA_WIN))
         {
           tui_refreshing_registers = 1;
-          tuiCheckDataValues (fi);
+          tui_check_data_values (fi);
           tui_refreshing_registers = 0;
         }
     }
diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index 815758d..4aed786 100644
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -246,7 +246,7 @@ tui_set_layout (enum tui_layout_type layoutType,
 	      if (!regsPopulate &&
 		  (newLayout == SRC_DATA_COMMAND ||
 		   newLayout == DISASSEM_DATA_COMMAND))
-		tuiDisplayAllData ();
+		tui_display_all_data ();
 
 	      tui_update_source_windows_with_addr (addr);
 	    }
diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index ad42b9e..4e0096e 100644
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -249,7 +249,7 @@ tui_show_registers (TuiRegisterDisplayType dpyType)
   if (ret == TUI_FAILURE)
     {
       dataWin->detail.dataDisplayInfo.regsDisplayType = TUI_UNDEFINED_REGS;
-      tuiEraseDataContent (NO_REGS_STRING);
+      tui_erase_data_content (NO_REGS_STRING);
     }
   else
     {
@@ -266,7 +266,7 @@ tui_show_registers (TuiRegisterDisplayType dpyType)
 	     dataItemWin->content[0])->whichElement.data)->highlight = FALSE;
 	}
       dataWin->detail.dataDisplayInfo.regsDisplayType = dpyType;
-      tuiDisplayAllData ();
+      tui_display_all_data ();
     }
   (tuiLayoutDef ())->regsDisplayType = dpyType;
 
diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index 83286b3..8cde063 100644
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -469,7 +469,7 @@ tuiScrollForward (TuiWinInfoPtr winToScroll, int numToScroll)
       else if (winToScroll == disassemWin)
 	tui_vertical_disassem_scroll (FORWARD_SCROLL, _numToScroll);
       else if (winToScroll == dataWin)
-	tuiVerticalDataScroll (FORWARD_SCROLL, _numToScroll);
+	tui_vertical_data_scroll (FORWARD_SCROLL, _numToScroll);
     }
 
   return;
@@ -499,7 +499,7 @@ tuiScrollBackward (TuiWinInfoPtr winToScroll, int numToScroll)
       else if (winToScroll == disassemWin)
 	tui_vertical_disassem_scroll (BACKWARD_SCROLL, _numToScroll);
       else if (winToScroll == dataWin)
-	tuiVerticalDataScroll (BACKWARD_SCROLL, _numToScroll);
+	tui_vertical_data_scroll (BACKWARD_SCROLL, _numToScroll);
     }
   return;
 }				/* tuiScrollBackward */
@@ -608,7 +608,7 @@ tuiRefreshAll (void)
 	      tui_update_exec_info (winList[type]);
 	      break;
 	    case DATA_WIN:
-	      tuiRefreshDataWin ();
+	      tui_refresh_data_win ();
 	      break;
 	    default:
 	      break;
@@ -910,7 +910,7 @@ The window name specified must be valid and visible.\n");
 	}
 
       if (dataWin && dataWin->generic.isVisible)
-	tuiRefreshDataWin ();
+	tui_refresh_data_win ();
       tuiFree (bufPtr);
       printf_filtered ("Focus set to %s window.\n",
 		       winName ((TuiGenWinInfoPtr) tuiWinWithFocus ()));
@@ -1412,7 +1412,7 @@ _makeVisibleWithNewHeight (TuiWinInfoPtr winInfo)
 	}
       break;
     case DATA_WIN:
-      tuiDisplayAllData ();
+      tui_display_all_data ();
       break;
     case CMD_WIN:
       winInfo->detail.commandInfo.curLine = 0;
diff --git a/gdb/tui/tui-windata.c b/gdb/tui/tui-windata.c
index 42775de..facea77 100644
--- a/gdb/tui/tui-windata.c
+++ b/gdb/tui/tui-windata.c
@@ -122,7 +122,7 @@ tuiDeleteDataContentWindows (void)
 
 
 void
-tuiEraseDataContent (char *prompt)
+tui_erase_data_content (char *prompt)
 {
   werase (dataWin->generic.handle);
   tui_check_and_display_highlight_if_needed (dataWin);
@@ -141,24 +141,19 @@ tuiEraseDataContent (char *prompt)
 		 prompt);
     }
   wrefresh (dataWin->generic.handle);
-
-  return;
-}				/* tuiEraseDataContent */
+}
 
 
-/*
-   ** tuiDisplayAllData().
-   **        This function displays the data that is in the data window's
-   **        content.  It does not set the content.
- */
+/* This function displays the data that is in the data window's
+   content.  It does not set the content.  */
 void
-tuiDisplayAllData (void)
+tui_display_all_data (void)
 {
   if (dataWin->generic.contentSize <= 0)
-    tuiEraseDataContent (NO_DATA_STRING);
+    tui_erase_data_content (NO_DATA_STRING);
   else
     {
-      tuiEraseDataContent ((char *) NULL);
+      tui_erase_data_content ((char *) NULL);
       tuiDeleteDataContentWindows ();
       tui_check_and_display_highlight_if_needed (dataWin);
       tui_display_registers_from (0);
@@ -171,8 +166,7 @@ tuiDisplayAllData (void)
 	{
 	}
     }
-  return;
-}				/* tuiDisplayAllData */
+}
 
 
 /*
@@ -241,7 +235,7 @@ tuiDisplayDataFrom (int elementNo, int reuseWindows)
 
   if (firstLine >= 0)
     {
-      tuiEraseDataContent ((char *) NULL);
+      tui_erase_data_content ((char *) NULL);
       if (!reuseWindows)
 	tuiDeleteDataContentWindows ();
       tuiDisplayDataFromLine (firstLine);
@@ -251,14 +245,11 @@ tuiDisplayDataFrom (int elementNo, int reuseWindows)
 }				/* tuiDisplayDataFrom */
 
 
-/*
-   ** tuiRefreshDataWin()
-   **        Function to redisplay the contents of the data window.
- */
+/* Function to redisplay the contents of the data window.  */
 void
-tuiRefreshDataWin (void)
+tui_refresh_data_win (void)
 {
-  tuiEraseDataContent ((char *) NULL);
+  tui_erase_data_content ((char *) NULL);
   if (dataWin->generic.contentSize > 0)
     {
       int firstElement = tuiFirstDataItemDisplayed ();
@@ -266,17 +257,12 @@ tuiRefreshDataWin (void)
       if (firstElement >= 0)	/* re-use existing windows */
 	tuiDisplayDataFrom (firstElement, TRUE);
     }
-
-  return;
-}				/* tuiRefreshDataWin */
+}
 
 
-/*
-   ** tuiCheckDataValues().
-   **        Function to check the data values and hilite any that have changed
- */
+/* Function to check the data values and hilite any that have changed.  */
 void
-tuiCheckDataValues (struct frame_info *frame)
+tui_check_data_values (struct frame_info *frame)
 {
   tui_check_register_values (frame);
 
@@ -305,15 +291,12 @@ tuiCheckDataValues (struct frame_info *frame)
 #endif
 	}
     }
-}				/* tuiCheckDataValues */
+}
 
 
-/*
-   ** tuiVerticalDataScroll()
-   **        Scroll the data window vertically forward or backward.
- */
+/* Scroll the data window vertically forward or backward.   */
 void
-tuiVerticalDataScroll (TuiScrollDirection scrollDirection, int numToScroll)
+tui_vertical_data_scroll (TuiScrollDirection scrollDirection, int numToScroll)
 {
   int firstElementNo;
   int firstLine = (-1);
@@ -335,7 +318,7 @@ tuiVerticalDataScroll (TuiScrollDirection scrollDirection, int numToScroll)
 	firstLine += numToScroll;
       else
 	firstLine -= numToScroll;
-      tuiEraseDataContent ((char *) NULL);
+      tui_erase_data_content ((char *) NULL);
       tuiDeleteDataContentWindows ();
       tuiDisplayDataFromLine (firstLine);
     }
diff --git a/gdb/tui/tui-windata.h b/gdb/tui/tui-windata.h
index 0b1e700..10123a3 100644
--- a/gdb/tui/tui-windata.h
+++ b/gdb/tui/tui-windata.h
@@ -1,5 +1,8 @@
 /* Data/register window display.
-   Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+   Copyright 1998, 1999, 2000, 2001, 2004 Free Software Foundation,
+   Inc.
+
    Contributed by Hewlett-Packard Company.
 
    This file is part of GDB.
@@ -19,29 +22,20 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#ifndef _TUI_DATAWIN_H
-#define _TUI_DATAWIN_H
-
-
-/*****************************************
-** TYPE DEFINITIONS                        **
-******************************************/
-
+#ifndef TUI_WINDATA_H
+#define TUI_WINDATA_H
 
+#include "tui/tui-data.h"
 
-/*****************************************
-** PUBLIC FUNCTION EXTERNAL DECLS        **
-******************************************/
-extern void tuiEraseDataContent (char *);
-extern void tuiDisplayAllData (void);
-extern void tuiCheckDataValues (struct frame_info *);
-extern void tuiDisplayDataFromLine (int);
-extern int tuiFirstDataItemDisplayed (void);
-extern int tuiFirstDataElementNoInLine (int);
-extern void tuiDeleteDataContentWindows (void);
-extern void tuiRefreshDataWin (void);
-extern void tuiDisplayDataFrom (int, int);
-extern void tuiVerticalDataScroll (TuiScrollDirection, int);
+extern void tui_erase_data_content (char *);
+extern void tui_display_all_data (void);
+extern void tui_check_data_values (struct frame_info *);
+extern void tui_display_data_from_line (int);
+extern int tui_first_data_item_displayed (void);
+extern int tui_first_data_element_no_in_line (int);
+extern void tui_delete_data_content_windows (void);
+extern void tui_refresh_data_win (void);
+extern void tui_display_data_from (int, int);
+extern void tui_vertical_data_scroll (enum tui_scroll_direction, int);
 
 #endif
-/*_TUI_DATAWIN_H*/
diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c
index 8f16d0f..5e44d98 100644
--- a/gdb/tui/tui.c
+++ b/gdb/tui/tui.c
@@ -225,7 +225,7 @@ tui_rl_other_window (int count, int key)
     {
       tuiSetWinFocusTo (winInfo);
       if (dataWin && dataWin->generic.isVisible)
-        tuiRefreshDataWin ();
+        tui_refresh_data_win ();
       keypad (cmdWin->generic.handle, (winInfo != cmdWin));
     }
   return 0;