1 files changed, 81 insertions, 86 deletions

diff --git a/src/nvim/window.c b/src/nvim/window.c
index 3cadfe612a..24fe529fd6 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -1300,6 +1300,7 @@ static void win_rotate(int upwards, int count)
     if (upwards) {              /* first window becomes last window */
       /* remove first window/frame from the list */
       frp = curwin->w_frame->fr_parent->fr_child;
+      assert(frp != NULL);
       wp1 = frp->fr_win;
       win_remove(wp1, NULL);
       frame_remove(frp);
@@ -3025,8 +3026,10 @@ static void new_frame(win_T *wp)
 void win_init_size(void)
 {
   firstwin->w_height = ROWS_AVAIL;
+  firstwin->w_height_inner = firstwin->w_height;
   topframe->fr_height = ROWS_AVAIL;
   firstwin->w_width = Columns;
+  firstwin->w_width_inner = firstwin->w_width;
   topframe->fr_width = Columns;
 }
 
@@ -3118,7 +3121,7 @@ int win_new_tabpage(int after, char_u *filename)
 
     redraw_all_later(NOT_VALID);
 
-    if (ui_is_external(kUIMultigrid)) {
+    if (ui_has(kUIMultigrid)) {
         tabpage_check_windows(tp);
     }
 
@@ -3319,7 +3322,7 @@ static void enter_tabpage(tabpage_T *tp, buf_T *old_curbuf, int trigger_enter_au
   lastwin = tp->tp_lastwin;
   topframe = tp->tp_topframe;
 
-  if (old_curtab != curtab && ui_is_external(kUIMultigrid)) {
+  if (old_curtab != curtab && ui_has(kUIMultigrid)) {
      tabpage_check_windows(old_curtab);
   }
 
@@ -3889,7 +3892,6 @@ static win_T *win_alloc(win_T *after, int hidden)
 
   // allocate window structure and linesizes arrays
   win_T *new_wp = xcalloc(1, sizeof(win_T));
-  win_alloc_lines(new_wp);
 
   new_wp->handle = ++last_win_id;
   handle_register_window(new_wp);
@@ -3970,7 +3972,7 @@ win_free (
     }
   }
 
-  win_free_lsize(wp);
+  xfree(wp->w_lines);
 
   for (i = 0; i < wp->w_tagstacklen; ++i)
     xfree(wp->w_tagstack[i].tagname);
@@ -4010,7 +4012,7 @@ win_free (
 
 void win_free_grid(win_T *wp, bool reinit)
 {
-  if (wp->w_grid.handle != 0 && ui_is_external(kUIMultigrid)) {
+  if (wp->w_grid.handle != 0 && ui_has(kUIMultigrid)) {
     ui_call_grid_destroy(wp->w_grid.handle);
     wp->w_grid.handle = 0;
   }
@@ -4118,28 +4120,6 @@ static void frame_remove(frame_T *frp)
 
 
 /*
- * Allocate w_lines[] for window "wp".
- */
-void win_alloc_lines(win_T *wp)
-{
-  wp->w_lines_valid = 0;
-  assert(wp->w_grid.Rows >= 0);
-  wp->w_lines = xcalloc(MAX(wp->w_grid.Rows + 1, Rows), sizeof(wline_T));
-}
-
-/*
- * free lsize arrays for a window
- */
-void win_free_lsize(win_T *wp)
-{
-  // TODO: why would wp be NULL here?
-  if (wp != NULL) {
-    xfree(wp->w_lines);
-    wp->w_lines = NULL;
-  }
-}
-
-/*
  * Called from win_new_shellsize() after Rows changed.
  * This only does the current tab page, others must be done when made active.
  */
@@ -4876,9 +4856,9 @@ void win_drag_vsep_line(win_T *dragwin, int offset)
 // Has no effect when the window is less than two lines.
 void set_fraction(win_T *wp)
 {
-  if (wp->w_height > 1) {
-    wp->w_fraction = ((long)wp->w_wrow * FRACTION_MULT + wp->w_height / 2)
-                   / (long)wp->w_height;
+  if (wp->w_height_inner > 1) {
+    wp->w_fraction = ((long)wp->w_wrow * FRACTION_MULT + wp->w_height_inner / 2)
+                   / (long)wp->w_height_inner;
   }
 }
 
@@ -4889,46 +4869,25 @@ void set_fraction(win_T *wp)
  */
 void win_new_height(win_T *wp, int height)
 {
-  int prev_height = wp->w_height;
-
-  /* Don't want a negative height.  Happens when splitting a tiny window.
-   * Will equalize heights soon to fix it. */
-  if (height < 0)
+  // Don't want a negative height.  Happens when splitting a tiny window.
+  // Will equalize heights soon to fix it.
+  if (height < 0) {
     height = 0;
-  if (wp->w_height == height)
-    return;         /* nothing to do */
-
-  if (wp->w_height > 0) {
-    if (wp == curwin) {
-      // w_wrow needs to be valid. When setting 'laststatus' this may
-      // call win_new_height() recursively.
-      validate_cursor();
-    }
-    if (wp->w_height != prev_height) {  // -V547
-      return;  // Recursive call already changed the size, bail out.
-    }
-    if (wp->w_wrow != wp->w_prev_fraction_row) {
-      set_fraction(wp);
-    }
   }
-
-  wp->w_height = height;
-  wp->w_skipcol = 0;
-
-  // There is no point in adjusting the scroll position when exiting.  Some
-  // values might be invalid.
-  if (!exiting) {
-    scroll_to_fraction(wp, prev_height);
+  if (wp->w_height == height) {
+    return;  // nothing to do
   }
 
+  wp->w_height = height;
   wp->w_pos_changed = true;
+  win_set_inner_size(wp);
 }
 
 void scroll_to_fraction(win_T *wp, int prev_height)
 {
     linenr_T lnum;
     int sline, line_size;
-    int height = wp->w_height;
+    int height = wp->w_height_inner;
 
   /* Don't change w_topline when height is zero.  Don't set w_topline when
    * 'scrollbind' is set and this isn't the current window. */
@@ -4951,8 +4910,8 @@ void scroll_to_fraction(win_T *wp, int prev_height)
       // Make sure the whole cursor line is visible, if possible.
       const int rows = plines_win(wp, lnum, false);
 
-      if (sline > wp->w_height - rows) {
-        sline = wp->w_height - rows;
+      if (sline > wp->w_height_inner - rows) {
+        sline = wp->w_height_inner - rows;
         wp->w_wrow -= rows - line_size;
       }
     }
@@ -4964,14 +4923,14 @@ void scroll_to_fraction(win_T *wp, int prev_height)
        * room use w_skipcol;
        */
       wp->w_wrow = line_size;
-      if (wp->w_wrow >= wp->w_height
-          && (wp->w_width - win_col_off(wp)) > 0) {
-        wp->w_skipcol += wp->w_width - win_col_off(wp);
-        --wp->w_wrow;
-        while (wp->w_wrow >= wp->w_height) {
-          wp->w_skipcol += wp->w_width - win_col_off(wp)
+      if (wp->w_wrow >= wp->w_height_inner
+          && (wp->w_width_inner - win_col_off(wp)) > 0) {
+        wp->w_skipcol += wp->w_width_inner - win_col_off(wp);
+        wp->w_wrow--;
+        while (wp->w_wrow >= wp->w_height_inner) {
+          wp->w_skipcol += wp->w_width_inner - win_col_off(wp)
                            + win_col_off2(wp);
-          --wp->w_wrow;
+          wp->w_wrow--;
         }
       }
       set_topline(wp, lnum);
@@ -5024,10 +4983,58 @@ void scroll_to_fraction(win_T *wp, int prev_height)
   redraw_win_later(wp, SOME_VALID);
   wp->w_redr_status = TRUE;
   invalidate_botline_win(wp);
+}
+
+void win_set_inner_size(win_T *wp)
+{
+  int width = wp->w_width_request;
+  if (width == 0) {
+    width = wp->w_width;
+  }
+
+  int prev_height = wp->w_height_inner;
+  int height = wp->w_height_request;
+  if (height == 0) {
+    height = wp->w_height;
+  }
+
+  if (height != prev_height) {
+    if (height > 0) {
+      if (wp == curwin) {
+        // w_wrow needs to be valid. When setting 'laststatus' this may
+        // call win_new_height() recursively.
+        validate_cursor();
+      }
+      if (wp->w_height_inner != prev_height) {  // -V547
+        return;  // Recursive call already changed the size, bail out.
+      }
+      if (wp->w_wrow != wp->w_prev_fraction_row) {
+        set_fraction(wp);
+      }
+    }
+    wp->w_height_inner = height;
+    wp->w_skipcol = 0;
+
+    // There is no point in adjusting the scroll position when exiting.  Some
+    // values might be invalid.
+    if (!exiting) {
+      scroll_to_fraction(wp, prev_height);
+    }
+  }
+
+  if (width != wp->w_width_inner) {
+    wp->w_width_inner = width;
+    wp->w_lines_valid = 0;
+    changed_line_abv_curs_win(wp);
+    invalidate_botline_win(wp);
+    if (wp == curwin) {
+      update_topline();
+      curs_columns(true);  // validate w_wrow
+    }
+  }
 
   if (wp->w_buffer->terminal) {
-    terminal_resize(wp->w_buffer->terminal, 0, wp->w_height);
-    redraw_win_later(wp, NOT_VALID);
+    terminal_check_size(wp->w_buffer->terminal);
   }
 }
 
@@ -5035,23 +5042,11 @@ void scroll_to_fraction(win_T *wp, int prev_height)
 void win_new_width(win_T *wp, int width)
 {
   wp->w_width = width;
-  wp->w_lines_valid = 0;
-  changed_line_abv_curs_win(wp);
-  invalidate_botline_win(wp);
-  if (wp == curwin) {
-    update_topline();
-    curs_columns(TRUE);         /* validate w_wrow */
-  }
+  win_set_inner_size(wp);
+
   redraw_win_later(wp, NOT_VALID);
   wp->w_redr_status = TRUE;
 
-  if (wp->w_buffer->terminal) {
-    if (wp->w_height != 0) {
-      terminal_resize(wp->w_buffer->terminal,
-                      (uint16_t)(MAX(0, wp->w_width - win_col_off(wp))),
-                      0);
-    }
-  }
   wp->w_pos_changed = true;
 }
 
@@ -5355,7 +5350,7 @@ static void last_status_rec(frame_T *fr, int statusline)
  */
 int tabline_height(void)
 {
-  if (ui_is_external(kUITabline)) {
+  if (ui_has(kUITabline)) {
     return 0;
   }
   assert(first_tabpage);
@@ -6092,7 +6087,7 @@ void win_findbuf(typval_T *argvars, list_T *list)
 
 void win_ui_flush(void)
 {
-  if (!ui_is_external(kUIMultigrid)) {
+  if (!ui_has(kUIMultigrid)) {
     return;
   }