Updated copyright notices for most files.

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

diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index 7022400aaa1b6255c645c342b12a1367a15ac492..5ec56b695752a7ee662829d2b90ab7ae38c40c8e 100644 (file)
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -1,7 +1,7 @@
 /* TUI window generic functions.
 
 /* TUI window generic functions.
 

-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008,
+   2009 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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 /* This module contains procedures for handling tui window functions
    like resize, scrolling, scrolling, changing focus, etc.
 
 /* This module contains procedures for handling tui window functions
    like resize, scrolling, scrolling, changing focus, etc.


@@ -52,12 +50,16 @@
 #include <ctype.h>
 #include "readline/readline.h"
 
 #include <ctype.h>
 #include "readline/readline.h"
 

+#include <signal.h>
+

 /*******************************
 ** Static Local Decls
 ********************************/
 static void make_visible_with_new_height (struct tui_win_info *);
 /*******************************
 ** Static Local Decls
 ********************************/
 static void make_visible_with_new_height (struct tui_win_info *);

-static void make_invisible_and_set_new_height (struct tui_win_info *, int);
-static enum tui_status tui_adjust_win_heights (struct tui_win_info *, int);
+static void make_invisible_and_set_new_height (struct tui_win_info *, 
+                                              int);
+static enum tui_status tui_adjust_win_heights (struct tui_win_info *, 
+                                              int);

 static int new_height_ok (struct tui_win_info *, int);
 static void tui_set_tab_width_command (char *, int);
 static void tui_refresh_all_command (char *, int);
 static int new_height_ok (struct tui_win_info *, int);
 static void tui_set_tab_width_command (char *, int);
 static void tui_refresh_all_command (char *, int);


@@ -69,15 +71,17 @@ static void tui_scroll_forward_command (char *, int);
 static void tui_scroll_backward_command (char *, int);
 static void tui_scroll_left_command (char *, int);
 static void tui_scroll_right_command (char *, int);
 static void tui_scroll_backward_command (char *, int);
 static void tui_scroll_left_command (char *, int);
 static void tui_scroll_right_command (char *, int);

-static void parse_scrolling_args (char *, struct tui_win_info **, int *);
+static void parse_scrolling_args (char *, 
+                                 struct tui_win_info **, 
+                                 int *);

 
 
 /***************************************
 ** DEFINITIONS
 ***************************************/
 
 
 /***************************************
 ** DEFINITIONS
 ***************************************/

-#define WIN_HEIGHT_USAGE      "Usage: winheight <win_name> [+ | -] <#lines>\n"
-#define XDBWIN_HEIGHT_USAGE   "Usage: w <#lines>\n"
-#define FOCUS_USAGE           "Usage: focus {<win> | next | prev}\n"
+#define WIN_HEIGHT_USAGE    "Usage: winheight <win_name> [+ | -] <#lines>\n"
+#define XDBWIN_HEIGHT_USAGE "Usage: w <#lines>\n"
+#define FOCUS_USAGE         "Usage: focus {<win> | next | prev}\n"

 
 /***************************************
 ** PUBLIC FUNCTIONS
 
 /***************************************
 ** PUBLIC FUNCTIONS


@@ -199,8 +203,10 @@ struct tui_translate tui_border_kind_translate_lrcorner[] = {
 /* Tui configuration variables controlled with set/show command.  */
 const char *tui_active_border_mode = "bold-standout";
 static void
 /* Tui configuration variables controlled with set/show command.  */
 const char *tui_active_border_mode = "bold-standout";
 static void

