gdb/tui: allow cmd window to change size in tui_layout_split::apply

When we switch layouts we call the tui_layout_split::apply member
function to reapply the layout, and recalculate all the window sizes.

One special case is the cmd window, which we try to keep at its
existing size.

However, in some cases it is not appropriate to keep the cmd window at
its existing size.  I will describe two such cases here, in one, we
want the cmd window to reduce in size, and in the other, we want the
cmd window to grow in size.

Try these steps in a 80 columns, by 24 lines terminal:

  (gdb) tui enable
  (gdb) layout src
  (gdb) winheight cmd 20
  (gdb) layout split

You should see that the status window is missing from the new layout,
and that the cmd window has been placed over the border of the asm
window.  The 'info win' output is:

  (gdb) info win
  Name       Lines Columns Focus
  src            3      80 (has focus)
  asm            3      80
  status         1      80
  cmd           20      80

Notice that gdb has assigned 27 lines of screen space, even with the
border overlap between the src and asm windows, this is still 2 lines
too many.

The problem here is that after switching layouts, gdb has forced the
cmd window to retain its 20 line height.  Really, we want the cmd
window to reduce in height so that the src and asm windows can occupy
their minimum required space.

This commit allows this (details on how are below).  After this
commit, in the above situation, we now see the status window displayed
correctly, and the 'info win' output is:

  (gdb) info win
  Name       Lines Columns Focus
  src            3      80 (has focus)
  asm            3      80
  status         1      80
  cmd           18      80

The cmd window has been reduced in size by 2 lines so that everything
can fit on the screen.

The second example is one which was discussed in a recent commit,
consider this case (still in the 80 column, 24 line terminal):

  (gdb) tui enable
  (gdb) tui new-layout conly cmd 1
  (gdb) layout conly
  (gdb) info win
  Name       Lines Columns Focus
  cmd            8      80 (has focus)
  (gdb)

This layout only contains a cmd window, which we would expect to
occupy the entire terminal.  But instead, the cmd window only occupies
the first 8 lines, and the rest of the terminal is unused!

The reason is, again, that the cmd window is keeping its previous
size (8 lines).

After this commit things are slightly different, the 'info win' output
is now:

  (gdb) info win
  Name       Lines Columns Focus
  cmd           20      80 (has focus)

Which is a little better, but why only 20 lines?  Turns out there's
yet another bug hitting this case.  That bug will be addressed in a
later commit, so, for now, we're accepting the 20 lines.

What this commit does is modify the phase of tui_layout_split::apply
that handles any left over space.  Usually, in "Step 2", each
sub-layout has a size calculated.  As the size is an integer, then,
when all sizes are calculated we may have some space left over.

This extra space is then distributed between all the windows fairly
until all the space is used up.

When we consider windows minimum size, or fixed size windows, then it
is possible that we might try to use more space than is available,
this was our first example above.  The same code that added extra
space to the windows, can also be used to reclaim space (in the over
allocation case) to allow all windows to fit.

The problem then is the cmd window, which we often force to a fixed
size.  Inside the loop that handles the allocation of excess space, if
we find that we have tried every window, and still have space either
left to give, or we need to claim back more space, then, if the cmd
window was changed to a fixed size, we can change the cmd window back
to a non-fixed-size window, and proceed to either give, or take space
from the cmd window as needed.

diff --git a/gdb/testsuite/gdb.tui/new-layout.exp b/gdb/testsuite/gdb.tui/new-layout.exp
index 66048e6523895269a1eed1d013c3254f2d2f61fb..0d49d033be502d287809501e9eee830358597948 100644 (file)
--- a/gdb/testsuite/gdb.tui/new-layout.exp
+++ b/gdb/testsuite/gdb.tui/new-layout.exp
@@ -124,5 +124,14 @@ foreach_with_prefix layout $layouts {
        Term::command "winheight src + 5"
        Term::check_box "left window box after grow" 0 0 40 15
        Term::check_box "right window box after grow" 39 0 41 15
+    } elseif {$name == "cmd_only"} {
+       Term::check_region_contents "bottom of cmd window is blank" \
+           0 14 80 10 "^\\s+$"
+       Term::command "info win"
+       Term::check_region_contents "info win output" \
+           0 0 80 24 [multi_line "info win\\s+" \
+                          "Name\\s+Lines\\s+Columns\\s+Focus\\s+" \
+                          "cmd\\s+20\\s+80\\s+\\(has focus\\)\\s+" \
+                          "$gdb_prompt\\s+"]
     }
 }

