]> git.ipfire.org Git - thirdparty/binutils-gdb.git/blobdiff - gdb/tui/tui-win.c
Copyright year update in most files of the GDB Project.
[thirdparty/binutils-gdb.git] / gdb / tui / tui-win.c
index 7022400aaa1b6255c645c342b12a1367a15ac492..0a49697d69e7a9ee944184eee57154837bcc945d 100644 (file)
@@ -1,7 +1,6 @@
 /* TUI window generic functions.
 
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1998-2004, 2006-2012 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., 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.
@@ -45,6 +42,7 @@
 #include "tui/tui-source.h"
 #include "tui/tui-winsource.h"
 #include "tui/tui-windata.h"
+#include "tui/tui-win.h"
 
 #include "gdb_curses.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 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);
@@ -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 parse_scrolling_args (char *, struct tui_win_info **, int *);
+static void parse_scrolling_args (char *, 
+                                 struct tui_win_info **, 
+                                 int *);
 
 
 /***************************************
 ** 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
@@ -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
-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"),
@@ -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
-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"),
@@ -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
-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);
@@ -336,11 +346,15 @@ tui_get_cmd_list (void)
   return &tuilist;
 }
 
-/* Function to initialize gdb commands, for tui window manipulation.  */
+/* Function to initialize gdb commands, for tui window
+   manipulation.  */
+
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_tui_win;
+
 void
 _initialize_tui_win (void)
 {
-  struct cmd_list_element *c;
   static struct cmd_list_element *tui_setlist;
   static struct cmd_list_element *tui_showlist;
 
@@ -480,7 +494,8 @@ tui_set_win_focus_to (struct tui_win_info *win_info)
 
 
 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)
     {
@@ -488,12 +503,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 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)
@@ -504,7 +519,8 @@ tui_scroll_forward (struct tui_win_info *win_to_scroll, int num_to_scroll)
 }
 
 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)
     {
@@ -512,12 +528,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 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)
@@ -529,7 +545,8 @@ tui_scroll_backward (struct tui_win_info *win_to_scroll, int num_to_scroll)
 
 
 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)
     {
@@ -537,20 +554,22 @@ tui_scroll_left (struct tui_win_info *win_to_scroll, int num_to_scroll)
 
       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)
-       tui_horizontal_source_scroll (win_to_scroll, LEFT_SCROLL, _num_to_scroll);
+
+      /* 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_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)
     {
@@ -558,14 +577,15 @@ tui_scroll_right (struct tui_win_info *win_to_scroll, int num_to_scroll)
 
       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)
-       tui_horizontal_source_scroll (win_to_scroll, RIGHT_SCROLL, _num_to_scroll);
+
+      /* 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);
     }
 }
 
@@ -605,7 +625,8 @@ tui_refresh_all_win (void)
   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)
            {
@@ -628,8 +649,8 @@ tui_refresh_all_win (void)
 }
 
 
-/* Resize all the windows based on the the terminal size.  This
-   function gets called from within the readline sinwinch handler.  */
+/* Resize all the windows based on the terminal size.  This function
+   gets called from within the readline sinwinch handler.  */
 void
 tui_resize_all (void)
 {
@@ -658,8 +679,9 @@ tui_resize_all (void)
       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;
@@ -691,6 +713,7 @@ tui_resize_all (void)
          else
            new_height = first_win->generic.height + split_diff;
 
+         locator->origin.y = new_height + 1;
          make_invisible_and_set_new_height (first_win, new_height);
          TUI_CMD_WIN->generic.origin.y = locator->origin.y + 1;
          TUI_CMD_WIN->generic.width += width_diff;
@@ -713,7 +736,8 @@ tui_resize_all (void)
            {
              first_win = TUI_DATA_WIN;
              first_win->generic.width += width_diff;
-             second_win = (struct tui_win_info *) (tui_source_windows ())->list[0];
+             second_win = (struct tui_win_info *)
+               (tui_source_windows ())->list[0];
              second_win->generic.width += width_diff;
            }
          /* Change the first window's height/width.  */
@@ -755,8 +779,9 @@ tui_resize_all (void)
 
          /* Change the command window's height/width.  */
          TUI_CMD_WIN->generic.origin.y = locator->origin.y + 1;
-         make_invisible_and_set_new_height (
-                            TUI_CMD_WIN, TUI_CMD_WIN->generic.height + cmd_split_diff);
+         make_invisible_and_set_new_height (TUI_CMD_WIN,
+                                            TUI_CMD_WIN->generic.height
+                                            + cmd_split_diff);
          make_visible_with_new_height (first_win);
          make_visible_with_new_height (second_win);
          make_visible_with_new_height (TUI_CMD_WIN);
@@ -766,20 +791,18 @@ tui_resize_all (void)
            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++)
        {
-         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] = (struct tui_win_info *) NULL;
            }
        }
