diff --git a/ncurses-5.9-ibm327x.dif b/ncurses-5.9-ibm327x.dif index 4cbcf70..6298989 100644 --- a/ncurses-5.9-ibm327x.dif +++ b/ncurses-5.9-ibm327x.dif @@ -4,7 +4,7 @@ --- misc/terminfo.src +++ misc/terminfo.src 2018-10-29 10:23:47.271511864 +0000 -@@ -17278,8 +17278,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv +@@ -17396,8 +17396,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv # ibm327x|line mode IBM 3270 style, diff --git a/ncurses-6.2-patches.tar.bz2 b/ncurses-6.2-patches.tar.bz2 index 99ca18d..9b2c503 100644 --- a/ncurses-6.2-patches.tar.bz2 +++ b/ncurses-6.2-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f135a42a8004f6ae93f939705667fc823fa162f53474fd821b706ed6a91b5dea -size 1934120 +oid sha256:320df657656585954a583758abf76e2d13a95333741c50ee6307691fbdd07ceb +size 1943815 diff --git a/ncurses-6.2.dif b/ncurses-6.2.dif index 6cf6435..617acda 100644 --- a/ncurses-6.2.dif +++ b/ncurses-6.2.dif @@ -7,7 +7,7 @@ man/man_db.renames | 2 man/ncurses.3x | 4 + misc/gen-pkgconfig.in | 8 ++ - misc/terminfo.src | 138 ++++++++++++++++++++++++++++++++++--------- + misc/terminfo.src | 107 ++++++++++++++++++++++++++++++++++++------- ncurses/Makefile.in | 2 ncurses/curses.priv.h | 2 ncurses/run_cmd.sh | 11 +++ @@ -18,7 +18,7 @@ ncurses/tinfo/read_termcap.c | 21 ++++-- progs/Makefile.in | 4 - test/test.priv.h | 4 - - 19 files changed, 249 insertions(+), 79 deletions(-) + 19 files changed, 231 insertions(+), 68 deletions(-) --- aclocal.m4 +++ aclocal.m4 2021-01-11 07:35:24.208330490 +0000 @@ -412,7 +412,7 @@ gn, use=dumb, lpr|printer|line printer, OTbs, hc, os, -@@ -1015,9 +1017,15 @@ linux-c|linux console 1.3.6+ for older n +@@ -1013,9 +1015,15 @@ linux-c|linux console 1.3.6+ for older n # The 2.2.x kernels add a private mode that sets the cursor type; use that to # get a block cursor for cvvis. # reported by Frank Heckenbach . @@ -429,7 +429,7 @@ # Linux 2.6.x has a fix for SI/SO to work with UTF-8 encoding added here: # http://lkml.iu.edu/hypermail/linux/kernel/0602.2/0738.html -@@ -1050,6 +1058,7 @@ linux2.6|linux 2.6.x console, +@@ -1048,6 +1056,7 @@ linux2.6|linux 2.6.x console, acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxy yzz{{||}}~~, enacs=\E)0, rmacs=^O, @@ -437,7 +437,7 @@ sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5 %t;2%;%?%p6%t;1%;m%?%p9%t\016%e\017%;, sgr0=\E[m\017, smacs=^N, use=linux2.2, -@@ -5210,8 +5219,26 @@ xterm-noapp|xterm with cursor keys in no +@@ -5347,8 +5356,26 @@ xterm-noapp|xterm with cursor keys in no xterm-24|vs100|xterms|xterm terminal emulator (X Window System), lines#24, use=xterm-old, @@ -464,7 +464,7 @@ use=xterm-new, # This entry assumes that xterm's handling of VT100 SI/SO is disabled by -@@ -5556,7 +5583,7 @@ xterms-sun|small (80x24) xterm with sunF +@@ -5693,7 +5720,7 @@ xterms-sun|small (80x24) xterm with sunF #### GNOME (VTE) # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 @@ -473,7 +473,7 @@ bce, kdch1=^?, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=xterm-color, -@@ -5807,10 +5834,14 @@ mgt|Multi GNOME Terminal, +@@ -5944,10 +5971,14 @@ mgt|Multi GNOME Terminal, #### KDE # This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce # or not is debatable). @@ -489,7 +489,7 @@ # Konsole 1.0.1 (2001/11/25) # (formerly known as kvt) # -@@ -6062,7 +6093,7 @@ mlterm3|multi lingual terminal emulator, +@@ -6199,7 +6230,7 @@ mlterm3|multi lingual terminal emulator, mlterm2|multi lingual terminal emulator, am, eslok, km, mc5i, mir, msgr, npc, xenl, XT, colors#8, cols#80, it#8, lines#24, pairs#64, @@ -498,7 +498,7 @@ bel=^G, bold=\E[1m, cbt=\E[Z, clear=\E[H\E[2J, 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, -@@ -6140,7 +6171,7 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6276,7 +6307,7 @@ rxvt-basic|rxvt terminal base (X Window enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\n, is1=\E[?47l\E=\E[?1l, @@ -507,18 +507,18 @@ kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m, rmul=\E[24m, -@@ -6235,8 +6266,8 @@ rxvt-basic|rxvt terminal base (X Window +@@ -6371,8 +6402,8 @@ rxvt-basic|rxvt terminal base (X Window # Removed kDN6, etc (control+shift) since rxvt does not implement this -TD rxvt+pcfkeys|fragment for PC-style fkeys, kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d, - kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, kcub1=\E[D, kcud1=\E[B, -- kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kel=\E[8\^, +- kcuf1=\E[C, kcuu1=\E[A, kel=\E[8\^, kend=\E[8~, kf1=\E[11~, + kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, kcub1=\EOD, kcud1=\EOB, -+ kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kel=\E[8\^, - kend=\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~, -@@ -6327,6 +6358,38 @@ rxvt-cygwin-native|rxvt terminal emulato ++ kcuf1=\EOC, kcuu1=\EOA, kel=\E[8\^, kend=\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~, +@@ -6462,6 +6493,38 @@ rxvt-cygwin-native|rxvt terminal emulato \302x\263y\363z\362{\343|\330~\376, use=rxvt-cygwin, @@ -557,7 +557,7 @@ # This variant is supposed to work with rxvt 2.7.7 when compiled with # NO_BRIGHTCOLOR defined. rxvt needs more work... rxvt-16color|rxvt with 16 colors like aixterm, -@@ -6391,7 +6454,7 @@ Eterm|Eterm-color|Eterm with xterm-style +@@ -6526,7 +6589,7 @@ Eterm|Eterm-color|Eterm with xterm-style 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, is1=\E[?47l\E>\E[?1l, is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kNXT@, @@ -566,7 +566,7 @@ kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M, mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmam=\E[?7l, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=, -@@ -7381,7 +7444,7 @@ pty|4bsd pseudo teletype, +@@ -7514,7 +7577,7 @@ pty|4bsd pseudo teletype, # https://github.com/emacs-mirror/emacs/blob/master/lisp/term.el # # The codes supported by the term.el terminal emulation in GNU Emacs 19.30 @@ -575,7 +575,7 @@ am, mir, xenl, cols#80, lines#24, bel=^G, bold=\E[1m, clear=\E[H\E[J, cr=\r, -@@ -7394,6 +7457,13 @@ eterm|gnu emacs term.el terminal emulati +@@ -7527,6 +7590,13 @@ eterm|gnu emacs term.el terminal emulati rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmso=\E[m, rmul=\E[m, sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m, smul=\E[4m, @@ -589,16 +589,16 @@ # The codes supported by the term.el terminal emulation in GNU Emacs 22.2 eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96, -@@ -7522,7 +7592,7 @@ screen|VT 100/ANSI X3.64 virtual termina +@@ -7654,7 +7724,7 @@ screen|VT 100/ANSI X3.64 virtual termina dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, flash=\Eg, 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, indn=\E[%p1%dS, is2=\E)0, kbs=^H, kcbt=\E[Z, + ind=\n, indn=\E[%p1%dS, is2=\E)0, kbs=^?, kcbt=\E[Z, - kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, - kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, - kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, -@@ -7644,6 +7714,13 @@ screen.xterm-xfree86|screen.xterm-new|sc + kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, + kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, + kf4=\EOS, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, +@@ -7774,6 +7844,13 @@ screen.xterm-xfree86|screen.xterm-new|sc use=xterm+x11mouse, use=xterm-new, #:screen.xterm|screen for modern xterm, #: use=screen.xterm-new, @@ -612,7 +612,7 @@ # xterm-r6 does not really support khome/kend unless it is propped up by # the translations resource. screen.xterm-r6|screen customized for X11R6 xterm, -@@ -7731,7 +7808,7 @@ screen2|old VT 100/ANSI X3.64 virtual te +@@ -7861,7 +7938,7 @@ screen2|old VT 100/ANSI X3.64 virtual te cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=, il=\E[%p1%dL, @@ -621,7 +621,7 @@ kcuu1=\EA, kf0=\E~, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\E0I, khome=\EH, nel=\r\n, rc=\E8, ri=\EM, rmir=\E[4l, rmso=\E[23m, -@@ -9638,7 +9715,7 @@ hp700-wy|HP700/41 emulating wyse30, +@@ -9759,7 +9836,7 @@ hp700-wy|HP700/41 emulating wyse30, ri=\Ej, rmir=\Er, rmso=\EG0$<10/>, rmul=\EG0$<10/>, sgr0=\EG0$<10/>, smir=\Eq, smso=\EG4$<10/>, smul=\EG8$<10/>, tbc=\E0, vpa=\E[%p1%{32}%+%c, @@ -630,7 +630,7 @@ am, da, db, xhp, cols#80, lh#2, lines#24, lm#0, lw#8, nlab#8, acsc=0cjgktlrmfn/q\,t5u6v8w7x., bel=^G, blink=\E&dA, -@@ -17289,7 +17366,7 @@ ibm3101|i3101|IBM 3101-10, +@@ -17406,7 +17483,7 @@ ibm3101|i3101|IBM 3101-10, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, ed=\EJ, el=\EI, home=\EH, hts=\E0, ind=\n, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, nel=\r\n, tbc=\EH, @@ -639,7 +639,7 @@ is2=\E S, rmacs=\E>B, rmcup=\E>B, rs2=\E S, s0ds=\E>B, sgr=\E4%{64}%?%p1%t%{65}%|%;%?%p2%t%{66}%|%;%?%p3%t%{65}%|%; %?%p4%t%{68}%|%;%?%p5%t%{64}%|%;%?%p6%t%{72}%|%;%?%p7%t -@@ -17547,7 +17624,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De +@@ -17664,7 +17741,7 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De tbc=\E[3g, use=ecma+index, # "Megapel" refers to the display adapter, which was used with the IBM RT # aka IBM 6150. diff --git a/ncurses.changes b/ncurses.changes index a53d312..a9af0f7 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Feb 22 08:41:45 UTC 2021 - Dr. Werner Fink + +- Add ncurses patch 20210220 + + improve tic warning when oc/op do not mention SGR 39/49 for xterm + compatible XT flag. + + revert change to lib_addch.c in waddch_literal() from 20210130, since + the followup fix in PutCharLR() actually corrects the problem while + this change causes too-early filling/wrapping (report by Johannes + Altmanninger). + + add/use vt220+pcedit and vt220+vtedit -TD + + add scrt/securecrt and absolute -TD + + add nel to xterm-new, though supported since X11R5 -TD + + add/use xterm+nofkeys -TD + + move use of ecma+italics from xterm-basic to xterm+nofkeys -TD +- Port patch ncurses-6.2.dif mainly terminfo.src + ------------------------------------------------------------------- Mon Feb 15 11:15:34 UTC 2021 - Dr. Werner Fink