2004-01-28 Andrew Cagney <cagney@redhat.com>

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

diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index c1694b231cfdcac638401476b051979797d4bc5e..249f5d766090d7c2a05dbcf84503a0c4d0b037bc 100644 (file)
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -1,7 +1,7 @@
 /* TUI layout window management.
 
-   Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation,
-   Inc.
+   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
+   Foundation, Inc.
 
    Contributed by Hewlett-Packard Company.
 
@@ -128,17 +128,14 @@ showLayout (TuiLayoutType layout)
 }
 
 
-/*
-   ** tuiSetLayout()
-   **    Function to set the layout to SRC_COMMAND, DISASSEM_COMMAND,
-   **    SRC_DISASSEM_COMMAND, SRC_DATA_COMMAND, or DISASSEM_DATA_COMMAND.
-   **    If the layout is SRC_DATA_COMMAND, DISASSEM_DATA_COMMAND, or
-   **    UNDEFINED_LAYOUT, then the data window is populated according
-   **    to regsDisplayType.
- */
-TuiStatus
-tuiSetLayout (TuiLayoutType layoutType,
-              TuiRegisterDisplayType regsDisplayType)
+/* Function to set the layout to SRC_COMMAND, DISASSEM_COMMAND,
+   SRC_DISASSEM_COMMAND, SRC_DATA_COMMAND, or DISASSEM_DATA_COMMAND.
+   If the layout is SRC_DATA_COMMAND, DISASSEM_DATA_COMMAND, or
+   UNDEFINED_LAYOUT, then the data window is populated according to
+   regsDisplayType.  */
+enum tui_status
+tui_set_layout (enum tui_layout_type layoutType,
+               enum tui_register_display_type regsDisplayType)
 {
   TuiStatus status = TUI_SUCCESS;
 
@@ -193,7 +190,7 @@ tuiSetLayout (TuiLayoutType layoutType,
                         ** 2. if target was compiled without -g
                         ** We still want to show the assembly though!
                       */
-                     addr = tuiGetBeginAsmAddress ();
+                     addr = tui_get_begin_asm_address ();
                      tuiSetWinFocusTo (disassemWin);
                      layoutDef->displayMode = DISASSEM_WIN;
                      layoutDef->split = FALSE;
@@ -206,7 +203,7 @@ tuiSetLayout (TuiLayoutType layoutType,
                         ** 2. if target was compiled without -g
                         ** We still want to show the assembly though!
                       */
-                     addr = tuiGetBeginAsmAddress ();
+                     addr = tui_get_begin_asm_address ();
                      if (winWithFocus == srcWin)
                        tuiSetWinFocusTo (srcWin);
                      else
@@ -229,7 +226,7 @@ tuiSetLayout (TuiLayoutType layoutType,
                         ** 2. if target was compiled without -g
                         ** We still want to show the assembly though!
                       */
-                     addr = tuiGetBeginAsmAddress ();
+                     addr = tui_get_begin_asm_address ();
                      if (winWithFocus != dataWin)
                        tuiSetWinFocusTo (disassemWin);
                      else
@@ -258,7 +255,7 @@ tuiSetLayout (TuiLayoutType layoutType,
              layoutDef->regsDisplayType =
                (regsDisplayType == TUI_UNDEFINED_REGS ?
                 TUI_GENERAL_REGS : regsDisplayType);
-             tuiShowRegisters (layoutDef->regsDisplayType);
+             tui_show_registers (layoutDef->regsDisplayType);
            }
        }
     }
@@ -268,14 +265,11 @@ tuiSetLayout (TuiLayoutType layoutType,
   return status;
 }
 
-/*
-   ** tuiAddWinToLayout().
-   **        Add the specified window to the layout in a logical way.
-   **        This means setting up the most logical layout given the
-   **        window to be added.
- */
+/* Add the specified window to the layout in a logical way.  This
+   means setting up the most logical layout given the window to be
+   added.  */
 void
-tuiAddWinToLayout (TuiWinType type)
+tui_add_win_to_layout (enum tui_win_type type)
 {
   TuiLayoutType curLayout = currentLayout ();
 
@@ -365,14 +359,12 @@ tuiDefaultWinHeight (TuiWinType type, TuiLayoutType layout)
 }                              /* tuiDefaultWinHeight */
 
 
-/*
-   ** tuiDefaultWinViewportHeight().
-   **        Answer the height of a window.  If it hasn't been created yet,
-   **        answer what the height of a window would be based upon its
-   **        type and the layout.
- */
+/* Answer the height of a window.  If it hasn't been created yet,
+   answer what the height of a window would be based upon its type and
+   the layout.  */
 int
-tuiDefaultWinViewportHeight (TuiWinType type, TuiLayoutType layout)
+tui_default_win_viewport_height (enum tui_win_type type,
+                                enum tui_layout_type layout)
 {
   int h;
 
@@ -430,7 +422,7 @@ Source/Disassembly/Command layouts.\n");
    **        $REGS, $GREGS, $FREGS, $SREGS.
  */
 TuiStatus
-tui_set_layout (const char *layoutName)
+tui_set_layout_for_display_command (const char *layoutName)
 {
   TuiStatus status = TUI_SUCCESS;
 
@@ -522,7 +514,7 @@ tui_set_layout (const char *layoutName)
            status = TUI_FAILURE;
          xfree (bufPtr);
 
-         tuiSetLayout (newLayout, dpyType);
+         tui_set_layout (newLayout, dpyType);
        }
     }
   else
@@ -568,15 +560,15 @@ _tuiHandleXDBLayout (TuiLayoutDefPtr layoutDef)
 {
   if (layoutDef->split)
     {
-      tuiSetLayout (SRC_DISASSEM_COMMAND, TUI_UNDEFINED_REGS);
+      tui_set_layout (SRC_DISASSEM_COMMAND, TUI_UNDEFINED_REGS);
       tuiSetWinFocusTo (winList[layoutDef->displayMode]);
     }
   else
     {
       if (layoutDef->displayMode == SRC_WIN)
-       tuiSetLayout (SRC_COMMAND, TUI_UNDEFINED_REGS);
+       tui_set_layout (SRC_COMMAND, TUI_UNDEFINED_REGS);
       else
-       tuiSetLayout (DISASSEM_DATA_COMMAND, layoutDef->regsDisplayType);
+       tui_set_layout (DISASSEM_DATA_COMMAND, layoutDef->regsDisplayType);
     }
 
 
@@ -622,7 +614,7 @@ _tuiLayout_command (char *arg, int fromTTY)
   tui_enable ();
 
   /* Switch to the selected layout.  */
-  if (tui_set_layout (arg) != TUI_SUCCESS)
+  if (tui_set_layout_for_display_command (arg) != TUI_SUCCESS)
     warning ("Invalid layout specified.\n%s", LAYOUT_USAGE);
 
 }
@@ -850,7 +842,7 @@ _showSourceDisassemCommand (void)
              srcWin->detail.sourceInfo.hasLocator = FALSE;
              disassemWin->detail.sourceInfo.hasLocator = TRUE;
              m_beVisible (locator);
-             tuiShowLocatorContent ();
+             tui_show_locator_content ();
              tuiShowSourceContent (disassemWin);
 
              if (m_winPtrIsNull (cmdWin))
@@ -941,7 +933,7 @@ _showData (TuiLayoutType newLayout)
     }
   winList[winType]->detail.sourceInfo.hasLocator = TRUE;
   m_beVisible (locator);
-  tuiShowLocatorContent ();
+  tui_show_locator_content ();
   addToSourceWindows (winList[winType]);
   setCurrentLayoutTo (newLayout);
 
@@ -1121,7 +1113,7 @@ _showSourceOrDisassemAndCommand (TuiLayoutType layoutType)
        {
          (*winInfoPtr)->detail.sourceInfo.hasLocator = TRUE;
          m_beVisible (locator);
-         tuiShowLocatorContent ();
+         tui_show_locator_content ();
          tuiShowSourceContent (*winInfoPtr);
 
          if (m_winPtrIsNull (cmdWin))