-show_tui_active_border_mode (struct ui_file *file, int from_tty,
-                            struct cmd_list_element *c, const char *value)
+show_tui_active_border_mode (struct ui_file *file,
+                            int from_tty,
+                            struct cmd_list_element *c, 
+                            const char *value)

 {
   fprintf_filtered (file, _("\
 The attribute mode to use for the active TUI window border is \"%s\".\n"),
 {
   fprintf_filtered (file, _("\
 The attribute mode to use for the active TUI window border is \"%s\".\n"),


@@ -209,8 +215,10 @@ The attribute mode to use for the active TUI window border is \"%s\".\n"),
 
 const char *tui_border_mode = "normal";
 static void
 
 const char *tui_border_mode = "normal";
 static void

-show_tui_border_mode (struct ui_file *file, int from_tty,
-                     struct cmd_list_element *c, const char *value)
+show_tui_border_mode (struct ui_file *file, 
+                     int from_tty,
+                     struct cmd_list_element *c, 
+                     const char *value)

 {
   fprintf_filtered (file, _("\
 The attribute mode to use for the TUI window borders is \"%s\".\n"),
 {
   fprintf_filtered (file, _("\
 The attribute mode to use for the TUI window borders is \"%s\".\n"),


@@ -219,8 +227,10 @@ The attribute mode to use for the TUI window borders is \"%s\".\n"),
 
 const char *tui_border_kind = "acs";
 static void
 
 const char *tui_border_kind = "acs";
 static void

-show_tui_border_kind (struct ui_file *file, int from_tty,
-                     struct cmd_list_element *c, const char *value)
+show_tui_border_kind (struct ui_file *file, 
+                     int from_tty,
+                     struct cmd_list_element *c, 
+                     const char *value)

 {
   fprintf_filtered (file, _("The kind of border for TUI windows is \"%s\".\n"),
                    value);
 {
   fprintf_filtered (file, _("The kind of border for TUI windows is \"%s\".\n"),
                    value);


@@ -336,7 +346,8 @@ tui_get_cmd_list (void)
   return &tuilist;
 }
 
   return &tuilist;
 }
 

-/* Function to initialize gdb commands, for tui window manipulation.  */
+/* Function to initialize gdb commands, for tui window
+   manipulation.  */

 void
 _initialize_tui_win (void)
 {
 void
 _initialize_tui_win (void)
 {


@@ -480,7 +491,8 @@ tui_set_win_focus_to (struct tui_win_info *win_info)
 
 
 void
 
 
 void

-tui_scroll_forward (struct tui_win_info *win_to_scroll, int num_to_scroll)
+tui_scroll_forward (struct tui_win_info *win_to_scroll, 
+                   int num_to_scroll)

 {
   if (win_to_scroll != TUI_CMD_WIN)
     {
 {
   if (win_to_scroll != TUI_CMD_WIN)
     {


@@ -488,12 +500,12 @@ tui_scroll_forward (struct tui_win_info *win_to_scroll, int num_to_scroll)
 
       if (num_to_scroll == 0)
        _num_to_scroll = win_to_scroll->generic.height - 3;
 
       if (num_to_scroll == 0)
        _num_to_scroll = win_to_scroll->generic.height - 3;

-      /*
-         ** If we are scrolling the source or disassembly window, do a
-         ** "psuedo" scroll since not all of the source is in memory,
-         ** only what is in the viewport.  If win_to_scroll is the
-         ** command window do nothing since the term should handle it.
-       */
+
+      /* If we are scrolling the source or disassembly window, do a
+         "psuedo" scroll since not all of the source is in memory,
+         only what is in the viewport.  If win_to_scroll is the
+         command window do nothing since the term should handle
+         it.  */

       if (win_to_scroll == TUI_SRC_WIN)
        tui_vertical_source_scroll (FORWARD_SCROLL, _num_to_scroll);
       else if (win_to_scroll == TUI_DISASM_WIN)
       if (win_to_scroll == TUI_SRC_WIN)
        tui_vertical_source_scroll (FORWARD_SCROLL, _num_to_scroll);
       else if (win_to_scroll == TUI_DISASM_WIN)


@@ -504,7 +516,8 @@ tui_scroll_forward (struct tui_win_info *win_to_scroll, int num_to_scroll)
 }
 
 void
 }
 
 void

-tui_scroll_backward (struct tui_win_info *win_to_scroll, int num_to_scroll)
+tui_scroll_backward (struct tui_win_info *win_to_scroll, 
+                    int num_to_scroll)

 {
   if (win_to_scroll != TUI_CMD_WIN)
     {
 {
   if (win_to_scroll != TUI_CMD_WIN)
     {


@@ -512,12 +525,12 @@ tui_scroll_backward (struct tui_win_info *win_to_scroll, int num_to_scroll)
 
       if (num_to_scroll == 0)
        _num_to_scroll = win_to_scroll->generic.height - 3;
 
       if (num_to_scroll == 0)
        _num_to_scroll = win_to_scroll->generic.height - 3;

-      /*
-         ** If we are scrolling the source or disassembly window, do a
-         ** "psuedo" scroll since not all of the source is in memory,
-         ** only what is in the viewport.  If win_to_scroll is the
-         ** command window do nothing since the term should handle it.
-       */
+
+      /* If we are scrolling the source or disassembly window, do a
+         "psuedo" scroll since not all of the source is in memory,
+         only what is in the viewport.  If win_to_scroll is the
+         command window do nothing since the term should handle
+         it.  */

       if (win_to_scroll == TUI_SRC_WIN)
        tui_vertical_source_scroll (BACKWARD_SCROLL, _num_to_scroll);
       else if (win_to_scroll == TUI_DISASM_WIN)
       if (win_to_scroll == TUI_SRC_WIN)
        tui_vertical_source_scroll (BACKWARD_SCROLL, _num_to_scroll);
       else if (win_to_scroll == TUI_DISASM_WIN)


@@ -529,7 +542,8 @@ tui_scroll_backward (struct tui_win_info *win_to_scroll, int num_to_scroll)
 
 
 void
 
 
 void

-tui_scroll_left (struct tui_win_info *win_to_scroll, int num_to_scroll)
+tui_scroll_left (struct tui_win_info *win_to_scroll,
+                int num_to_scroll)

 {
   if (win_to_scroll != TUI_CMD_WIN)
     {
 {
   if (win_to_scroll != TUI_CMD_WIN)
     {


@@ -537,20 +551,21 @@ tui_scroll_left (struct tui_win_info *win_to_scroll, int num_to_scroll)
 
       if (_num_to_scroll == 0)
        _num_to_scroll = 1;
 
       if (_num_to_scroll == 0)
        _num_to_scroll = 1;

-      /*
-         ** If we are scrolling the source or disassembly window, do a
-         ** "psuedo" scroll since not all of the source is in memory,
-         ** only what is in the viewport. If win_to_scroll is the
-         ** command window do nothing since the term should handle it.
-       */
-      if (win_to_scroll == TUI_SRC_WIN || win_to_scroll == TUI_DISASM_WIN)
+
+      /* If we are scrolling the source or disassembly window, do a
+         "psuedo" scroll since not all of the source is in memory,
+         only what is in the viewport. If win_to_scroll is the command
+         window do nothing since the term should handle it.  */
+      if (win_to_scroll == TUI_SRC_WIN
+         || win_to_scroll == TUI_DISASM_WIN)

        tui_horizontal_source_scroll (win_to_scroll, LEFT_SCROLL, _num_to_scroll);
     }
 }
 
 
 void
        tui_horizontal_source_scroll (win_to_scroll, LEFT_SCROLL, _num_to_scroll);
     }
 }
 
 
 void

-tui_scroll_right (struct tui_win_info *win_to_scroll, int num_to_scroll)
+tui_scroll_right (struct tui_win_info *win_to_scroll, 
+                 int num_to_scroll)

 {
   if (win_to_scroll != TUI_CMD_WIN)
     {
 {
   if (win_to_scroll != TUI_CMD_WIN)
     {


@@ -558,13 +573,13 @@ tui_scroll_right (struct tui_win_info *win_to_scroll, int num_to_scroll)
 
       if (_num_to_scroll == 0)
        _num_to_scroll = 1;
 
       if (_num_to_scroll == 0)
        _num_to_scroll = 1;

-      /*
-         ** If we are scrolling the source or disassembly window, do a
-         ** "psuedo" scroll since not all of the source is in memory,
-         ** only what is in the viewport. If win_to_scroll is the
-         ** command window do nothing since the term should handle it.
-       */
-      if (win_to_scroll == TUI_SRC_WIN || win_to_scroll == TUI_DISASM_WIN)
+
+      /* If we are scrolling the source or disassembly window, do a
+         "psuedo" scroll since not all of the source is in memory,
+         only what is in the viewport. If win_to_scroll is the command
+         window do nothing since the term should handle it.  */
+      if (win_to_scroll == TUI_SRC_WIN
+         || win_to_scroll == TUI_DISASM_WIN)

        tui_horizontal_source_scroll (win_to_scroll, RIGHT_SCROLL, _num_to_scroll);
     }
 }
        tui_horizontal_source_scroll (win_to_scroll, RIGHT_SCROLL, _num_to_scroll);
     }
 }


@@ -605,7 +620,8 @@ tui_refresh_all_win (void)
   tui_refresh_all (tui_win_list);
   for (type = SRC_WIN; type < MAX_MAJOR_WINDOWS; type++)
     {
   tui_refresh_all (tui_win_list);
   for (type = SRC_WIN; type < MAX_MAJOR_WINDOWS; type++)
     {

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

        {
          switch (type)
            {
        {
          switch (type)
            {


@@ -658,8 +674,9 @@ tui_resize_all (void)
       tui_update_gdb_sizes ();
       tui_set_term_height_to (screenheight);
       tui_set_term_width_to (screenwidth);
       tui_update_gdb_sizes ();
       tui_set_term_height_to (screenheight);
       tui_set_term_width_to (screenwidth);

-      if (cur_layout == SRC_DISASSEM_COMMAND ||
-       cur_layout == SRC_DATA_COMMAND || cur_layout == DISASSEM_DATA_COMMAND)
+      if (cur_layout == SRC_DISASSEM_COMMAND 
+         || cur_layout == SRC_DATA_COMMAND
+         || cur_layout == DISASSEM_DATA_COMMAND)

        num_wins_displayed++;
       split_diff = height_diff / num_wins_displayed;
       cmd_split_diff = split_diff;
        num_wins_displayed++;
       split_diff = height_diff / num_wins_displayed;
       cmd_split_diff = split_diff;


@@ -766,13 +783,12 @@ tui_resize_all (void)
            tui_erase_source_content (second_win, EMPTY_SOURCE_PROMPT);
          break;
        }
            tui_erase_source_content (second_win, EMPTY_SOURCE_PROMPT);
          break;
        }

-      /*
-         ** Now remove all invisible windows, and their content so that
-         ** they get created again when called for with the new size.
-       */
+      /* Now remove all invisible windows, and their content so that
+         they get created again when called for with the new size.  */

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

-         if (win_type != CMD_WIN && (tui_win_list[win_type] != NULL)
+         if (win_type != CMD_WIN 
+             && (tui_win_list[win_type] != NULL)

              && !tui_win_list[win_type]->generic.is_visible)
            {
              tui_free_window (tui_win_list[win_type]);
              && !tui_win_list[win_type]->generic.is_visible)
            {
              tui_free_window (tui_win_list[win_type]);


@@ -794,13 +810,26 @@ tui_resize_all (void)
 void
 tui_sigwinch_handler (int signal)
 {
 void
 tui_sigwinch_handler (int signal)
 {

-  /*
-     ** Say that a resize was done so that the readline can do it
-     ** later when appropriate.
-   */
+  /* Say that a resize was done so that the readline can do it later
+     when appropriate.  */

   tui_set_win_resized_to (TRUE);
 }
 
   tui_set_win_resized_to (TRUE);
 }
 

+/* Initializes SIGWINCH signal handler for the tui.  */
+void
+tui_initialize_win (void)
+{
+#ifdef SIGWINCH
+#ifdef HAVE_SIGACTION
+  struct sigaction old_winch;
+  memset (&old_winch, 0, sizeof (old_winch));
+  old_winch.sa_handler = &tui_sigwinch_handler;
+  sigaction (SIGWINCH, &old_winch, NULL);
+#else
+  signal (SIGWINCH, &tui_sigwinch_handler);
+#endif
+#endif
+}

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


@@ -886,7 +915,8 @@ tui_set_focus (char *arg, int from_tty)
       else
        win_info = tui_partial_win_by_name (buf_ptr);
 
       else
        win_info = tui_partial_win_by_name (buf_ptr);
 

-      if (win_info == (struct tui_win_info *) NULL || !win_info->generic.is_visible)
+      if (win_info == (struct tui_win_info *) NULL
+         || !win_info->generic.is_visible)

        warning (_("Invalid window specified. \n\
 The window name specified must be valid and visible.\n"));
       else
        warning (_("Invalid window specified. \n\
 The window name specified must be valid and visible.\n"));
       else


@@ -921,7 +951,8 @@ tui_all_windows_info (char *arg, int from_tty)
   struct tui_win_info *win_with_focus = tui_win_with_focus ();
 
   for (type = SRC_WIN; (type < MAX_MAJOR_WINDOWS); type++)
   struct tui_win_info *win_with_focus = tui_win_with_focus ();
 
   for (type = SRC_WIN; (type < MAX_MAJOR_WINDOWS); type++)

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

       {
        if (win_with_focus == tui_win_list[type])
          printf_filtered ("        %s\t(%d lines)  <has focus>\n",
       {
        if (win_with_focus == tui_win_list[type])
          printf_filtered ("        %s\t(%d lines)  <has focus>\n",


@@ -984,14 +1015,13 @@ tui_set_win_height (char *arg, int from_tty)
        {
          *buf_ptr = (char) 0;
 
        {
          *buf_ptr = (char) 0;
 

-         /*
-            ** Validate the window name.
-          */
+         /* Validate the window name.  */

          for (i = 0; i < strlen (wname); i++)
            wname[i] = toupper (wname[i]);
          win_info = tui_partial_win_by_name (wname);
 
          for (i = 0; i < strlen (wname); i++)
            wname[i] = toupper (wname[i]);
          win_info = tui_partial_win_by_name (wname);
 

-         if (win_info == (struct tui_win_info *) NULL || !win_info->generic.is_visible)
+         if (win_info == (struct tui_win_info *) NULL
+             || !win_info->generic.is_visible)

            warning (_("Invalid window specified. \n\
 The window name specified must be valid and visible.\n"));
          else
            warning (_("Invalid window specified. \n\
 The window name specified must be valid and visible.\n"));
          else


@@ -1022,10 +1052,9 @@ The window name specified must be valid and visible.\n"));
                        new_height = input_no;
                      else
                        new_height = win_info->generic.height + input_no;
                        new_height = input_no;
                      else
                        new_height = win_info->generic.height + input_no;

-                     /*
-                        ** Now change the window's height, and adjust all
-                        ** other windows around it.
-                      */
+
+                     /* Now change the window's height, and adjust
+                        all other windows around it.  */

                      if (tui_adjust_win_heights (win_info,
                                                new_height) == TUI_FAILURE)
                        warning (_("Invalid window height specified.\n%s"),
                      if (tui_adjust_win_heights (win_info,
                                                new_height) == TUI_FAILURE)
                        warning (_("Invalid window height specified.\n%s"),


@@ -1075,9 +1104,9 @@ tui_xdb_set_win_height (char *arg, int from_tty)
        {                       /* Add 1 for the locator.  */
          int new_height = tui_term_height () - (input_no + 1);
 
        {                       /* Add 1 for the locator.  */
          int new_height = tui_term_height () - (input_no + 1);
 

-         if (!new_height_ok (tui_win_list[CMD_WIN], new_height) ||
-             tui_adjust_win_heights (tui_win_list[CMD_WIN],
-                                   new_height) == TUI_FAILURE)
+         if (!new_height_ok (tui_win_list[CMD_WIN], new_height)
+             || tui_adjust_win_heights (tui_win_list[CMD_WIN],
+                                        new_height) == TUI_FAILURE)

            warning (_("Invalid window height specified.\n%s"),
                     XDBWIN_HEIGHT_USAGE);
        }
            warning (_("Invalid window height specified.\n%s"),
                     XDBWIN_HEIGHT_USAGE);
        }


@@ -1099,7 +1128,8 @@ tui_xdb_set_win_height_command (char *arg, int from_tty)
 
 /* Function to adjust all window heights around the primary.   */
 static enum tui_status
 
 /* Function to adjust all window heights around the primary.   */
 static enum tui_status

-tui_adjust_win_heights (struct tui_win_info *primary_win_info, int new_height)
+tui_adjust_win_heights (struct tui_win_info *primary_win_info,
+                       int new_height)

 {
   enum tui_status status = TUI_FAILURE;
 
 {
   enum tui_status status = TUI_FAILURE;
 


@@ -1114,7 +1144,8 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info, int new_height)
          enum tui_layout_type cur_layout = tui_current_layout ();
 
          diff = (new_height - primary_win_info->generic.height) * (-1);
          enum tui_layout_type cur_layout = tui_current_layout ();
 
          diff = (new_height - primary_win_info->generic.height) * (-1);

-         if (cur_layout == SRC_COMMAND || cur_layout == DISASSEM_COMMAND)
+         if (cur_layout == SRC_COMMAND 
+             || cur_layout == DISASSEM_COMMAND)

            {
              struct tui_win_info *src_win_info;
 
            {
              struct tui_win_info *src_win_info;
 


@@ -1153,11 +1184,10 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info, int new_height)
                  second_win = (tui_source_windows ())->list[0];
                }
              if (primary_win_info == TUI_CMD_WIN)
                  second_win = (tui_source_windows ())->list[0];
                }
              if (primary_win_info == TUI_CMD_WIN)

-               { /*
-                  ** Split the change in height accross the 1st & 2nd
-                  ** windows, adjusting them as well.
-                  */
-                 int first_split_diff = diff / 2;      /* Subtract the locator.  */
+               { /* Split the change in height accross the 1st & 2nd
+                    windows, adjusting them as well.  */
+                 /* Subtract the locator.  */
+                 int first_split_diff = diff / 2;

                  int second_split_diff = first_split_diff;
 
                  if (diff % 2)
                  int second_split_diff = first_split_diff;
 
                  if (diff % 2)


@@ -1200,10 +1230,9 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info, int new_height)
              else
                {
                  if ((TUI_CMD_WIN->generic.height + diff) < 1)
              else
                {
                  if ((TUI_CMD_WIN->generic.height + diff) < 1)

-                   { /*
-                       ** If there is no way to increase the command window
-                       ** take real estate from the 1st or 2nd window.
-                      */
+                   { /* If there is no way to increase the command
+                        window take real estate from the 1st or 2nd
+                        window.  */

                      if ((TUI_CMD_WIN->generic.height + diff) < 1)
                        {
                          int i;
                      if ((TUI_CMD_WIN->generic.height + diff) < 1)
                        {
                          int i;


@@ -1253,7 +1282,8 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info, int new_height)
    with the targer) invisible, and set the new height and
    location.  */
 static void
    with the targer) invisible, and set the new height and
    location.  */
 static void

-make_invisible_and_set_new_height (struct tui_win_info *win_info, int height)
+make_invisible_and_set_new_height (struct tui_win_info *win_info, 
+                                  int height)

 {
   int i;
   struct tui_gen_win_info *gen_win_info;
 {
   int i;
   struct tui_gen_win_info *gen_win_info;


@@ -1374,7 +1404,8 @@ make_visible_with_new_height (struct tui_win_info *win_info)
 
 
 static int
 
 
 static int

-new_height_ok (struct tui_win_info *primary_win_info, int new_height)
+new_height_ok (struct tui_win_info *primary_win_info, 
+              int new_height)

 {
   int ok = (new_height < tui_term_height ());
 
 {
   int ok = (new_height < tui_term_height ());
 


@@ -1386,12 +1417,12 @@ new_height_ok (struct tui_win_info *primary_win_info, int new_height)
       diff = (new_height - primary_win_info->generic.height) * (-1);
       if (cur_layout == SRC_COMMAND || cur_layout == DISASSEM_COMMAND)
        {
       diff = (new_height - primary_win_info->generic.height) * (-1);
       if (cur_layout == SRC_COMMAND || cur_layout == DISASSEM_COMMAND)
        {

-         ok = ((primary_win_info->generic.type == CMD_WIN &&
-                new_height <= (tui_term_height () - 4) &&
-                new_height >= MIN_CMD_WIN_HEIGHT) ||
-               (primary_win_info->generic.type != CMD_WIN &&
-                new_height <= (tui_term_height () - 2) &&
-                new_height >= MIN_WIN_HEIGHT));
+         ok = ((primary_win_info->generic.type == CMD_WIN 
+                && new_height <= (tui_term_height () - 4) 
+                && new_height >= MIN_CMD_WIN_HEIGHT) 
+               || (primary_win_info->generic.type != CMD_WIN 
+                   && new_height <= (tui_term_height () - 2) 
+                   && new_height >= MIN_WIN_HEIGHT));

          if (ok)
            {                   /* Check the total height.  */
              struct tui_win_info *win_info;
          if (ok)
            {                   /* Check the total height.  */
              struct tui_win_info *win_info;


@@ -1420,12 +1451,10 @@ new_height_ok (struct tui_win_info *primary_win_info, int new_height)
              first_win = TUI_DATA_WIN;
              second_win = (tui_source_windows ())->list[0];
            }
              first_win = TUI_DATA_WIN;
              second_win = (tui_source_windows ())->list[0];
            }

-         /*
-            ** We could simply add all the heights to obtain the same result
-            ** but below is more explicit since we subtract 1 for the
-            ** line that the first and second windows share, and add one
-            ** for the locator.
-          */
+         /* We could simply add all the heights to obtain the same
+            result but below is more explicit since we subtract 1 for
+            the line that the first and second windows share, and add
+            one for the locator.  */

          total_height = cur_total_height =
            (first_win->generic.height + second_win->generic.height - 1)
            + TUI_CMD_WIN->generic.height + 1;  /* Locator. */
          total_height = cur_total_height =
            (first_win->generic.height + second_win->generic.height - 1)
            + TUI_CMD_WIN->generic.height + 1;  /* Locator. */


@@ -1434,29 +1463,27 @@ new_height_ok (struct tui_win_info *primary_win_info, int new_height)
              /* Locator included since first & second win share a line.  */
              ok = ((first_win->generic.height +
                     second_win->generic.height + diff) >=
              /* Locator included since first & second win share a line.  */
              ok = ((first_win->generic.height +
                     second_win->generic.height + diff) >=

-                   (MIN_WIN_HEIGHT * 2) &&
-                   new_height >= MIN_CMD_WIN_HEIGHT);
+                   (MIN_WIN_HEIGHT * 2) 
+                   && new_height >= MIN_CMD_WIN_HEIGHT);

              if (ok)
                {
              if (ok)
                {

-                 total_height = new_height + (first_win->generic.height +
-                                         second_win->generic.height + diff);
+                 total_height = new_height + 
+                   (first_win->generic.height +
+                    second_win->generic.height + diff);

                  min_height = MIN_CMD_WIN_HEIGHT;
                }
            }
          else
            {
              min_height = MIN_WIN_HEIGHT;
                  min_height = MIN_CMD_WIN_HEIGHT;
                }
            }
          else
            {
              min_height = MIN_WIN_HEIGHT;

-             /*
-                ** First see if we can increase/decrease the command
-                ** window.  And make sure that the command window is
-                ** at least 1 line.
-              */
+
+             /* First see if we can increase/decrease the command
+                window.  And make sure that the command window is at
+                least 1 line.  */

              ok = ((TUI_CMD_WIN->generic.height + diff) > 0);
              if (!ok)
              ok = ((TUI_CMD_WIN->generic.height + diff) > 0);
              if (!ok)

-               {       /*
-                          ** Looks like we have to increase/decrease one of
-                          ** the other windows.
-                        */
+               { /* Looks like we have to increase/decrease one of
+                    the other windows.  */

                  if (primary_win_info == first_win)
                    ok = (second_win->generic.height + diff) >= min_height;
                  else
                  if (primary_win_info == first_win)
                    ok = (second_win->generic.height + diff) >= min_height;
                  else


@@ -1474,12 +1501,11 @@ new_height_ok (struct tui_win_info *primary_win_info, int new_height)
                      TUI_CMD_WIN->generic.height + diff;
                }
            }
                      TUI_CMD_WIN->generic.height + diff;
                }
            }

-         /*
-            ** Now make sure that the proposed total height doesn't exceed
-            ** the old total height.
-          */
+         /* Now make sure that the proposed total height doesn't
+            exceed the old total height.  */

          if (ok)
          if (ok)

-           ok = (new_height >= min_height && total_height <= cur_total_height);
+           ok = (new_height >= min_height 
+                 && total_height <= cur_total_height);

        }
     }
 
        }
     }
 


@@ -1488,17 +1514,16 @@ new_height_ok (struct tui_win_info *primary_win_info, int new_height)
 
 
 static void
 
 
 static void

-parse_scrolling_args (char *arg, struct tui_win_info **win_to_scroll,
+parse_scrolling_args (char *arg, 
+                     struct tui_win_info **win_to_scroll,

                      int *num_to_scroll)
 {
   if (num_to_scroll)
     *num_to_scroll = 0;
   *win_to_scroll = tui_win_with_focus ();
 
                      int *num_to_scroll)
 {
   if (num_to_scroll)
     *num_to_scroll = 0;
   *win_to_scroll = tui_win_with_focus ();
 

-  /*
-     ** First set up the default window to scroll, in case there is no
-     ** window name arg.
-   */
+  /* First set up the default window to scroll, in case there is no
+     window name arg.  */

   if (arg != (char *) NULL)
     {
       char *buf, *buf_ptr;
   if (arg != (char *) NULL)
     {
       char *buf, *buf_ptr;


@@ -1542,8 +1567,8 @@ parse_scrolling_args (char *arg, struct tui_win_info **win_to_scroll,
            wname[i] = toupper (wname[i]);
          *win_to_scroll = tui_partial_win_by_name (wname);
 
            wname[i] = toupper (wname[i]);
          *win_to_scroll = tui_partial_win_by_name (wname);
 

-         if (*win_to_scroll == (struct tui_win_info *) NULL ||
-             !(*win_to_scroll)->generic.is_visible)
+         if (*win_to_scroll == (struct tui_win_info *) NULL
+             || !(*win_to_scroll)->generic.is_visible)

            error (_("Invalid window specified. \n\
 The window name specified must be valid and visible.\n"));
          else if (*win_to_scroll == TUI_CMD_WIN)
            error (_("Invalid window specified. \n\
 The window name specified must be valid and visible.\n"));
          else if (*win_to_scroll == TUI_CMD_WIN)