mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-09 04:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: assume STATUS_HEIGHT to be 1 (#17804)

Browse Source 
Since https://github.com/neovim/neovim/pull/17790 being merged means we can assume the value of `STATUS_HEIGHT` to always be 1, this commit removes code that's unnecessary if `STATUS_HEIGHT` is 1.
This commit is contained in:
Famiu Haque
2022-03-27 21:33:54 +06:00
committed by GitHub
parent a8e2c45b94
commit 05edab85d7
1 changed files with 27 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/nvim/window.c
View File

@@ -971,7 +971,6 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)
int before; int before;
int minheight; int minheight;
int wmh1; int wmh1;
int hsep_height;
bool did_set_fraction = false; bool did_set_fraction = false;
// aucmd_win should always remain floating // aucmd_win should always remain floating
@@ -1084,7 +1083,6 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)
} }
} }
} else { } else {
hsep_height = STATUS_HEIGHT;
layout = FR_COL; layout = FR_COL;
/* /*
@@ -1093,7 +1091,7 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)
*/ */
// Current window requires at least 1 space. // Current window requires at least 1 space.
wmh1 = p_wmh == 0 ? 1 : p_wmh; wmh1 = p_wmh == 0 ? 1 : p_wmh;
needed = wmh1 + hsep_height; needed = wmh1 + STATUS_HEIGHT;
if (flags & WSP_ROOM) { if (flags & WSP_ROOM) {
needed += p_wh - wmh1; needed += p_wh - wmh1;
} }
@@ -1135,15 +1133,15 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)
new_size = oldwin_height / 2; new_size = oldwin_height / 2;
} }
if (new_size > available - minheight - hsep_height) { if (new_size > available - minheight - STATUS_HEIGHT) {
new_size = available - minheight - hsep_height; new_size = available - minheight - STATUS_HEIGHT;
} }
if (new_size < wmh1) { if (new_size < wmh1) {
new_size = wmh1; new_size = wmh1;
} }
// if it doesn't fit in the current window, need win_equal() // if it doesn't fit in the current window, need win_equal()
if (oldwin_height - new_size - hsep_height < p_wmh) { if (oldwin_height - new_size - STATUS_HEIGHT < p_wmh) {
do_equal = true; do_equal = true;
} }
@@ -1156,7 +1154,7 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)
set_fraction(oldwin); set_fraction(oldwin);
did_set_fraction = true; did_set_fraction = true;
win_setheight_win(oldwin->w_height + new_size + hsep_height, win_setheight_win(oldwin->w_height + new_size + STATUS_HEIGHT,
oldwin); oldwin);
oldwin_height = oldwin->w_height; oldwin_height = oldwin->w_height;
if (need_status) { if (need_status) {
@@ -1173,7 +1171,7 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)
while (frp != NULL) { while (frp != NULL) {
if (frp->fr_win != oldwin && frp->fr_win != NULL if (frp->fr_win != oldwin && frp->fr_win != NULL
&& (frp->fr_win->w_height > new_size && (frp->fr_win->w_height > new_size
|| frp->fr_win->w_height > oldwin_height - new_size - hsep_height)) { || frp->fr_win->w_height > oldwin_height - new_size - STATUS_HEIGHT)) {
do_equal = true; do_equal = true;
break; break;
} }
@@ -2021,7 +2019,6 @@ static void win_equal_rec(win_T *next_curwin, bool current, frame_T *topfr, int
int room = 0; int room = 0;
int new_size; int new_size;
int has_next_curwin = 0; int has_next_curwin = 0;
int hsep_height;
bool hnc; bool hnc;
if (topfr->fr_layout == FR_LEAF) { if (topfr->fr_layout == FR_LEAF) {
@@ -2167,7 +2164,6 @@ static void win_equal_rec(win_T *next_curwin, bool current, frame_T *topfr, int
totwincount -= wincount; totwincount -= wincount;
} }
} else { // topfr->fr_layout == FR_COL } else { // topfr->fr_layout == FR_COL
hsep_height = STATUS_HEIGHT;
topfr->fr_width = width; topfr->fr_width = width;
topfr->fr_height = height; topfr->fr_height = height;
@@ -2182,7 +2178,7 @@ static void win_equal_rec(win_T *next_curwin, bool current, frame_T *topfr, int
} else { } else {
extra_sep = 0; extra_sep = 0;
} }
totwincount = (n + extra_sep) / (p_wmh + hsep_height); totwincount = (n + extra_sep) / (p_wmh + STATUS_HEIGHT);
has_next_curwin = frame_has_win(topfr, next_curwin); has_next_curwin = frame_has_win(topfr, next_curwin);
/* /*
@@ -2217,7 +2213,7 @@ static void win_equal_rec(win_T *next_curwin, bool current, frame_T *topfr, int
} else { } else {
// These windows don't use up room. // These windows don't use up room.
totwincount -= (n + (fr->fr_next == NULL totwincount -= (n + (fr->fr_next == NULL
? extra_sep : 0)) / (p_wmh + hsep_height); ? extra_sep : 0)) / (p_wmh + STATUS_HEIGHT);
} }
room -= new_size - n; room -= new_size - n;
if (room < 0) { if (room < 0) {
@@ -2263,7 +2259,7 @@ static void win_equal_rec(win_T *next_curwin, bool current, frame_T *topfr, int
// Compute the maximum number of windows vert. in "fr". // Compute the maximum number of windows vert. in "fr".
n = frame_minheight(fr, NOWIN); n = frame_minheight(fr, NOWIN);
wincount = (n + (fr->fr_next == NULL ? extra_sep : 0)) wincount = (n + (fr->fr_next == NULL ? extra_sep : 0))
/ (p_wmh + hsep_height); / (p_wmh + STATUS_HEIGHT);
m = frame_minheight(fr, next_curwin); m = frame_minheight(fr, next_curwin);
if (has_next_curwin) { if (has_next_curwin) {
hnc = frame_has_win(fr, next_curwin); hnc = frame_has_win(fr, next_curwin);
@@ -6514,38 +6510,32 @@ void last_status(bool morewin)
} }
// Look for resizable frames and take lines from them to make room for the statusline // Look for resizable frames and take lines from them to make room for the statusline
static void resize_frame_for_status(frame_T *fr, int resize_amount) static void resize_frame_for_status(frame_T *fr)
{ {
// Find a frame to take a line from. // Find a frame to take a line from.
frame_T *fp = fr; frame_T *fp = fr;
win_T *wp = fr->fr_win; win_T *wp = fr->fr_win;
int n;
while (resize_amount > 0) { while (fp->fr_height <= frame_minheight(fp, NULL)) {
while (fp->fr_height <= frame_minheight(fp, NULL)) { if (fp == topframe) {
if (fp == topframe) { emsg(_(e_noroom));
emsg(_(e_noroom)); return;
return;
}
// In a column of frames: go to frame above. If already at
// the top or in a row of frames: go to parent.
if (fp->fr_parent->fr_layout == FR_COL && fp->fr_prev != NULL) {
fp = fp->fr_prev;
} else {
fp = fp->fr_parent;
}
} }
n = MIN(fp->fr_height - frame_minheight(fp, NULL), resize_amount); // In a column of frames: go to frame above. If already at
resize_amount -= n; // the top or in a row of frames: go to parent.
if (fp->fr_parent->fr_layout == FR_COL && fp->fr_prev != NULL) {
if (fp != fr) { fp = fp->fr_prev;
frame_new_height(fp, fp->fr_height - n, false, false);
frame_fix_height(wp);
(void)win_comp_pos();
} else { } else {
win_new_height(wp, wp->w_height - n); fp = fp->fr_parent;
} }
} }
if (fp != fr) {
frame_new_height(fp, fp->fr_height - 1, false, false);
frame_fix_height(wp);
(void)win_comp_pos();
} else {
win_new_height(wp, wp->w_height - 1);
}
} }
static void last_status_rec(frame_T *fr, bool statusline, bool is_stl_global) static void last_status_rec(frame_T *fr, bool statusline, bool is_stl_global)
@@ -6566,15 +6556,12 @@ static void last_status_rec(frame_T *fr, bool statusline, bool is_stl_global)
} else if (wp->w_status_height == 0 && !is_stl_global && statusline) { } else if (wp->w_status_height == 0 && !is_stl_global && statusline) {
// Add statusline to window if needed // Add statusline to window if needed
wp->w_status_height = STATUS_HEIGHT; wp->w_status_height = STATUS_HEIGHT;
resize_frame_for_status(fr, STATUS_HEIGHT); resize_frame_for_status(fr);
comp_col(); comp_col();
} }
} else if (wp->w_status_height != 0 && is_stl_global) { } else if (wp->w_status_height != 0 && is_stl_global) {
// If statusline is global and the window has a statusline, replace it with a horizontal // If statusline is global and the window has a statusline, replace it with a horizontal
// separator // separator
if (STATUS_HEIGHT - 1 != 0) {
win_new_height(wp, wp->w_height + STATUS_HEIGHT - 1);
}
wp->w_status_height = 0; wp->w_status_height = 0;
wp->w_hsep_height = 1; wp->w_hsep_height = 1;
comp_col(); comp_col();
@@ -6582,7 +6569,6 @@ static void last_status_rec(frame_T *fr, bool statusline, bool is_stl_global)
// If statusline isn't global and the window doesn't have a statusline, re-add it // If statusline isn't global and the window doesn't have a statusline, re-add it
wp->w_status_height = STATUS_HEIGHT; wp->w_status_height = STATUS_HEIGHT;
wp->w_hsep_height = 0; wp->w_hsep_height = 0;
resize_frame_for_status(fr, STATUS_HEIGHT - 1);
comp_col(); comp_col();
} }
redraw_all_later(SOME_VALID); redraw_all_later(SOME_VALID);