Make TUI resizing tests more robust
[deliverable/binutils-gdb.git] / gdb / tui / tui-win.c
index 0d155fbd2ca1aa2de5a28fa5d6651d7c3a21dd65..feeee34c0831d76c82a216d0da1251b200124692 100644 (file)
@@ -1,6 +1,6 @@
 /* TUI window generic functions.
 
-   Copyright (C) 1998-2015 Free Software Foundation, Inc.
+   Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
    Contributed by Hewlett-Packard Company.
 
 #include "cli/cli-cmds.h"
 #include "top.h"
 #include "source.h"
+#include "event-loop.h"
+#include "gdbcmd.h"
 
 #include "tui/tui.h"
+#include "tui/tui-io.h"
+#include "tui/tui-command.h"
 #include "tui/tui-data.h"
+#include "tui/tui-layout.h"
 #include "tui/tui-wingeneral.h"
 #include "tui/tui-stack.h"
 #include "tui/tui-regs.h"
 #include "tui/tui-disasm.h"
 #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 <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 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 void tui_set_win_height_command (char *, int);
-static void tui_xdb_set_win_height_command (char *, int);
-static void tui_all_windows_info (char *, int);
-static void tui_set_focus_command (char *, int);
-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 *, 
+static void tui_set_tab_width_command (const char *, int);
+static void tui_refresh_all_command (const char *, int);
+static void tui_all_windows_info (const char *, int);
+static void tui_scroll_forward_command (const char *, int);
+static void tui_scroll_backward_command (const char *, int);
+static void tui_scroll_left_command (const char *, int);
+static void tui_scroll_right_command (const char *, int);
+static void parse_scrolling_args (const 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"
-
-/***************************************
-** PUBLIC FUNCTIONS
-***************************************/
+#define WIN_HEIGHT_USAGE    "Usage: winheight WINDOW-NAME [+ | -] NUM-LINES\n"
+#define FOCUS_USAGE         "Usage: focus [WINDOW-NAME | next | prev]\n"
 
 #ifndef ACS_LRCORNER
 #  define ACS_LRCORNER '+'
@@ -315,19 +302,19 @@ tui_update_variables (void)
 }
 
 static void
-set_tui_cmd (char *args, int from_tty)
+set_tui_cmd (const char *args, int from_tty)
 {
 }
 
 static void
-show_tui_cmd (char *args, int from_tty)
+show_tui_cmd (const char *args, int from_tty)
 {
 }
 
 static struct cmd_list_element *tuilist;
 
 static void
-tui_command (char *args, int from_tty)
+tui_command (const char *args, int from_tty)
 {
   printf_unfiltered (_("\"tui\" must be followed by the name of a "
                      "tui command.\n"));
@@ -344,132 +331,124 @@ tui_get_cmd_list (void)
   return &tuilist;
 }
 
-/* Function to initialize gdb commands, for tui window
-   manipulation.  */
+/* The set_func hook of "set tui ..." commands that affect the window
+   borders on the TUI display.  */
+void
+tui_set_var_cmd (const char *null_args,
+                int from_tty, struct cmd_list_element *c)
+{
+  if (tui_update_variables () && tui_active)
+    tui_rehighlight_all ();
+}
 
-/* Provide a prototype to silence -Wmissing-prototypes.  */
-extern initialize_file_ftype _initialize_tui_win;
+\f
 
-void
-_initialize_tui_win (void)
+/* True if TUI resizes should print a message.  This is used by the
+   test suite.  */
+
+static bool resize_message;
+
+static void
+show_tui_resize_message (struct ui_file *file, int from_tty,
+                        struct cmd_list_element *c, const char *value)
 {
-  static struct cmd_list_element *tui_setlist;
-  static struct cmd_list_element *tui_showlist;
+  fprintf_filtered (file, _("TUI resize messaging is %s.\n"), value);
+}
 
-  /* Define the classes of commands.
-     They will appear in the help list in the reverse of this order.  */
-  add_prefix_cmd ("tui", class_tui, set_tui_cmd,
-                  _("TUI configuration variables"),
-                 &tui_setlist, "set tui ",
-                 0 /* allow-unknown */, &setlist);
-  add_prefix_cmd ("tui", class_tui, show_tui_cmd,
-                  _("TUI configuration variables"),
-                 &tui_showlist, "show tui ",
-                 0 /* allow-unknown */, &showlist);
+\f
 
-  add_com ("refresh", class_tui, tui_refresh_all_command,
-           _("Refresh the terminal display.\n"));
-  if (xdb_commands)
-    add_com_alias ("U", "refresh", class_tui, 0);
-  add_com ("tabset", class_tui, tui_set_tab_width_command, _("\
-Set the width (in characters) of tab stops.\n\
-Usage: tabset <n>\n"));
-  add_com ("winheight", class_tui, tui_set_win_height_command, _("\
-Set the height of a specified window.\n\
-Usage: winheight <win_name> [+ | -] <#lines>\n\
-Window names are:\n\
-src  : the source window\n\
-cmd  : the command window\n\
-asm  : the disassembly window\n\
-regs : the register display\n"));
-  add_com_alias ("wh", "winheight", class_tui, 0);
-  add_info ("win", tui_all_windows_info,
-           _("List of all displayed windows.\n"));
-  add_com ("focus", class_tui, tui_set_focus_command, _("\
-Set focus to named window or next/prev window.\n\
-Usage: focus {<win> | next | prev}\n\
-Valid Window names are:\n\
-src  : the source window\n\
-asm  : the disassembly window\n\
-regs : the register display\n\
-cmd  : the command window\n"));
-  add_com_alias ("fs", "focus", class_tui, 0);
-  add_com ("+", class_tui, tui_scroll_forward_command, _("\
-Scroll window forward.\n\
-Usage: + [win] [n]\n"));
-  add_com ("-", class_tui, tui_scroll_backward_command, _("\
-Scroll window backward.\n\
-Usage: - [win] [n]\n"));
-  add_com ("<", class_tui, tui_scroll_left_command, _("\
-Scroll window text to the left.\n\
-Usage: < [win] [n]\n"));
-  add_com (">", class_tui, tui_scroll_right_command, _("\
-Scroll window text to the right.\n\
-Usage: > [win] [n]\n"));
-  if (xdb_commands)
-    add_com ("w", class_xdb, tui_xdb_set_win_height_command, _("\
-XDB compatibility command for setting the height of a command window.\n\
-Usage: w <#lines>\n"));
+/* Generic window name completion function.  Complete window name pointed
+   to by TEXT and WORD.  If INCLUDE_NEXT_PREV_P is true then the special
+   window names 'next' and 'prev' will also be considered as possible
+   completions of the window name.  */
 
