From: Thomas E. Dickey Date: Sun, 29 Mar 2015 17:28:34 +0000 (+0000) Subject: ncurses 5.9 - patch 20150329 X-Git-Tag: v6.0~17 X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=61784de97467c5401927becd7a999064cd6244dc;hp=fe6abf09238512f5a902bc1aeab2263d1e997396 ncurses 5.9 - patch 20150329 + correct cut/paste error for "--enable-ext-putwin" that made it the same as "--enable-ext-colors" (report by Roumen Petrov) --- diff --git a/NEWS b/NEWS index a2deff1f..f854d9e4 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.2363 2015/03/28 21:50:39 tom Exp $ +-- $Id: NEWS,v 1.2365 2015/03/29 14:38:58 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,10 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20150329 + + correct cut/paste error for "--enable-ext-putwin" that made it the + same as "--enable-ext-colors" (report by Roumen Petrov) + 20150328 + add "-f" option to test/savescreen.c to help with testing/debugging the extended putwin/getwin. diff --git a/VERSION b/VERSION index 7efef8b0..3d0fb4fe 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:9 5.9 20150328 +5:0:9 5.9 20150329 diff --git a/configure b/configure index 8e1e66b7..61fa203d 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.600 . +# From configure.in Revision: 1.601 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20141204. # @@ -11646,9 +11646,9 @@ fi echo "$as_me:11646: checking if you want to use extended putwin/screendump" >&5 echo $ECHO_N "checking if you want to use extended putwin/screendump... $ECHO_C" >&6 -# Check whether --enable-ext-colors or --disable-ext-colors was given. -if test "${enable_ext_colors+set}" = set; then - enableval="$enable_ext_colors" +# Check whether --enable-ext-putwin or --disable-ext-putwin was given. +if test "${enable_ext_putwin+set}" = set; then + enableval="$enable_ext_putwin" with_ext_putwin=$enableval else with_ext_putwin=no diff --git a/configure.in b/configure.in index 67e1535d..0d5624be 100644 --- a/configure.in +++ b/configure.in @@ -28,14 +28,14 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: configure.in,v 1.600 2015/03/27 10:48:27 tom Exp $ +dnl $Id: configure.in,v 1.601 2015/03/29 14:33:54 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl See http://invisible-island.net/autoconf/ for additional information. dnl dnl --------------------------------------------------------------------------- AC_PREREQ(2.52.20030208) -AC_REVISION($Revision: 1.600 $) +AC_REVISION($Revision: 1.601 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -1078,7 +1078,7 @@ AC_SUBST(NCURSES_MOUSE_VERSION) ### use option --enable-ext-putwin to turn on extended screendumps AC_MSG_CHECKING(if you want to use extended putwin/screendump) -AC_ARG_ENABLE(ext-colors, +AC_ARG_ENABLE(ext-putwin, [ --enable-ext-putwin compile with extended putwin/screendump], [with_ext_putwin=$enableval], [with_ext_putwin=no]) diff --git a/dist.mk b/dist.mk index 5ecb0982..bab612a7 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1040 2015/03/27 10:27:01 tom Exp $ +# $Id: dist.mk,v 1.1041 2015/03/29 14:32:33 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -37,7 +37,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 5 NCURSES_MINOR = 9 -NCURSES_PATCH = 20150328 +NCURSES_PATCH = 20150329 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/ncurses/base/lib_screen.c b/ncurses/base/lib_screen.c index 8569a556..4d310be2 100644 --- a/ncurses/base/lib_screen.c +++ b/ncurses/base/lib_screen.c @@ -41,7 +41,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_screen.c,v 1.70 2015/03/29 00:16:00 tom Exp $") +MODULE_ID("$Id: lib_screen.c,v 1.72 2015/03/29 15:25:29 tom Exp $") #define MAX_SIZE 0x3fff /* 16k is big enough for a window or pad */ @@ -321,7 +321,7 @@ decode_chtype(char *source, chtype fillin, chtype *target) T(("decode_chtype '%s'", source)); source = decode_attr(source, &attr, &color); source = decode_char(source, &value); - *target = ChCharOf(value) | attr | COLOR_PAIR(color); + *target = (ChCharOf(value) | attr | (chtype) COLOR_PAIR(color)); /* FIXME - ignore combining characters */ return source; } @@ -334,6 +334,7 @@ decode_cchar(char *source, cchar_t *fillin, cchar_t *target) attr_t attr = fillin->attr; wchar_t chars[CCHARW_MAX]; int append = 0; + int value = 0; T(("decode_cchar '%s'", source)); *target = blank; @@ -344,14 +345,14 @@ decode_cchar(char *source, cchar_t *fillin, cchar_t *target) #endif source = decode_attr(source, &attr, &color); memset(chars, 0, sizeof(chars)); - source = decode_char(source, &chars[0]); + source = decode_char(source, &value); + chars[0] = (wchar_t) value; /* handle combining characters */ while (source[0] == MARKER && source[1] == APPEND) { - int value; source += 2; source = decode_char(source, &value); if (append++ < CCHARW_MAX) { - chars[append] = value; + chars[append] = (wchar_t) value; } } setcchar(target, chars, attr, (short) color, NULL); @@ -694,21 +695,22 @@ encode_cell(char *target, CARG_CH_T source, CARG_CH_T previous) } #endif for (n = 0; n < SIZEOF(source->chars); ++n) { - if (source->chars[n] == 0) + unsigned uch = source->chars[n]; + if (uch == 0) continue; if (n) { *target++ = MARKER; *target++ = APPEND; } *target++ = MARKER; - if (source->chars[n] > 0xffff) { - sprintf(target, "U%08x", source->chars[n]); - } else if (source->chars[n] > 0xff) { - sprintf(target, "u%04x", source->chars[n]); - } else if (source->chars[n] < 32 || source->chars[n] >= 127) { - sprintf(target, "%03o", source->chars[n] & 0xff); + if (uch > 0xffff) { + sprintf(target, "U%08x", uch); + } else if (uch > 0xff) { + sprintf(target, "u%04x", uch); + } else if (uch < 32 || uch >= 127) { + sprintf(target, "%03o", uch & 0xff); } else { - switch (source->chars[n]) { + switch (uch) { case ' ': strcpy(target, "s"); break; @@ -717,7 +719,7 @@ encode_cell(char *target, CARG_CH_T source, CARG_CH_T previous) *target = '\0'; break; default: - sprintf(--target, "%c", source->chars[n]); + sprintf(--target, "%c", uch); break; } } diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index c31d09fe..dd8d4708 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9+20150328) unstable; urgency=low +ncurses6 (5.9+20150329) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Fri, 27 Mar 2015 06:27:01 -0400 + -- Thomas E. Dickey Sun, 29 Mar 2015 10:32:33 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index c31d09fe..dd8d4708 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9+20150328) unstable; urgency=low +ncurses6 (5.9+20150329) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Fri, 27 Mar 2015 06:27:01 -0400 + -- Thomas E. Dickey Sun, 29 Mar 2015 10:32:33 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 4fd108c3..9982b33d 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9+20150328) unstable; urgency=low +ncurses6 (5.9+20150329) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Fri, 27 Mar 2015 06:27:01 -0400 + -- Thomas E. Dickey Sun, 29 Mar 2015 10:32:33 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 952dd9d1..bfb24012 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.93 2015/03/27 10:27:01 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.94 2015/03/29 14:32:33 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "5" !define VERSION_MINOR "9" !define VERSION_YYYY "2015" -!define VERSION_MMDD "0328" +!define VERSION_MMDD "0329" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index bedf564a..58a627c7 100644 --- a/package/mingw-ncurses.spec +++ b/package/mingw-ncurses.spec @@ -3,7 +3,7 @@ Summary: shared libraries for terminal handling Name: mingw32-ncurses6 Version: 5.9 -Release: 20150328 +Release: 20150329 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index f61c4de1..850a06e3 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 5.9 -Release: 20150328 +Release: 20150329 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz