patch 9.1.1898: tabpanel: inconsistent use of cmdline with tabpanel

Problem:  tabpanel: inconsistent use of cmdline and message area with
          tabpanel
Solution: Reduce the cmdline and message area by the horizontal size of
          the tabpanel (Hirohito Higashi)

closes: #18678

Signed-off-by: Hirohito Higashi <h.east.727@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

Author: h-east

src/arglist.c

@@ -1007,7 +1007,7 @@ arg_all_close_unused_windows(arg_all_state_T *aall)
 	    buf = wp->w_buffer;
 	    if (buf->b_ffname == NULL
 		    || (!aall->keep_tabs && (buf->b_nwindows > 1
-			    || wp->w_width != Columns)))
+			    || wp->w_width != cmdline_width)))
 		i = aall->opened_len;
 	    else
 	    {

src/cmdexpand.c

@@ -421,7 +421,7 @@ cmdline_pum_create(
     if (showtail)
 	prefix_len += vim_strsize(showmatches_gettail(matches[0]))
 	    - vim_strsize(matches[0]);
-    compl_startcol = MAX(0, compl_startcol - prefix_len);
+    compl_startcol = cmdline_col_off + MAX(0, compl_startcol - prefix_len);
 
     return EXPAND_OK;
 }
@@ -611,9 +611,9 @@ win_redr_status_matches(
 	return;
 
     if (has_mbyte)
-	buf = alloc(Columns * MB_MAXBYTES + 1);
+	buf = alloc(topframe->fr_width * MB_MAXBYTES + 1);
     else
-	buf = alloc(Columns + 1);
+	buf = alloc(topframe->fr_width + 1);
     if (buf == NULL)
 	return;
 
@@ -640,15 +640,15 @@ win_redr_status_matches(
 	if (first_match > 0)
 	    clen += 2;
 	// jumping right, put match at the left
-	if ((long)clen > Columns)
+	if (clen > topframe->fr_width)
 	{
 	    first_match = match;
 	    // if showing the last match, we can add some on the left
 	    clen = 2;
 	    for (i = match; i < num_matches; ++i)
 	    {
 		clen += status_match_len(xp, SHOW_MATCH(i)) + 2;
-		if ((long)clen >= Columns)
+		if (clen >= topframe->fr_width)
 		    break;
 	    }
 	    if (i == num_matches)
@@ -659,7 +659,7 @@ win_redr_status_matches(
 	while (first_match > 0)
 	{
 	    clen += status_match_len(xp, SHOW_MATCH(first_match - 1)) + 2;
-	    if ((long)clen >= Columns)
+	    if (clen >= topframe->fr_width)
 		break;
 	    --first_match;
 	}
@@ -679,7 +679,7 @@ win_redr_status_matches(
     clen = len;
 
     i = first_match;
-    while ((long)(clen + status_match_len(xp, SHOW_MATCH(i)) + 2) < Columns)
+    while (clen + status_match_len(xp, SHOW_MATCH(i)) + 2 < topframe->fr_width)
     {
 	if (i == match)
 	{
@@ -773,14 +773,17 @@ win_redr_status_matches(
 	    }
 	}
 
-	screen_puts(buf, row, 0, attr);
+	screen_puts(buf, row, firstwin->w_wincol, attr);
 	if (selstart != NULL && highlight)
 	{
 	    *selend = NUL;
-	    screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM));
+	    screen_puts(selstart, row, firstwin->w_wincol + selstart_col,
+		    HL_ATTR(HLF_WM));
 	}
 
-	screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr);
+	screen_fill(row, row + 1, firstwin->w_wincol + clen,
+		firstwin->w_wincol + topframe->fr_width,
+		fillchar, fillchar, attr);
     }
 
     win_redraw_last_status(topframe);
@@ -1371,7 +1374,7 @@ showmatches(expand_T *xp, int display_wildmenu, int display_list, int noselect)
 	{
 	    // compute the number of columns and lines for the listing
 	    maxlen += 2;    // two spaces between file names
-	    columns = ((int)Columns + 2) / maxlen;
+	    columns = (cmdline_width + 2) / maxlen;
 	    if (columns < 1)
 		columns = 1;
 	    lines = (numMatches + columns - 1) / columns;
@@ -4503,9 +4506,6 @@ wildmenu_cleanup(cmdline_info_T *cclp UNUSED)
 	p_ls = save_p_ls;
 	p_wmh = save_p_wmh;
 	last_status(FALSE);
-#if defined(FEAT_TABPANEL)
-	redraw_tabpanel = TRUE;
-#endif
 	update_screen(UPD_VALID);	// redraw the screen NOW
 	redrawcmd();
 	save_p_ls = -1;

src/digraph.c

@@ -1972,7 +1972,7 @@ printdigraph(digr_T *dp, result_T *previous)
 	*previous = dp->result;
     }
 #endif
-    if (msg_col > Columns - list_width)
+    if (msg_col > cmdline_width - list_width)
 	msg_putchar('\n');
     if (msg_col)
 	while (msg_col % list_width != 0)

src/drawscreen.c

@@ -502,7 +502,7 @@ win_redr_status(win_T *wp, int ignore_pum UNUSED)
 	if (wp->w_buffer->b_p_ro)
 	    plen += vim_snprintf((char *)p + plen, MAXPATHL - plen, "%s", _("[RO]"));
 
-	this_ru_col = ru_col - (Columns - wp->w_width);
+	this_ru_col = ru_col - (cmdline_width - wp->w_width);
 	n = (wp->w_width + 1) / 2;
 	if (this_ru_col < n)
 	    this_ru_col = n;
@@ -721,8 +721,8 @@ win_redr_ruler(win_T *wp, int always, int ignore_pum)
 	    row = Rows - 1;
 	    fillchar = ' ';
 	    attr = 0;
-	    width = Columns;
-	    off = 0;
+	    off = cmdline_col_off;
+	    width = cmdline_width;
 	}
 
 	// In list mode virtcol needs to be recomputed
@@ -755,7 +755,7 @@ win_redr_ruler(win_T *wp, int always, int ignore_pum)
 	if (wp->w_status_height == 0)	// can't use last char of screen
 	    ++n1;
 
-	this_ru_col = ru_col - (Columns - width);
+	this_ru_col = ru_col - (cmdline_width - width);
 	// Never use more than half the window/screen width, leave the other
 	// half for the filename.
 	n2 = (width + 1) / 2;
@@ -2609,7 +2609,7 @@ win_update(win_T *wp)
 			    FALSE);
 	    else
 		screen_char(LineOffset[k] + topframe->fr_width - 1, k,
-			Columns - 1);
+			cmdline_width - 1);
     }
 #endif
 