-  /* Define the tui control variables.  */
-  add_setshow_enum_cmd ("border-kind", no_class, tui_border_kind_enums,
-                       &tui_border_kind, _("\
-Set the kind of border for TUI windows."), _("\
-Show the kind of border for TUI windows."), _("\
-This variable controls the border of TUI windows:\n\
-space           use a white space\n\
-ascii           use ascii characters + - | for the border\n\
-acs             use the Alternate Character Set"),
-                       NULL,
-                       show_tui_border_kind,
-                       &tui_setlist, &tui_showlist);
+static void
+window_name_completer (completion_tracker &tracker,
+                      int include_next_prev_p,
+                      const char *text, const char *word)
+{
+  std::vector<const char *> completion_name_vec;
 
-  add_setshow_enum_cmd ("border-mode", no_class, tui_border_mode_enums,
-                       &tui_border_mode, _("\
-Set the attribute mode to use for the TUI window borders."), _("\
-Show the attribute mode to use for the TUI window borders."), _("\
-This variable controls the attributes to use for the window borders:\n\
-normal          normal display\n\
-standout        use highlight mode of terminal\n\
-reverse         use reverse video mode\n\
-half            use half bright\n\
-half-standout   use half bright and standout mode\n\
-bold            use extra bright or bold\n\
-bold-standout   use extra bright or bold with standout mode"),
-                       NULL,
-                       show_tui_border_mode,
-                       &tui_setlist, &tui_showlist);
+  for (tui_win_info *win_info : all_tui_windows ())
+    {
+      const char *completion_name = NULL;
 
-  add_setshow_enum_cmd ("active-border-mode", no_class, tui_border_mode_enums,
-                       &tui_active_border_mode, _("\
-Set the attribute mode to use for the active TUI window border."), _("\
-Show the attribute mode to use for the active TUI window border."), _("\
-This variable controls the attributes to use for the active window border:\n\
-normal          normal display\n\
-standout        use highlight mode of terminal\n\
-reverse         use reverse video mode\n\
-half            use half bright\n\
-half-standout   use half bright and standout mode\n\
-bold            use extra bright or bold\n\
-bold-standout   use extra bright or bold with standout mode"),
-                       NULL,
-                       show_tui_active_border_mode,
-                       &tui_setlist, &tui_showlist);
+      /* We can't focus on an invisible window.  */
+      if (!win_info->is_visible ())
+       continue;
+
+      completion_name = win_info->name ();
+      gdb_assert (completion_name != NULL);
+      completion_name_vec.push_back (completion_name);
+    }
+
+  /* If no windows are considered visible then the TUI has not yet been
+     initialized.  But still "focus src" and "focus cmd" will work because
+     invoking the focus command will entail initializing the TUI which sets the
+     default layout to SRC_COMMAND.  */
+  if (completion_name_vec.empty ())
+    {
+      completion_name_vec.push_back (SRC_NAME);
+      completion_name_vec.push_back (CMD_NAME);
+    }
+
+  if (include_next_prev_p)
+    {
+      completion_name_vec.push_back ("next");
+      completion_name_vec.push_back ("prev");
+    }
+
+
+  completion_name_vec.push_back (NULL);
+  complete_on_enum (tracker, completion_name_vec.data (), text, word);
+}
+
+/* Complete possible window names to focus on.  TEXT is the complete text
+   entered so far, WORD is the word currently being completed.  */
+
+static void
+focus_completer (struct cmd_list_element *ignore,
+                completion_tracker &tracker,
+                const char *text, const char *word)
+{
+  window_name_completer (tracker, 1, text, word);
+}
+
+/* Complete possible window names for winheight command.  TEXT is the
+   complete text entered so far, WORD is the word currently being
+   completed.  */
+
+static void
+winheight_completer (struct cmd_list_element *ignore,
+                    completion_tracker &tracker,
+                    const char *text, const char *word)
+{
+  /* The first word is the window name.  That we can complete.  Subsequent
+     words can't be completed.  */
+  if (word != text)
+    return;
+
+  window_name_completer (tracker, 0, text, word);
 }
 
 /* Update gdb's knowledge of the terminal size.  */
 void
 tui_update_gdb_sizes (void)
 {
-  char cmd[50];
-
-  /* Set to TUI command window dimension or use readline values.  */
-  xsnprintf (cmd, sizeof (cmd), "set width %d",
-           tui_active ? TUI_CMD_WIN->generic.width : tui_term_width());
-  execute_command (cmd, 0);
-  xsnprintf (cmd, sizeof (cmd), "set height %d",
-           tui_active ? TUI_CMD_WIN->generic.height : tui_term_height());
-  execute_command (cmd, 0);
+  int width, height;
+
+  if (tui_active)
+    {
+      width = TUI_CMD_WIN->width;
+      height = TUI_CMD_WIN->height;
+    }
+  else
+    {
+      width = tui_term_width ();
+      height = tui_term_height ();
+    }
+
+  set_screen_width_and_height (width, height);
 }
 
 
@@ -481,174 +460,68 @@ tui_set_win_focus_to (struct tui_win_info *win_info)
     {
       struct tui_win_info *win_with_focus = tui_win_with_focus ();
 
-      if (win_with_focus != NULL
-         && win_with_focus->generic.type != CMD_WIN)
-       tui_unhighlight_win (win_with_focus);
+      tui_unhighlight_win (win_with_focus);
       tui_set_win_with_focus (win_info);
-      if (win_info->generic.type != CMD_WIN)
-       tui_highlight_win (win_info);
+      tui_highlight_win (win_info);
     }
 }
 
 
 void
-tui_scroll_forward (struct tui_win_info *win_to_scroll, 
-                   int num_to_scroll)
+tui_win_info::forward_scroll (int num_to_scroll)
 {
-  if (win_to_scroll != TUI_CMD_WIN)
-    {
-      int _num_to_scroll = 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 (win_to_scroll == TUI_SRC_WIN)
-       tui_vertical_source_scroll (FORWARD_SCROLL, _num_to_scroll);
-      else if (win_to_scroll == TUI_DISASM_WIN)
-       tui_vertical_disassem_scroll (FORWARD_SCROLL, _num_to_scroll);
-      else if (win_to_scroll == TUI_DATA_WIN)
-       tui_vertical_data_scroll (FORWARD_SCROLL, _num_to_scroll);
-    }
-}
+  if (num_to_scroll == 0)
+    num_to_scroll = height - 3;
 
-void
-tui_scroll_backward (struct tui_win_info *win_to_scroll, 
-                    int num_to_scroll)
-{
-  if (win_to_scroll != TUI_CMD_WIN)
-    {
-      int _num_to_scroll = 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 (win_to_scroll == TUI_SRC_WIN)
-       tui_vertical_source_scroll (BACKWARD_SCROLL, _num_to_scroll);
-      else if (win_to_scroll == TUI_DISASM_WIN)
-       tui_vertical_disassem_scroll (BACKWARD_SCROLL, _num_to_scroll);
-      else if (win_to_scroll == TUI_DATA_WIN)
-       tui_vertical_data_scroll (BACKWARD_SCROLL, _num_to_scroll);
-    }
+  do_scroll_vertical (num_to_scroll);
 }
 
-
 void
-tui_scroll_left (struct tui_win_info *win_to_scroll,
-                int num_to_scroll)
+tui_win_info::backward_scroll (int num_to_scroll)
 {
-  if (win_to_scroll != TUI_CMD_WIN)
-    {
-      int _num_to_scroll = 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 (num_to_scroll == 0)
+    num_to_scroll = height - 3;
+
+  do_scroll_vertical (-num_to_scroll);
 }
 
 
 void
-tui_scroll_right (struct tui_win_info *win_to_scroll, 
-                 int num_to_scroll)
+tui_win_info::left_scroll (int num_to_scroll)
 {
-  if (win_to_scroll != TUI_CMD_WIN)
-    {
-      int _num_to_scroll = 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 (num_to_scroll == 0)
+    num_to_scroll = 1;
+
+  do_scroll_horizontal (num_to_scroll);
 }
 
 
-/* Scroll a window.  Arguments are passed through a va_list.  */
 void
-tui_scroll (enum tui_scroll_direction direction,
-           struct tui_win_info *win_to_scroll,
-           int num_to_scroll)
+tui_win_info::right_scroll (int num_to_scroll)
 {
-  switch (direction)
-    {
-    case FORWARD_SCROLL:
-      tui_scroll_forward (win_to_scroll, num_to_scroll);
-      break;
-    case BACKWARD_SCROLL:
-      tui_scroll_backward (win_to_scroll, num_to_scroll);
-      break;
-    case LEFT_SCROLL:
-      tui_scroll_left (win_to_scroll, num_to_scroll);
-      break;
-    case RIGHT_SCROLL:
-      tui_scroll_right (win_to_scroll, num_to_scroll);
-      break;
-    default:
-      break;
-    }
+  if (num_to_scroll == 0)
+    num_to_scroll = 1;
+
+  do_scroll_horizontal (-num_to_scroll);
 }
 
 
 void
 tui_refresh_all_win (void)
 {
-  enum tui_win_type type;
-
   clearok (curscr, TRUE);
-  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)
-       {
-         switch (type)
-           {
-           case SRC_WIN:
-           case DISASSEM_WIN:
-             tui_show_source_content (tui_win_list[type]);
-             tui_check_and_display_highlight_if_needed (tui_win_list[type]);
-             tui_erase_exec_info_content (tui_win_list[type]);
-             tui_update_exec_info (tui_win_list[type]);
-             break;
-           case DATA_WIN:
-             tui_refresh_data_win ();
-             break;
-           default:
-             break;
-           }
-       }
-    }
-  tui_show_locator_content ();
+  tui_refresh_all ();
 }
 
