Attachment 255394 Details for Bug 282647 – fix termcap, v0

[patch] fix termcap, v0

bug282647.termcap.diff (text/plain), 6.22 KB, created by Jan Beich on 2024-11-22 18:22:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2024-11-22 18:22:58 UTC

Size: 6.22 KB

patch

obsolete

>From d8e3b2809b8041192487f50433cdb51af90493e6 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Fri, 22 Nov 2024 18:42:46 +0100
>Subject: [PATCH 1/3] termcap: port xterm titlebar/icon from terminfo
>
>PR:		282647
>Reviewed by:	?
>---
> share/termcap/termcap | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
>diff --git a/share/termcap/termcap b/share/termcap/termcap
>index 8852938e9802..0041026b58aa 100644
>--- a/share/termcap/termcap
>+++ b/share/termcap/termcap
>@@ -3022,6 +3022,18 @@ xterm-xfree86|xterm terminal emulator (XFree86):\
> xterm|X11 terminal emulator:\
> 	:tc=xterm-new:
> #	:tc=xterm-r6:
>+
>+# Building blocks to allow access to the X titlebar and icon name as a status line.
>+xterm+sl|access X title line and icon name:\
>+	:hs:\
>+	:ds=\E]0;\007:fs=^G:ts=\E]0;:
>+xterm+sl-twm|access X title line (pacify twm-descended window managers):\
>+	:hs:\
>+	:ds=\E]2;\007:fs=^G:ts=\E]2;:
>+xterm+sl-alt|alternate access X title line:\
>+	:hs:\
>+	:ds=\E]2;\E\\:fs=\E\\:ts=\E]2;:
>+
> # dtterm termcap entry - Obtained from Xinside's CDE with permission
> # from Thomas Roell
> dtterm|dtterm-cde10:\
>
>From 76fe5ac7371ccc5f860ecd988275ec5edfbd4673 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Fri, 22 Nov 2024 18:44:46 +0100
>Subject: [PATCH 2/3] termcap: add hs/ts/fs to tmux like terminfo
>
>PR:		282647
>Reviewed by:	?
>---
> share/termcap/termcap | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/share/termcap/termcap b/share/termcap/termcap
>index 0041026b58aa..29627646d089 100644
>--- a/share/termcap/termcap
>+++ b/share/termcap/termcap
>@@ -2790,10 +2790,10 @@ ecma+italics|ECMA-48 italics:\
> 
> tmux|tmux terminal multiplexer:\
> 	:so=\E[7m:se=\E[27m:\
>-	:tc=ecma+italics:tc=screen:
>+	:tc=ecma+italics:tc=xterm+sl:tc=screen:
> tmux-256color|tmux with 256 colors:\
> 	:so=\E[7m:se=\E[27m:\
>-	:tc=ecma+italics:tc=screen-256color:
>+	:tc=ecma+italics:tc=xterm+sl:tc=screen-256color:
> 
> # $XTermId: termcap,v 1.78 2009/11/09 00:24:26 tom Exp $
> #
>
>From 4fbc0120190ef135f494a8fd101c8d4913a6283c Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Fri, 22 Nov 2024 19:05:19 +0100
>Subject: [PATCH 3/3] termcap: simplify via xterm+sl* like terminfo
>
>PR:		282647
>Reviewed by:	?
>---
> share/termcap/termcap | 35 +++++++++++++++++++----------------
> 1 file changed, 19 insertions(+), 16 deletions(-)
>
>diff --git a/share/termcap/termcap b/share/termcap/termcap
>index 29627646d089..198fe7f7cc39 100644
>--- a/share/termcap/termcap
>+++ b/share/termcap/termcap
>@@ -4699,7 +4699,7 @@ Eterm|Eterm Terminal Emulator (X11 Window System):\
> 
> # Termcap for xterm-termite
> xterm-termite|VTE-based terminal:\
>-	:NP:am:hs:mi:ms:ut:xn:\
>+	:NP:am:mi:ms:ut:xn:\
> 	:Co#256:co#80:it#8:li#24:pa#32767:\
> 	:@7=\EOF:@8=\EOM:AB=\E[48;5;%dm:AF=\E[38;5;%dm:AL=\E[%dL:\
> 	:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:F1=\E[23~:F2=\E[24~:\
>@@ -4708,35 +4708,37 @@ xterm-termite|VTE-based terminal:\
> 	:ZR=\E[23m:al=\E[L:bl=^G:bt=\E[Z:cb=\E[1K:cd=\E[J:ce=\E[K:\
> 	:ch=\E[%i%dG:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:\
> 	:cs=\E[%i%d;%dr:cv=\E[%i%dd:dc=\E[P:dl=\E[M:do=^J:\
>-	:ds=\E]2;\007:ec=\E[%dX:ei=\E[4l:fs=^G:ho=\E[H:im=\E[4h:\
>+	:ec=\E[%dX:ei=\E[4l:ho=\E[H:im=\E[4h:\
> 	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:k6=\E[17~:\
> 	:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kB=\E[Z:kD=\E[3~:\
> 	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:kd=\EOB:ke=\E[?1l:\
> 	:kh=\EOH:kl=\EOD:kr=\EOC:ks=\E[?1h:ku=\EOA:le=^H:md=\E[1m:\
> 	:me=\E[m:mr=\E[7m:nd=\E[C:op=\E[39;49m:r1=\Ec:rc=\E8:\
> 	:sc=\E7:se=\E[27m:sf=^J:so=\E[7m:sr=\EM:ta=^I:te=\E[?1049l:\
>-	:ti=\E[?1049h:ts=\E]2;:u6=\E[%i%d;%dR:u7=\E[6n:ue=\E[24m:\
>-	:up=\E[A:us=\E[4m:ve=\E[?25h:vi=\E[?25l:
>+	:ti=\E[?1049h:u6=\E[%i%d;%dR:u7=\E[6n:ue=\E[24m:\
>+	:up=\E[A:us=\E[4m:ve=\E[?25h:vi=\E[?25l:\
>+	:xterm+sl-twm:
> 
> # Termcap for st terminal taken from the st-0.8 sources
> st|simpleterm:\
>-	:am:hs:mi:ms:xn:\
>+	:am:mi:ms:xn:\
> 	:co#80:it#8:li#24:\
> 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
> 	:K1=\E[1~:K2=\EOu:K3=\E[5~:K4=\E[4~:K5=\E[6~:LE=\E[%dD:\
> 	:RI=\E[%dC:SF=\E[%dS:UP=\E[%dA:ae=\E(B:al=\E[L:as=\E(0:\
> 	:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
> 	:cm=\E[%i%d;%dH:cr=\r:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:\
>-	:dl=\E[M:do=\n:ec=\E[%dX:ei=\E[4l:fs=^G:ho=\E[H:im=\E[4h:\
>+	:dl=\E[M:do=\n:ec=\E[%dX:ei=\E[4l:ho=\E[H:im=\E[4h:\
> 	:is=\E[4l\E>\E[?1034l:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
> 	:k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
> 	:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:kd=\EOB:\
> 	:ke=\E[?1l\E>:kh=\E[1~:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
> 	:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:me=\E[0m:mh=\E[2m:\
> 	:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[27m:sf=\n:so=\E[7m:\
>-	:sr=\EM:st=\EH:ta=^I:te=\E[?1049l:ti=\E[?1049h:ts=\E]0;:\
>+	:sr=\EM:st=\EH:ta=^I:te=\E[?1049l:ti=\E[?1049h:\
> 	:ue=\E[24m:up=\E[A:us=\E[4m:vb=\E[?5h\E[?5l:\
>-	:ve=\E[?12l\E[?25h:vi=\E[?25l:vs=\E[?25h:
>+	:ve=\E[?12l\E[?25h:vi=\E[?25l:vs=\E[?25h:\
>+	:tc=xterm+sl:
> 
> st-256color|simpleterm with 256 colors:\
> 	:cc:\
>@@ -4761,27 +4763,28 @@ xterm-kitty|KovId's TTY:\
> 	:tc=xterm-256color:tc=kitty+common:
> 
> kitty+common|KovId's TTY common properties:\
>-	:am:hs:km:mi:ms:xn:\
>+	:am:km:mi:ms:xn:\
> 	:co#80:it#8:li#24:\
> 	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:K1=:K3=:\
> 	:K4=:K5=:LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\
> 	:ae=\E(B:al=\E[L:as=\E(0:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:\
> 	:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=\r:cs=\E[%i%d;%dr:\
>-	:ct=\E[3g:dc=\E[P:dl=\E[M:do=\n:ds=\E]2;\007:ec=\E[%dX:\
>-	:ei=\E[4l:fs=^G:ho=\E[H:im=\E[4h:k1=\EOP:k2=\EOQ:k3=\EOR:\
>+	:ct=\E[3g:dc=\E[P:dl=\E[M:do=\n:ec=\E[%dX:\
>+	:ei=\E[4l:ho=\E[H:im=\E[4h:k1=\EOP:k2=\EOQ:k3=\EOR:\
> 	:k4=\EOS:k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:\
> 	:k9=\E[20~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:\
> 	:kd=\EOB:ke=\E[?1l:kh=\EOH:kl=\EOD:kr=\EOC:ks=\E[?1h:\
> 	:ku=\EOA:le=^H:md=\E[1m:me=\E[0m:mh=\E[2m:mr=\E[7m:nd=\E[C:\
> 	:rc=\E8:sc=\E7:se=\E[27m:sf=\n:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
>-	:te=\E[?1049l:ti=\E[?1049h:ts=\E]2;:ue=\E[24m:up=\E[A:\
>+	:te=\E[?1049l:ti=\E[?1049h::ue=\E[24m:up=\E[A:\
> 	:us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[?12l\E[?25h:vi=\E[?25l:\
>-	:vs=\E[?12;25h:
>+	:vs=\E[?12;25h:\
>+	:tc=xterm+sl-twm:
> 
> foot|foot terminal emulator:\
>-	:bw:hs:\
>-	:ds=\E]2;\E\\:fs=\E\\:kb=\177:ts=\E]2;:vb=\E]555\E\\:\
>-	:tc=xterm-256color:
>+	:bw:\
>+	:kb=\177:vb=\E]555\E\\:\
>+	:tc=xterm+sl-alt:tc=xterm-256color:
> #
> # END OF TERMCAP
> # ------------------------

Actions: View | Diff

Attachments on bug 282647: 255394