bug-ncurses
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] Update Alacritty terminfo


From: Christian Dürr
Subject: [PATCH] Update Alacritty terminfo
Date: Tue, 31 Dec 2019 17:00:04 +0100
User-agent: Cyrus-JMAP/3.1.7-694-gd5bab98-fmstable-20191218v1

This updates the Alacritty terminfo to the latest revision available in its
repository.

Since there have been some changes made to the xterm base, it does not use the
xterm terminfo anymore. However it would probably be possible to extract some of
the things if it's desirable to minimize size.

I've also taken the liberty to update some of the notes made, that I do not
believe are accurate anymore. The multiple modifiers was actively patched. I
wasn't aware of issues with cursor position after leaving the alt screen, but
comparing it to XTerm does not show any difference to me.

If there's any inaccurate statements or improvements to be made, please let me
know and I can fix things upstream in Alacritty.
---
 misc/terminfo.src | 124 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 107 insertions(+), 17 deletions(-)

diff --git a/misc/terminfo.src b/misc/terminfo.src
index 4f45020c..fc64dd14 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6890,7 +6890,7 @@ terminology|EFL-based terminal emulator,
 
 #### Alacritty
 # https://github.com/jwilm/alacritty
-# Version 0.3.3 (2019/08/03)
+# Version 0.4.0 (2019/11/25)
 # Version 0.2.1 (2018/10/03)
 # Project started in 2016/02, uses Rust and OpenGL, and in contrast to (most X
 # terminal programs) is not designed to run with a remote server.
@@ -6920,33 +6920,123 @@ terminology|EFL-based terminal emulator,
 #              no X10 mouse
 #              has normal and highlight mouse
 #              has any-event and button-event mouse
-#              cursor-position wrong after alternate-screen
 #              none of the dtterm controls work
 # tack:
 #      bell and flash do not work
 #      italics and crossed-out work (latter did not work in 0.2.1)
-#      function-keys work up to kf36; those using two modifiers do not work
+#      function-keys work up to kf36
 #
 # The program sources include "alacritty" and "alacritty-direct", which are
-# copied from "xterm-256color" and "xterm-direct" (but using semicolon for
-# subparameter delimiter).  Refactored here to use ncurses building blocks -TD
+# derived from "xterm-256color" and "xterm-direct" (but using semicolon for
+# subparameter delimiter).
 alacritty|alacritty terminal emulator,
-       rs1=\Ec\E]104\007, use=xterm+256color,
-       use=alacritty+common,
+    use=alacritty+common,
+    rs1=\Ec\E]104\007,
+    ccc,
+    colors#0x100, pairs#0x7FFF,
+    initc=\E]4;%p1%d;rgb\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*
+          %{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\,
+    oc=\E]104\007,
+    setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;
+          5;%p1%d%;m,
+    setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5
+          ;%p1%d%;m,
+    setb@, setf@,
 
 alacritty-direct|alacritty with direct color indexing,
