win/TUI: Improve terminal/console support #9401

justinmk · 2018-12-27T21:51:39Z

Merge win/TUI: Improve terminal/console support #9094 except 367a60a and e931f72 .
Depends on uv_set_vterm_state() which we are trying to upstream. win,tty: Use ANSI and Xterm processing of ConEmu libuv/libuv#1873 win,tty: Added set cursor style to CSI sequences libuv/libuv#1884
Adds builtin terminfos for ConEmu, cygwin, and cmd.exe

Use uv_set_vterm_state() to override libuv's guess. See libuv/libuv#1873 for discussion. This commit uses a terminal-detection approach based on GetProcessImageFileNameW(...), which will be reverted in the following commit. The approach was intended to handle the case of running in winpty (:terminal), but we will add $NVIM env var for that. Also add some support for ConEmu, cygwin.

justinmk · 2018-12-28T15:23:47Z

@mhinz I changed update_terminfo.sh to append NOLINT to the terminfo arrays.

When I run the script I see these messages, have you seen this before?

[*] Build terminfo database                                                                                
"<stdin>", line 1105, col 36, terminal 'fbterm': limiting value of `pairs' from 0x10000 to 0x7fff                                                           
"<stdin>", line 4590, col 36, terminal 'xterm+256color': limiting value of `pairs' from 0x10000 to 0x7fff                     
...

jamessan · 2018-12-28T18:59:44Z

When I run the script I see these messages, have you seen this before?

I have. It's nothing to worry about.

scripts/update_terminfo.sh

mhinz

The printf commit seemst like code churn, since it really just replaces one command with another without real gain.

I approve of the NOLINT change, though. :)

justinmk · 2018-12-30T13:08:44Z

@erw7 For reference: see 41c3615

src/nvim/os/tty.c

erw7 · 2018-12-30T14:23:14Z

src/nvim/os/tty.c

+      *term = "win32con";
+    }
+  }
+


#ifdef NVIM_UV_HAS_SET_VTERM_STATE is not necessary?

I think for WIndows, we should assume/require it. I hope it will be upstreamed, but meanwhile anyone building on Windows will probably use our "bundled" deps.

- Also remove feature-detection of uv_set_vterm_state(): instead, on Windows we always require libuv to have that function.

justinmk · 2018-12-30T19:01:59Z

@erw7 Thanks for the review. I pushed an update. Will merge if there are no more comments.

We already set back_color_erase in our builtin terminfo (terminfo_defs.h:conemu_terminfo), so we don't need to set it explicitly in patch_terminfo_bugs().

justinmk · 2018-12-30T19:26:43Z

src/nvim/tui/tui.c

@@ -1555,10 +1554,6 @@ static void patch_terminfo_bugs(TUIData *data, const char *term,
    unibi_set_bool(ut, unibi_back_color_erase, false);
  }

-  if (conemu) {
-    unibi_set_bool(ut, unibi_back_color_erase, true);
-  }


@erw7 I think this isn't needed now, because we have the builtin terminfo. RIght?

