vim: src/term.c comparison

comparison src/term.c @ 11731:d06f3576823a v8.0.0748

patch 8.0.0748: running Vim in terminal window doesn't use the right colors commit https://github.com/vim/vim/commit/b7a8dfeb49784145fe133496ce38703d236e4fbe Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jul 22 20:33:05 2017 +0200 patch 8.0.0748: running Vim in terminal window doesn't use the right colors Problem: When running Vim in a terminal window it does not detect the right number of colors available. Solution: Detect the version string that libvterm returns. Pass the number of colors in $COLORS.

author	Christian Brabandt <cb@256bit.org>
date	Sat, 22 Jul 2017 20:45:04 +0200
parents	568ea579d20e
children	5c69c6d9e2eb

comparison

equal deleted inserted replaced

-:a9cdc89f3ded
+:d06f3576823a
 		add_termcode(name, (char_u *)p->bt_string, term_8bit);
 	}
 }
 }
 #if defined(HAVE_TGETENT) || defined(FEAT_TERMRESPONSE)
-static void set_color_count(int nr);
 /*
 * Set number of colors.
 * Store it as a number in t_colors.
 * Store it as a string in T_CCO (using nr_colors[]).
 */
 if (t_colors > 1)
 	sprintf((char *)nr_colors, "%d", t_colors);
 else
 	*nr_colors = NUL;
 set_string_option_direct((char_u *)"t_Co", -1, nr_colors, OPT_FREE, 0);
+}
+/*
+* Set the color count to "val" and redraw if it changed.
+*/
+static void
+may_adjust_color_count(int val)
+{
+if (val != t_colors)
+{
+	/* Nr of colors changed, initialize highlighting and
+	 * redraw everything.  This causes a redraw, which usually
+	 * clears the message.  Try keeping the message if it
+	 * might work. */
+	set_keep_msg_from_hist();
+	set_color_count(val);
+	init_highlight(TRUE, FALSE);
+# ifdef DEBUG_TERMRESPONSE
+	{
+	    char buf[100];
+	    int  r = redraw_asap(CLEAR);
+	    sprintf(buf, "Received t_Co, redraw_asap(): %d", r);
+	    log_tr(buf);
+	}
+# else
+	redraw_asap(CLEAR);
+# endif
+}
 }
 #endif
 #ifdef HAVE_TGETENT
 static char *(key_names[]) =
 return FALSE;
 }
 # endif
 void
-term_set_winsize(int width, int height)
+term_set_winsize(int height, int width)
 {
-OUT_STR(tgoto((char *)T_CWS, height, width));
+OUT_STR(tgoto((char *)T_CWS, width, height));
 }
 #endif
 void
 term_fg_color(int n)
 * Replace all entries that are NULL by empty_option
 */
 void
 ttest(int pairs)
 {
+char_u *env_colors;
 check_options();		    /* make sure no options are NULL */
 /*
 * MUST have "cm": cursor motion.
 */
 	/* Set 'weirdinvert' according to value of 't_xs' */
 	p_wiv = (*T_XS != NUL);
 }
 need_gather = TRUE;
-/* Set t_colors to the value of t_Co. */
+/* Set t_colors to the value of $COLORS or t_Co. */
 t_colors = atoi((char *)T_CCO);
+env_colors = mch_getenv((char_u *)"COLORS");
+if (env_colors != NULL && isdigit(*env_colors))
+{
+	int colors = atoi((char *)env_colors);
+	if (colors != t_colors)
+	    set_color_count(colors);
+}
 }
 #if (defined(FEAT_GUI) && (defined(FEAT_MENU) || !defined(USE_ON_FLY_SCROLL))) \
 	|| defined(PROTO)
 /*
 	{
 	    /* Check for some responses from the terminal starting with
 	     * "<Esc>[" or CSI:
 	     *
 	     * - Xterm version string: <Esc>[>{x};{vers};{y}c
+	     *   Libvterm returns {x} == 0, {vers} == 100, {y} == 0.
 	     *   Also eat other possible responses to t_RV, rxvt returns
 	     *   "<Esc>[?1;2c". Also accept CSI instead of <Esc>[.
 	     *   mrxvt has been reported to have "+" in the version. Assume
 	     *   the escape sequence ends with a letter or one of "{|}~".
 	     *
 			switch_to_8bit();
 		    /* rxvt sends its version number: "20703" is 2.7.3.
 		     * Ignore it for when the user has set 'term' to xterm,
 		     * even though it's an rxvt. */
-		    if (extra > 0)
+		    if (col > 20000)
-			extra = atoi((char *)tp + extra);
+			col = 0;
-		    if (extra > 20000)
-			extra = 0;
 		    if (tp[1 + (tp[0] != CSI)] == '>' && j == 2)
 		    {
 			/* Only set 'ttymouse' automatically if it was not set
 			 * by the user already. */
 			if (!option_was_set((char_u *)"ttym"))
 			{
 # ifdef TTYM_SGR
-			    if (extra >= 277)
+			    if (col >= 277)
 				set_option_value((char_u *)"ttym", 0L,
 							  (char_u *)"sgr", 0);
 			    else
 # endif
 			    /* if xterm version >= 95 use mouse dragging */
-			    if (extra >= 95)
+			    if (col >= 95)
 				set_option_value((char_u *)"ttym", 0L,
 						       (char_u *)"xterm2", 0);
 			}
 			/* if xterm version >= 141 try to get termcap codes */
-			if (extra >= 141)
+			if (col >= 141)
 			{
 			    LOG_TR("Enable checking for XT codes");
 			    check_for_codes = TRUE;
 			    need_gather = TRUE;
 			    req_codes_from_term();
+			}
+			/* libvterm sends 0;100;0 */
+			if (col == 100
+				&& STRNCMP(tp + extra - 2, ">0;100;0c", 9) == 0)
+			{
+			    /* If run from Vim $COLORS is set to the number of
+			     * colors the terminal supports.  Otherwise assume
+			     * 256, libvterm supports even more. */
+			    if (mch_getenv((char_u *)"COLORS") == NULL)
+				may_adjust_color_count(256);
 			}
 		    }
 # ifdef FEAT_EVAL
 		    set_vim_var_string(VV_TERMRESPONSE, tp, i + 1);
 # endif
 	    str[j] = NUL;
 	    if (name[0] == 'C' && name[1] == 'o')
 	    {
 		/* Color count is not a key code. */
 		i = atoi((char *)str);
-		if (i != t_colors)
+		may_adjust_color_count(i);
-		{
-		    /* Nr of colors changed, initialize highlighting and
-		     * redraw everything.  This causes a redraw, which usually
-		     * clears the message.  Try keeping the message if it
-		     * might work. */
-		    set_keep_msg_from_hist();
-		    set_color_count(i);
-		    init_highlight(TRUE, FALSE);
-#ifdef DEBUG_TERMRESPONSE
-		    {
-			char buf[100];
-			int  r = redraw_asap(CLEAR);
-			sprintf(buf, "Received t_Co, redraw_asap(): %d", r);
-			log_tr(buf);
-		    }
-#else
-		    redraw_asap(CLEAR);
-#endif
-		}
 	    }
 	    else
 	    {
 		/* First delete any existing entry with the same code. */
 		i = find_term_bykeys(str);

Mercurial > vim

comparison src/term.c @ 11731:d06f3576823a v8.0.0748