1# ncurses 6.1 - patch 20190803 - Thomas E. Dickey
2#
3# ------------------------------------------------------------------------------
4#
5# Ncurses 6.1 is at
6# 	ftp.gnu.org:/pub/gnu
7#
8# Patches for ncurses 6.1 can be found at
9# 	ftp://ftp.invisible-island.net/ncurses/6.1
10#	http://invisible-mirror.net/archives/ncurses/6.1
11#
12# ------------------------------------------------------------------------------
13# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190803.patch.gz
14# patch by Thomas E. Dickey <dickey@invisible-island.net>
15# created  Sun Aug  4 00:24:33 UTC 2019
16# ------------------------------------------------------------------------------
17# NEWS                             |   13 ++-
18# VERSION                          |    2
19# dist.mk                          |    4
20# misc/terminfo.src                |  155 +++++++++++++++++++++----------------
21# ncurses/base/lib_scroll.c        |   14 +--
22# ncurses/tinfo/parse_entry.c      |    7 +
23# package/debian-mingw/changelog   |    4
24# package/debian-mingw64/changelog |    4
25# package/debian/changelog         |    4
26# package/mingw-ncurses.nsi        |    4
27# package/mingw-ncurses.spec       |    2
28# package/ncurses.spec             |    2
29# package/ncursest.spec            |    2
30# 13 files changed, 130 insertions(+), 87 deletions(-)
31# ------------------------------------------------------------------------------
32Index: NEWS
33Prereq:  1.3356
34--- ncurses-6.1-20190728+/NEWS	2019-07-28 18:49:10.000000000 +0000
35+++ ncurses-6.1-20190803/NEWS	2019-08-03 22:31:47.000000000 +0000
36@@ -25,7 +25,7 @@
37 -- sale, use or other dealings in this Software without prior written        --
38 -- authorization.                                                            --
39 -------------------------------------------------------------------------------
40--- $Id: NEWS,v 1.3356 2019/07/28 18:49:10 tom Exp $
41+-- $Id: NEWS,v 1.3359 2019/08/03 22:31:47 tom Exp $
42 -------------------------------------------------------------------------------
43
44 This is a log of changes that ncurses has gone through since Zeyd started
45@@ -45,6 +45,17 @@
46 Changes through 1.9.9e did not credit all contributions;
47 it is not possible to add this information.
48
49+20190803
50+	+ improve loop limits in _nc_scroll_window() to handle a case where
51+	  the scrolled data is a pad which is taller than the window (patch
52+	  by Rob King).
53+	+ amend the change to screen, because tmux relies upon that entry
54+	  and does not support that feature (Debian #933572) -TD
55+	+ updated ms-terminal entry & notes -TD
56+	+ updated kitty entry & notes -TD
57+	+ updated alacritty+common entry & notes -TD
58+	+ use xterm+sl-twm for consistency -TD
59+
60 20190728
61 	+ fix a few more coverity warnings.
62 	+ more documentation updates based on tctest.
63Index: VERSION
64--- ncurses-6.1-20190728+/VERSION	2019-07-28 10:39:10.000000000 +0000
65+++ ncurses-6.1-20190803/VERSION	2019-08-03 13:57:42.000000000 +0000
66@@ -1 +1 @@
67-5:0:10	6.1	20190728
68+5:0:10	6.1	20190803
69Index: dist.mk
70Prereq:  1.1298
71--- ncurses-6.1-20190728+/dist.mk	2019-07-28 10:39:10.000000000 +0000
72+++ ncurses-6.1-20190803/dist.mk	2019-08-03 13:57:42.000000000 +0000
73@@ -25,7 +25,7 @@
74 # use or other dealings in this Software without prior written               #
75 # authorization.                                                             #
76 ##############################################################################
77-# $Id: dist.mk,v 1.1298 2019/07/28 10:39:10 tom Exp $
78+# $Id: dist.mk,v 1.1299 2019/08/03 13:57:42 tom Exp $
79 # Makefile for creating ncurses distributions.
80 #
81 # This only needs to be used directly as a makefile by developers, but
82@@ -37,7 +37,7 @@
83 # These define the major/minor/patch versions of ncurses.
84 NCURSES_MAJOR = 6
85 NCURSES_MINOR = 1
86-NCURSES_PATCH = 20190728
87+NCURSES_PATCH = 20190803
88
89 # We don't append the patch to the version, since this only applies to releases
90 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
91Index: misc/terminfo.src
92--- ncurses-6.1-20190728+/misc/terminfo.src	2019-07-06 20:35:26.000000000 +0000
93+++ ncurses-6.1-20190803/misc/terminfo.src	2019-08-03 21:42:15.000000000 +0000
94@@ -6,8 +6,8 @@
95 # Report bugs and new terminal descriptions to
96 #	bug-ncurses@gnu.org
97 #
98-#	$Revision: 1.757 $
99-#	$Date: 2019/07/06 20:35:26 $
100+#	$Revision: 1.763 $
101+#	$Date: 2019/08/03 21:42:15 $
102 #
103 # The original header is preserved below for reference.  It is noted that there
104 # is a "newer" version which differs in some cosmetic details (but actually
105@@ -4223,8 +4223,9 @@
106 ms-vt-utf8|vt-utf8|UTF-8 flavor of vt100+,
107 	use=ms-vt100+,
108
109+# Windows Terminal (Preview)
110 # Windows 10 1903
111-# Version 0.2.1715.0
112+# Version 0.2.1831.0
113 # https://github.com/microsoft/terminal
114 #
115 # The task manager shows this as "OpenConsole.exe", which differs
116@@ -4239,10 +4240,12 @@
117 #   fail in vttest, which does not pay attention to TERM.
118 # vttest:
119 # - menu 1 (tests for cursor movement) misbehaves like command-prompt
120+# - primary DA says this is a vanilla VT100
121 # - does not flush response to primary DA, leaving a ^M on the end when
122-#   The PowerShell tab is used.  Both the "Legacy" tab and the command-prompt
123+#   the PowerShell tab is used.  Both the "Legacy" tab and the command-prompt
124 #   work properly in this test.
125-# - in the generic VT100 tests, there are problems with character sets.
126+# - in the generic VT100 tests, there are problems with character sets
127+#   (diamond shows as a double-width character, DEL as two replacement-chars).
128 # - outside of the generic VT100 tests, the program does poorly because most
129 #   of the features are missing.
130 # - ECH does not work properly
131@@ -4257,11 +4260,14 @@
132 #   or simply incorrect
133 # - sends escape+key rather than implementing meta mode
134 # other:
135-# - color palette cannot be altered
136+# - color palette can be altered, but OSC 104 for resetting does not work
137+# - crashed with a script used for testing NRCS.
138+# - does not recognize either xterm+direct or xterm+indirect escapes.
139 ms-terminal|Windows10 terminal,
140 	npc,
141 	rmkx=\E[?1l, rmm@, smkx=\E[?1h, smm@, use=xterm+256setaf,
142-	use=xterm+pcfkeys, use=xterm-basic,
143+	use=xterm+pcfkeys, use=ansi+rep, use=ecma+index,
144+	use=xterm-basic,
145
146 #### Visual Studio
147 # Visual Studio Code 1.35.1 uses xterm.js (see https://xtermjs.org/).
148@@ -6847,6 +6853,7 @@
149
150 #### Alacritty
151 # https://github.com/jwilm/alacritty
152+# Version 0.3.3 (2019/08/03)
153 # Version 0.2.1 (2018/10/03)
154 # Project started in 2016/02, uses Rust and OpenGL, and in contrast to (most X
155 # terminal programs) is not designed to run with a remote server.
156@@ -6854,21 +6861,24 @@
157 # Packaged in Arch Linux -
158 # vttest:
159 #	initial screensize 24x80
160-#	does not switch between 80/132 columns
161-#	passes wrapping test
162-#	identifies as a vt100
163+#	no DECCOLM (does not switch between 80/132 columns)
164+#	otherwise, passes wrapping test
165+#	no DECSCNM
166+#	identifies as a vt102
167 #	passes bce test
168 #	vt220:
169-#		fails ECH, leaving text on right margin
170+#		ECH works (0.2.1 left text on right margin)
171 #		no SRM, DECSCA
172 #	vt320:
173 #		fails DECXCPR
174 #		does not implement any of the DECRQM/DECRPM controls
175 #		does not implement any of the DECRQSS controls
176 #	vt420:
177+#		no DECLRMM
178 #		no DECBI, DECFI
179 #	other:
180-#		fails REP, SL, SR
181+#		fails CHT, otherwise ECMA-48 cursor movement ok
182+#		fails ERM/SPA, SL, SR, passes REP, SD, SU
183 #	xterm:
184 #		no X10 mouse
185 #		has normal and highlight mouse
186@@ -6876,9 +6886,9 @@
187 #		cursor-position wrong after alternate-screen
188 #		none of the dtterm controls work
189 # tack:
190-#	bell and flash do not work (perhaps Parallels problem)
191-#	italics works; crossed-out does not
192-#	function-keys work up to kf36; window manager interferes with remainder
193+#	bell and flash do not work
194+#	italics and crossed-out work (latter did not work in 0.2.1)
195+#	function-keys work up to kf36; those using two modifiers do not work
196 #
197 # The program sources include "alacritty" and "alacritty-direct", which are
198 # copied from "xterm-256color" and "xterm-direct" (but using semicolon for
199@@ -6891,18 +6901,19 @@
200 	use=xterm+indirect, use=alacritty+common,
201
202 # removed ech, since it fails vttest -TD
203-# removed ecma+strikeout, not implemented -TD
204+# added ecma+strikeout in 0.3.3 -TD
205+# added xterm+sl-twm in 0.3.3 -TD
206 alacritty+common|base fragment for alacritty,
207 	npc,
208-	ech@, kb2=\EOE, kbs=^H, kcbt=\E[Z, kent=\EOM, Se=\E[0 q,
209+	ech@, kb2=\EOE, kbs=^?, kcbt=\E[Z, kent=\EOM, Se=\E[0 q,
210 	use=ecma+index, use=xterm-basic, use=xterm+app,
211 	use=ansi+rep, use=xterm+sm+1006, use=xterm+tmux,
212-	use=ecma+italics, use=xterm+pce2, use=xterm+pcc2,
213-	use=xterm+pcf2,
214+	use=ecma+strikeout, use=xterm+sl-twm, use=ecma+italics,
215+	use=xterm+pce2, use=xterm+pcc2, use=xterm+pcf2,
216
217 #### Kitty
218 # https://github.com/kovidgoyal/kitty
219-# Version 0.12.3
220+# Version 0.13.3
221 # Project started in 2016/10 (see alacritty), but is a Python script rather
222 # than Rust, using OpenGL.  The same caveats regarding remote connections
223 # apply.  This is not an X terminal, though (like alacritty), it copies
224@@ -6959,8 +6970,10 @@
225 #			no mouse-highlight tracking
226 #			no DEC locator
227 #		dtterm - only supports report-size chars/pixels
228+#		recognizes tcap-query
229 # tack:
230 #	flash doesn't work
231+#	italics do not work
232 #	bce should be set (but see vttest)
233 #*	developer's terminfo stopped at kf25, but the program continues,
234 #	copying xterm for the rest of the control+fkey sequence
235@@ -6971,6 +6984,7 @@
236 #	act like xterm for the editing/cursor-keys, e.g., alt+shift.  While
237 #	the implementation is incomplete, the building-blocks are consistent
238 #	with what has been implemented -TD
239+#	DECKPAM does not work -TD
240 #*	ka1, ka3, kc1, kc3 were bogus (removed)
241 #*	meta sends escape (removed kmm) -TD
242 #*	cvvis does not make cursor "more visible" -TD
243@@ -6988,8 +7002,8 @@
244 	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
245 	cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C,
246 	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
247-	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
248-	ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
249+	dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, dl=\E[%p1%dM,
250+	dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
251 	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
252 	ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
253 	ind=\n, kbs=^?, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
254@@ -7007,13 +7021,13 @@
255 	knp=\E[6~, kpp=\E[5~, kri=\E[1;2A, op=\E[39;49m, rc=\E8,
256 	rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmir=\E[4l,
257 	rmkx=\E[?1l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec, sc=\E7,
258-	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
259-	    %t;7%;;m,
260+	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;
261+	    %?%p1%p3%|%t;7%;m,
262 	sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
263 	smkx=\E[?1h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
264 	vpa=\E[%i%p1%dd, use=ecma+index, use=xterm+sl-twm,
265-	use=xterm+pce2, use=xterm+pcc2, use=ecma+italics,
266-	use=xterm+alt1049,
267+	use=ecma+strikeout, use=xterm+pce2, use=xterm+pcc2,
268+	use=ecma+italics, use=xterm+alt1049,
269
270 ######## WEB CLIENTS
271
272@@ -7221,6 +7235,12 @@
273 # the other capabilities will confuse screen.  Curses applications which use
274 # sgr are not impacted (because that usually resets all capabilities before
275 # setting any), but termcap applications do not use sgr -TD
276+#
277+# The "screen" entry should use ecma+index rather than just indn, but tmux
278+# defaults to using "screen".  For background, screen supported ecma+index
279+# since 1994 (i.e., screen 3.0.5), stating that it was an obscure code used by
280+# the (Siemens Nixdorf) 97801 terminal.  It was not shown in the termcap or
281+# terminfo entries (which list about 60% of the control sequences).
282 screen|VT 100/ANSI X3.64 virtual terminal,
283 	OTbs, OTpt, am, km, mir, msgr, xenl, G0,
284 	colors#8, cols#80, it#8, lines#24, ncv@, pairs#64, U8#1,
285@@ -7235,27 +7255,27 @@
286 	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
287 	enacs=\E(B\E)0, flash=\Eg, home=\E[H, hpa=\E[%i%p1%dG,
288 	ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
289-	ind=\n, is2=\E)0, kbs=^H, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
290-	kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP,
291-	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR,
292-	kf4=\EOS, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
293-	kf9=\E[20~, khome=\E[1~, kich1=\E[2~, kmous=\E[M,
294-	knp=\E[6~, kpp=\E[5~, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM,
295-	rmacs=^O, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[23m,
296-	rmul=\E[24m, rs2=\Ec\E[?1000l\E[?25h, sc=\E7,
297+	ind=\n, indn=\E[%p1%dS, is2=\E)0, kbs=^H, kcbt=\E[Z,
298+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
299+	kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
300+	kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
301+	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
302+	khome=\E[1~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~,
303+	nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmir=\E[4l,
304+	rmkx=\E[?1l\E>, rmso=\E[23m, rmul=\E[24m,
305+	rs2=\Ec\E[?1000l\E[?25h, sc=\E7,
306 	sgr=\E[0%?%p6%t;1%;%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;
307 	    5%;%?%p5%t;2%;m%?%p9%t\016%e\017%;,
308 	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=,
309 	smso=\E[3m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
310-	E0=\E(B, S0=\E(%p1%c, use=ecma+index, use=xterm+alt1049,
311-	use=ecma+color,
312+	E0=\E(B, S0=\E(%p1%c, use=xterm+alt1049, use=ecma+color,
313 # The bce and status-line entries are from screen 3.9.13 (and require some
314 # changes to .screenrc).
315 screen-bce|VT 100/ANSI X3.64 virtual terminal with bce,
316 	bce,
317-	ech@, use=screen,
318+	ech@, use=screen4,
319 screen-s|VT 100/ANSI X3.64 virtual terminal with hardstatus line,
320-	dsl=\E_\E\\, fsl=\E\\, tsl=\E_, use=screen,
321+	dsl=\E_\E\\, fsl=\E\\, tsl=\E_, use=screen4,
322
323 # ======================================================================
324 # Entries for GNU Screen with 16 colors.
325@@ -7266,7 +7286,7 @@
326 # do all support 16 color palette.
327
328 screen-16color|GNU Screen with 16 colors,
329-	use=ibm+16color, use=screen,
330+	use=ibm+16color, use=screen4,
331
332 screen-16color-s|GNU Screen with 16 colors and status line,
333 	use=ibm+16color, use=screen-s,
334@@ -7281,7 +7301,7 @@
335 # Entries for GNU Screen 4.02 with --enable-colors256.
336
337 screen-256color|GNU Screen with 256 colors,
338-	use=xterm+256setaf, use=screen,
339+	use=xterm+256setaf, use=screen4,
340
341 screen-256color-s|GNU Screen with 256 colors and status line,
342 	use=xterm+256setaf, use=screen-s,
343@@ -7367,14 +7387,14 @@
344 	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i
345 	     \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u
346 	     \264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
347-	use=screen+fkeys, use=xterm+x11mouse, use=screen,
348+	use=screen+fkeys, use=xterm+x11mouse, use=screen4,
349 # Other terminals
350 screen.rxvt|screen in rxvt,
351 	bw, XT,
352 	cvvis@, flash@, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
353 	kcuu1=\EOA, use=screen+fkeys, use=vt100+enq,
354 	use=rxvt+pcfkeys, use=xterm+x11mouse, use=vt220+keypad,
355-	use=screen,
356+	use=screen4,
357 screen.Eterm|screen in Eterm,
358 	use=xterm+x11mouse, use=screen+fkeys, use=Eterm,
359 screen.mrxvt|screen in mrxvt,
360@@ -7392,7 +7412,7 @@
361 screen.linux|screen in linux console,
362 	bw,
363 	kbs=^?, kcbt@, use=xterm+x11mouse, use=screen+fkeys,
364-	use=screen,
365+	use=screen4,
366 screen.mlterm|screen in mlterm,
367 	use=xterm+x11mouse, use=screen+fkeys, use=mlterm,
368 screen.putty|screen in putty,
369@@ -7434,7 +7454,7 @@
370 	ech@, use=screen.linux,
371
372 screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols,
373-	cols#132, use=screen,
374+	cols#132, use=screen4,
375
376 screen2|old VT 100/ANSI X3.64 virtual terminal,
377 	cols#80, it#8, lines#24,
378@@ -7470,7 +7490,7 @@
379 # was last updated in 2009 to include 256-color support.  The most recent
380 # release is 4.6.2 (October 2017).
381 screen4|VT 100/ANSI X3.64 virtual terminal,
382-	use=screen,
383+	use=ecma+index, use=screen,
384
385 # As of March 2019, screen 5.0 has not been released.
386 #
387@@ -7488,7 +7508,7 @@
388 	rmso=\E[27m,
389 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?
390 	    %p5%t;2%;m%?%p9%t\016%e\017%;,
391-	smso=\E[7m, use=ecma+italics, use=screen,
392+	smso=\E[7m, use=ecma+italics, use=screen4,
393
394 #### Tmux
395
396@@ -20670,7 +20690,7 @@
397 	     yzz||}}~~,
398 	bel=\007\E\^ \E\\, bold@, csr@, flash=\Eg\E\^ \E\\, kmous@,
399 	rmul@, smul@, u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\EZ,
400-	use=xterm+x11mouse, use=screen,
401+	use=xterm+x11mouse, use=screen4,
402
403 screen.minitel1b|Screen specific for minitel1b,
404 	kclr=\E[2J, kdl1=\E[M, kf13=^Y{1, kf14=^Y{2, kf15=^Y{3,
405@@ -20798,7 +20818,7 @@
406 	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
407 	   \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
408 	   \n\n\n\n\n\n\n\n\n\n,
409-	use=xterm+x11mouse, use=screen,
410+	use=xterm+x11mouse, use=screen4,
411
412 screen.linux-m1b|Linux m1b specific for screen,
413 	colors@, pairs@,
414@@ -20813,30 +20833,29 @@
415
416 putty-m1|Putty Minitel 1 "like" Couleurs,
417 	hs,
418-	dim@, dsl=\E]2;\007, fsl=^G, kf1=\E[11~, kf2=\E[12~,
419-	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
420-	rmcup=\E[2J\E[?47l\E8, rmul=\E[24m, smcup=\E7\E[?47h,
421-	smul=\E[4m, tsl=\E]2;, .E3=\E[300S, .WS=\E[8;%d;%dt,
422-	Z0=\E[?3h, Z1=\E[?3l, use=ecma+index, use=linux-m1,
423+	dim@, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
424+	kf5=\E[15~, rmcup=\E[2J\E[?47l\E8, rmul=\E[24m,
425+	smcup=\E7\E[?47h, smul=\E[4m, .E3=\E[300S,
426+	.WS=\E[8;%d;%dt, Z0=\E[?3h, Z1=\E[?3l, use=xterm+sl-twm,
427+	use=ecma+index, use=linux-m1,
428
429 putty-m1b|Putty Minitel 1B "like" Monochrome (Gris/Blanc/Noir),
430 	hs,
431-	dim@, dsl=\E]2;\007, fsl=^G, kf1=\E[11~, kf2=\E[12~,
432-	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
433-	rmcup=\E[2J\E[?47l\E8, rmul=\E[24m, smcup=\E7\E[?47h,
434-	smul=\E[4m, tsl=\E]2;, .E3=\E[300S, .WS=\E[8;%d;%dt,
435-	Z0=\E[?3h, Z1=\E[?3l, use=ecma+index, use=linux-m1b,
436+	dim@, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
437+	kf5=\E[15~, rmcup=\E[2J\E[?47l\E8, rmul=\E[24m,
438+	smcup=\E7\E[?47h, smul=\E[4m, .E3=\E[300S,
439+	.WS=\E[8;%d;%dt, Z0=\E[?3h, Z1=\E[?3l, use=xterm+sl-twm,
440+	use=ecma+index, use=linux-m1b,
441
442 putty-m2|Putty Minitel 2 "like" Couleurs (Vert/Blanc/Noir),
443 	hs,
444 	acsc=``aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{
445 	     {||}}~~,
446-	dim@, dsl=\E]2;\007, fsl=^G, kf1=\E[11~, kf2=\E[12~,
447-	kf3=\E[13~, kf4=\E[14~, kf5=\E[15~,
448-	rmcup=\E[2J\E[?47l\E8, rmul=\E[24m, smcup=\E7\E[?47h,
449-	smul=\E[4m, tsl=\E]2;, .E3=\E[300S, .WS=\E[8;%d;%dt,
450-	Z0=\E[?3h, Z1=\E[?3l, use=ecma+index, use=linux-m2,
451-
452+	dim@, kf1=\E[11~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
453+	kf5=\E[15~, rmcup=\E[2J\E[?47l\E8, rmul=\E[24m,
454+	smcup=\E7\E[?47h, smul=\E[4m, .E3=\E[300S,
455+	.WS=\E[8;%d;%dt, Z0=\E[?3h, Z1=\E[?3l, use=xterm+sl-twm,
456+	use=ecma+index, use=linux-m2,
457
458 screen.putty-m1|Putty m1 specific for screen,
459 	dim@, rmul=\E[24m, smul=\E[4m, E3@, use=screen.linux-m1,
460@@ -26345,4 +26364,12 @@
461 #	+ add domterm -TD
462 #	+ improve comments for recent changes, add alias xterm.js -TD
463 #
464+# 2019-08-03
465+#	+ amend the change to screen, because tmux relies upon that entry
466+#	  and does not support that feature (Debian #933572) -TD
467+#	+ updated ms-terminal entry & notes -TD
468+#	+ updated kitty entry & notes -TD
469+#	+ updated alacritty+common entry & notes -TD
470+#	+ use xterm+sl-twm for consistency -TD
471+#
472 ######## SHANTIH!  SHANTIH!  SHANTIH!
473Index: ncurses/base/lib_scroll.c
474Prereq:  1.29
475--- ncurses-6.1-20190728+/ncurses/base/lib_scroll.c	2011-10-22 16:34:50.000000000 +0000
476+++ ncurses-6.1-20190803/ncurses/base/lib_scroll.c	2019-08-03 22:27:55.000000000 +0000
477@@ -1,5 +1,5 @@
478 /****************************************************************************
479- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
480+ * Copyright (c) 1998-2011,2019 Free Software Foundation, Inc.              *
481  *                                                                          *
482  * Permission is hereby granted, free of charge, to any person obtaining a  *
483  * copy of this software and associated documentation files (the            *
484@@ -43,7 +43,7 @@
485
486 #include <curses.priv.h>
487
488-MODULE_ID("$Id: lib_scroll.c,v 1.29 2011/10/22 16:34:50 tom Exp $")
489+MODULE_ID("$Id: lib_scroll.c,v 1.31 2019/08/03 22:27:55 tom Exp $")
490
491 NCURSES_EXPORT(void)
492 _nc_scroll_window(WINDOW *win,
493@@ -77,11 +77,13 @@
494      * setup cost.  So there is no point in trying to be excessively
495      * clever -- esr.
496      */
497+#define BottomLimit(n) ((n) >= 0 && (n) >= top)
498+#define TopLimit(n)    ((n) <= win->_maxy && (n) <= bottom)
499
500     /* shift n lines downwards */
501     if (n < 0) {
502 	limit = top - n;
503-	for (line = bottom; line >= limit && line >= 0; line--) {
504+	for (line = bottom; line >= limit && BottomLimit(line); line--) {
505 	    TR(TRACE_MOVE, ("...copying %d to %d", line + n, line));
506 	    memcpy(win->_line[line].text,
507 		   win->_line[line + n].text,
508@@ -89,7 +91,7 @@
509 	    if_USE_SCROLL_HINTS(win->_line[line].oldindex =
510 				win->_line[line + n].oldindex);
511 	}
512-	for (line = top; line < limit && line <= win->_maxy; line++) {
513+	for (line = top; line < limit && TopLimit(line); line++) {
514 	    TR(TRACE_MOVE, ("...filling %d", line));
515 	    for (j = 0; j <= win->_maxx; j++)
516 		win->_line[line].text[j] = blank;
517@@ -100,14 +102,14 @@
518     /* shift n lines upwards */
519     if (n > 0) {
520 	limit = bottom - n;
521-	for (line = top; line <= limit && line <= win->_maxy; line++) {
522+	for (line = top; line <= limit && TopLimit(line); line++) {
523 	    memcpy(win->_line[line].text,
524 		   win->_line[line + n].text,
525 		   to_copy);
526 	    if_USE_SCROLL_HINTS(win->_line[line].oldindex =
527 				win->_line[line + n].oldindex);
528 	}
529-	for (line = bottom; line > limit && line >= 0; line--) {
530+	for (line = bottom; line > limit && BottomLimit(line); line--) {
531 	    for (j = 0; j <= win->_maxx; j++)
532 		win->_line[line].text[j] = blank;
533 	    if_USE_SCROLL_HINTS(win->_line[line].oldindex = _NEWINDEX);
534Index: ncurses/tinfo/parse_entry.c
535Prereq:  1.96
536--- ncurses-6.1-20190728+/ncurses/tinfo/parse_entry.c	2019-03-16 23:31:40.000000000 +0000
537+++ ncurses-6.1-20190803/ncurses/tinfo/parse_entry.c	2019-08-03 23:10:38.000000000 +0000
538@@ -47,7 +47,7 @@
539 #include <ctype.h>
540 #include <tic.h>
541
542-MODULE_ID("$Id: parse_entry.c,v 1.96 2019/03/16 23:31:40 tom Exp $")
543+MODULE_ID("$Id: parse_entry.c,v 1.97 2019/08/03 23:10:38 tom Exp $")
544
545 #ifdef LINT
546 static short const parametrized[] =
547@@ -530,9 +530,12 @@
548 		break;
549
550 	    case NUMBER:
551+#if !NCURSES_EXT_NUMBERS
552 		if (_nc_curr_token.tk_valnumber > MAX_NUMBER) {
553 		    entryp->tterm.Numbers[entry_ptr->nte_index] = MAX_NUMBER;
554-		} else {
555+		} else
556+#endif
557+		{
558 		    entryp->tterm.Numbers[entry_ptr->nte_index] =
559 			(NCURSES_INT2) _nc_curr_token.tk_valnumber;
560 		}
561Index: package/debian-mingw/changelog
562--- ncurses-6.1-20190728+/package/debian-mingw/changelog	2019-07-28 10:39:10.000000000 +0000
563+++ ncurses-6.1-20190803/package/debian-mingw/changelog	2019-08-03 13:57:42.000000000 +0000
564@@ -1,8 +1,8 @@
565-ncurses6 (6.1+20190728) unstable; urgency=low
566+ncurses6 (6.1+20190803) unstable; urgency=low
567
568   * latest weekly patch
569
570- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 28 Jul 2019 06:39:10 -0400
571+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 03 Aug 2019 09:57:42 -0400
572
573 ncurses6 (5.9-20131005) unstable; urgency=low
574
575Index: package/debian-mingw64/changelog
576--- ncurses-6.1-20190728+/package/debian-mingw64/changelog	2019-07-28 10:39:10.000000000 +0000
577+++ ncurses-6.1-20190803/package/debian-mingw64/changelog	2019-08-03 13:57:42.000000000 +0000
578@@ -1,8 +1,8 @@
579-ncurses6 (6.1+20190728) unstable; urgency=low
580+ncurses6 (6.1+20190803) unstable; urgency=low
581
582   * latest weekly patch
583
584- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 28 Jul 2019 06:39:10 -0400
585+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 03 Aug 2019 09:57:42 -0400
586
587 ncurses6 (5.9-20131005) unstable; urgency=low
588
589Index: package/debian/changelog
590--- ncurses-6.1-20190728+/package/debian/changelog	2019-07-28 10:39:10.000000000 +0000
591+++ ncurses-6.1-20190803/package/debian/changelog	2019-08-03 13:57:42.000000000 +0000
592@@ -1,8 +1,8 @@
593-ncurses6 (6.1+20190728) unstable; urgency=low
594+ncurses6 (6.1+20190803) unstable; urgency=low
595
596   * latest weekly patch
597
598- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 28 Jul 2019 06:39:10 -0400
599+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 03 Aug 2019 09:57:42 -0400
600
601 ncurses6 (5.9-20120608) unstable; urgency=low
602
603Index: package/mingw-ncurses.nsi
604Prereq:  1.344
605--- ncurses-6.1-20190728+/package/mingw-ncurses.nsi	2019-07-28 10:39:10.000000000 +0000
606+++ ncurses-6.1-20190803/package/mingw-ncurses.nsi	2019-08-03 13:57:42.000000000 +0000
607@@ -1,4 +1,4 @@
608-; $Id: mingw-ncurses.nsi,v 1.344 2019/07/28 10:39:10 tom Exp $
609+; $Id: mingw-ncurses.nsi,v 1.345 2019/08/03 13:57:42 tom Exp $
610
611 ; TODO add examples
612 ; TODO bump ABI to 6
613@@ -10,7 +10,7 @@
614 !define VERSION_MAJOR "6"
615 !define VERSION_MINOR "1"
616 !define VERSION_YYYY  "2019"
617-!define VERSION_MMDD  "0728"
618+!define VERSION_MMDD  "0803"
619 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
620
621 !define MY_ABI   "5"
622Index: package/mingw-ncurses.spec
623--- ncurses-6.1-20190728+/package/mingw-ncurses.spec	2019-07-28 10:39:10.000000000 +0000
624+++ ncurses-6.1-20190803/package/mingw-ncurses.spec	2019-08-03 13:57:42.000000000 +0000
625@@ -3,7 +3,7 @@
626 Summary: shared libraries for terminal handling
627 Name: mingw32-ncurses6
628 Version: 6.1
629-Release: 20190728
630+Release: 20190803
631 License: X11
632 Group: Development/Libraries
633 Source: ncurses-%{version}-%{release}.tgz
634Index: package/ncurses.spec
635--- ncurses-6.1-20190728+/package/ncurses.spec	2019-07-28 10:39:10.000000000 +0000
636+++ ncurses-6.1-20190803/package/ncurses.spec	2019-08-03 13:57:42.000000000 +0000
637@@ -1,7 +1,7 @@
638 Summary: shared libraries for terminal handling
639 Name: ncurses6
640 Version: 6.1
641-Release: 20190728
642+Release: 20190803
643 License: X11
644 Group: Development/Libraries
645 Source: ncurses-%{version}-%{release}.tgz
646Index: package/ncursest.spec
647--- ncurses-6.1-20190728+/package/ncursest.spec	2019-07-28 10:39:10.000000000 +0000
648+++ ncurses-6.1-20190803/package/ncursest.spec	2019-08-03 13:57:42.000000000 +0000
649@@ -1,7 +1,7 @@
650 Summary: Curses library with POSIX thread support.
651 Name: ncursest6
652 Version: 6.1
653-Release: 20190728
654+Release: 20190803
655 License: X11
656 Group: Development/Libraries
657 Source: ncurses-%{version}-%{release}.tgz
658