diff --git a/gdb/testsuite/gdb.tui/winheight.exp b/gdb/testsuite/gdb.tui/winheight.exp
index 0d0c886304d85e462ea660dffb552c347eda4386..b541c21b8250290e2e140ada73e98c4ea556578a 100644 (file)
--- a/gdb/testsuite/gdb.tui/winheight.exp
+++ b/gdb/testsuite/gdb.tui/winheight.exp
@@ -50,3 +50,49 @@ Term::check_box "larger source box again" 0 0 80 15
 Term::command "layout asm"
 Term::check_box "check for asm window" 0 0 80 15
 
+
+# Check what happens when we switch from src layout to split layout.
+# The interesting thing here is that the src layout has one flexible
+# window (the src), the status window, which is of fixed size, and the
+# cmd window, which tries to retain its size when a layout changes.
+#
+# In contrast, the split layout has both a src and asm window, plus
+# the same status and cmd windows.
+#
+# Of particular interest here is the first test, where we maximise the
+# cmd window before switching to split.  This requires gdb to realise
+# that it has to shrink the cmd window, even though this is something
+# gdb usually avoids doing.
+#
+# Each test here is a size for the src window in the 'src' layout.
+# The test then switches to the 'split' layout, and calculates the
+# expected window sizes.
+foreach_with_prefix cmd_size {20 12 5} {
+    set src_size_before [expr 24 - ${cmd_size} - 1]
+    set split_size [expr (24 - ${cmd_size}) / 2]
+
+    if { $split_size < 3 } {
+       # The minimum window size is 3, so force that.
+       set src_size_after 3
+       set asm_size_after 3
+    } elseif { [expr $split_size % 2] == 0 } {
+       # The remaining space can be divided evenly between the two
+       # windows.
+       set src_size_after ${split_size}
+       set asm_size_after ${split_size}
+    } else {
+       # The space can't be divided evenly, the asm window will get
+       # the extra line.
+       set src_size_after ${split_size}
+       set asm_size_after [expr ${split_size} + 1]
+    }
+
+    Term::command "layout src"
+    Term::command "winheight cmd ${cmd_size}"
+    Term::check_box "check for src window" 0 0 80 ${src_size_before}
+
+    # Both windows should be of equal size, which will be their minimum.
+    Term::command "layout split"
+    Term::check_box "check for src window in split" 0 0 80 ${src_size_after}
+    Term::check_box "check for asm window in split" 0 [expr ${src_size_after} - 1] 80 ${asm_size_after}
+}

diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index 30beefddfdb9f9e6aadc95cf7f852f66bda08817..874760d526f3e988625bb15257715cfa8a56b7e7 100644 (file)
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -735,6 +735,30 @@ tui_layout_split::apply (int x_, int y_, int width_, int height_)
   width = width_;
   height = height_;
 