-      tui_set_win_resized_to (TRUE);
       /* Turn keypad back on, unless focus is in the command
         window.  */
       if (win_with_focus != TUI_CMD_WIN)
@@ -787,20 +810,35 @@ tui_resize_all (void)
     }
 }
 
-
+#ifdef SIGWINCH
 /* SIGWINCH signal handler for the tui.  This signal handler is always
    called, even when the readline package clears signals because it is
    set as the old_sigwinch() (TUI only).  */
-void
+static 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);
 }
+#endif
 
+/* 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 +924,8 @@ tui_set_focus (char *arg, int from_tty)
       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
@@ -899,7 +938,8 @@ The window name specified must be valid and visible.\n"));
        tui_refresh_data_win ();
       xfree (buf_ptr);
       printf_filtered (_("Focus set to %s window.\n"),
-                      tui_win_name ((struct tui_gen_win_info *) tui_win_with_focus ()));
+                      tui_win_name ((struct tui_gen_win_info *)
+                                    tui_win_with_focus ()));
     }
   else
     warning (_("Incorrect Number of Arguments.\n%s"), FOCUS_USAGE);
@@ -921,7 +961,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++)
-    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",
@@ -984,14 +1025,13 @@ tui_set_win_height (char *arg, int from_tty)
        {
          *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);
 
-         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
@@ -1022,10 +1062,9 @@ The window name specified must be valid and visible.\n"));
                        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"),
@@ -1075,9 +1114,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);
 
-         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);
        }
@@ -1099,7 +1138,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
-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;
 
@@ -1114,7 +1154,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);
-         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;
 
@@ -1153,11 +1194,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)
-               { /*
-                  ** 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)
@@ -1192,21 +1232,22 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info, int new_height)
                                                  first_win,
                                 first_win->generic.height + first_split_diff);
                  second_win->generic.origin.y = first_win->generic.height - 1;
-                 make_invisible_and_set_new_height (
-                   second_win, second_win->generic.height + second_split_diff);
+                 make_invisible_and_set_new_height (second_win,
+                                                    second_win->generic.height
+                                                    + second_split_diff);
                  TUI_CMD_WIN->generic.origin.y = locator->origin.y + 1;
                  make_invisible_and_set_new_height (TUI_CMD_WIN, new_height);
                }
              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;
+
                          for (i = TUI_CMD_WIN->generic.height + diff;
                               (i < 1); i++)
                            if (primary_win_info == first_win)
@@ -1231,8 +1272,8 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info, int new_height)
                  if ((TUI_CMD_WIN->generic.height + diff) < 1)
                    make_invisible_and_set_new_height (TUI_CMD_WIN, 1);
                  else
-                   make_invisible_and_set_new_height (
-                                    TUI_CMD_WIN, TUI_CMD_WIN->generic.height + diff);
+                   make_invisible_and_set_new_height (TUI_CMD_WIN,
+                                                      TUI_CMD_WIN->generic.height + diff);
                }
              make_visible_with_new_height (TUI_CMD_WIN);
              make_visible_with_new_height (second_win);
@@ -1253,7 +1294,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
-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;
@@ -1294,8 +1336,9 @@ make_invisible_and_set_new_height (struct tui_win_info *win_info, int height)
       /* Delete all data item windows.  */
       for (i = 0; i < win_info->generic.content_size; i++)
        {
-         gen_win_info = (struct tui_gen_win_info *) & ((struct tui_win_element *)
-                     win_info->generic.content[i])->which_element.data_window;
+         gen_win_info = (struct tui_gen_win_info *)
+           &((struct tui_win_element *)
+             win_info->generic.content[i])->which_element.data_window;
          tui_delete_win (gen_win_info->handle);
          gen_win_info->handle = (WINDOW *) NULL;
        }
