vim.exe to 24bit color #2060

ghost · 2017-09-05T12:10:03Z

Start with :set termguicolors.
Please build with Make_mvc.mak VCON=yes.

ghost · 2017-09-05T12:41:05Z

before: (colorscheme desert)

after:

chrisbra · 2017-09-05T14:14:25Z

src/proto/os_win32.pro

@@ -67,4 +67,5 @@ void used_file_arg(char *name, int literal, int full_path, int diff_mode);
 void set_alist_count(void);
 void fix_arg_enc(void);
 int mch_setenv(char *var, char *value, int x);
+BOOL correct_vtp(void);


I think we are not using BOOL

I was careless...fixed.

codecov-io · 2017-09-05T14:23:56Z

Codecov Report

Merging #2060 into master will increase coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master    #2060      +/-   ##
==========================================
+ Coverage   74.45%   74.45%   +<.01%     
==========================================
  Files          90       90              
  Lines      132140   132148       +8     
  Branches    29017    29018       +1     
==========================================
+ Hits        98383    98391       +8     
  Misses      33732    33732              
  Partials       25       25

Impacted Files	Coverage Δ
src/misc1.c	`82.79% <ø> (ø)`	⬆️
src/option.c	`84.41% <ø> (-0.06%)`	⬇️
src/term.c	`50.88% <ø> (+0.16%)`	⬆️
src/syntax.c	`77.37% <100%> (-0.12%)`	⬇️
src/terminal.c	`65.19% <0%> (-0.4%)`	⬇️
src/evalfunc.c	`83.15% <0%> (-0.3%)`	⬇️
src/os_unix.c	`53.41% <0%> (-0.05%)`	⬇️
src/window.c	`81.35% <0%> (-0.04%)`	⬇️
src/version.c	`81.81% <0%> (ø)`	⬆️
... and 11 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0c4dc88...cbb7948. Read the comment docs.

k-takata · 2017-09-06T00:19:28Z

This will fix #1270.

ghost · 2017-09-06T01:10:21Z

I found it earlier.
Space key to the right, backspace key to the left.
notgc does not do this. Not even VCON=no does.
It resolves quickly.

ghost · 2017-09-06T02:32:39Z

I made a mistake in handling the WriteConsole API.

ghost · 2017-09-28T12:40:26Z

After scrolling, the right edge of the screen becomes colorless.
Scroll API ignores color information.
Wait for Microsoft's fix.
Or I might miss something...

ghost · 2017-09-28T12:44:13Z

I forgot.
Start with
:set term=win32-24bit
:set termguicolors

ghost · 2017-10-01T23:40:25Z

All problems have been resolved !

(Unexpectedly, the commit seems to have been aranged in order of date, Correctly Rewrote is later than Revert all.)

ghost · 2017-10-02T04:13:07Z

I will check also in the GentooLinux and MinGW64 environment in the future.

ghost · 2017-10-02T05:20:33Z

I learned.
I will make use of it next.

ghost · 2017-10-02T05:28:09Z

I was careless again.
Now I am making changes to work only with on/off of tgc.

k-takata · 2017-10-21T19:16:23Z

I tried this on Windows 10 Fall Creators Update. It looks almost good, but 'tgc' is automatically set to on. It should be explicitly set by user.

ghost · 2017-10-22T16:52:55Z

I did it like that.
I read it further and wrote it properly.

ghost · 2017-10-23T00:01:38Z

Fix :colorscheme on notgc failed.
(Bug repro, :colorscheme blue | colorscheme default)

ghost · 2017-10-23T05:33:45Z

The build was broken for a long time. Fixed. I wonder what I'm doing...

brammool · 2017-11-05T16:57:08Z

What is the status of this patch? Have enough people tried it out to know it's working well?

k-takata

@ntak Could you check my review comments?

I also wonder the prefix VCON_ is suitable for this.
Microsoft doesn't use the term "Virtual Console" in the reference: https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences
Used terms are "Virtual Terminal Sequences", "ENABLE_VIRTUAL_TERMINAL_PROCESSING", etc.
VTP_ might be prefer? What do you think?

k-takata · 2017-11-06T07:51:17Z

