This diff looks big but in fact there are only three changes, cnorm,
cvvis and sgr.

I don't use rxvt-unicode, but it looks fine, if it's working for you
then ok nicm



On Wed, Jan 07, 2015 at 02:21:39AM -0700, David Coppa wrote:
> 
> Keep it in sync with rxvt-unicode-9.21.
> 
> ok?
> 
> Ciao,
> David
> 
> Index: termtypes.master
> ===================================================================
> RCS file: /cvs/src/share/termtypes/termtypes.master,v
> retrieving revision 1.50
> diff -u -p -u -p -r1.50 termtypes.master
> --- termtypes.master  17 Sep 2014 15:35:25 -0000      1.50
> +++ termtypes.master  7 Jan 2015 09:17:31 -0000
> @@ -5015,50 +5015,51 @@ rxvt-16color|xterm with 16 colors like a
>  # Updated: Oezguer Kesim <[email protected]> 02 Nov 1997
>  # Updated: Marc Lehmann <[email protected]>, 17 Feb 2005
>  # Updated: Marc Lehmann <[email protected]>, 04 Nov 2008: change init/reset 
> sequences
> +# Updated: Marc Lehmann <[email protected]>, 24 Nov 2014: implement cvvis 
> as blinking cursor
> +# Updated: Marc Lehmann <[email protected]>, 13 Dec 2014: removed 
> superfluous 0 from sgr
>  rxvt-unicode|rxvt-unicode terminal (X Window System),
> -     bw, am, bce, ccc, xenl, eo, km, hs, mir, msgr, npc, mc5i, xon,
> -     btns#5, cols#80, it#8, lines#24, lm#0, colors#88, pairs#7744,
> -     ncv#0,
> +     am, bce, bw, ccc, eo, hs, km, mc5i, mir, msgr, npc, xenl, xon,
> +     btns#5, colors#88, cols#80, it#8, lines#24, lm#0, ncv#0,
> +     pairs#7744,
>       acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
> -     bel=^G, cr=^M, csr=\E[%i%p1%d;%p2%dr, tbc=\E[3g,
> -     clear=\E[H\E[2J, el1=\E[1K, el=\E[K, ed=\E[J,
> -     hpa=\E[%i%p1%dG, cup=\E[%i%p1%d;%p2%dH, cud1=^J,
> -     home=\E[H, civis=\E[?25l, cub1=^H, cnorm=\E[?25h,
> -     cuf1=\E[C, cuu1=\E[A, cvvis=\E[?25h, dch1=\E[P, dl1=\E[M,
> -     dsl=\E]2;\007, enacs=, smacs=\E(0, smam=\E[?7h,
> -     blink=\E[5m, bold=\E[1m, smcup=\E[?1049h, smir=\E[4h,
> -     sitm=\E[3m, rev=\E[7m, smso=\E[7m, smul=\E[4m,
> -     ech=\E[%p1%dX, rmacs=\E(B, rmam=\E[?7l, sgr0=\E[m\E(B,
> -     rmcup=\E[r\E[?1049l, rmir=\E[4l, ritm=\E[23m,
> -     rmso=\E[27m, rmul=\E[24m, flash=\E[?5h$<20/>\E[?5l,
> -     fsl=^G, is1=\E[!p,
> -     is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l,
> +     bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
> +     clear=\E[H\E[2J, cnorm=\E[?12l\E[?25h, cr=^M,
> +     csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
> +     cud=\E[%p1%dB, cud1=^J, 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, dl=\E[%p1%dM,
> +     dl1=\E[M, dsl=\E]2;\007, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
> +     el1=\E[1K, enacs=, flash=\E[?5h$<20/>\E[?5l, fsl=^G,
> +     home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
> +     ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J, indn=\E[%p1%dS,
>       
> initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\,
> -     ich1=\E[@, il1=\E[L, ka1=\EOw, ka3=\EOy, kb2=\EOu, kbs=\177,
> -     kcbt=\E[Z, kc1=\EOq, kc3=\EOs, kdch1=\E[3~, kcud1=\E[B,
> -     kend=\E[8~, kent=\EOM, kel=\E[8\^, kf1=\E[11~, kf10=\E[21~,
> -     kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
> -     kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~,
> -     kf19=\E[33~, kf2=\E[12~, kf20=\E[34~, kf3=\E[13~,
> -     kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
> -     kf9=\E[20~, kfnd=\E[1~, khome=\E[7~, kich1=\E[2~,
> -     kcub1=\E[D, kmous=\E[M, knp=\E[6~, kpp=\E[5~, kcuf1=\E[C,
> -     kDC=\E[3$, kslt=\E[4~, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$,
> -     kLFT=\E[d, kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, kcuu1=\E[A,
> -     rmkx=\E>, smkx=\E=, op=\E[39;49m, dch=\E[%p1%dP,
> -     dl=\E[%p1%dM, cud=\E[%p1%dB, ich=\E[%p1%d@,
> -     indn=\E[%p1%dS, il=\E[%p1%dL, cub=\E[%p1%dD,
> -     cuf=\E[%p1%dC, rin=\E[%p1%dT, cuu=\E[%p1%dA, mc0=\E[i,
> -     mc4=\E[4i, mc5=\E[5i, rs1=\Ec,
> +     is1=\E[!p,
> +     is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l,
> +     kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d,
> +     kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, ka1=\EOw, ka3=\EOy,
> +     kb2=\EOu, kbs=\177, kc1=\EOq, kc3=\EOs, kcbt=\E[Z,
> +     kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
> +     kdch1=\E[3~, kel=\E[8\^, kend=\E[8~, kent=\EOM, kf1=\E[11~,
> +     kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
> +     kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~,
> +     kf18=\E[32~, kf19=\E[33~, kf2=\E[12~, kf20=\E[34~,
> +     kf3=\E[13~, kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~,
> +     kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~, khome=\E[7~,
> +     kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~, kslt=\E[4~,
> +     mc0=\E[i, mc4=\E[4i, mc5=\E[5i, op=\E[39;49m, rc=\E8,
> +     rev=\E[7m, ri=\EM, rin=\E[%p1%dT, ritm=\E[23m, rmacs=\E(B,
> +     rmam=\E[?7l, rmcup=\E[r\E[?1049l, rmir=\E[4l, rmkx=\E>,
> +     rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
>       rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l,
> -     rc=\E8, vpa=\E[%i%p1%dd, sc=\E7, ind=^J, ri=\EM, s0ds=\E(B,
> -     s1ds=\E(0, s2ds=\E*B, s3ds=\E+B, setab=\E[48;5;%p1%dm,
> -     setaf=\E[38;5;%p1%dm,
> -     
> sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
> +     s0ds=\E(B, s1ds=\E(0, s2ds=\E*B, s3ds=\E+B, sc=\E7,
> +     setab=\E[48;5;%p1%dm, setaf=\E[38;5;%p1%dm,
>       
> setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
>       
> setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
> -     hts=\EH, ht=^I, tsl=\E]2;, u6=\E[%i%d;%dR, u7=\E[6n,
> -     u8=\E[?1;2c, u9=\E[c,
> +     
> sgr=\E[%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
> +     sgr0=\E[m\E(B, sitm=\E[3m, smacs=\E(0, smam=\E[?7h,
> +     smcup=\E[?1049h, smir=\E[4h, smkx=\E=, smso=\E[7m,
> +     smul=\E[4m, tbc=\E[3g, tsl=\E]2;, u6=\E[%i%d;%dR, u7=\E[6n,
> +     u8=\E[?1;2c, u9=\E[c, vpa=\E[%i%p1%dd,
>  
>  rxvt-unicode-256color|rxvt-unicode terminal with 256 colors (X Window 
> System),
>       colors#256,

Reply via email to