+  /* In some situations we fix the size of the cmd window.  However,
+     occasionally this turns out to be a mistake.  This struct is used to
+     hold the original information about the cmd window, so we can restore
+     it if needed.  */
+  struct old_size_info
+  {
+    /* Constructor.  */
+    old_size_info (int index_, int min_size_, int max_size_)
+      : index (index_),
+       min_size (min_size_),
+       max_size (max_size_)
+    { /* Nothing.  */ }
+
+    /* The index in m_splits where the cmd window was found.  */
+    int index;
+
+    /* The previous min/max size.  */
+    int min_size;
+    int max_size;
+  };
+
+  /* This is given a value only if we fix the size of the cmd window.  */
+  gdb::optional<old_size_info> old_cmd_info;
+
   std::vector<size_info> info (m_splits.size ());
 
   tui_debug_printf ("weights are: %s",
@@ -762,6 +786,10 @@ tui_layout_split::apply (int x_, int y_, int width_, int height_)
          && m_splits[i].layout->get_name () != nullptr
          && strcmp (m_splits[i].layout->get_name (), "cmd") == 0)
        {
+         /* Save the old cmd window information, in case we need to
+            restore it later.  */
+          old_cmd_info.emplace (i, info[i].min_size, info[i].max_size);
+
          /* If this layout has never been applied, then it means the
             user just changed the layout.  In this situation, it's
             desirable to keep the size of the command window the
@@ -833,22 +861,66 @@ tui_layout_split::apply (int x_, int y_, int width_, int height_)
       tui_debug_print_size_info (info);
     }
 
+  /* If we didn't find any sub-layouts that were of a non-fixed size, but
+     we did find the cmd window, then we can consider that a sort-of
+     non-fixed size sub-layout.
+
+     The cmd window might, initially, be of a fixed size (see above), but,
+     we are willing to relax this constraint if required to correctly apply
+     this layout (see below).  */
+  if (last_index == -1 && old_cmd_info.has_value ())
+    last_index = old_cmd_info->index;
+
   /* Allocate any leftover size.  */
-  if (available_size > used_size && last_index != -1)
+  if (available_size != used_size && last_index != -1)
     {
-      /* Loop over all windows until all available space is used up.  */
+      /* Loop over all windows until the amount of used space is equal to
+        the amount of available space.  There's an escape hatch within
+        the loop in case we can't find any sub-layouts to resize.  */
       bool found_window_that_can_grow_p = true;
       for (int idx = last_index;
-          available_size > used_size;
+          available_size != used_size;
           idx = (idx + 1) % m_splits.size ())
        {
-         /* Once we have visited all of the windows, check that we did
-            manage to allocate some more space.  This prevents us getting
-            stuck in the loop forever if we can't allocate anything
-            more.  */
+         /* Every time we get back to last_index, which is where the loop
+            started, we check to make sure that we did assign some space
+            to a window, bringing used_size closer to available_size.
+
+            If we didn't, but the cmd window is of a fixed size, then we
+            can make the console window non-fixed-size, and continue
+            around the loop, hopefully, this will allow the layout to be
+            applied correctly.
+
+            If we still make it around the loop without moving used_size
+            closer to available_size, then there's nothing more we can do,
+            and we break out of the loop.  */
          if (idx == last_index)
            {
-             if (!found_window_that_can_grow_p)
+             /* If the used_size is greater than the available_size then
+                this indicates that the fixed-sized sub-layouts claimed
+                more space than is available.  This layout is not going to
+                work.  Our only hope at this point is to make the cmd
+                window non-fixed-size (if possible), and hope we can
+                shrink this enough to fit the rest of the sub-layouts in.
+
+                Alternatively, we've made it around the loop without
+                adjusting any window's size.  This likely means all
+                windows have hit their min or max size.  Again, our only
+                hope is to make the cmd window non-fixed-size, and hope
+                this fixes all our problems.  */
+             if (old_cmd_info.has_value ()
+                 && ((available_size < used_size)
+                     || !found_window_that_can_grow_p))
+               {
+                 info[old_cmd_info->index].min_size = old_cmd_info->min_size;
+                 info[old_cmd_info->index].max_size = old_cmd_info->max_size;
+                 tui_debug_printf
+                   ("restoring index %d (cmd) size limits, min = %d, max = %d",
+                    old_cmd_info->index, old_cmd_info->min_size,
+                    old_cmd_info->max_size);
+                 old_cmd_info.reset ();
+               }
+             else if (!found_window_that_can_grow_p)
                break;
              found_window_that_can_grow_p = false;
            }
@@ -860,6 +932,13 @@ tui_layout_split::apply (int x_, int y_, int width_, int height_)
              info[idx].size += 1;
              used_size += 1;
            }
+         else if (available_size < used_size
+                  && info[idx].size > info[idx].min_size)
+           {
+             found_window_that_can_grow_p = true;
+             info[idx].size -= 1;
+             used_size -= 1;
+           }
        }
 
       if (debug_tui)