src/ex_cmds.c

@@ -1253,7 +1253,7 @@ do_bang(
 	msg_putchar('!');
 	msg_outtrans(newcmd);
 	msg_clr_eos();
-	windgoto(msg_row, msg_col);
+	windgoto(msg_row, cmdline_col_off + msg_col);
 
 	do_shell(newcmd, 0);
     }
@@ -1404,7 +1404,7 @@ do_filter(
     if (cmd_buf == NULL)
 	goto filterend;
 
-    windgoto((int)Rows - 1, 0);
+    windgoto((int)Rows - 1, cmdline_col_off);
     cursor_on();
 
     /*
@@ -1659,7 +1659,7 @@ do_shell(
     // This windgoto is required for when the '\n' resulted in a "delete line
     // 1" command to the terminal.
     if (!swapping_screen())
-	windgoto(msg_row, msg_col);
+	windgoto(msg_row, cmdline_col_off + msg_col);
     cursor_on();
     (void)call_shell(cmd, SHELL_COOKED | flags);
     did_check_timestamps = FALSE;
@@ -4694,7 +4694,7 @@ ex_substitute(exarg_T *eap)
 			    msg_no_more = FALSE;
 			    msg_scroll = i;
 			    showruler(TRUE);
-			    windgoto(msg_row, msg_col);
+			    windgoto(msg_row, cmdline_col_off + msg_col);
 			    RedrawingDisabled = save_RedrawingDisabled;
 
 #ifdef USE_ON_FLY_SCROLL

src/ex_docmd.c

@@ -6684,7 +6684,7 @@ ex_stop(exarg_T *eap)
     if (!eap->forceit)
 	autowrite_all();
     apply_autocmds(EVENT_VIMSUSPEND, NULL, NULL, FALSE, NULL);
-    windgoto((int)Rows - 1, 0);
+    windgoto((int)Rows - 1, cmdline_col_off);
     out_char('\n');
     out_flush();
     stoptermcap();

src/ex_getln.c

@@ -1167,7 +1167,7 @@ cmdline_erase_chars(
 	{
 #ifdef FEAT_RIGHTLEFT
 	    if (cmdmsg_rl)
-		msg_col = Columns;
+		msg_col = cmdline_width;
 	    else
 #endif
 		msg_col = 0;
@@ -1375,8 +1375,8 @@ cmdline_left_right_mouse(int c, int *ignore_drag_release)
 	int	i;
 
 	i = cmdline_charsize(ccline.cmdpos);
-	if (mouse_row <= cmdline_row + ccline.cmdspos / Columns
-		&& mouse_col < ccline.cmdspos % Columns + i)
+	if (mouse_row <= cmdline_row + ccline.cmdspos / cmdline_width
+		&& mouse_col < ccline.cmdspos % cmdline_width + i)
 	    break;
 	if (has_mbyte)
 	{
@@ -2114,7 +2114,7 @@ getcmdline_int(
 		    goto cmdline_changed;
 		if (!cmd_silent)
 		{
-		    windgoto(msg_row, 0);
+		    windgoto(msg_row, cmdline_col_off);
 		    out_flush();
 		}
 		break;
@@ -2285,7 +2285,7 @@ getcmdline_int(
 		    if (ccline.cmdpos >= ccline.cmdlen)
 			break;
 		    i = cmdline_charsize(ccline.cmdpos);
-		    if (KeyTyped && ccline.cmdspos + i >= Columns * Rows)
+		    if (KeyTyped && ccline.cmdspos + i >= cmdline_width * Rows)
 			break;
 		    ccline.cmdspos += i;
 		    if (has_mbyte)
@@ -3010,8 +3010,8 @@ set_cmdspos_cursor(void)
     set_cmdspos();
     if (KeyTyped)
     {
-	m = Columns * Rows;
-	if (m < 0)	// overflow, Columns or Rows at weird value
+	m = cmdline_width * Rows;
+	if (m < 0)	// overflow, cmdline_width or Rows at weird value
 	    m = MAXCOL;
     }
     else
@@ -3043,7 +3043,7 @@ correct_cmdspos(int idx, int cells)
 {
     if ((*mb_ptr2len)(ccline.cmdbuff + idx) > 1
 		&& (*mb_ptr2cells)(ccline.cmdbuff + idx) > 1
-		&& ccline.cmdspos % Columns + cells > Columns)
+		&& ccline.cmdspos % cmdline_width + cells > cmdline_width)
 	ccline.cmdspos++;
 }
 
@@ -3243,7 +3243,7 @@ getexmodeline(
 		    }
 		}
 		msg_clr_eos();
-		windgoto(msg_row, msg_col);
+		windgoto(msg_row, cmdline_col_off + msg_col);
 		continue;
 	    }
 
@@ -3316,7 +3316,7 @@ getexmodeline(
 	line_ga.ga_len += len;
 	escaped = FALSE;
 
-	windgoto(msg_row, msg_col);
+	windgoto(msg_row, cmdline_col_off + msg_col);
 	pend = (char_u *)(line_ga.ga_data) + line_ga.ga_len;
 
 	// We are done when a NL is entered, but not when it comes after a
@@ -3432,8 +3432,8 @@ redrawcmd_preedit(void)
 	    cmdpos  += preedit_start_col;
 	}
 
-	msg_row = cmdline_row + (cmdspos / (int)Columns);
-	msg_col = cmdspos % (int)Columns;
+	msg_row = cmdline_row + (cmdspos / cmdline_width);
+	msg_col = cmdspos % cmdline_width;
 	if (msg_row >= Rows)
 	    msg_row = Rows - 1;
 
@@ -3808,7 +3808,7 @@ put_on_cmdline(char_u *str, int len, int redraw)
 		msg_col -= i;
 		if (msg_col < 0)
 		{
-		    msg_col += Columns;
+		    msg_col += cmdline_width;
 		    --msg_row;
 		}
 	    }
@@ -3827,8 +3827,8 @@ put_on_cmdline(char_u *str, int len, int redraw)
 	}
 	if (KeyTyped)
 	{
-	    m = Columns * Rows;
-	    if (m < 0)	// overflow, Columns or Rows at weird value
+	    m = cmdline_width * Rows;
+	    if (m < 0)	// overflow, cmdline_width or Rows at weird value
 		m = MAXCOL;
 	}
 	else
@@ -4052,7 +4052,7 @@ redrawcmdprompt(void)
     if (ccline.cmdprompt != NULL)
     {
 	msg_puts_attr((char *)ccline.cmdprompt, ccline.cmdattr);
-	ccline.cmdindent = msg_col + (msg_row - cmdline_row) * Columns;
+	ccline.cmdindent = msg_col + (msg_row - cmdline_row) * cmdline_width;
 	// do the reverse of set_cmdspos()
 	if (ccline.cmdfirstc != NUL)
 	    --ccline.cmdindent;
@@ -4076,7 +4076,7 @@ redrawcmd(void)
     // when 'incsearch' is set there may be no command line while redrawing
     if (ccline.cmdbuff == NULL)
     {
-	windgoto(cmdline_row, 0);
+	windgoto(cmdline_row, cmdline_col_off);
 	msg_clr_eos();
 	return;
     }
@@ -4131,21 +4131,21 @@ cursorcmd(void)
 #ifdef FEAT_RIGHTLEFT
     if (cmdmsg_rl)
     {
-	msg_row = cmdline_row  + (ccline.cmdspos / (int)(Columns - 1));
-	msg_col = (int)Columns - (ccline.cmdspos % (int)(Columns - 1)) - 1;
+	msg_row = cmdline_row  + (ccline.cmdspos / (cmdline_width - 1));
+	msg_col = cmdline_width - (ccline.cmdspos % (cmdline_width - 1)) - 1;
 	if (msg_row <= 0)
 	    msg_row = Rows - 1;
     }
     else
 #endif
     {
-	msg_row = cmdline_row + (ccline.cmdspos / (int)Columns);
-	msg_col = ccline.cmdspos % (int)Columns;
+	msg_row = cmdline_row + (ccline.cmdspos / cmdline_width);
+	msg_col = ccline.cmdspos % cmdline_width;
 	if (msg_row >= Rows)
 	    msg_row = Rows - 1;
     }
 
-    windgoto(msg_row, msg_col);
+    windgoto(msg_row, cmdline_col_off + msg_col);
 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
     if (p_imst == IM_ON_THE_SPOT)
 	redrawcmd_preedit();
@@ -4161,13 +4161,13 @@ gotocmdline(int clr)
     msg_start();
 #ifdef FEAT_RIGHTLEFT
     if (cmdmsg_rl)
-	msg_col = Columns - 1;
+	msg_col = cmdline_width - 1;
     else
 #endif
 	msg_col = 0;	    // always start in column 0
     if (clr)		    // clear the bottom line(s)
 	msg_clr_eos();	    // will reset clear_cmdline
-    windgoto(cmdline_row, 0);
+    windgoto(cmdline_row, cmdline_col_off);
 }
 
 /*

src/getchar.c

@@ -2448,7 +2448,7 @@ getchar_common(typval_T *argvars, typval_T *rettv, int allow_number)
     if (cursor_flag == 'h')
 	cursor_sleep();
     else if (cursor_flag == 'm')
-	windgoto(msg_row, msg_col);
+	windgoto(msg_row, cmdline_col_off + msg_col);
 
     ++no_mapping;
     ++allow_keys;

src/globals.h

@@ -146,6 +146,8 @@ EXTERN int	vgetc_char INIT(= 0);
  * update_screen().
  */
 EXTERN int	cmdline_row;
+EXTERN int	cmdline_col_off;
+EXTERN int	cmdline_width;
 
 EXTERN int	redraw_cmdline INIT(= FALSE);	// cmdline must be redrawn
 EXTERN int	redraw_mode INIT(= FALSE);	// mode must be redrawn