+void
+tui_rehighlight_all (void)
+{
+  for (tui_win_info *win_info : all_tui_windows ())
+    win_info->check_and_display_highlight_if_needed ();
+}
 
 /* Resize all the windows based on the terminal size.  This function
-   gets called from within the readline sinwinch handler.  */
+   gets called from within the readline SIGWINCH handler.  */
 void
 tui_resize_all (void)
 {
@@ -664,8 +537,8 @@ tui_resize_all (void)
       struct tui_win_info *win_with_focus = tui_win_with_focus ();
       struct tui_win_info *first_win;
       struct tui_win_info *second_win;
-      struct tui_gen_win_info *locator = tui_locator_win_info_ptr ();
-      enum tui_win_type win_type;
+      tui_source_window_base *src_win;
+      struct tui_locator_window *locator = tui_locator_win_info_ptr ();
       int new_height, split_diff, cmd_split_diff, num_wins_displayed = 2;
 
 #ifdef HAVE_RESIZE_TERM
@@ -673,7 +546,7 @@ tui_resize_all (void)
 #endif      
       /* Turn keypad off while we resize.  */
       if (win_with_focus != TUI_CMD_WIN)
-       keypad (TUI_CMD_WIN->generic.handle, FALSE);
+       keypad (TUI_CMD_WIN->handle.get (), FALSE);
       tui_update_gdb_sizes ();
       tui_set_term_height_to (screenheight);
       tui_set_term_width_to (screenwidth);
@@ -695,74 +568,64 @@ tui_resize_all (void)
          AIX 5.3 does not define clear.  */
       erase ();
       clearok (curscr, TRUE);
-      refresh ();
       switch (cur_layout)
        {
        case SRC_COMMAND:
        case DISASSEM_COMMAND:
-         first_win = (struct tui_win_info *) (tui_source_windows ())->list[0];
-         first_win->generic.width += width_diff;
-         locator->width += width_diff;
+         src_win = *(tui_source_windows ().begin ());
          /* Check for invalid heights.  */
          if (height_diff == 0)
-           new_height = first_win->generic.height;
-         else if ((first_win->generic.height + split_diff) >=
+           new_height = src_win->height;
+         else if ((src_win->height + split_diff) >=
                   (screenheight - MIN_CMD_WIN_HEIGHT - 1))
            new_height = screenheight - MIN_CMD_WIN_HEIGHT - 1;
-         else if ((first_win->generic.height + split_diff) <= 0)
+         else if ((src_win->height + split_diff) <= 0)
            new_height = MIN_WIN_HEIGHT;
          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;
-         new_height = screenheight - TUI_CMD_WIN->generic.origin.y;
-         make_invisible_and_set_new_height (TUI_CMD_WIN, new_height);
-         make_visible_with_new_height (first_win);
-         make_visible_with_new_height (TUI_CMD_WIN);
-         if (first_win->generic.content_size <= 0)
-           tui_erase_source_content (first_win, EMPTY_SOURCE_PROMPT);
+           new_height = src_win->height + split_diff;
+
+         src_win->resize (new_height, screenwidth, 0, 0);
+
+         locator->resize (1, screenwidth, 0, new_height);
+
+         new_height = screenheight - (new_height + 1);
+         TUI_CMD_WIN->resize (new_height, screenwidth,
+                              0, locator->origin.y + 1);
          break;
        default:
          if (cur_layout == SRC_DISASSEM_COMMAND)
            {
-             first_win = TUI_SRC_WIN;
-             first_win->generic.width += width_diff;
+             src_win = TUI_SRC_WIN;
+             first_win = src_win;
              second_win = TUI_DISASM_WIN;
-             second_win->generic.width += width_diff;
            }
          else
            {
              first_win = TUI_DATA_WIN;
-             first_win->generic.width += width_diff;
-             second_win = (struct tui_win_info *)
-               (tui_source_windows ())->list[0];
-             second_win->generic.width += width_diff;
+             src_win = *(tui_source_windows ().begin ());
+             second_win = src_win;
            }
          /* Change the first window's height/width.  */
          /* Check for invalid heights.  */
          if (height_diff == 0)
-           new_height = first_win->generic.height;
-         else if ((first_win->generic.height +
-                   second_win->generic.height + (split_diff * 2)) >=
+           new_height = first_win->height;
+         else if ((first_win->height +
+                   second_win->height + (split_diff * 2)) >=
                   (screenheight - MIN_CMD_WIN_HEIGHT - 1))
            new_height = (screenheight - MIN_CMD_WIN_HEIGHT - 1) / 2;
-         else if ((first_win->generic.height + split_diff) <= 0)
+         else if ((first_win->height + split_diff) <= 0)
            new_height = MIN_WIN_HEIGHT;
          else
-           new_height = first_win->generic.height + split_diff;
-         make_invisible_and_set_new_height (first_win, new_height);
+           new_height = first_win->height + split_diff;
 
-         locator->width += width_diff;
+         first_win->resize (new_height, screenwidth, 0, 0);
 
          /* Change the second window's height/width.  */
          /* Check for invalid heights.  */
          if (height_diff == 0)
-           new_height = second_win->generic.height;
-         else if ((first_win->generic.height +
-                   second_win->generic.height + (split_diff * 2)) >=
+           new_height = second_win->height;
+         else if ((first_win->height +
+                   second_win->height + (split_diff * 2)) >=
                   (screenheight - MIN_CMD_WIN_HEIGHT - 1))
            {
              new_height = screenheight - MIN_CMD_WIN_HEIGHT - 1;
@@ -771,119 +634,140 @@ tui_resize_all (void)
              else
                new_height /= 2;
            }
-         else if ((second_win->generic.height + split_diff) <= 0)
+         else if ((second_win->height + split_diff) <= 0)
            new_height = MIN_WIN_HEIGHT;
          else
-           new_height = second_win->generic.height + split_diff;
-         second_win->generic.origin.y = first_win->generic.height - 1;
-         make_invisible_and_set_new_height (second_win, new_height);
+           new_height = second_win->height + split_diff;
+
+         second_win->resize (new_height, screenwidth,
+                             0, first_win->height - 1);
+
+         locator->resize (1, screenwidth,
+                          0, second_win->origin.y + new_height);
 
          /* 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_visible_with_new_height (first_win);
-         make_visible_with_new_height (second_win);
-         make_visible_with_new_height (TUI_CMD_WIN);
-         if (first_win->generic.content_size <= 0)
-           tui_erase_source_content (first_win, EMPTY_SOURCE_PROMPT);
-         if (second_win->generic.content_size <= 0)
-           tui_erase_source_content (second_win, EMPTY_SOURCE_PROMPT);
+         new_height = screenheight - (locator->origin.y + 1);
+         TUI_CMD_WIN->resize (new_height, screenwidth,
+                              0, locator->origin.y + 1);
          break;
        }
-      /* 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)
-             && !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_delete_invisible_windows ();
       /* Turn keypad back on, unless focus is in the command
         window.  */
       if (win_with_focus != TUI_CMD_WIN)
-       keypad (TUI_CMD_WIN->generic.handle, TRUE);
+       keypad (TUI_CMD_WIN->handle.get (), TRUE);
     }
 }
 
 #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).  */
+/* Token for use by TUI's asynchronous SIGWINCH handler.  */
+static struct async_signal_handler *tui_sigwinch_token;
+
+/* TUI's SIGWINCH signal handler.  */
 static void
 tui_sigwinch_handler (int signal)
 {
-  /* Say that a resize was done so that the readline can do it later
-     when appropriate.  */
-  tui_set_win_resized_to (TRUE);
+  mark_async_signal_handler (tui_sigwinch_token);
+  tui_set_win_resized_to (true);
+}
+
+/* Callback for asynchronously resizing TUI following a SIGWINCH signal.  */
+static void
+tui_async_resize_screen (gdb_client_data arg)
+{
+  rl_resize_terminal ();
+
+  if (!tui_active)
+    {
+      int screen_height, screen_width;
+
+      rl_get_screen_size (&screen_height, &screen_width);
+      set_screen_width_and_height (screen_width, screen_height);
+
+      /* win_resized is left set so that the next call to tui_enable()
+        resizes the TUI windows.  */
+    }
+  else
+    {
+      tui_set_win_resized_to (false);
+      tui_resize_all ();
+      tui_refresh_all_win ();
+      tui_update_gdb_sizes ();
+      if (resize_message)
+       {
+         static int count;
+         printf_unfiltered ("@@ resize done %d, size = %dx%d\n", count,
+                            tui_term_width (), tui_term_height ());
+         ++count;
+       }
+      tui_redisplay_readline ();
+    }
 }
 #endif
 
-/* Initializes SIGWINCH signal handler for the tui.  */
+/* Initialize TUI's SIGWINCH signal handler.  Note that the handler is not
+   uninstalled when we exit TUI, so the handler should not assume that TUI is
+   always active.  */
 void
 tui_initialize_win (void)
 {
 #ifdef SIGWINCH
+  tui_sigwinch_token
+    = create_async_signal_handler (tui_async_resize_screen, NULL);
+
+  {
 #ifdef HAVE_SIGACTION
-  struct sigaction old_winch;
+    struct sigaction old_winch;
 
-  memset (&old_winch, 0, sizeof (old_winch));
-  old_winch.sa_handler = &tui_sigwinch_handler;
+    memset (&old_winch, 0, sizeof (old_winch));
+    old_winch.sa_handler = &tui_sigwinch_handler;
 #ifdef SA_RESTART
-  old_winch.sa_flags = SA_RESTART;
+    old_winch.sa_flags = SA_RESTART;
 #endif
-  sigaction (SIGWINCH, &old_winch, NULL);
+    sigaction (SIGWINCH, &old_winch, NULL);
 #else
-  signal (SIGWINCH, &tui_sigwinch_handler);
+    signal (SIGWINCH, &tui_sigwinch_handler);
 #endif
+  }
 #endif
 }
 
 
-/*************************
-** STATIC LOCAL FUNCTIONS
-**************************/
-
-
 static void
-tui_scroll_forward_command (char *arg, int from_tty)
+tui_scroll_forward_command (const char *arg, int from_tty)
 {
   int num_to_scroll = 1;
   struct tui_win_info *win_to_scroll;
 
   /* Make sure the curses mode is enabled.  */
   tui_enable ();
-  if (arg == (char *) NULL)
-    parse_scrolling_args (arg, &win_to_scroll, (int *) NULL);
+  if (arg == NULL)
+    parse_scrolling_args (arg, &win_to_scroll, NULL);
   else
     parse_scrolling_args (arg, &win_to_scroll, &num_to_scroll);
-  tui_scroll (FORWARD_SCROLL, win_to_scroll, num_to_scroll);
+  win_to_scroll->forward_scroll (num_to_scroll);
 }
 
 
 static void
-tui_scroll_backward_command (char *arg, int from_tty)
+tui_scroll_backward_command (const char *arg, int from_tty)
 {
   int num_to_scroll = 1;
   struct tui_win_info *win_to_scroll;
 
   /* Make sure the curses mode is enabled.  */
   tui_enable ();
-  if (arg == (char *) NULL)
-    parse_scrolling_args (arg, &win_to_scroll, (int *) NULL);
+  if (arg == NULL)
+    parse_scrolling_args (arg, &win_to_scroll, NULL);
   else
     parse_scrolling_args (arg, &win_to_scroll, &num_to_scroll);
-  tui_scroll (BACKWARD_SCROLL, win_to_scroll, num_to_scroll);
+  win_to_scroll->backward_scroll (num_to_scroll);
 }
 
 
 static void
-tui_scroll_left_command (char *arg, int from_tty)
+tui_scroll_left_command (const char *arg, int from_tty)
 {
   int num_to_scroll;
   struct tui_win_info *win_to_scroll;
@@ -891,12 +775,12 @@ tui_scroll_left_command (char *arg, int from_tty)
   /* Make sure the curses mode is enabled.  */
   tui_enable ();
   parse_scrolling_args (arg, &win_to_scroll, &num_to_scroll);
-  tui_scroll (LEFT_SCROLL, win_to_scroll, num_to_scroll);
+  win_to_scroll->left_scroll (num_to_scroll);
 }
 
 
 static void
-tui_scroll_right_command (char *arg, int from_tty)
+tui_scroll_right_command (const char *arg, int from_tty)
 {
   int num_to_scroll;
   struct tui_win_info *win_to_scroll;
@@ -904,84 +788,71 @@ tui_scroll_right_command (char *arg, int from_tty)
   /* Make sure the curses mode is enabled.  */
   tui_enable ();
   parse_scrolling_args (arg, &win_to_scroll, &num_to_scroll);
-  tui_scroll (RIGHT_SCROLL, win_to_scroll, num_to_scroll);
+  win_to_scroll->right_scroll (num_to_scroll);
 }
 
 
 /* Set focus to the window named by 'arg'.  */
 static void
-tui_set_focus (char *arg, int from_tty)
+tui_set_focus_command (const char *arg, int from_tty)
 {
-  if (arg != (char *) NULL)
-    {
-      char *buf_ptr = (char *) xstrdup (arg);
-      int i;
-      struct tui_win_info *win_info = (struct tui_win_info *) NULL;
+  tui_enable ();
 
-      for (i = 0; (i < strlen (buf_ptr)); i++)
-       buf_ptr[i] = toupper (arg[i]);
+  if (arg != NULL)
+    {
+      struct tui_win_info *win_info = NULL;
 
-      if (subset_compare (buf_ptr, "NEXT"))
+      if (subset_compare (arg, "next"))
        win_info = tui_next_win (tui_win_with_focus ());
-      else if (subset_compare (buf_ptr, "PREV"))
+      else if (subset_compare (arg, "prev"))
        win_info = tui_prev_win (tui_win_with_focus ());
       else
-       win_info = tui_partial_win_by_name (buf_ptr);
+       win_info = tui_partial_win_by_name (arg);
 
-      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
-       {
-         tui_set_win_focus_to (win_info);
-         keypad (TUI_CMD_WIN->generic.handle, (win_info != TUI_CMD_WIN));
-       }
+      if (win_info == NULL)
+       error (_("Unrecognized window name \"%s\""), arg);
+      if (!win_info->is_visible ())
+       error (_("Window \"%s\" is not visible"), arg);
 
-      if (TUI_DATA_WIN && TUI_DATA_WIN->generic.is_visible)
-       tui_refresh_data_win ();
-      xfree (buf_ptr);
+      tui_set_win_focus_to (win_info);
+      keypad (TUI_CMD_WIN->handle.get (), win_info != TUI_CMD_WIN);
       printf_filtered (_("Focus set to %s window.\n"),
-                      tui_win_name ((struct tui_gen_win_info *)
-                                    tui_win_with_focus ()));
+                      tui_win_with_focus ()->name ());
     }
   else
-    warning (_("Incorrect Number of Arguments.\n%s"), FOCUS_USAGE);
-}
-
-static void
-tui_set_focus_command (char *arg, int from_tty)
-{
-  /* Make sure the curses mode is enabled.  */
-  tui_enable ();
-  tui_set_focus (arg, from_tty);
+    error (_("Incorrect Number of Arguments.\n%s"), FOCUS_USAGE);
 }
 
-
 static void
-tui_all_windows_info (char *arg, int from_tty)
+tui_all_windows_info (const char *arg, int from_tty)
 {
-  enum tui_win_type type;
   struct tui_win_info *win_with_focus = tui_win_with_focus ();
+  struct ui_out *uiout = current_uiout;
+
+  ui_out_emit_table table_emitter (uiout, 3, -1, "tui-windows");
+  uiout->table_header (10, ui_left, "name", "Name");
+  uiout->table_header (5, ui_right, "lines", "Lines");
+  uiout->table_header (10, ui_left, "focus", "Focus");
+  uiout->table_body ();
 
-  for (type = SRC_WIN; (type < MAX_MAJOR_WINDOWS); type++)
-    if (tui_win_list[type] 
-       && tui_win_list[type]->generic.is_visible)
+  for (tui_win_info *win_info : all_tui_windows ())
+    if (win_info->is_visible ())
       {
-       if (win_with_focus == tui_win_list[type])
-         printf_filtered ("        %s\t(%d lines)  <has focus>\n",
-                          tui_win_name (&tui_win_list[type]->generic),
-                          tui_win_list[type]->generic.height);
+       ui_out_emit_tuple tuple_emitter (uiout, nullptr);
+
+       uiout->field_string ("name", win_info->name ());
+       uiout->field_signed ("lines", win_info->height);
+       if (win_with_focus == win_info)
+         uiout->field_string ("focus", _("(has focus)"));
        else
-         printf_filtered ("        %s\t(%d lines)\n",
-                          tui_win_name (&tui_win_list[type]->generic),
-                          tui_win_list[type]->generic.height);
+         uiout->field_skip ("focus");
+       uiout->text ("\n");
       }
 }
 
 
 static void
-tui_refresh_all_command (char *arg, int from_tty)
+tui_refresh_all_command (const char *arg, int from_tty)
 {
   /* Make sure the curses mode is enabled.  */
   tui_enable ();
@@ -989,157 +860,153 @@ tui_refresh_all_command (char *arg, int from_tty)
   tui_refresh_all_win ();
 }
 
+/* The tab width that should be used by the TUI.  */
 
-/* Set the height of the specified window.  */
+unsigned int tui_tab_width = DEFAULT_TAB_LEN;
+
+/* The tab width as set by the user.  */
+
+static unsigned int internal_tab_width = DEFAULT_TAB_LEN;
+
+/* After the tab width is set, call this to update the relevant
+   windows.  */
+
+static void
+update_tab_width ()
+{
+  for (tui_win_info *win_info : all_tui_windows ())
+    {
+      if (win_info->is_visible ())
+       win_info->update_tab_width ();
+    }
+}
+
+/* Callback for "set tui tab-width".  */
+
+static void
+tui_set_tab_width (const char *ignore,
+                  int from_tty, struct cmd_list_element *c)
+{
+  if (internal_tab_width == 0)
+    {
+      internal_tab_width = tui_tab_width;
+      error (_("Tab width must not be 0"));
+    }
+
+  tui_tab_width = internal_tab_width;
+  update_tab_width ();
+}
+
+/* Callback for "show tui tab-width".  */
+
+static void
+tui_show_tab_width (struct ui_file *file, int from_tty,
+                   struct cmd_list_element *c, const char *value)
+{
+  fprintf_filtered (gdb_stdout, _("TUI tab width is %s spaces.\n"), value);
+
+}
+
+/* Set the tab width of the specified window.  */
 static void
-tui_set_tab_width_command (char *arg, int from_tty)
+tui_set_tab_width_command (const char *arg, int from_tty)
 {
   /* Make sure the curses mode is enabled.  */
   tui_enable ();
-  if (arg != (char *) NULL)
+  if (arg != NULL)
     {
       int ts;
 
       ts = atoi (arg);
-      if (ts > 0)
-       tui_set_default_tab_len (ts);
-      else
+      if (ts <= 0)
        warning (_("Tab widths greater than 0 must be specified."));
+      else
+       {
+         internal_tab_width = ts;
+         tui_tab_width = ts;
+
+         update_tab_width ();
+       }
     }
 }
 
 
 /* Set the height of the specified window.  */
 static void
-tui_set_win_height (char *arg, int from_tty)
+tui_set_win_height_command (const char *arg, int from_tty)
 {
   /* Make sure the curses mode is enabled.  */
   tui_enable ();
-  if (arg != (char *) NULL)
+  if (arg != NULL)
     {
-      char *buf = xstrdup (arg);
+      std::string copy = arg;
+      char *buf = &copy[0];
       char *buf_ptr = buf;
-      char *wname = (char *) NULL;
-      int new_height, i;
+      char *wname = NULL;
+      int new_height;
       struct tui_win_info *win_info;
 
       wname = buf_ptr;
       buf_ptr = strchr (buf_ptr, ' ');
-      if (buf_ptr != (char *) NULL)
+      if (buf_ptr != NULL)
        {
-         *buf_ptr = (char) 0;
+         *buf_ptr = '\0';
 
          /* 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)
-           warning (_("Invalid window specified. \n\
-The window name specified must be valid and visible.\n"));
-         else
+         if (win_info == NULL)
+           error (_("Unrecognized window name \"%s\""), arg);
+         if (!win_info->is_visible ())
+           error (_("Window \"%s\" is not visible"), arg);
+
+         /* Process the size.  */
+         buf_ptr = skip_spaces (buf_ptr);
+
+         if (*buf_ptr != '\0')
            {
-             /* Process the size.  */
-             while (*(++buf_ptr) == ' ')
-               ;
+             bool negate = false;
+             bool fixed_size = true;
+             int input_no;;
 
-             if (*buf_ptr != (char) 0)
+             if (*buf_ptr == '+' || *buf_ptr == '-')
                {
-                 int negate = FALSE;
-                 int fixed_size = TRUE;
-                 int input_no;;
-
-                 if (*buf_ptr == '+' || *buf_ptr == '-')
-                   {
-                     if (*buf_ptr == '-')
-                       negate = TRUE;
-                     fixed_size = FALSE;
-                     buf_ptr++;
-                   }
-                 input_no = atoi (buf_ptr);
-                 if (input_no > 0)
-                   {
-                     if (negate)
-                       input_no *= (-1);
-                     if (fixed_size)
-                       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.  */
-                     if (tui_adjust_win_heights (win_info,
-                                               new_height) == TUI_FAILURE)
-                       warning (_("Invalid window height specified.\n%s"),
-                                WIN_HEIGHT_USAGE);
-                     else
-                        tui_update_gdb_sizes ();
-                   }
+                 if (*buf_ptr == '-')
+                   negate = true;
+                 fixed_size = false;
+                 buf_ptr++;
+               }
+             input_no = atoi (buf_ptr);
+             if (input_no > 0)
+               {
+                 if (negate)
+                   input_no *= (-1);
+                 if (fixed_size)
+                   new_height = input_no;
                  else
+                   new_height = win_info->height + input_no;
+
+                 /* 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"),
                             WIN_HEIGHT_USAGE);
+                 else
+                   tui_update_gdb_sizes ();
                }
+             else
+               warning (_("Invalid window height specified.\n%s"),
+                        WIN_HEIGHT_USAGE);
            }
        }
       else
        printf_filtered (WIN_HEIGHT_USAGE);
-
-      if (buf != (char *) NULL)
-       xfree (buf);
     }
   else
     printf_filtered (WIN_HEIGHT_USAGE);
 }
 
-/* Set the height of the specified window, with va_list.  */
-static void
-tui_set_win_height_command (char *arg, int from_tty)
-{
-  /* Make sure the curses mode is enabled.  */
-  tui_enable ();
-  tui_set_win_height (arg, from_tty);
-}
-
-
-/* XDB Compatibility command for setting the window height.  This will
-   increase or decrease the command window by the specified
-   amount.  */
-static void
-tui_xdb_set_win_height (char *arg, int from_tty)
-{
-  /* Make sure the curses mode is enabled.  */
-  tui_enable ();
-  if (arg != (char *) NULL)
-    {
-      int input_no = atoi (arg);
-
-      if (input_no > 0)
-       {                       /* 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)
-           warning (_("Invalid window height specified.\n%s"),
-                    XDBWIN_HEIGHT_USAGE);
-       }
-      else
-       warning (_("Invalid window height specified.\n%s"),
-                XDBWIN_HEIGHT_USAGE);
-    }
-  else
-    warning (_("Invalid window height specified.\n%s"), XDBWIN_HEIGHT_USAGE);
-}
-
-/* Set the height of the specified window, with va_list.  */
-static void
-tui_xdb_set_win_height_command (char *arg, int from_tty)
-{
-  tui_xdb_set_win_height (arg, 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,
@@ -1150,23 +1017,25 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info,
   if (new_height_ok (primary_win_info, new_height))
     {
       status = TUI_SUCCESS;
-      if (new_height != primary_win_info->generic.height)
+      if (new_height != primary_win_info->height)
        {
          int diff;
          struct tui_win_info *win_info;
-         struct tui_gen_win_info *locator = tui_locator_win_info_ptr ();
+         struct tui_locator_window *locator = tui_locator_win_info_ptr ();
          enum tui_layout_type cur_layout = tui_current_layout ();
+         int width = tui_term_width ();
 
-         diff = (new_height - primary_win_info->generic.height) * (-1);
+         diff = (new_height - primary_win_info->height) * (-1);
          if (cur_layout == SRC_COMMAND 
              || cur_layout == DISASSEM_COMMAND)
            {
              struct tui_win_info *src_win_info;
 
-             make_invisible_and_set_new_height (primary_win_info, new_height);
-             if (primary_win_info->generic.type == CMD_WIN)
+             primary_win_info->resize (new_height, width,
+                                       0, primary_win_info->origin.y);
+             if (primary_win_info->type == CMD_WIN)
                {
-                 win_info = (tui_source_windows ())->list[0];
+                 win_info = *(tui_source_windows ().begin ());
                  src_win_info = win_info;
                }
              else
@@ -1174,31 +1043,38 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info,
                  win_info = tui_win_list[CMD_WIN];
                  src_win_info = primary_win_info;
                }
-             make_invisible_and_set_new_height (win_info,
-                                            win_info->generic.height + diff);
-             TUI_CMD_WIN->generic.origin.y = locator->origin.y + 1;
-             make_visible_with_new_height (win_info);
-             make_visible_with_new_height (primary_win_info);
-             if (src_win_info->generic.content_size <= 0)
-               tui_erase_source_content (src_win_info, EMPTY_SOURCE_PROMPT);
+             win_info->resize (win_info->height + diff, width,
+                               0, win_info->origin.y);
+             TUI_CMD_WIN->origin.y = locator->origin.y + 1;
+             if ((src_win_info->type == SRC_WIN
+                  || src_win_info->type == DISASSEM_WIN))
+               {
+                 tui_source_window_base *src_base
+                   = (tui_source_window_base *) src_win_info;
+                 if (src_base->content.empty ())
+                   src_base->erase_source_content ();
+               }
            }
          else
            {
              struct tui_win_info *first_win;
-             struct tui_win_info *second_win;
+             struct tui_source_window_base *second_win;
+             tui_source_window_base *src1;
 
              if (cur_layout == SRC_DISASSEM_COMMAND)
                {
-                 first_win = TUI_SRC_WIN;
+                 src1 = TUI_SRC_WIN;
+                 first_win = src1;
                  second_win = TUI_DISASM_WIN;
                }
              else
                {
+                 src1 = nullptr;
                  first_win = TUI_DATA_WIN;
-                 second_win = (tui_source_windows ())->list[0];
+                 second_win = *(tui_source_windows ().begin ());
                }
              if (primary_win_info == TUI_CMD_WIN)
-               { /* Split the change in height accross the 1st & 2nd
+               { /* Split the change in height across the 1st & 2nd
                     windows, adjusting them as well.  */
                  /* Subtract the locator.  */
                  int first_split_diff = diff / 2;
@@ -1206,8 +1082,8 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info,
 
                  if (diff % 2)
                    {
-                     if (first_win->generic.height >
-                         second_win->generic.height)
+                     if (first_win->height >
+                         second_win->height)
                        if (diff < 0)
                          first_split_diff--;
                        else
@@ -1220,72 +1096,74 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info,
                            second_split_diff++;
                        }
                    }
-                 /* Make sure that the minimum hieghts are
+                 /* Make sure that the minimum heights are
                     honored.  */
-                 while ((first_win->generic.height + first_split_diff) < 3)
+                 while ((first_win->height + first_split_diff) < 3)
                    {
                      first_split_diff++;
                      second_split_diff--;
                    }
-                 while ((second_win->generic.height + second_split_diff) < 3)
+                 while ((second_win->height + second_split_diff) < 3)
                    {
                      second_split_diff++;
                      first_split_diff--;
                    }
-                 make_invisible_and_set_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);
-                 TUI_CMD_WIN->generic.origin.y = locator->origin.y + 1;
-                 make_invisible_and_set_new_height (TUI_CMD_WIN, new_height);
+                 first_win->resize (first_win->height + first_split_diff,
+                                    width,
+                                    0, first_win->origin.y);
+                 second_win->resize (second_win->height + second_split_diff,
+                                     width,
+                                     0, first_win->height - 1);
+                 locator->resize (1, width,
+                                  0, (second_win->origin.y
+                                      + second_win->height + 1));
+
+                 TUI_CMD_WIN->resize (new_height, width,
+                                      0, locator->origin.y + 1);
                }
              else
                {
-                 if ((TUI_CMD_WIN->generic.height + diff) < 1)
+                 if ((TUI_CMD_WIN->height + diff) < 1)
                    { /* 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)
+                     if ((TUI_CMD_WIN->height + diff) < 1)
                        {
                          int i;
 
-                         for (i = TUI_CMD_WIN->generic.height + diff;
+                         for (i = TUI_CMD_WIN->height + diff;
                               (i < 1); i++)
                            if (primary_win_info == first_win)
-                             second_win->generic.height--;
+                             second_win->height--;
                            else
-                             first_win->generic.height--;
+                             first_win->height--;
                        }
                    }
                  if (primary_win_info == first_win)
-                   make_invisible_and_set_new_height (first_win, new_height);
+                   first_win->resize (new_height, width, 0, 0);
                  else
-                   make_invisible_and_set_new_height (
-                                                   first_win,
-                                                 first_win->generic.height);
-                 second_win->generic.origin.y = first_win->generic.height - 1;
+                   first_win->resize (first_win->height, width, 0, 0);
+                 second_win->origin.y = first_win->height - 1;
                  if (primary_win_info == second_win)
-                   make_invisible_and_set_new_height (second_win, new_height);
+                   second_win->resize (new_height, width,
+                                       0, first_win->height - 1);
                  else
-                   make_invisible_and_set_new_height (
-                                     second_win, second_win->generic.height);
-                 TUI_CMD_WIN->generic.origin.y = locator->origin.y + 1;
-                 if ((TUI_CMD_WIN->generic.height + diff) < 1)
-                   make_invisible_and_set_new_height (TUI_CMD_WIN, 1);
+                   second_win->resize (second_win->height, width,
+                                       0, first_win->height - 1);
+                 locator->resize (1, width,
+                                  0, (second_win->origin.y
+                                      + second_win->height + 1));
+                 TUI_CMD_WIN->origin.y = locator->origin.y + 1;
+                 if ((TUI_CMD_WIN->height + diff) < 1)
+                   TUI_CMD_WIN->resize (1, width, 0, locator->origin.y + 1);
                  else
-                   make_invisible_and_set_new_height (TUI_CMD_WIN,
-                                                      TUI_CMD_WIN->generic.height + diff);
+                   TUI_CMD_WIN->resize (TUI_CMD_WIN->height + diff, width,
+                                        0, locator->origin.y + 1);
                }
-             make_visible_with_new_height (TUI_CMD_WIN);
-             make_visible_with_new_height (second_win);
-             make_visible_with_new_height (first_win);
-             if (first_win->generic.content_size <= 0)
-               tui_erase_source_content (first_win, EMPTY_SOURCE_PROMPT);
-             if (second_win->generic.content_size <= 0)
-               tui_erase_source_content (second_win, EMPTY_SOURCE_PROMPT);
+             if (src1 != nullptr && src1->content.empty ())
+               src1->erase_source_content ();
+             if (second_win->content.empty ())
+               second_win->erase_source_content ();
            }
        }
     }
@@ -1293,145 +1171,14 @@ tui_adjust_win_heights (struct tui_win_info *primary_win_info,
   return status;
 }
 
+/* See tui-data.h.  */
 
-/* Function make the target window (and auxillary windows associated
-   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)
-{
-  int i;
-  struct tui_gen_win_info *gen_win_info;
-
-  tui_make_invisible (&win_info->generic);
-  win_info->generic.height = height;
-  if (height > 1)
-    win_info->generic.viewport_height = height - 1;
-  else
-    win_info->generic.viewport_height = height;
-  if (win_info != TUI_CMD_WIN)
-    win_info->generic.viewport_height--;
-
-  /* Now deal with the auxillary windows associated with win_info.  */
-  switch (win_info->generic.type)
-    {
-    case SRC_WIN:
-    case DISASSEM_WIN:
-      gen_win_info = win_info->detail.source_info.execution_info;
-      tui_make_invisible (gen_win_info);
-      gen_win_info->height = height;
-      gen_win_info->origin.y = win_info->generic.origin.y;
-      if (height > 1)
-       gen_win_info->viewport_height = height - 1;
-      else
-       gen_win_info->viewport_height = height;
-      if (win_info != TUI_CMD_WIN)
-       gen_win_info->viewport_height--;
-
-      if (tui_win_has_locator (win_info))
-       {
-         gen_win_info = tui_locator_win_info_ptr ();
-         tui_make_invisible (gen_win_info);
-         gen_win_info->origin.y = win_info->generic.origin.y + height;
-       }
-      break;
-    case DATA_WIN:
-      /* 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;
-         tui_delete_win (gen_win_info->handle);
-         gen_win_info->handle = (WINDOW *) NULL;
-       }
-      break;
-    default:
-      break;
-    }
-}
-
-
-/* Function to make the windows with new heights visible.  This means
-   re-creating the windows' content since the window had to be
-   destroyed to be made invisible.  */
-static void
-make_visible_with_new_height (struct tui_win_info *win_info)
+int
+tui_win_info::max_height () const
 {
-  struct symtab *s;
-
-  tui_make_visible (&win_info->generic);
-  tui_check_and_display_highlight_if_needed (win_info);
-  switch (win_info->generic.type)
-    {
-    case SRC_WIN:
-    case DISASSEM_WIN:
-      tui_free_win_content (win_info->detail.source_info.execution_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, 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 frame_info *frame = deprecated_safe_get_selected_frame ();
-         struct gdbarch *gdbarch = get_frame_arch (frame);
-
-         s = find_pc_line_symtab (get_frame_pc (frame));
-         if (win_info->generic.type == SRC_WIN)
-           {
-             line.loa = LOA_LINE;
-             line.u.line_no = cursal.line;
-           }
-         else
-           {
-             line.loa = LOA_ADDRESS;
-             find_line_pc (s, cursal.line, &line.u.addr);
-           }
-         tui_update_source_window (win_info, gdbarch, s, line, TRUE);
-       }
-      if (tui_win_has_locator (win_info))
-       {
-         tui_make_visible (tui_locator_win_info_ptr ());
-         tui_show_locator_content ();
-       }
-      break;
-    case DATA_WIN:
-      tui_display_all_data ();
-      break;
-    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);
-      break;
-    default:
-      break;
-    }
+  return tui_term_height () - 2;
 }
 
-
 static int
 new_height_ok (struct tui_win_info *primary_win_info, 
               int new_height)
@@ -1443,25 +1190,21 @@ new_height_ok (struct tui_win_info *primary_win_info,
       int diff;
       enum tui_layout_type cur_layout = tui_current_layout ();
 
-      diff = (new_height - primary_win_info->generic.height) * (-1);
+      diff = (new_height - primary_win_info->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 = (new_height <= primary_win_info->max_height ()
+               && new_height >= MIN_CMD_WIN_HEIGHT);
          if (ok)
            {                   /* Check the total height.  */
              struct tui_win_info *win_info;
 
              if (primary_win_info == TUI_CMD_WIN)
-               win_info = (tui_source_windows ())->list[0];
+               win_info = *(tui_source_windows ().begin ());
              else
                win_info = TUI_CMD_WIN;
              ok = ((new_height +
-                    (win_info->generic.height + diff)) <= tui_term_height ());
+                    (win_info->height + diff)) <= tui_term_height ());
            }
        }
       else
@@ -1478,27 +1221,27 @@ new_height_ok (struct tui_win_info *primary_win_info,
          else
            {
              first_win = TUI_DATA_WIN;
-             second_win = (tui_source_windows ())->list[0];
+             second_win = *(tui_source_windows ().begin ());
            }
          /* 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. */
+           (first_win->height + second_win->height - 1)
+           + TUI_CMD_WIN->height + 1;  /* Locator. */
          if (primary_win_info == TUI_CMD_WIN)
            {
              /* Locator included since first & second win share a line.  */
-             ok = ((first_win->generic.height +
-                    second_win->generic.height + diff) >=
+             ok = ((first_win->height +
+                    second_win->height + diff) >=
                    (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);
+                   (first_win->height +
+                    second_win->height + diff);
                  min_height = MIN_CMD_WIN_HEIGHT;
                }
            }
@@ -1509,25 +1252,25 @@ new_height_ok (struct tui_win_info *primary_win_info,
              /* 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);
+             ok = ((TUI_CMD_WIN->height + diff) > 0);
              if (!ok)
                { /* 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;
+                   ok = (second_win->height + diff) >= min_height;
                  else
-                   ok = (first_win->generic.height + diff) >= min_height;
+                   ok = (first_win->height + diff) >= min_height;
                }
              if (ok)
                {
                  if (primary_win_info == first_win)
                    total_height = new_height +
-                     second_win->generic.height +
-                     TUI_CMD_WIN->generic.height + diff;
+                     second_win->height +
+                     TUI_CMD_WIN->height + diff;
                  else
                    total_height = new_height +
-                     first_win->generic.height +
-                     TUI_CMD_WIN->generic.height + diff;
+                     first_win->height +
+                     TUI_CMD_WIN->height + diff;
                }
            }
          /* Now make sure that the proposed total height doesn't
@@ -1543,7 +1286,7 @@ new_height_ok (struct tui_win_info *primary_win_info,
 
 
 static void
-parse_scrolling_args (char *arg, 
+parse_scrolling_args (const char *arg, 
                      struct tui_win_info **win_to_scroll,
                      int *num_to_scroll)
 {
@@ -1553,21 +1296,22 @@ parse_scrolling_args (char *arg,
 
   /* First set up the default window to scroll, in case there is no
      window name arg.  */
-  if (arg != (char *) NULL)
+  if (arg != NULL)
     {
-      char *buf, *buf_ptr;
+      char *buf_ptr;
 
       /* Process the number of lines to scroll.  */
-      buf = buf_ptr = xstrdup (arg);
+      std::string copy = arg;
+      buf_ptr = &copy[0];
       if (isdigit (*buf_ptr))
        {
          char *num_str;
 
          num_str = buf_ptr;
          buf_ptr = strchr (buf_ptr, ' ');
-         if (buf_ptr != (char *) NULL)
+         if (buf_ptr != NULL)
            {
-             *buf_ptr = (char) 0;
+             *buf_ptr = '\0';
              if (num_to_scroll)
                *num_to_scroll = atoi (num_str);
              buf_ptr++;
@@ -1577,35 +1321,151 @@ parse_scrolling_args (char *arg,
        }
 
       /* Process the window name if one is specified.  */
-      if (buf_ptr != (char *) NULL)
+      if (buf_ptr != NULL)
        {
-         char *wname;
-         int i;
+         const char *wname;
 
-         if (*buf_ptr == ' ')
-           while (*(++buf_ptr) == ' ')
-             ;
+         wname = skip_spaces (buf_ptr);
 
-         if (*buf_ptr != (char) 0)
+         if (*wname != '\0')
            {
-             wname = buf_ptr;
-
-             /* Validate the window name.  */
-             for (i = 0; i < strlen (wname); i++)
-               wname[i] = toupper (wname[i]);
+             *win_to_scroll = tui_partial_win_by_name (wname);
+
+             if (*win_to_scroll == NULL)
+               error (_("Unrecognized window `%s'"), wname);
+             if (!(*win_to_scroll)->is_visible ())
+               error (_("Window is not visible"));
+             else if (*win_to_scroll == TUI_CMD_WIN)
+               *win_to_scroll = *(tui_source_windows ().begin ());
            }
-         else
-           wname = "?";
-         
-         *win_to_scroll = tui_partial_win_by_name (wname);
-
-         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)
-           *win_to_scroll = (tui_source_windows ())->list[0];
        }
-      xfree (buf);
     }
 }
+
+/* Function to initialize gdb commands, for tui window
+   manipulation.  */
+
+void
+_initialize_tui_win (void)
+{
+  static struct cmd_list_element *tui_setlist;
+  static struct cmd_list_element *tui_showlist;
+  struct cmd_list_element *cmd;
+
+  /* Define the classes of commands.
+     They will appear in the help list in the reverse of this order.  */
+  add_prefix_cmd ("tui", class_tui, set_tui_cmd,
+                  _("TUI configuration variables."),
+                 &tui_setlist, "set tui ",
+                 0 /* allow-unknown */, &setlist);
+  add_prefix_cmd ("tui", class_tui, show_tui_cmd,
+                  _("TUI configuration variables."),
+                 &tui_showlist, "show tui ",
+                 0 /* allow-unknown */, &showlist);
+
+  add_com ("refresh", class_tui, tui_refresh_all_command,
+           _("Refresh the terminal display."));
+
+  cmd = add_com ("tabset", class_tui, tui_set_tab_width_command, _("\
+Set the width (in characters) of tab stops.\n\
+Usage: tabset N"));
+  deprecate_cmd (cmd, "set tui tab-width");
+
+  cmd = add_com ("winheight", class_tui, tui_set_win_height_command, _("\
+Set or modify the height of a specified window.\n"
+WIN_HEIGHT_USAGE
+"Window names are:\n\
+   src  : the source window\n\
+   cmd  : the command window\n\
+   asm  : the disassembly window\n\
+   regs : the register display"));
+  add_com_alias ("wh", "winheight", class_tui, 0);
+  set_cmd_completer (cmd, winheight_completer);
+  add_info ("win", tui_all_windows_info,
+           _("List of all displayed windows."));
+  cmd = add_com ("focus", class_tui, tui_set_focus_command, _("\
+Set focus to named window or next/prev window.\n"
+FOCUS_USAGE
+"Valid Window names are:\n\
+   src  : the source window\n\
+   asm  : the disassembly window\n\
+   regs : the register display\n\
+   cmd  : the command window"));
+  add_com_alias ("fs", "focus", class_tui, 0);
+  set_cmd_completer (cmd, focus_completer);
+  add_com ("+", class_tui, tui_scroll_forward_command, _("\
+Scroll window forward.\n\
+Usage: + [WIN] [N]"));
+  add_com ("-", class_tui, tui_scroll_backward_command, _("\
+Scroll window backward.\n\
+Usage: - [WIN] [N]"));
+  add_com ("<", class_tui, tui_scroll_left_command, _("\
+Scroll window text to the left.\n\
+Usage: < [WIN] [N]"));
+  add_com (">", class_tui, tui_scroll_right_command, _("\
+Scroll window text to the right.\n\
+Usage: > [WIN] [N]"));
+
+  /* Define the tui control variables.  */
+  add_setshow_enum_cmd ("border-kind", no_class, tui_border_kind_enums,
+                       &tui_border_kind, _("\
+Set the kind of border for TUI windows."), _("\
+Show the kind of border for TUI windows."), _("\
+This variable controls the border of TUI windows:\n\
+   space           use a white space\n\
+   ascii           use ascii characters + - | for the border\n\
+   acs             use the Alternate Character Set"),
+                       tui_set_var_cmd,
+                       show_tui_border_kind,
+                       &tui_setlist, &tui_showlist);
+
+  add_setshow_enum_cmd ("border-mode", no_class, tui_border_mode_enums,
+                       &tui_border_mode, _("\
+Set the attribute mode to use for the TUI window borders."), _("\
+Show the attribute mode to use for the TUI window borders."), _("\
+This variable controls the attributes to use for the window borders:\n\
+   normal          normal display\n\
+   standout        use highlight mode of terminal\n\
+   reverse         use reverse video mode\n\
+   half            use half bright\n\
+   half-standout   use half bright and standout mode\n\
+   bold            use extra bright or bold\n\
+   bold-standout   use extra bright or bold with standout mode"),
+                       tui_set_var_cmd,
+                       show_tui_border_mode,
+                       &tui_setlist, &tui_showlist);
+
+  add_setshow_enum_cmd ("active-border-mode", no_class, tui_border_mode_enums,
+                       &tui_active_border_mode, _("\
+Set the attribute mode to use for the active TUI window border."), _("\
+Show the attribute mode to use for the active TUI window border."), _("\
+This variable controls the attributes to use for the active window border:\n\
+   normal          normal display\n\
+   standout        use highlight mode of terminal\n\
+   reverse         use reverse video mode\n\
+   half            use half bright\n\
+   half-standout   use half bright and standout mode\n\
+   bold            use extra bright or bold\n\
+   bold-standout   use extra bright or bold with standout mode"),
+                       tui_set_var_cmd,
+                       show_tui_active_border_mode,
+                       &tui_setlist, &tui_showlist);
+
+  add_setshow_zuinteger_cmd ("tab-width", no_class,
+                            &internal_tab_width, _("\
+Set the tab width, in characters, for the TUI."), _("\
+Show the tab witdh, in characters, for the TUI."), _("\
+This variable controls how many spaces are used to display a tab character."),
+                            tui_set_tab_width, tui_show_tab_width,
+                            &tui_setlist, &tui_showlist);
+
+  add_setshow_boolean_cmd ("tui-resize-message", class_maintenance,
+                          &resize_message, _("\
+Set TUI resize messaging."), _("\
+Show TUI resize messaging."), _("\
+When enabled GDB will print a message when the terminal is resized."),
+                          nullptr,
+                          show_tui_resize_message,
+                          &maintenance_set_cmdlist,
+                          &maintenance_show_cmdlist);
+}
This page took 0.045765 seconds and 4 git commands to generate.