Fix TUI source window drawing

The smaxrow and smaxcol parameters of prefresh are the bottom right corner
of the text area inclusive, not exclusive.

And if the source window grows bigger in height, the pad has to grow as
well.

gdb/ChangeLog:

2021-01-05  Hannes Domani  <ssbssa@yahoo.de>

	PR tui/26927
	* tui/tui-winsource.c (tui_source_window_base::refresh_window):
	Fix source pad size in prefresh.
	(tui_source_window_base::show_source_content): Grow source pad
	if necessary.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7ece6c75d9cd9df119b1f44d69cc5faf3b5c7c41..7716ff9b1aad49a508ab8d154aba4b5a3b18f0e6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2021-01-05  Hannes Domani  <ssbssa@yahoo.de>
+
+       PR tui/26927
+       * tui/tui-winsource.c (tui_source_window_base::refresh_window):
+       Fix source pad size in prefresh.
+       (tui_source_window_base::show_source_content): Grow source pad
+       if necessary.
+
 2021-01-04  Mike Frysinger  <vapier@gentoo.org>
 
        * bfin-tdep.c (bfin_push_dummy_call): Use align_up.

diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index adbd2777fc799518e9b6e070b301f0282a110fde..55b66e1bc1670f20b7b692be21ab2873972243d0 100644 (file)
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -262,7 +262,7 @@ tui_source_window_base::refresh_window ()
      scrolled beyond where we clip.  */
   m_horizontal_offset = pad_x;
   prefresh (m_pad.get (), 0, pad_x, y + 1, x + left_margin,
-           y + 1 + m_content.size (), x + left_margin + view_width - 1);
+           y + m_content.size (), x + left_margin + view_width - 1);
 }
 
 void
@@ -273,7 +273,8 @@ tui_source_window_base::show_source_content ()
   check_and_display_highlight_if_needed ();
 
   int pad_width = std::max (m_max_length, width);
-  if (m_pad == nullptr || pad_width > getmaxx (m_pad.get ()))
+  if (m_pad == nullptr || pad_width > getmaxx (m_pad.get ())
+      || m_content.size () > getmaxy (m_pad.get ()))
     m_pad.reset (newpad (m_content.size (), pad_width));
 
   werase (m_pad.get ());