1# ncurses 6.1 - patch 20190713 - 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-20190713.patch.gz 14# patch by Thomas E. Dickey <dickey@invisible-island.net> 15# created Sun Jul 14 00:50:41 UTC 2019 16# ------------------------------------------------------------------------------ 17# NEWS | 8 ++ 18# VERSION | 2 19# dist.mk | 4 - 20# doc/html/ada/funcs/T.htm | 2 21# doc/html/ada/terminal_interface-curses-terminfo__adb.htm | 2 22# doc/html/man/adacurses6-config.1.html | 2 23# doc/html/man/captoinfo.1m.html | 2 24# doc/html/man/clear.1.html | 2 25# doc/html/man/curs_bkgd.3x.html | 10 ++- 26# doc/html/man/curs_mouse.3x.html | 13 ++-- 27# doc/html/man/form.3x.html | 2 28# doc/html/man/infocmp.1m.html | 2 29# doc/html/man/infotocap.1m.html | 2 30# doc/html/man/menu.3x.html | 2 31# doc/html/man/ncurses.3x.html | 2 32# doc/html/man/ncurses6-config.1.html | 2 33# doc/html/man/panel.3x.html | 2 34# doc/html/man/tabs.1.html | 2 35# doc/html/man/term.7.html | 6 +- 36# doc/html/man/terminfo.5.html | 39 +++++++------ 37# doc/html/man/tic.1m.html | 2 38# doc/html/man/toe.1m.html | 2 39# doc/html/man/tput.1.html | 2 40# doc/html/man/tset.1.html | 2 41# man/curs_bkgd.3x | 10 ++- 42# man/curs_mouse.3x | 18 +++--- 43# man/term.7 | 6 +- 44# man/terminfo.head | 6 +- 45# man/terminfo.tail | 30 +++++----- 46# package/debian-mingw/changelog | 4 - 47# package/debian-mingw64/changelog | 4 - 48# package/debian/changelog | 4 - 49# package/mingw-ncurses.nsi | 4 - 50# package/mingw-ncurses.spec | 2 51# package/ncurses.spec | 2 52# package/ncursest.spec | 2 53# progs/reset_cmd.c | 9 +-- 54# test/padview.c | 14 +++- 55# 38 files changed, 132 insertions(+), 99 deletions(-) 56# ------------------------------------------------------------------------------ 57Index: NEWS 58Prereq: 1.3344 59--- ncurses-6.1-20190706+/NEWS 2019-07-06 20:51:46.000000000 +0000 60+++ ncurses-6.1-20190713/NEWS 2019-07-13 23:10:57.000000000 +0000 61@@ -25,7 +25,7 @@ 62 -- sale, use or other dealings in this Software without prior written -- 63 -- authorization. -- 64 ------------------------------------------------------------------------------- 65--- $Id: NEWS,v 1.3344 2019/07/06 20:51:46 tom Exp $ 66+-- $Id: NEWS,v 1.3347 2019/07/13 23:10:57 tom Exp $ 67 ------------------------------------------------------------------------------- 68 69 This is a log of changes that ncurses has gone through since Zeyd started 70@@ -45,6 +45,12 @@ 71 Changes through 1.9.9e did not credit all contributions; 72 it is not possible to add this information. 73 74+20190713 75+ + change reset's behavior for margins to simply clear soft-margins if 76+ possible, rather than clearing and then setting them according to the 77+ terminal's width (suggested by Thomas Wolff). 78+ + correct order of one wbkgd versus start_color call in test/padview.c 79+ 80 20190706 81 + add domterm -TD 82 + improve comments for recent changes, add alias xterm.js -TD 83Index: VERSION 84--- ncurses-6.1-20190706+/VERSION 2019-07-06 09:10:26.000000000 +0000 85+++ ncurses-6.1-20190713/VERSION 2019-07-13 20:42:44.000000000 +0000 86@@ -1 +1 @@ 87-5:0:10 6.1 20190706 88+5:0:10 6.1 20190713 89Index: dist.mk 90Prereq: 1.1293 91--- ncurses-6.1-20190706+/dist.mk 2019-07-06 09:10:26.000000000 +0000 92+++ ncurses-6.1-20190713/dist.mk 2019-07-13 20:42:44.000000000 +0000 93@@ -25,7 +25,7 @@ 94 # use or other dealings in this Software without prior written # 95 # authorization. # 96 ############################################################################## 97-# $Id: dist.mk,v 1.1293 2019/07/06 09:10:26 tom Exp $ 98+# $Id: dist.mk,v 1.1294 2019/07/13 20:42:44 tom Exp $ 99 # Makefile for creating ncurses distributions. 100 # 101 # This only needs to be used directly as a makefile by developers, but 102@@ -37,7 +37,7 @@ 103 # These define the major/minor/patch versions of ncurses. 104 NCURSES_MAJOR = 6 105 NCURSES_MINOR = 1 106-NCURSES_PATCH = 20190706 107+NCURSES_PATCH = 20190713 108 109 # We don't append the patch to the version, since this only applies to releases 110 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) 111Index: doc/html/ada/funcs/T.htm 112--- ncurses-6.1-20190706+/doc/html/ada/funcs/T.htm 2019-06-15 23:31:13.000000000 +0000 113+++ ncurses-6.1-20190713/doc/html/ada/funcs/T.htm 2019-07-13 23:50:38.000000000 +0000 114@@ -20,8 +20,8 @@ 115 <LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_89_16" TARGET="main">tgetnum</A> 116 <LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_108_16" TARGET="main">tgetstr - terminal_interface-curses-termcap.adb:108</A> 117 <LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_129_16" TARGET="main">tgetstr - terminal_interface-curses-termcap.adb:129</A> 118-<LI><A HREF="../terminal_interface-curses-termcap__ads.htm#ref_53_13" TARGET="main">TGoto</A> 119 <LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_151_16" TARGET="main">tgoto</A> 120+<LI><A HREF="../terminal_interface-curses-termcap__ads.htm#ref_53_13" TARGET="main">TGoto</A> 121 <LI><A HREF="../terminal_interface-curses-terminfo__adb.htm#ref_69_16" TARGET="main">tigetflag</A> 122 <LI><A HREF="../terminal_interface-curses-terminfo__adb.htm#ref_87_16" TARGET="main">tigetstr - terminal_interface-curses-terminfo.adb:87</A> 123 <LI><A HREF="../terminal_interface-curses-terminfo__adb.htm#ref_108_16" TARGET="main">tigetstr - terminal_interface-curses-terminfo.adb:108</A> 124Index: doc/html/ada/terminal_interface-curses-terminfo__adb.htm 125--- ncurses-6.1-20190706+/doc/html/ada/terminal_interface-curses-terminfo__adb.htm 2019-03-16 19:34:48.000000000 +0000 126+++ ncurses-6.1-20190713/doc/html/ada/terminal_interface-curses-terminfo__adb.htm 2019-07-13 23:50:39.000000000 +0000 127@@ -151,7 +151,7 @@ 128 <b>end</b> <A HREF="terminal_interface-curses-terminfo__ads.htm#ref_68_13">Get_Number</A>; 129 130 <span class="comment"><EM>------------------------------------------------------------------------------</EM></span> 131- <b>procedure</b> <span class="symbol"><A NAME="ref_137_14" HREF="terminal_interface-curses-terminfo__ads.htm#ref_76_14">Put_String</A></span> (<span class="symbol"><A NAME="ref_137_26" HREF="terminal_interface-curses-terminfo__ads.htm#ref_76_26">Str</A></span> : Terminfo_String; 132+ <b>procedure</b> <span class="symbol"><A NAME="ref_137_14" HREF="terminal_interface-curses-terminfo__ads.htm#ref_76_14">Put_String</A></span> (<span class="symbol"><A NAME="ref_137_26" HREF="terminal_interface-curses-terminfo__ads.htm#ref_76_26">Str</A></span> : <A HREF="terminal_interface-curses-terminfo__ads.htm#ref_44_35">Terminfo_String</A>; 133 <span class="symbol"><A NAME="ref_138_26" HREF="terminal_interface-curses-terminfo__ads.htm#ref_77_26">affcnt</A></span> : Natural := 1; 134 <span class="symbol"><A NAME="ref_139_26" HREF="terminal_interface-curses-terminfo__ads.htm#ref_78_26">putc</A></span> : <A HREF="terminal_interface-curses-terminfo__ads.htm#ref_71_9">putctype</A> := <b>null</b>) <b>is</b> 135 <b>function</b> <span class="symbol"><A NAME="ref_140_16">tputs</A></span> (<span class="symbol"><A NAME="ref_140_23" HREF="terminal_interface-curses-terminfo__adb.htm#ref_140_16">str</A></span> : char_array; 136Index: doc/html/man/adacurses6-config.1.html 137--- ncurses-6.1-20190706+/doc/html/man/adacurses6-config.1.html 2019-06-23 21:16:02.000000000 +0000 138+++ ncurses-6.1-20190713/doc/html/man/adacurses6-config.1.html 2019-07-13 23:50:33.000000000 +0000 139@@ -125,7 +125,7 @@ 140 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 141 <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> 142 143- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190623). 144+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713). 145 146 147 148Index: doc/html/man/captoinfo.1m.html 149--- ncurses-6.1-20190706+/doc/html/man/captoinfo.1m.html 2019-06-23 21:16:02.000000000 +0000 150+++ ncurses-6.1-20190713/doc/html/man/captoinfo.1m.html 2019-07-13 23:50:33.000000000 +0000 151@@ -190,7 +190,7 @@ 152 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 153 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> 154 155- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190623). 156+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713). 157 158 159 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> 160Index: doc/html/man/clear.1.html 161--- ncurses-6.1-20190706+/doc/html/man/clear.1.html 2019-06-23 21:16:02.000000000 +0000 162+++ ncurses-6.1-20190713/doc/html/man/clear.1.html 2019-07-13 23:50:33.000000000 +0000 163@@ -148,7 +148,7 @@ 164 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 165 <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> 166 167- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190623). 168+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713). 169 170 171 172Index: doc/html/man/curs_bkgd.3x.html 173--- ncurses-6.1-20190706+/doc/html/man/curs_bkgd.3x.html 2019-03-16 19:34:43.000000000 +0000 174+++ ncurses-6.1-20190713/doc/html/man/curs_bkgd.3x.html 2019-07-13 23:50:33.000000000 +0000 175@@ -1,6 +1,6 @@ 176 <!-- 177 **************************************************************************** 178- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. * 179+ * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc. * 180 * * 181 * Permission is hereby granted, free of charge, to any person obtaining a * 182 * copy of this software and associated documentation files (the * 183@@ -26,7 +26,7 @@ 184 * sale, use or other dealings in this Software without prior written * 185 * authorization. * 186 **************************************************************************** 187- * @Id: curs_bkgd.3x,v 1.28 2018/12/09 00:45:05 tom Exp @ 188+ * @Id: curs_bkgd.3x,v 1.29 2019/07/13 21:01:06 tom Exp @ 189 --> 190 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> 191 <HTML> 192@@ -121,6 +121,12 @@ 193 rent background, and then adding attributes from the new back- 194 ground. 195 196+ If the background's character value is zero, a space is assumed. 197+ 198+ If the terminal does not support color, or if color has not been 199+ started with <STRONG>start_color</STRONG>, the new background character's color 200+ attribute will be ignored. 201+ 202 203 </PRE><H3><a name="h3-getbkgd">getbkgd</a></H3><PRE> 204 The <STRONG>getbkgd</STRONG> function returns the given window's current background 205Index: doc/html/man/curs_mouse.3x.html 206--- ncurses-6.1-20190706+/doc/html/man/curs_mouse.3x.html 2019-03-16 19:34:44.000000000 +0000 207+++ ncurses-6.1-20190713/doc/html/man/curs_mouse.3x.html 2019-07-13 23:50:34.000000000 +0000 208@@ -1,7 +1,7 @@ 209 <!-- 210 * t 211 **************************************************************************** 212- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. * 213+ * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc. * 214 * * 215 * Permission is hereby granted, free of charge, to any person obtaining a * 216 * copy of this software and associated documentation files (the * 217@@ -27,7 +27,7 @@ 218 * sale, use or other dealings in this Software without prior written * 219 * authorization. * 220 **************************************************************************** 221- * @Id: curs_mouse.3x,v 1.50 2018/12/29 23:40:47 tom Exp @ 222+ * @Id: curs_mouse.3x,v 1.51 2019/07/13 23:45:12 tom Exp @ 223 --> 224 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> 225 <HTML> 226@@ -347,10 +347,11 @@ 227 228 Because there are no standard terminal responses that would serve to 229 identify terminals which support the xterm mouse protocol, <STRONG>ncurses</STRONG> as- 230- sumes that if your $TERM environment variable contains "xterm", or 231- <STRONG>kmous</STRONG> is defined in the terminal description, then the terminal may 232- send mouse events. The <STRONG>kmous</STRONG> capability is checked first, allowing the 233- use of newer xterm mouse protocols. 234+ sumes that if <STRONG>kmous</STRONG> is defined in the terminal description, or if the 235+ terminal description's primary name or aliases contain the string 236+ "xterm", then the terminal may send mouse events. The <STRONG>kmous</STRONG> capability 237+ is checked first, allowing the use of newer xterm mouse protocols such 238+ as xterm's private mode 1006. 239 240 241 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 242Index: doc/html/man/form.3x.html 243--- ncurses-6.1-20190706+/doc/html/man/form.3x.html 2019-06-23 21:16:04.000000000 +0000 244+++ ncurses-6.1-20190713/doc/html/man/form.3x.html 2019-07-13 23:50:35.000000000 +0000 245@@ -246,7 +246,7 @@ 246 <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "form_" for detailed 247 descriptions of the entry points. 248 249- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190623). 250+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713). 251 252 253 254Index: doc/html/man/infocmp.1m.html 255--- ncurses-6.1-20190706+/doc/html/man/infocmp.1m.html 2019-06-23 21:16:04.000000000 +0000 256+++ ncurses-6.1-20190713/doc/html/man/infocmp.1m.html 2019-07-13 23:50:36.000000000 +0000 257@@ -481,7 +481,7 @@ 258 259 https://invisible-island.net/ncurses/tctest.html 260 261- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190623). 262+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713). 263 264 265 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> 266Index: doc/html/man/infotocap.1m.html 267--- ncurses-6.1-20190706+/doc/html/man/infotocap.1m.html 2019-06-23 21:16:04.000000000 +0000 268+++ ncurses-6.1-20190713/doc/html/man/infotocap.1m.html 2019-07-13 23:50:36.000000000 +0000 269@@ -85,7 +85,7 @@ 270 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 271 <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> 272 273- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190623). 274+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713). 275 276 277 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> 278Index: doc/html/man/menu.3x.html 279--- ncurses-6.1-20190706+/doc/html/man/menu.3x.html 2019-06-23 21:16:05.000000000 +0000 280+++ ncurses-6.1-20190713/doc/html/man/menu.3x.html 2019-07-13 23:50:36.000000000 +0000 281@@ -221,7 +221,7 @@ 282 <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> and related pages whose names begin "menu_" for detailed 283 descriptions of the entry points. 284 285- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190623). 286+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713). 287 288 289 290Index: doc/html/man/ncurses.3x.html 291--- ncurses-6.1-20190706+/doc/html/man/ncurses.3x.html 2019-06-23 21:16:05.000000000 +0000 292+++ ncurses-6.1-20190713/doc/html/man/ncurses.3x.html 2019-07-13 23:50:37.000000000 +0000 293@@ -59,7 +59,7 @@ 294 method of updating character screens with reasonable optimization. 295 This implementation is "new curses" (ncurses) and is the approved 296 replacement for 4.4BSD classic curses, which has been discontinued. 297- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190623). 298+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713). 299 300 The <STRONG>ncurses</STRONG> library emulates the curses library of System V Release 4 301 UNIX, and XPG4 (X/Open Portability Guide) curses (also known as XSI 302Index: doc/html/man/ncurses6-config.1.html 303--- ncurses-6.1-20190706+/doc/html/man/ncurses6-config.1.html 2019-06-23 21:16:05.000000000 +0000 304+++ ncurses-6.1-20190713/doc/html/man/ncurses6-config.1.html 2019-07-13 23:50:37.000000000 +0000 305@@ -112,7 +112,7 @@ 306 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 307 <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> 308 309- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190623). 310+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713). 311 312 313 314Index: doc/html/man/panel.3x.html 315--- ncurses-6.1-20190706+/doc/html/man/panel.3x.html 2019-06-23 21:16:05.000000000 +0000 316+++ ncurses-6.1-20190713/doc/html/man/panel.3x.html 2019-07-13 23:50:37.000000000 +0000 317@@ -204,7 +204,7 @@ 318 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 319 <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, 320 321- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190623). 322+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713). 323 324 325 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> 326Index: doc/html/man/tabs.1.html 327--- ncurses-6.1-20190706+/doc/html/man/tabs.1.html 2019-06-23 21:16:06.000000000 +0000 328+++ ncurses-6.1-20190713/doc/html/man/tabs.1.html 2019-07-13 23:50:37.000000000 +0000 329@@ -205,7 +205,7 @@ 330 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 331 <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>. 332 333- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190623). 334+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713). 335 336 337 338Index: doc/html/man/term.7.html 339--- ncurses-6.1-20190706+/doc/html/man/term.7.html 2019-03-16 19:34:46.000000000 +0000 340+++ ncurses-6.1-20190713/doc/html/man/term.7.html 2019-07-13 23:50:37.000000000 +0000 341@@ -1,6 +1,6 @@ 342 <!-- 343 **************************************************************************** 344- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. * 345+ * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc. * 346 * * 347 * Permission is hereby granted, free of charge, to any person obtaining a * 348 * copy of this software and associated documentation files (the * 349@@ -26,7 +26,7 @@ 350 * sale, use or other dealings in this Software without prior written * 351 * authorization. * 352 **************************************************************************** 353- * @Id: term.7,v 1.26 2018/07/28 22:19:56 tom Exp @ 354+ * @Id: term.7,v 1.27 2019/07/13 23:17:23 tom Exp @ 355 --> 356 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> 357 <HTML> 358@@ -177,7 +177,7 @@ 359 360 -vb Use visible bell (flash) rather than beep. 361 362- -w Wide; terminal is in 132 column mode. 363+ -w Wide; terminal is in 132-column mode. 364 365 Conventionally, if your terminal type is a variant intended to specify 366 a line height, that suffix should go first. So, for a hypothetical 367Index: doc/html/man/terminfo.5.html 368--- ncurses-6.1-20190706+/doc/html/man/terminfo.5.html 2019-06-23 21:16:06.000000000 +0000 369+++ ncurses-6.1-20190713/doc/html/man/terminfo.5.html 2019-07-13 23:50:37.000000000 +0000 370@@ -5,7 +5,7 @@ 371 * Note: this must be run through tbl before nroff. 372 * The magic cookie on the first line triggers this under some man programs. 373 **************************************************************************** 374- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. * 375+ * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc. * 376 * * 377 * Permission is hereby granted, free of charge, to any person obtaining a * 378 * copy of this software and associated documentation files (the * 379@@ -31,9 +31,9 @@ 380 * sale, use or other dealings in this Software without prior written * 381 * authorization. * 382 **************************************************************************** 383- * @Id: terminfo.head,v 1.35 2018/07/28 22:29:09 tom Exp @ 384+ * @Id: terminfo.head,v 1.36 2019/07/13 23:17:33 tom Exp @ 385 * Head of terminfo man page ends here 386- * @Id: terminfo.tail,v 1.93 2019/06/01 22:32:15 tom Exp @ 387+ * @Id: terminfo.tail,v 1.95 2019/07/13 23:29:04 tom Exp @ 388 * Beginning of terminfo.tail file 389 * This file is part of ncurses. 390 * See "terminfo.head" for copyright. 391@@ -74,7 +74,7 @@ 392 <EM>Terminfo</EM> describes terminals by giving a set of capabilities which they 393 have, by specifying how to perform screen operations, and by specifying 394 padding requirements and initialization sequences. This describes 395- <STRONG>ncurses</STRONG> version 6.1 (patch 20190623). 396+ <STRONG>ncurses</STRONG> version 6.1 (patch 20190713). 397 398 399 </PRE><H3><a name="h3-Terminfo-Entry-Syntax">Terminfo Entry Syntax</a></H3><PRE> 400@@ -124,7 +124,7 @@ 401 ing up the terminal should have a root name, thus "hp2621". This name 402 should not contain hyphens. Modes that the hardware can be in, or user 403 preferences, should be indicated by appending a hyphen and a mode suf- 404- fix. Thus, a vt100 in 132 column mode would be vt100-w. The following 405+ fix. Thus, a vt100 in 132-column mode would be vt100-w. The following 406 suffixes should be used where possible: 407 408 <STRONG>Suffix</STRONG> <STRONG>Meaning</STRONG> <STRONG>Example</STRONG> 409@@ -1902,10 +1902,14 @@ 410 run the program 411 <STRONG>iprog</STRONG> 412 413- output <STRONG>is1</STRONG> <STRONG>is2</STRONG> 414+ output 415+ <STRONG>is1</STRONG> and 416+ <STRONG>is2</STRONG> 417 418 set the margins using 419- <STRONG>mgc</STRONG>, <STRONG>smgl</STRONG> and <STRONG>smgr</STRONG> 420+ <STRONG>mgc</STRONG> or 421+ <STRONG>smglp</STRONG> and <STRONG>smgrp</STRONG> or 422+ <STRONG>smgl</STRONG> and <STRONG>smgr</STRONG> 423 424 set tabs using 425 <STRONG>tbc</STRONG> and <STRONG>hts</STRONG> 426@@ -1913,8 +1917,8 @@ 427 print the file 428 <STRONG>if</STRONG> 429 430- and finally 431- output <STRONG>is3</STRONG>. 432+ and finally output 433+ <STRONG>is3</STRONG>. 434 435 Most initialization is done with <STRONG>is2</STRONG>. Special terminal modes can be 436 set up without duplicating strings by putting the common sequences in 437@@ -1922,14 +1926,14 @@ 438 439 A set of sequences that does a harder reset from a totally unknown 440 state can be given as <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG>, <STRONG>rf</STRONG> and <STRONG>rs3</STRONG>, analogous to <STRONG>is1</STRONG> <STRONG>,</STRONG> <STRONG>is2</STRONG> <STRONG>,</STRONG> <STRONG>if</STRONG> 441- and <STRONG>is3</STRONG> respectively. These strings are output by the <STRONG>reset</STRONG> program 442- (an alias of <STRONG>tset</STRONG>), which is used when the terminal gets into a wedged 443- state. Commands are normally placed in <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG> <STRONG>rs3</STRONG> and <STRONG>rf</STRONG> only if 444- they produce annoying effects on the screen and are not necessary when 445- logging in. For example, the command to set the vt100 into 80-column 446- mode would normally be part of <STRONG>is2</STRONG>, but it causes an annoying glitch of 447- the screen and is not normally needed since the terminal is usually 448- already in 80 column mode. 449+ and <STRONG>is3</STRONG> respectively. These strings are output by <EM>reset</EM> option of 450+ <STRONG>tput</STRONG>, or by the <STRONG>reset</STRONG> program (an alias of <STRONG>tset</STRONG>), which is used when 451+ the terminal gets into a wedged state. Commands are normally placed in 452+ <STRONG>rs1</STRONG>, <STRONG>rs2</STRONG> <STRONG>rs3</STRONG> and <STRONG>rf</STRONG> only if they produce annoying effects on the screen 453+ and are not necessary when logging in. For example, the command to set 454+ the vt100 into 80-column mode would normally be part of <STRONG>is2</STRONG>, but it 455+ causes an annoying glitch of the screen and is not normally needed 456+ since the terminal is usually already in 80-column mode. 457 458 The <STRONG>reset</STRONG> program writes strings including <STRONG>iprog</STRONG>, etc., in the same 459 order as the <EM>init</EM> program, using <STRONG>rs1</STRONG>, etc., instead of <STRONG>is1</STRONG>, etc. If 460@@ -2146,7 +2150,6 @@ 461 green <STRONG>COLOR_GREEN</STRONG> 2 0,max,0 462 yellow <STRONG>COLOR_YELLOW</STRONG> 3 max,max,0 463 blue <STRONG>COLOR_BLUE</STRONG> 4 0,0,max 464- 465 magenta <STRONG>COLOR_MAGENTA</STRONG> 5 max,0,max 466 cyan <STRONG>COLOR_CYAN</STRONG> 6 0,max,max 467 white <STRONG>COLOR_WHITE</STRONG> 7 max,max,max 468Index: doc/html/man/tic.1m.html 469--- ncurses-6.1-20190706+/doc/html/man/tic.1m.html 2019-06-23 21:16:06.000000000 +0000 470+++ ncurses-6.1-20190713/doc/html/man/tic.1m.html 2019-07-13 23:50:37.000000000 +0000 471@@ -365,7 +365,7 @@ 472 <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>, <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, 473 <STRONG><A HREF="term.5.html">term(5)</A></STRONG>. <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>. <STRONG><A HREF="user_caps.5.html">user_caps(5)</A></STRONG>. 474 475- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190623). 476+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713). 477 478 479 </PRE><H2><a name="h2-AUTHOR">AUTHOR</a></H2><PRE> 480Index: doc/html/man/toe.1m.html 481--- ncurses-6.1-20190706+/doc/html/man/toe.1m.html 2019-06-23 21:16:06.000000000 +0000 482+++ ncurses-6.1-20190713/doc/html/man/toe.1m.html 2019-07-13 23:50:37.000000000 +0000 483@@ -113,7 +113,7 @@ 484 <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG>ter-</STRONG> 485 <STRONG><A HREF="terminfo.5.html">minfo(5)</A></STRONG>. 486 487- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190623). 488+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713). 489 490 491 492Index: doc/html/man/tput.1.html 493--- ncurses-6.1-20190706+/doc/html/man/tput.1.html 2019-06-23 21:16:06.000000000 +0000 494+++ ncurses-6.1-20190713/doc/html/man/tput.1.html 2019-07-13 23:50:37.000000000 +0000 495@@ -522,7 +522,7 @@ 496 </PRE><H2><a name="h2-SEE-ALSO">SEE ALSO</a></H2><PRE> 497 <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>. 498 499- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190623). 500+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713). 501 502 503 504Index: doc/html/man/tset.1.html 505--- ncurses-6.1-20190706+/doc/html/man/tset.1.html 2019-06-23 21:16:06.000000000 +0000 506+++ ncurses-6.1-20190713/doc/html/man/tset.1.html 2019-07-13 23:50:37.000000000 +0000 507@@ -389,7 +389,7 @@ 508 <STRONG>csh(1)</STRONG>, <STRONG>sh(1)</STRONG>, <STRONG>stty(1)</STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG>tty(4)</STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, 509 <STRONG>ttys(5)</STRONG>, <STRONG>environ(7)</STRONG> 510 511- This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190623). 512+ This describes <STRONG>ncurses</STRONG> version 6.1 (patch 20190713). 513 514 515 516Index: man/curs_bkgd.3x 517Prereq: 1.28 518--- ncurses-6.1-20190706+/man/curs_bkgd.3x 2018-12-09 00:45:05.000000000 +0000 519+++ ncurses-6.1-20190713/man/curs_bkgd.3x 2019-07-13 21:01:06.000000000 +0000 520@@ -1,5 +1,5 @@ 521 .\"*************************************************************************** 522-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. * 523+.\" Copyright (c) 1998-2018,2019 Free Software Foundation, Inc. * 524 .\" * 525 .\" Permission is hereby granted, free of charge, to any person obtaining a * 526 .\" copy of this software and associated documentation files (the * 527@@ -26,7 +26,7 @@ 528 .\" authorization. * 529 .\"*************************************************************************** 530 .\" 531-.\" $Id: curs_bkgd.3x,v 1.28 2018/12/09 00:45:05 tom Exp $ 532+.\" $Id: curs_bkgd.3x,v 1.29 2019/07/13 21:01:06 tom Exp $ 533 .de bP 534 .ie n .IP \(bu 4 535 .el .IP \(bu 2 536@@ -112,6 +112,12 @@ 537 the library updates only the non-color attributes, 538 first removing those which may have come from the current background, 539 and then adding attributes from the new background. 540+.PP 541+If the background's character value is zero, a space is assumed. 542+.PP 543+If the terminal does not support color, 544+or if color has not been started with \fBstart_color\fP, 545+the new background character's color attribute will be ignored. 546 .SS getbkgd 547 .PP 548 The \fBgetbkgd\fR function returns the given window's current background 549Index: man/curs_mouse.3x 550Prereq: 1.50 551--- ncurses-6.1-20190706+/man/curs_mouse.3x 2018-12-29 23:40:47.000000000 +0000 552+++ ncurses-6.1-20190713/man/curs_mouse.3x 2019-07-13 23:45:12.000000000 +0000 553@@ -1,6 +1,6 @@ 554 '\" t 555 .\"*************************************************************************** 556-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. * 557+.\" Copyright (c) 1998-2018,2019 Free Software Foundation, Inc. * 558 .\" * 559 .\" Permission is hereby granted, free of charge, to any person obtaining a * 560 .\" copy of this software and associated documentation files (the * 561@@ -27,7 +27,7 @@ 562 .\" authorization. * 563 .\"*************************************************************************** 564 .\" 565-.\" $Id: curs_mouse.3x,v 1.50 2018/12/29 23:40:47 tom Exp $ 566+.\" $Id: curs_mouse.3x,v 1.51 2019/07/13 23:45:12 tom Exp $ 567 .ie \n(.g .ds `` \(lq 568 .el .ds `` `` 569 .ie \n(.g .ds '' \(rq 570@@ -394,7 +394,7 @@ 571 .PP 572 Mouse events under xterm will not be detected correctly in a window with 573 its keypad bit off, since they are interpreted as a variety of function key. 574-Your terminfo description should have \fBkmous\fR set to "\\E[M" 575+Your terminfo description should have \fBkmous\fR set to \*(``\\E[M\*('' 576 (the beginning of the response from xterm for mouse clicks). 577 Other values for \fBkmous\fR are permitted, 578 but under the same assumption, 579@@ -402,11 +402,13 @@ 580 .PP 581 Because there are no standard terminal responses that would serve to identify 582 terminals which support the xterm mouse protocol, \fBncurses\fR assumes that 583-if your $TERM environment variable contains \*(``xterm\*('', 584-or \fBkmous\fR is defined in 585-the terminal description, then the terminal may send mouse events. 586-The \fBkmous\fP capability is checked first, allowing the 587-use of newer xterm mouse protocols. 588+if \fBkmous\fR is defined in the terminal description, 589+or if the terminal description's primary name or aliases 590+contain the string \*(``xterm\*('', 591+then the terminal may send mouse events. 592+The \fBkmous\fP capability is checked first, 593+allowing the use of newer xterm mouse protocols 594+such as xterm's private mode 1006. 595 .SH SEE ALSO 596 \fBcurses\fR(3X), 597 \fBcurs_kernel\fR(3X), 598Index: man/term.7 599Prereq: 1.26 600--- ncurses-6.1-20190706+/man/term.7 2018-07-28 22:19:56.000000000 +0000 601+++ ncurses-6.1-20190713/man/term.7 2019-07-13 23:17:23.000000000 +0000 602@@ -1,5 +1,5 @@ 603 .\"*************************************************************************** 604-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. * 605+.\" Copyright (c) 1998-2018,2019 Free Software Foundation, Inc. * 606 .\" * 607 .\" Permission is hereby granted, free of charge, to any person obtaining a * 608 .\" copy of this software and associated documentation files (the * 609@@ -26,7 +26,7 @@ 610 .\" authorization. * 611 .\"*************************************************************************** 612 .\" 613-.\" $Id: term.7,v 1.26 2018/07/28 22:19:56 tom Exp $ 614+.\" $Id: term.7,v 1.27 2019/07/13 23:17:23 tom Exp $ 615 .TH term 7 616 .ie \n(.g .ds `` \(lq 617 .el .ds `` `` 618@@ -190,7 +190,7 @@ 619 Use visible bell (flash) rather than beep. 620 .TP 5 621 \-w 622-Wide; terminal is in 132 column mode. 623+Wide; terminal is in 132-column mode. 624 .PP 625 Conventionally, if your terminal type is a variant intended to specify a 626 line height, that suffix should go first. 627Index: man/terminfo.head 628Prereq: 1.35 629--- ncurses-6.1-20190706+/man/terminfo.head 2018-07-28 22:29:09.000000000 +0000 630+++ ncurses-6.1-20190713/man/terminfo.head 2019-07-13 23:17:33.000000000 +0000 631@@ -1,5 +1,5 @@ 632 .\"*************************************************************************** 633-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. * 634+.\" Copyright (c) 1998-2018,2019 Free Software Foundation, Inc. * 635 .\" * 636 .\" Permission is hereby granted, free of charge, to any person obtaining a * 637 .\" copy of this software and associated documentation files (the * 638@@ -26,7 +26,7 @@ 639 .\" authorization. * 640 .\"*************************************************************************** 641 .\" 642-.\" $Id: terminfo.head,v 1.35 2018/07/28 22:29:09 tom Exp $ 643+.\" $Id: terminfo.head,v 1.36 2019/07/13 23:17:33 tom Exp $ 644 .TH terminfo 5 "" "" "File Formats" 645 .ds n 5 646 .ds d @TERMINFO@ 647@@ -124,7 +124,7 @@ 648 This name should not contain hyphens. 649 Modes that the hardware can be in, or user preferences, should 650 be indicated by appending a hyphen and a mode suffix. 651-Thus, a vt100 in 132 column mode would be vt100\-w. 652+Thus, a vt100 in 132-column mode would be vt100\-w. 653 The following suffixes should be used where possible: 654 .PP 655 .TS 656Index: man/terminfo.tail 657Prereq: 1.93 658--- ncurses-6.1-20190706+/man/terminfo.tail 2019-06-01 22:32:15.000000000 +0000 659+++ ncurses-6.1-20190713/man/terminfo.tail 2019-07-13 23:29:04.000000000 +0000 660@@ -1,4 +1,4 @@ 661-.\" $Id: terminfo.tail,v 1.93 2019/06/01 22:32:15 tom Exp $ 662+.\" $Id: terminfo.tail,v 1.95 2019/07/13 23:29:04 tom Exp $ 663 .\" Beginning of terminfo.tail file 664 .\" This file is part of ncurses. 665 .\" See "terminfo.head" for copyright. 666@@ -1141,14 +1141,17 @@ 667 .B iprog 668 .TP 669 output 670-.B is1 671-.B is2 672+.br 673+\fBis1\fP and 674+.br 675+\fBis2\fP 676 .TP 677 set the margins using 678-.BR mgc , 679-.B smgl 680-and 681-.B smgr 682+\fBmgc\fP or 683+.br 684+\fBsmglp\fP and \fBsmgrp\fP or 685+.br 686+\fBsmgl\fP and \fBsmgr\fP 687 .TP 688 set tabs using 689 .B tbc 690@@ -1156,11 +1159,10 @@ 691 .B hts 692 .TP 693 print the file 694-.B if 695+\fBif\fP 696 .TP 697-and finally 698-output 699-.BR is3 . 700+and finally output 701+\fBis3\fP. 702 .RE 703 .PP 704 Most initialization is done with 705@@ -1187,7 +1189,9 @@ 706 and 707 .B is3 708 respectively. 709-These strings are output by the \fB@RESET@\fP program 710+These strings are output 711+by \fIreset\fP option of \fB@TPUT@\fP, 712+or by the \fB@RESET@\fP program 713 (an alias of \fB@TSET@\fP), 714 which is used when the terminal gets into a wedged state. 715 Commands are normally placed in 716@@ -1202,7 +1206,7 @@ 717 normally be part of 718 .BR is2 , 719 but it causes an annoying glitch of the screen and is not normally 720-needed since the terminal is usually already in 80 column mode. 721+needed since the terminal is usually already in 80-column mode. 722 .PP 723 The \fB@RESET@\fP program writes strings including 724 .BR iprog , 725Index: package/debian-mingw/changelog 726--- ncurses-6.1-20190706+/package/debian-mingw/changelog 2019-07-06 09:10:26.000000000 +0000 727+++ ncurses-6.1-20190713/package/debian-mingw/changelog 2019-07-13 20:42:44.000000000 +0000 728@@ -1,8 +1,8 @@ 729-ncurses6 (6.1+20190706) unstable; urgency=low 730+ncurses6 (6.1+20190713) unstable; urgency=low 731 732 * latest weekly patch 733 734- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Jul 2019 05:10:26 -0400 735+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 13 Jul 2019 16:42:44 -0400 736 737 ncurses6 (5.9-20131005) unstable; urgency=low 738 739Index: package/debian-mingw64/changelog 740--- ncurses-6.1-20190706+/package/debian-mingw64/changelog 2019-07-06 09:10:26.000000000 +0000 741+++ ncurses-6.1-20190713/package/debian-mingw64/changelog 2019-07-13 20:42:44.000000000 +0000 742@@ -1,8 +1,8 @@ 743-ncurses6 (6.1+20190706) unstable; urgency=low 744+ncurses6 (6.1+20190713) unstable; urgency=low 745 746 * latest weekly patch 747 748- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Jul 2019 05:10:26 -0400 749+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 13 Jul 2019 16:42:44 -0400 750 751 ncurses6 (5.9-20131005) unstable; urgency=low 752 753Index: package/debian/changelog 754--- ncurses-6.1-20190706+/package/debian/changelog 2019-07-06 09:10:26.000000000 +0000 755+++ ncurses-6.1-20190713/package/debian/changelog 2019-07-13 20:42:44.000000000 +0000 756@@ -1,8 +1,8 @@ 757-ncurses6 (6.1+20190706) unstable; urgency=low 758+ncurses6 (6.1+20190713) unstable; urgency=low 759 760 * latest weekly patch 761 762- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Jul 2019 05:10:26 -0400 763+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 13 Jul 2019 16:42:44 -0400 764 765 ncurses6 (5.9-20120608) unstable; urgency=low 766 767Index: package/mingw-ncurses.nsi 768Prereq: 1.339 769--- ncurses-6.1-20190706+/package/mingw-ncurses.nsi 2019-07-06 09:10:26.000000000 +0000 770+++ ncurses-6.1-20190713/package/mingw-ncurses.nsi 2019-07-13 20:42:44.000000000 +0000 771@@ -1,4 +1,4 @@ 772-; $Id: mingw-ncurses.nsi,v 1.339 2019/07/06 09:10:26 tom Exp $ 773+; $Id: mingw-ncurses.nsi,v 1.340 2019/07/13 20:42:44 tom Exp $ 774 775 ; TODO add examples 776 ; TODO bump ABI to 6 777@@ -10,7 +10,7 @@ 778 !define VERSION_MAJOR "6" 779 !define VERSION_MINOR "1" 780 !define VERSION_YYYY "2019" 781-!define VERSION_MMDD "0706" 782+!define VERSION_MMDD "0713" 783 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} 784 785 !define MY_ABI "5" 786Index: package/mingw-ncurses.spec 787--- ncurses-6.1-20190706+/package/mingw-ncurses.spec 2019-07-06 09:10:26.000000000 +0000 788+++ ncurses-6.1-20190713/package/mingw-ncurses.spec 2019-07-13 20:42:44.000000000 +0000 789@@ -3,7 +3,7 @@ 790 Summary: shared libraries for terminal handling 791 Name: mingw32-ncurses6 792 Version: 6.1 793-Release: 20190706 794+Release: 20190713 795 License: X11 796 Group: Development/Libraries 797 Source: ncurses-%{version}-%{release}.tgz 798Index: package/ncurses.spec 799--- ncurses-6.1-20190706+/package/ncurses.spec 2019-07-06 09:10:26.000000000 +0000 800+++ ncurses-6.1-20190713/package/ncurses.spec 2019-07-13 20:42:44.000000000 +0000 801@@ -1,7 +1,7 @@ 802 Summary: shared libraries for terminal handling 803 Name: ncurses6 804 Version: 6.1 805-Release: 20190706 806+Release: 20190713 807 License: X11 808 Group: Development/Libraries 809 Source: ncurses-%{version}-%{release}.tgz 810Index: package/ncursest.spec 811--- ncurses-6.1-20190706+/package/ncursest.spec 2019-07-06 09:10:26.000000000 +0000 812+++ ncurses-6.1-20190713/package/ncursest.spec 2019-07-13 20:42:44.000000000 +0000 813@@ -1,7 +1,7 @@ 814 Summary: Curses library with POSIX thread support. 815 Name: ncursest6 816 Version: 6.1 817-Release: 20190706 818+Release: 20190713 819 License: X11 820 Group: Development/Libraries 821 Source: ncurses-%{version}-%{release}.tgz 822Index: progs/reset_cmd.c 823Prereq: 1.17 824--- ncurses-6.1-20190706+/progs/reset_cmd.c 2019-05-25 22:36:53.000000000 +0000 825+++ ncurses-6.1-20190713/progs/reset_cmd.c 2019-07-13 21:35:13.000000000 +0000 826@@ -52,7 +52,7 @@ 827 #include <sys/ptem.h> 828 #endif 829 830-MODULE_ID("$Id: reset_cmd.c,v 1.17 2019/05/25 22:36:53 tom Exp $") 831+MODULE_ID("$Id: reset_cmd.c,v 1.18 2019/07/13 21:35:13 tom Exp $") 832 833 /* 834 * SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS, 835@@ -495,6 +495,9 @@ 836 ? reset_2string 837 : init_2string); 838 839+ if (VALID_STRING(clear_margins)) { 840+ need_flush |= sent_string(clear_margins); 841+ } else 842 #if defined(set_lr_margin) 843 if (VALID_STRING(set_lr_margin)) { 844 need_flush |= sent_string(TPARM_2(set_lr_margin, 0, 845@@ -509,10 +512,8 @@ 846 columns - 1)); 847 } else 848 #endif 849- if (VALID_STRING(clear_margins) 850- && VALID_STRING(set_left_margin) 851+ if (VALID_STRING(set_left_margin) 852 && VALID_STRING(set_right_margin)) { 853- need_flush |= sent_string(clear_margins); 854 need_flush |= to_left_margin(); 855 need_flush |= sent_string(set_left_margin); 856 if (VALID_STRING(parm_right_cursor)) { 857Index: test/padview.c 858Prereq: 1.13 859--- ncurses-6.1-20190706+/test/padview.c 2019-01-21 19:47:07.000000000 +0000 860+++ ncurses-6.1-20190713/test/padview.c 2019-07-13 20:41:47.000000000 +0000 861@@ -28,7 +28,7 @@ 862 /* 863 * clone of view.c, using pads 864 * 865- * $Id: padview.c,v 1.13 2019/01/21 19:47:07 tom Exp $ 866+ * $Id: padview.c,v 1.14 2019/07/13 20:41:47 tom Exp $ 867 */ 868 869 #include <test.priv.h> 870@@ -191,7 +191,7 @@ 871 failed("cannot allocate pad workspace"); 872 if (try_color) { 873 wattrset(my_pad, COLOR_PAIR(my_pair)); 874- wbkgd(my_pad, (chtype) COLOR_PAIR(my_pair)); 875+ wbkgd(my_pad, (chtype) (' ' | COLOR_PAIR(my_pair))); 876 } 877 878 /* 879@@ -347,18 +347,22 @@ 880 nodelay(stdscr, TRUE); 881 idlok(stdscr, TRUE); /* allow use of insert/delete line */ 882 883- my_pad = read_file(fname = argv[optind]); 884- 885 if (try_color) { 886 if (has_colors()) { 887 start_color(); 888 init_pair(my_pair, COLOR_WHITE, COLOR_BLUE); 889- bkgd((chtype) COLOR_PAIR(my_pair)); 890+ bkgd((chtype) (' ' | COLOR_PAIR(my_pair))); 891 } else { 892 try_color = FALSE; 893 } 894 } 895 896+ /* 897+ * Do this after starting color, otherwise the pad's background will be 898+ * uncolored after the ncurses 6.1.20181208 fixes. 899+ */ 900+ my_pad = read_file(fname = argv[optind]); 901+ 902 my_row = 0; 903 while (!done) { 904 int n, c; 905