-       use=xterm+indirect, use=alacritty+common,
+    use=alacritty+common,
+    RGB,
+    colors#0x1000000, pairs#0x7FFF,
+    initc@, op=\E[39;49m,
+    setab=\E[%?%p1%{8}%<%t4%p1%d%e48;2;%p1%{65536}%/%d;%p1%{256}
+          %/%{255}%&%d;%p1%{255}%&%d%;m,
+    setaf=\E[%?%p1%{8}%<%t3%p1%d%e38;2;%p1%{65536}%/%d;%p1%{256}
+          %/%{255}%&%d;%p1%{255}%&%d%;m,
+    setb@, setf@,
 
-# removed ech, since it fails vttest -TD
-# added ecma+strikeout in 0.3.3 -TD
-# added xterm+sl-twm in 0.3.3 -TD
 alacritty+common|base fragment for alacritty,
-       npc,
-       ech@, kb2=\EOE, kbs=^?, kcbt=\E[Z, kent=\EOM, Se=\E[0 q,
-       use=ecma+index, use=xterm-basic, use=xterm+app,
-       use=ansi+rep, use=xterm+sm+1006, use=xterm+tmux,
-       use=ecma+strikeout, use=xterm+sl-twm, use=ecma+italics,
-       use=xterm+pce2, use=xterm+pcc2, use=xterm+pcf2,
+    OTbs, am, bce, km, mir, msgr, xenl, AX, XT,
+    colors#8, cols#80, it#8, lines#24, pairs#64,
+    acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+    bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
+    clear=\E[H\E[2J, cnorm=\E[?12l\E[?25h, cr=\r,
+    csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
+    cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
+    cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+    cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
+    dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
+    el1=\E[1K, flash=\E[?5h$<100/>\E[?5l, home=\E[H,
+    hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
+    il=\E[%p1%dL, il1=\E[L, ind=\n, invis=\E[8m,
+    is2=\E[!p\E[?3;4l\E[4l\E>, kmous=\E[M, meml=\El,
+    memu=\Em, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
+    rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>,
+    rmm=\E[?1034l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
+    rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7, setab=\E[4%p1%dm,
+    setaf=\E[3%p1%dm,
+    setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
+         %=%t3%e%p1%d%;m,
+    setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}
+         %=%t3%e%p1%d%;m,
+    sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
+        %?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
+    sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
+    smkx=\E[?1h\E=, smm=\E[?1034h, smso=\E[7m, smul=\E[4m,
+    tbc=\E[3g, vpa=\E[%i%p1%dd, E3=\E[3J,
+    kbs=^?,
+    ritm=\E[23m, sitm=\E[3m,
+    mc5i,
+    mc0=\E[i, mc4=\E[4i, mc5=\E[5i,
+    u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?%[;0123456789]c,
+    u9=\E[c,
+    rmcup=\E[?1049l\E[23;0;0t, smcup=\E[?1049h\E[22;0;0t,
+    npc,
+    indn=\E[%p1%dS, kb2=\EOE, kcbt=\E[Z, kent=\EOM,
+    rin=\E[%p1%dT,
+    rep=%p1%c\E[%p2%{1}%-%db,
+    rmxx=\E[29m, smxx=\E[9m,
+    kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kend=\EOF,
+    khome=\EOH,
+    kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
+    kf13=\E[1;2P, kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S,
+    kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ,
+    kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~,
+    kf23=\E[23;2~, kf24=\E[24;2~, kf25=\E[1;5P, kf26=\E[1;5Q,
+    kf27=\E[1;5R, kf28=\E[1;5S, kf29=\E[15;5~, kf3=\EOR,
+    kf30=\E[17;5~, kf31=\E[18;5~, kf32=\E[19;5~,
+    kf33=\E[20;5~, kf34=\E[21;5~, kf35=\E[23;5~,
+    kf36=\E[24;5~, kf37=\E[1;6P, kf38=\E[1;6Q, kf39=\E[1;6R,
+    kf4=\EOS, kf40=\E[1;6S, kf41=\E[15;6~, kf42=\E[17;6~,
+    kf43=\E[18;6~, kf44=\E[19;6~, kf45=\E[20;6~,
+    kf46=\E[21;6~, kf47=\E[23;6~, kf48=\E[24;6~,
+    kf49=\E[1;3P, kf5=\E[15~, kf50=\E[1;3Q, kf51=\E[1;3R,
+    kf52=\E[1;3S, kf53=\E[15;3~, kf54=\E[17;3~,
+    kf55=\E[18;3~, kf56=\E[19;3~, kf57=\E[20;3~,
+    kf58=\E[21;3~, kf59=\E[23;3~, kf6=\E[17~, kf60=\E[24;3~,
+    kf61=\E[1;4P, kf62=\E[1;4Q, kf63=\E[1;4R, kf7=\E[18~,
+    kf8=\E[19~, kf9=\E[20~,
+    kLFT=\E[1;2D, kRIT=\E[1;2C, kind=\E[1;2B, kri=\E[1;2A,
+    kDN=\E[1;2B, kDN3=\E[1;3B, kDN4=\E[1;4B, kDN5=\E[1;5B,
+    kDN6=\E[1;6B, kDN7=\E[1;7B, kLFT3=\E[1;3D, kLFT4=\E[1;4D,
+    kLFT5=\E[1;5D, kLFT6=\E[1;6D, kLFT7=\E[1;7D,
+    kRIT3=\E[1;3C, kRIT4=\E[1;4C, kRIT5=\E[1;5C,
+    kRIT6=\E[1;6C, kRIT7=\E[1;7C, kUP=\E[1;2A, kUP3=\E[1;3A,
+    kUP4=\E[1;4A, kUP5=\E[1;5A, kUP6=\E[1;6A, kUP7=\E[1;7A,
+    kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H, kIC=\E[2;2~,
+    kNXT=\E[6;2~, kPRV=\E[5;2~, kich1=\E[2~, knp=\E[6~,
+    kpp=\E[5~, kDC3=\E[3;3~, kDC4=\E[3;4~, kDC5=\E[3;5~,
+    kDC6=\E[3;6~, kDC7=\E[3;7~, kEND3=\E[1;3F, kEND4=\E[1;4F,
+    kEND5=\E[1;5F, kEND6=\E[1;6F, kEND7=\E[1;7F,
+    kHOM3=\E[1;3H, kHOM4=\E[1;4H, kHOM5=\E[1;5H,
+    kHOM6=\E[1;6H, kHOM7=\E[1;7H, kIC3=\E[2;3~, kIC4=\E[2;4~,
+    kIC5=\E[2;5~, kIC6=\E[2;6~, kIC7=\E[2;7~, kNXT3=\E[6;3~,
+    kNXT4=\E[6;4~, kNXT5=\E[6;5~, kNXT6=\E[6;6~,
+    kNXT7=\E[6;7~, kPRV3=\E[5;3~, kPRV4=\E[5;4~,
+    kPRV5=\E[5;5~, kPRV6=\E[5;6~, kPRV7=\E[5;7~,
+    kdch1=\E[3~,
+    Cr=\E]112\007, Cs=\E]12;%p1%s\007,
+    Ms=\E]52;%p1%s;%p2%s\007, Se=\E[0 q, Ss=\E[%p1%d q,
+    hs, dsl=\E]2;\007, fsl=^G, tsl=\E]2;,
 
 #### Kitty
 # https://github.com/kovidgoyal/kitty
-- 
2.24.1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]