mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-09 08:02:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(tui): enable vtpcon strikethrough feature #36762

Browse Source 
Problem:
Strikethrough was not enabled for vtpcon thus preventing strikethrough
text from being shown.

Solution:
Update `windows.ti`.

Co-authored-by: ymich9963 <gmichael834@gmail.com>
Co-authored-by: Justin M. Keyes <justinkz@gmail.com>
This commit is contained in:
Justin M. Keyes
2025-11-30 11:22:12 -05:00
committed by GitHub
parent 8c1327a622
commit d62bbe24cb
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/windows.ti
View File

@@ -56,7 +56,9 @@ vtpcon|ANSI emulation for console virtual terminal sequence with libuv,
kf55@, kf56@, kf57@, kf58@, kf59@, kf60@, kf61@, kf62@, kf63@, kmous@,
mc0@, mc4@, mc5@, meml@, memu@, oc@, rmam@, rmcup=\E[?1049l,
smcup=\E[?1049h, rmir@, rmkx@, rmm@, rs1@, rs2@,
sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p6%t;1%;m,
smxx=\E[9m,
rmxx=\E[29m,
sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p6%t;1%;%?%p9%t;9%;m,
sgr0=\E[0m, smam@, smglp@, smgrp@, smglr@, smir@, smkx@, smm@, tbc@, u6@, u7@, u8@, u9@,
Cr@, Cs@, Ms@, XM@, kDC3@, kDC4@, kDC5@, kDC6@, kDC7@,
kDN@, kDN3@, kDN4@, kDN5@, kDN6@, kDN7@,
@@ -67,5 +69,5 @@ vtpcon|ANSI emulation for console virtual terminal sequence with libuv,
kNXT3@, kNXT4@, kNXT5@, kNXT6@, kNXT7@,
kPRV3@, kPRV4@, kPRV5@, kPRV6@, kPRV7@,
kRIT3@, kRIT4@, kRIT5@, kRIT6@, kRIT7@,
kUP3@, kUP4@, kUP5@, kUP6@, kUP7@, rmxx@, smxx@, xm@,
kUP3@, kUP4@, kUP5@, kUP6@, kUP7@, xm@,
use=libuv+basekey, use=libuv+exkey, use=xterm+256color, use=xterm+sl, use=xterm-new,

18
src/gen/gen_terminfo.lua
View File

@@ -1,4 +1,12 @@
-- usage: nvim -ll src/gen/gen_terminfo.lua
-- USAGE:
--
-- # Optional: Delete cache to get latest terminfo from internet.
-- rm -rf /tmp/nvim_terminfo/
--
-- # Optional: Ensure the latest ncurses+tic is in your PATH.
-- export PATH="/opt/homebrew/Cellar/ncurses/6.5/bin/":"$PATH"
--
-- nvim -ll src/gen/gen_terminfo.lua
--
-- This script does:
--
@@ -111,8 +119,8 @@ if vim.uv.fs_stat(db) == nil then
end
sys('curl -O ' .. url)
sys('gunzip -f terminfo.src.gz')
sys('cat terminfo.src | tic -x -o "' .. db .. '" -')
sys('cat scripts/windows.ti | tic -x -o "' .. db .. '" -')
sys(('cat terminfo.src | tic -x -o "%s" -'):format(db))
sys(('cat scripts/windows.ti | tic -x -o "%s" -'):format(db))
sys('rm -f terminfo.src')
else
print('using cached terminfo in ' .. db)
@@ -138,7 +146,7 @@ end
local dbg = function() end
-- dbg = print
local f_enum = io.open(target_enum, 'wb')
local f_enum = assert(io.open(target_enum, 'wb'))
f_enum:write('// genenerated by src/gen/gen_terminfo.lua\n\n')
f_enum:write('#pragma once\n\n')
f_enum:write('typedef enum {\n')
@@ -169,7 +177,7 @@ f_enum:write(' kTermKeyCount,\n')
f_enum:write('} TerminfoKey;\n')
f_enum:close()
local f_defs = io.open(target_gen, 'wb')
local f_defs = assert(io.open(target_gen, 'wb'))
f_defs:write('// uncrustify:off\n\n')

4
src/nvim/tui/terminfo_builtin.h
View File

@@ -1654,12 +1654,12 @@ static const TerminfoEntry vtpcon_terminfo = {
[kTerm_parm_up_cursor] = "\033[%p1%dA",
[kTerm_set_a_background] = "\033[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m",
[kTerm_set_a_foreground] = "\033[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m",
[kTerm_set_attributes] = "\033[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p6%t;1%;m",
[kTerm_set_attributes] = "\033[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p6%t;1%;%?%p9%t;9%;m",
[kTerm_set_lr_margin] = NULL,
[kTerm_to_status_line] = "\033]0;",
[kTerm_reset_cursor_style] = "\033[2 q",
[kTerm_set_cursor_style] = "\033[%p1%d q",
[kTerm_enter_strikethrough_mode] = NULL,
[kTerm_enter_strikethrough_mode] = "\033[9m",
[kTerm_set_rgb_foreground] = NULL,
[kTerm_set_rgb_background] = NULL,
[kTerm_set_cursor_color] = NULL,