From 5841776c65ceadd8b7f73ea31062d8e57da470e3 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 7 Oct 2021 13:15:06 +0530 Subject: [PATCH] Add the BEGIN key to terminfo Fixes #4101 --- kitty/terminfo.py | 10 +++++----- terminfo/kitty.terminfo | 7 +++++++ terminfo/x/xterm-kitty | Bin 3297 -> 3394 bytes 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/kitty/terminfo.py b/kitty/terminfo.py index 13b75fb14..1fdc56951 100644 --- a/kitty/terminfo.py +++ b/kitty/terminfo.py @@ -297,9 +297,9 @@ string_capabilities.update({ name.format(unmod=unmod, key=key): encode_keystring(modify_key_bytes(b'\033' + value, mod)) for unmod, key, value in zip( - 'cuu1 cud1 cuf1 cub1 end home ich1 dch1 pp np'.split(), - 'UP DN RIT LFT END HOM IC DC PRV NXT'.split(), - b'OA OB OC OD OF OH [2~ [3~ [5~ [6~'.split()) + 'cuu1 cud1 cuf1 cub1 beg end home ich1 dch1 pp np'.split(), + 'UP DN RIT LFT BEG END HOM IC DC PRV NXT'.split(), + b'OA OB OC OD OE OF OH [2~ [3~ [5~ [6~'.split()) for name, mod in { 'k{unmod}': 0, 'k{key}': 2, 'k{key}3': 3, 'k{key}4': 4, 'k{key}5': 5, 'k{key}6': 6, 'k{key}7': 7}.items() @@ -438,9 +438,9 @@ queryable_capabilities = cast(Dict[str, str], numeric_capabilities.copy()) queryable_capabilities.update(string_capabilities) extra = (bool_capabilities | numeric_capabilities.keys() | string_capabilities.keys()) - set(termcap_aliases.values()) no_termcap_for = frozenset( - 'Su Smulx Sync Tc setrgbf setrgbb fullkbd kUP kDN'.split() + [ + 'Su Smulx Sync Tc setrgbf setrgbb fullkbd kUP kDN kbeg kBEG'.split() + [ 'k{}{}'.format(key, mod) - for key in 'UP DN RIT LFT END HOM IC DC PRV NXT'.split() + for key in 'UP DN RIT LFT BEG END HOM IC DC PRV NXT'.split() for mod in range(3, 8)]) if extra - no_termcap_for: raise Exception('Termcap aliases not complete, missing: {}'.format(extra - no_termcap_for)) diff --git a/terminfo/kitty.terminfo b/terminfo/kitty.terminfo index d1c3a9656..bb3c34761 100644 --- a/terminfo/kitty.terminfo +++ b/terminfo/kitty.terminfo @@ -59,6 +59,12 @@ xterm-kitty|KovIdTTY, ind=^J, indn=\E[%p1%dS, initc=\E]4;%p1%d;rgb\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*%{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\, + kBEG=\E[1;2E, + kBEG3=\E[1;3E, + kBEG4=\E[1;4E, + kBEG5=\E[1;5E, + kBEG6=\E[1;6E, + kBEG7=\E[1;7E, kDC=\E[3;2~, kDC3=\E[3;3~, kDC4=\E[3;4~, @@ -121,6 +127,7 @@ xterm-kitty|KovIdTTY, kUP7=\E[1;7A, ka1=, ka3=, + kbeg=\EOE, kbs=\177, kc1=, kc3=, diff --git a/terminfo/x/xterm-kitty b/terminfo/x/xterm-kitty index 83fbb786be33b0102884f75405e06a596e2918ab..185d9119fd4c2da9bad78749b18258cae47c1af4 100644 GIT binary patch delta 518 zcmX|+O-NL66vfZ|pF7nwG7;#2GXs8LP+3EhqZ5vpR%3!j5|T+Gf-USrC|p#V%!MF| zkUT^SB0-R%wB#vB6j8w}iWWhO0x^|nWt(s%!Sr}Dyu0|FbMLu}dpC+dgactILKORO zRpu81;}UvqvR=K+d)rt;rgU)0EPLS_*M0Q*Pv)!n?sh*N{?5<;czHIvZFUT}n?V*a z$_gG~f^|H@R<^T?y}ZU-yu!QBa_iF8zP^iS`J?EJUpR?UqkUgBw zV!nR+C>KmHjmY^X0Fle_)bX^v=KE{*g3jP1hH%mPv1g!TR3>Cvp2(cMkc_MgoO~C8 zC`2(zZ~&EvBZ)dRq6sZ%LpwUrjb8Mj9|O3HK@4LI6PUtd%;FgqU}FVut%v@yNVy!8 zm?WfD>gBXF%Q?9q9nvLNpONUP^w}z0cbITl N?Xt#Y(w+;Xd38r;WbQ_BymWGf(6P?xFvejAGb`tS-q`$tP^WKPy)UjX6?TH!?iA#@;$81AAM_tB3*3}Y1Ic#Nlb zh9pvWjWjY?z%o{_ig(z+Ch{oZlby4|o_2}IEx98-5|@XPkVp1UD_D#=KTFYa$K?_o Cqnd~S