[gdb/tui] Use more box_width in tui-regs.c

While experimenting with can_box () == false by default, I noticed two places
in tui-regs.c where we can replace a hardcoded 1 with box_width ().

It also turned out to be necessary to set scrollok to false, otherwise writing
the last char of the last line with register info will cause a scroll.

Tested on x86_64-linux.

Approved-By: Tom Tromey <tom@tromey.com>

diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index 4c6ea8aff0d45ea2ccd6749299770773bd97f96b..ba801ddc050502e3dc4a2106a7e8e62f6cfeb9bb 100644 (file)
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -288,7 +288,7 @@ tui_data_window::display_registers_from (int start_element_no)
 
   /* Now create each data "sub" window, and write the display into
      it.  */
-  int cur_y = 1;
+  int cur_y = box_width ();
   while (i < m_regs_content.size () && cur_y <= height - box_size ())
     {
       for (int j = 0;
@@ -296,7 +296,7 @@ tui_data_window::display_registers_from (int start_element_no)
           j++)
        {
          /* Create the window if necessary.  */
-         m_regs_content[i].x = (m_item_width * j) + 1;
+         m_regs_content[i].x = box_width () + (m_item_width * j);
          m_regs_content[i].y = cur_y;
          m_regs_content[i].visible = true;
          m_regs_content[i].rerender (handle.get (), m_item_width);
@@ -487,6 +487,10 @@ tui_data_window::check_register_values (frame_info_ptr frame)
 void
 tui_data_item_window::rerender (WINDOW *handle, int field_width)
 {
+  /* In case the regs window is not boxed, we'll write the last char in the
+     last line here, causing a scroll, so prevent that.  */
+  scrollok (handle, FALSE);
+
   if (highlight)
     /* We ignore the return value, casting it to void in order to avoid
        a compiler warning.  The warning itself was introduced by a patch