@@ -1324,19 +1367,23 @@ make_visible_with_new_height (struct tui_win_info *win_info)
       tui_make_visible (win_info->detail.source_info.execution_info);
       if (win_info->generic.content != NULL)
        {
+         struct gdbarch *gdbarch = win_info->detail.source_info.gdbarch;
          struct tui_line_or_address line_or_addr;
          struct symtab_and_line cursal
            = get_current_source_symtab_and_line ();
 
          line_or_addr = win_info->detail.source_info.start_line_or_addr;
          tui_free_win_content (&win_info->generic);
-         tui_update_source_window (win_info, cursal.symtab, line_or_addr, TRUE);
+         tui_update_source_window (win_info, gdbarch,
+                                   cursal.symtab, line_or_addr, TRUE);
        }
       else if (deprecated_safe_get_selected_frame () != NULL)
        {
          struct tui_line_or_address line;
-         struct symtab_and_line cursal = get_current_source_symtab_and_line ();
+         struct symtab_and_line cursal
+           = get_current_source_symtab_and_line ();
          struct frame_info *frame = deprecated_safe_get_selected_frame ();
+         struct gdbarch *gdbarch = get_frame_arch (frame);
 
          s = find_pc_symtab (get_frame_pc (frame));
          if (win_info->generic.type == SRC_WIN)
@@ -1349,7 +1396,7 @@ make_visible_with_new_height (struct tui_win_info *win_info)
              line.loa = LOA_ADDRESS;
              find_line_pc (s, cursal.line, &line.u.addr);
            }
-         tui_update_source_window (win_info, s, line, TRUE);
+         tui_update_source_window (win_info, gdbarch, s, line, TRUE);
        }
       if (tui_win_has_locator (win_info))
        {
@@ -1363,6 +1410,14 @@ make_visible_with_new_height (struct tui_win_info *win_info)
     case CMD_WIN:
       win_info->detail.command_info.cur_line = 0;
       win_info->detail.command_info.curch = 0;
+#ifdef HAVE_WRESIZE
+      wresize (TUI_CMD_WIN->generic.handle,
+              TUI_CMD_WIN->generic.height,
+              TUI_CMD_WIN->generic.width);
+#endif
+      mvwin (TUI_CMD_WIN->generic.handle,
+            TUI_CMD_WIN->generic.origin.y,
+            TUI_CMD_WIN->generic.origin.x);
       wmove (win_info->generic.handle,
             win_info->detail.command_info.cur_line,
             win_info->detail.command_info.curch);
@@ -1374,7 +1429,8 @@ make_visible_with_new_height (struct tui_win_info *win_info)
 
 
 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 ());
 
@@ -1386,12 +1442,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)
        {
-         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;
@@ -1420,12 +1476,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];
            }
-         /*
-            ** 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. */
@@ -1434,29 +1488,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) >=
-                   (MIN_WIN_HEIGHT * 2) &&
-                   new_height >= MIN_CMD_WIN_HEIGHT);
+                   (MIN_WIN_HEIGHT * 2) 
+                   && new_height >= MIN_CMD_WIN_HEIGHT);
              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;
-             /*
-                ** 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)
-               {       /*
-                          ** 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
@@ -1474,12 +1526,11 @@ new_height_ok (struct tui_win_info *primary_win_info, int new_height)
                      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)
-           ok = (new_height >= min_height && total_height <= cur_total_height);
+           ok = (new_height >= min_height 
+                 && total_height <= cur_total_height);
        }
     }
 
@@ -1488,17 +1539,16 @@ new_height_ok (struct tui_win_info *primary_win_info, int new_height)
 
 
 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 ();
 
-  /*
-     ** 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;
@@ -1542,8 +1592,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);
 
-         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)