I think BCE will always be off in builtin terminfo(see terminfo.c#L142). ConEmu seems to have BCE so I want to enable BCE even in the case of builtin terminfo.

@erw7 see #9443 .

Besides the "visible" improvements, this release features numerous internal improvements to the UI/screen code and test infrastructure. Numerous patches were merged from Vim, which are not mentioned below. FEATURES: 07ad5d7 clipboard: Support custom VimL functions neovim#9304 725da1f neovim#9401 win/TUI: Improve terminal/console support 7a8dadb neovim#9077 startup: Use $XDG_CONFIG_DIRS/nvim/sysinit.vim if it exists feec926 neovim#9299 support <cmd> mapping in more places 0653ed6 neovim#9028 diff/highlight: Show underline for low-priority CursorLine bddcbbb signs: Add "numhl" argument neovim#9113 05f9c7c clipboard: support Wayland (neovim#9230) 14ae394 neovim#9052 TUI: add support for undercurl and underline color 4fa3492 neovim#9023 man.vim: soft (dynamic) wrap neovim#9023 API: 8b39e4e neovim#6920 API: implement object namespaces b1aaa0a API: Implement nvim_win_set_buf() neovim#9100 8de87c7 neovim#8180 API: virtual text annotations (nvim_buf_set_virtual_text) 2b9fc9a neovim#8660 API: add nvim_buf_is_loaded() API: buf_get_lines, buf_line_count handle unloaded buffers 88f77c2 API: nvim_buf_get_offset_for_line 94841e5 API/UI: neovim#8221 ext_newgrid, ext_hlstate (use line-based rather than char-based updates) UI b5cfac0 neovim#8806 TUI: use BCE again more often, (smoother resizes/scrolling) 77b5e9a neovim#9315 screen: add missing status redraw when redraw_later(CLEAR) was used 5f15788 TUI: clip invalid regions on resize (neovim#8779), fixes neovim#8774 c936ae0 neovim#9193 TUI: improvements for scrolling and clearing f204274 neovim#9143 UI: disable clearing almost everywhere f4b2b66 neovim#9079 TUI: always use safe cursor movement after resize d36afaf neovim#9211 ui_options: also send when starting or from OptionSet 67f80d4 TUI: Avoid reset_cursor_color in old VTE neovim#9191 e55ebae neovim#9021 don't erase screen on `:hi Normal` during startup c5790d9 neovim#8915 TUI: Hint wrapped lines to terminals. FIXES: 231de72 RPC: turn errors from async calls into notifications 907ad92 TUI: Restore terminal title via "title stacking" (neovim#9407) cb76a8a genappimage: Unset $ARGV0 at invocation neovim#9376 b48efd9 neovim#9347 TUI: FreeBSD: Improve support for BSD vt console c16529a TUI: Konsole 18.07.70 supports DECSCUSR (neovim#9364) aec096f os/lang: use the correct LC_NUMERIC also for OS X 5fee0be provider: improve error message (neovim#9344) 3c42d7a TUI: alacritty supports set_cursor_color neovim#9353 7bff9a5 TUI: Alacritty supports DECSCUSR (neovim#9048) 57acfce macOS: infer primary language if $LANG is empty neovim#9345 bc132ae runtime/syntax: Fix highlighting of augroup contents (neovim#9328) 715fdfe neovim#9297 VimL/confirm(): Show dialog even if :silent 799d9c3 clipboard: Prefer xclip (neovim#9302) 6dae777 provider/nodejs: fix npm,yarn detection 16bc1e9 neovim#9218 channel: avoid buffering output when only terminal and no callbacks are active 72fecad neovim#8804 Fix crash in lang_init() on macOS if lang_region = NULL d581398 ruby: detect rbenv shims for other versions (neovim#8733) e568ac7 neovim#9123 third-party/unibilium: Fix parsing of extended capability entries c4c74c3 jobstart(): Fix hang on non-executable cwd neovim#9204 1cf50cb provider/nodejs: Simultaneously query npm and yarn neovim#9054 6c496db undo: Fix infinite loop if undo_read_byte returns EOF neovim#2880 f8f8357 neovim#9034 'swapfile: always show dialog' CHANGES: c236e80 neovim#9024 --embed: wait for UI unless --headless 180b50d neovim#9248 python: 'neovim' module was renamed to 'pynvim' 2000b6a neovim#8589 VimL: Remove legacy aliases "v:errmsg", "v:shell_error", "v:this_session" deb18a0 defaults: background=dark neovim#2894 (neovim#9205) c1187d4 defaults: win: 'shellpipe' for cmd.exe (neovim#8827)

erw7 and others added 5 commits December 27, 2018 22:35

win/TUI: builtin terminfos for cygwin, conemu, et al.

6c62f7b

win/TUI: ConEmu: set immediate_wrap_after_last_column neovim#9094

fad7a26

win/TUI: Fix scroll on Windows legacy console

4f030ec

Merge 'upstream/master' into pr-win-erw7

c101512

justinmk mentioned this pull request Dec 27, 2018

win/TUI: Improve terminal/console support #9094

Closed

11 tasks

justinmk added the platform:windows label Dec 27, 2018

test: win/TUI builtin terminfos

e85b911

jamessan reviewed Dec 28, 2018

View reviewed changes

scripts/update_terminfo.sh Outdated Show resolved Hide resolved

mhinz reviewed Dec 28, 2018

View reviewed changes

This comment has been minimized.

Sign in to view

justinmk added 2 commits December 28, 2018 23:52

update_terminfo.sh: Use printf instead of echo

959df5d

update_terminfo.sh: NOLINT data arrays

dba69a1

justinmk force-pushed the pr-win-erw7 branch from 184a85f to dba69a1 Compare December 28, 2018 22:52

justinmk force-pushed the pr-win-erw7 branch from daac4fc to b1a6281 Compare December 30, 2018 13:42

justinmk changed the title ~~win/TUI: merge #9094~~ win/TUI: Improve terminal/console support Dec 30, 2018

erw7 reviewed Dec 30, 2018

View reviewed changes

src/nvim/os/tty.c Outdated Show resolved Hide resolved

erw7 reviewed Dec 30, 2018

View reviewed changes

src/nvim/os/tty.c Outdated Show resolved Hide resolved

erw7 reviewed Dec 30, 2018

View reviewed changes

src/nvim/os/tty.c Show resolved Hide resolved

erw7 reviewed Dec 30, 2018

View reviewed changes

justinmk added 2 commits December 30, 2018 19:57

refactor: Extract os_tty_guess_term()

31a508c

- Also remove feature-detection of uv_set_vterm_state(): instead, on Windows we always require libuv to have that function.

cleanup: Remove os_term_is_nice()

9ca836f

justinmk force-pushed the pr-win-erw7 branch from b1a6281 to 9ca836f Compare December 30, 2018 18:58

win/TUI: ConEmu: get back_color_erase from terminfo

5749eca

We already set back_color_erase in our builtin terminfo (terminfo_defs.h:conemu_terminfo), so we don't need to set it explicitly in patch_terminfo_bugs().

justinmk commented Dec 30, 2018

View reviewed changes

justinmk merged commit 725da1f into neovim:master Dec 30, 2018

justinmk deleted the pr-win-erw7 branch December 30, 2018 22:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

win/TUI: Improve terminal/console support #9401

win/TUI: Improve terminal/console support #9401

Uh oh!

justinmk commented Dec 27, 2018 •

edited

Loading

Uh oh!

justinmk commented Dec 28, 2018

Uh oh!

jamessan commented Dec 28, 2018

Uh oh!

Uh oh!

mhinz left a comment

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

justinmk commented Dec 30, 2018 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

erw7 Dec 30, 2018

Uh oh!

justinmk Dec 30, 2018

Uh oh!

justinmk commented Dec 30, 2018

Uh oh!

justinmk Dec 30, 2018

Uh oh!

erw7 Dec 31, 2018

Uh oh!

justinmk Jan 2, 2019

Uh oh!

Uh oh!

Uh oh!

win/TUI: Improve terminal/console support #9401

win/TUI: Improve terminal/console support #9401

Uh oh!

Conversation

justinmk commented Dec 27, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

justinmk commented Dec 28, 2018

Uh oh!

jamessan commented Dec 28, 2018

Uh oh!

Uh oh!

mhinz left a comment

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

justinmk commented Dec 30, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

erw7 Dec 30, 2018

Choose a reason for hiding this comment

Uh oh!

justinmk Dec 30, 2018

Choose a reason for hiding this comment

Uh oh!

justinmk commented Dec 30, 2018

Uh oh!

justinmk Dec 30, 2018

Choose a reason for hiding this comment

Uh oh!

erw7 Dec 31, 2018

Choose a reason for hiding this comment

Uh oh!

justinmk Jan 2, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

justinmk commented Dec 27, 2018 •

edited

Loading

justinmk commented Dec 30, 2018 •

edited

Loading