src/os_win32.c

+typedef BOOL (WINAPI *PfnDynGetConsoleScreenBufferInfoEx)(HANDLE, PDYN_CONSOLE_SCREEN_BUFFER_INFOEX);
+static PfnDynGetConsoleScreenBufferInfoEx pDynGetConsoleScreenBufferInfoEx;
+typedef BOOL (WINAPI *PfnDynSetConsoleScreenBufferInfoEx)(HANDLE, PDYN_CONSOLE_SCREEN_BUFFER_INFOEX);
+static PfnDynSetConsoleScreenBufferInfoEx pDynSetConsoleScreenBufferInfoEx;


The prefix Dyn is not needed for these function pointers, because they don't conflict with the actual function names. Can you change these 4 lines as follows?

typedef BOOL (WINAPI *PfnGetConsoleScreenBufferInfoEx)(HANDLE, PDYN_CONSOLE_SCREEN_BUFFER_INFOEX); static PfnGetConsoleScreenBufferInfoEx pGetConsoleScreenBufferInfoEx; typedef BOOL (WINAPI *PfnSetConsoleScreenBufferInfoEx)(HANDLE, PDYN_CONSOLE_SCREEN_BUFFER_INFOEX); static PfnSetConsoleScreenBufferInfoEx pSetConsoleScreenBufferInfoEx;

k-takata · 2017-11-06T08:08:29Z

src/os_win32.c

+
+#ifndef FEAT_GUI_W32
+
+# define VTP_FIRST_SUPPORT_BUILD MAKE_VER(10, 0, 10563)


I have some comments about this line.

Can you add a comment to describe what this build number is?
E.g. /* Windows 10 version 1507 (November Update) */

You use the prefix VTP_ here, however you use VCON_ or vcon_ in other part.
Isn't it better to use VCON_ here? (Or is it better to use VTP_ (short for Virtual Terminal Processing) everywhere?)

Should we support 256 colors or 24-bit colors from 1507? I think they have been supported from 1703.
(Benefit for using VCON on 1507 might be support for underlines, but is it really needed?)

So, my suggestion is:

/* Support for 256 colors and 24-bit colors was added in Windows 10 * version 1703 (Creators Update). */ # define VCON_FIRST_SUPPORT_BUILD MAKE_VER(10, 0, 15063)

k-takata · 2017-11-06T08:18:32Z

src/proto/os_win32.pro

@@ -67,4 +67,6 @@ void used_file_arg(char *name, int literal, int full_path, int diff_mode);
 void set_alist_count(void);
 void fix_arg_enc(void);
 int mch_setenv(char *var, char *value, int x);
+void control_console_color_rgb(void);
+int vcon_get_stat(void);


It seems that these lines conflict with the latest code.
Could you fix them?

k-takata · 2017-11-06T08:21:51Z

src/os_win32.c

+
+/* This flags newly created from Windows 10 */
+#ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
+#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004


s/#define/# define/
Please insert a space.

k-takata · 2017-11-06T08:22:25Z

src/os_win32.c

+static void reset_console_color_rgb(void);
+#endif
+
+/* This flags newly created from Windows 10 */


s/This flags/This flag is/
I think this is a typo.

k-takata · 2017-11-06T08:26:39Z

src/os_win32.c

+#endif
+
+/* This can be removed when used with FEAT_GUI. */
+#if !defined(FEAT_GUI)


I think that the lines L292-L295 can be removed.

k-takata · 2017-11-06T08:37:16Z

src/os_win32.c

+#if !defined(FEAT_GUI)
+
+/*
+ * Get verion number including build number


s/verion/version/
Typo.

k-takata · 2017-11-06T08:50:57Z

src/os_win32.c

+#if !defined(FEAT_GUI) && defined(FEAT_TERMGUICOLORS)
+	    /* Do not turn off when using VCON */
+	    ((has_vcon) ? 0 : ENABLE_PROCESSED_OUTPUT) |
+#endif


It looks the mask value is changed when FEAT_TERMGUICOLORS is not defined.
Additionally, I don't think !defined(FEAT_GUI) is needed, because this part is inside #ifndef FEAT_GUI_W32.
Shouldn't be as follows?

cmodeout &= ~( #ifdef FEAT_TERMGUICOLORS /* Do not turn off the ENABLE_PROCESSED_OUTPUT flag when using * VCON. */ ((has_vcon) ? 0 : ENABLE_PROCESSED_OUTPUT) | #else ENABLE_PROCESSED_OUTPUT | #endif

ghost · 2017-11-08T14:42:42Z

I was doing other things. I will look it now.

parkovski · 2017-11-08T18:47:02Z

I've been using this patch for a while, overall it works great. The only issue I've found is the first time I press tab in the ex command line, the text flashes on the screen and then turns invisible. After that if I keep pressing tab, the rest of the completions are visible, it's only the first one that's a problem. This happens regardless of colorscheme and whether an actual completion exists - e.g. :asdfasdf<tab> is invisible, but :asdfasdf<tab><tab> shows up.

ghost · 2017-11-08T23:12:51Z

I redrawn the command line.

parkovski · 2017-11-08T23:14:17Z

Awesome, that fixed it. Other than that I've been using this for a while with no issues 😃.

k-takata · 2017-11-08T23:42:20Z

@ntak Could you include this patch? (Only cosmetic changes.)
https://bitbucket.org/k_takata/vim-ktakata-mq/src/fecb750f5391afa28527aee91efb914ba55d1a91/2060-3.diff?at=default&fileviewer=file-view-default

Fix #ifdef indentation.
Use FEAT_GUI_W32 instead of FEAT_GUI in os_win32.c. FEAT_GUI_W32 is used more than FEAT_GUI in os_win32.c.
Don't break a line in each function declaration if the function doesn't have any parameters.

k-takata · 2017-11-08T23:58:39Z

I also wondering what Vim should do if tgc is set on an older Windows which doesn't support virtual terminal processing.
I think that the display turns black and white in that case. But I don't think most people want this. Should we avoid 'tgc' being turned on on such environment?

ghost · 2017-11-09T00:12:50Z

It applied. Thank you very much.

ghost · 2018-02-06T11:30:37Z

I am browsing this page every day...
What is going on...
What is not going on...
What should I do...

brammool · 2018-02-21T16:41:22Z

Is this patch ready to be included? I hope it makes it possible to use the screen dump feature in the Windows console (as the normal console only supports 16 colors).

k-takata · 2018-02-22T01:21:43Z

I think the patch is ready. (You need to update an error number, though.)
But I don't know whether it can improve the screen dump feature.

ghost · 2018-02-22T02:00:46Z

If it can be solved with my personal skills, I will do my best.
If libvterm or winpty is the cause, that is the limit.
In my current patch, I do not think of screen dumps.
(I do not know the screen dump right now).

ghost · 2018-02-22T05:25:44Z

I studied now.
There is no Windows API to get the correct 24bit screen, fatal.
regretful...

vim/vim#2060 added +vcon. It doesn't work in Windows 7,8 so I'm back to 256 colors.

Problem: Cannot use 24 bit colors in MS-Windows console. Solution: Add support for vcon. (Nobuhiro Takasaki, Ken Takasaki, fixes vim#1270, fixes vim#2060)

Problem: Cannot use 24 bit colors in MS-Windows console. Solution: Add support for vcon. (Nobuhiro Takasaki, Ken Takasaki, fixes vim/vim#1270, fixes vim/vim#2060) vim/vim@cafafb3

…ell file Problem: Write NUL past allocated space using corrupted spell file. (Markus Vervier) Solution: Init "c" every time. vim/vim@97d2f34 N/A patches for version.c: vim-patch:8.0.1531: cannot use 24 bit colors in MS-Windows console Problem: Cannot use 24 bit colors in MS-Windows console. Solution: Add support for vcon. (Nobuhiro Takasaki, Ken Takasaki, fixes vim/vim#1270, fixes vim/vim#2060) vim/vim@cafafb3 vim-patch:8.0.1544: when using 'termguicolors' SpellBad doesn't show Problem: When using 'termguicolors' SpellBad doesn't show. Solution: When the GUI colors are not set fall back to the cterm colors. vim/vim@d4fc577 vim-patch:8.0.1589: error for setting 'modifiable' when resetting it Problem: Error for setting 'modifiable' when resetting it. Solution: Check if 'modifiable' was actually set. vim/vim@d7db27b vim-patch:8.0.1591: MS-Windows: when reparsing the arguments 'wildignore' matters Problem: MS-Windows: when reparsing the arguments 'wildignore' matters. Solution: Save and reset 'wildignore'. (Yasuhiro Matsumoto, closes vim/vim#2702) vim/vim@20586cb vim-patch:8.0.1712: terminal scrollback is not limited Problem: Terminal scrollback is not limited. Solution: Add the 'terminalscroll' option. vim/vim@8c041b6 Neovim has 'scrollback' option, not 'terminalscroll', to limit scrollback in terminal buffers. vim-patch:8.0.1745: build failure on MS-Windows Problem: Build failure on MS-Windows. Solution: Build job arguments for MS-Windows. Fix allocating job twice. vim/vim@2060892 vim-patch:8.0.1747: MS-Windows: term_start() does not set job_info() cmd Problem: MS-Windows: term_start() does not set job_info() cmd. Solution: Share the code from job_start() to set jv_argv. vim/vim@ebe74b7

ghost mentioned this pull request Sep 5, 2017

vim.exe 256色計画 vim-jp/issues#1068

Closed

chrisbra reviewed Sep 5, 2017

View reviewed changes

k-takata mentioned this pull request Sep 18, 2017

Windows (Conhost) - Typographical Emphasis #2113

Closed

mattn mentioned this pull request Sep 19, 2017

FEAT_WINDOWS 削除のおかげで既存パッチの多くがマージ出来なくなっている vim-jp/issues#1095

Closed

k-takata added enhancement platform-windows labels Oct 12, 2017

k-takata reviewed Nov 6, 2017

View reviewed changes

Nobuhiro Takasaki added 2 commits January 4, 2018 20:19

Integration of past patches

7429791

"dos-colors" fully compatible

0ecc1b6

bitcrazed mentioned this pull request Feb 16, 2018

Vim.exe HiDPI buffer size / cursor positioning microsoft/terminal#71

Closed

brammool closed this in cafafb3 Feb 22, 2018

k-takata mentioned this pull request Feb 23, 2018

The item 'vcon' is not described #2665

Closed

janlazo added a commit to janlazo/dotvim8 that referenced this pull request Mar 10, 2018

vim: 8.0.1531 broke termguicolors in ConEmu

23a5542

vim/vim#2060 added +vcon. It doesn't work in Windows 7,8 so I'm back to 256 colors.

ghost deleted the feat_vcon branch September 28, 2018 06:36


		#ifndef FEAT_GUI_W32

		# define VTP_FIRST_SUPPORT_BUILD MAKE_VER(10, 0, 10563)

vim.exe to 24bit color #2060

vim.exe to 24bit color #2060

Conversation

ghost commented Sep 5, 2017

ghost commented Sep 5, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov-io commented Sep 5, 2017 • edited

Codecov Report

k-takata commented Sep 6, 2017

ghost commented Sep 6, 2017

ghost commented Sep 6, 2017

ghost commented Sep 28, 2017

ghost commented Sep 28, 2017

ghost commented Oct 1, 2017

ghost commented Oct 2, 2017

ghost commented Oct 2, 2017

ghost commented Oct 2, 2017

k-takata commented Oct 21, 2017

ghost commented Oct 22, 2017

ghost commented Oct 23, 2017

ghost commented Oct 23, 2017

brammool commented Nov 5, 2017

k-takata left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost commented Nov 8, 2017

parkovski commented Nov 8, 2017

ghost commented Nov 8, 2017

parkovski commented Nov 8, 2017

k-takata commented Nov 8, 2017

k-takata commented Nov 8, 2017 • edited

ghost commented Nov 9, 2017

ghost commented Feb 6, 2018

brammool commented Feb 21, 2018

k-takata commented Feb 22, 2018

ghost commented Feb 22, 2018

ghost commented Feb 22, 2018

codecov-io commented Sep 5, 2017 •

edited

k-takata commented Nov 8, 2017 •

edited