mirror/ncursesw-morphos
2
0
Fork 0
mirror of https://github.com/Aigor44/ncursesw-morphos.git synced 2025-01-30 15:19:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

ncurses 5.9 - patch 20140712

Browse Source 
+ correct Charable() macro check for A_ALTCHARSET in wide-characters.
+ build-fix for position-debug code in tty_update.c, to work with or
  without sp-funcs.
This commit is contained in:
Thomas E. Dickey 2014-07-12 23:53:41 +00:00
parent ab61bfec8c
commit 6b96eb711c
10 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NEWS
View File

@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- $Id: NEWS,v 1.2236 2014/07/05 20:39:04 tom Exp $
-- $Id: NEWS,v 1.2239 2014/07/12 20:24:13 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@ -45,6 +45,11 @@ 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.
20140712
+ correct Charable() macro check for A_ALTCHARSET in wide-characters.
+ build-fix for position-debug code in tty_update.c, to work with or
without sp-funcs.
20140705
+ add w/W toggle to ncurses.c 'B' test, to demonstrate permutation of
video-attributes and colors with double-width character strings.

4
dist.mk
View File

@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
# $Id: dist.mk,v 1.995 2014/07/05 18:50:25 tom Exp $
# $Id: dist.mk,v 1.996 2014/07/12 14:47:53 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 = 20140705
NCURSES_PATCH = 20140712
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

8
ncurses/curses.priv.h
View File

@ -34,7 +34,7 @@
****************************************************************************/
/*
* $Id: curses.priv.h,v 1.537 2014/05/03 21:20:12 tom Exp $
* $Id: curses.priv.h,v 1.538 2014/07/12 20:06:11 tom Exp $
*
* curses.priv.h
*
@ -1458,11 +1458,11 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
AttrOf(dst) |= (attr_t) (ext + 1)
#define if_WIDEC(code) code
#define Charable(ch) ((SP_PARM->_legacy_coding) \
#define Charable(ch) (((SP_PARM->_legacy_coding) \
|| (AttrOf(ch) & A_ALTCHARSET) \
|| (!isWidecExt(ch) && \
|| (!isWidecExt(ch))) && \
(ch).chars[1] == L'\0' && \
_nc_is_charable(CharOf(ch))))
_nc_is_charable(CharOf(ch)))
#define L(ch) L ## ch
#else /* }{ */

26
ncurses/tty/tty_update.c
View File

@ -82,7 +82,7 @@
#include <ctype.h>
MODULE_ID("$Id: tty_update.c,v 1.277 2014/02/01 22:09:27 tom Exp $")
MODULE_ID("$Id: tty_update.c,v 1.279 2014/07/12 23:16:30 tom Exp $")
/*
* This define controls the line-breakout optimization. Every once in a
@ -179,7 +179,7 @@ position_check(NCURSES_SP_DCLx int expected_y, int expected_x, char *legend)
}
}
#else
#define position_check(sp, expected_y, expected_x, legend) /* nothing */
#define position_check(expected_y, expected_x, legend) /* nothing */
#endif /* POSITION_DEBUG */
/****************************************************************************
@ -194,13 +194,17 @@ GoTo(NCURSES_SP_DCLx int const row, int const col)
TR(TRACE_MOVE, ("GoTo(%p, %d, %d) from (%d, %d)",
(void *) SP_PARM, row, col, SP_PARM->_cursrow, SP_PARM->_curscol));
position_check(SP_PARM, SP_PARM->_cursrow, SP_PARM->_curscol, "GoTo");
position_check(NCURSES_SP_ARGx
SP_PARM->_cursrow,
SP_PARM->_curscol, "GoTo");
TINFO_MVCUR(NCURSES_SP_ARGx
SP_PARM->_cursrow,
SP_PARM->_curscol,
row, col);
position_check(SP_PARM, SP_PARM->_cursrow, SP_PARM->_curscol, "GoTo2");
position_check(NCURSES_SP_ARGx
SP_PARM->_cursrow,
SP_PARM->_curscol, "GoTo2");
}
static NCURSES_INLINE void
@ -390,7 +394,7 @@ PutCharLR(NCURSES_SP_DCLx const ARG_CH_T ch)
PutAttrChar(NCURSES_SP_ARGx ch);
SP_PARM->_curscol--;
position_check(SP_PARM,
position_check(NCURSES_SP_ARGx
SP_PARM->_cursrow,
SP_PARM->_curscol,
"exit_am_mode");
@ -449,7 +453,7 @@ wrap_cursor(NCURSES_SP_DCL0)
} else {
SP_PARM->_curscol--;
}
position_check(SP_PARM,
position_check(NCURSES_SP_ARGx
SP_PARM->_cursrow,
SP_PARM->_curscol,
"wrap_cursor");
@ -469,7 +473,9 @@ PutChar(NCURSES_SP_DCLx const ARG_CH_T ch)
if (SP_PARM->_curscol >= screen_columns(SP_PARM))
wrap_cursor(NCURSES_SP_ARG);
position_check(SP_PARM, SP_PARM->_cursrow, SP_PARM->_curscol, "PutChar");
position_check(NCURSES_SP_ARGx
SP_PARM->_cursrow,
SP_PARM->_curscol, "PutChar");
}
/*
@ -1570,7 +1576,7 @@ ClearScreen(NCURSES_SP_DCLx NCURSES_CH_T blank)
UpdateAttrs(SP_PARM, blank);
NCURSES_PUTP2("clear_screen", clear_screen);
SP_PARM->_cursrow = SP_PARM->_curscol = 0;
position_check(SP_PARM,
position_check(NCURSES_SP_ARGx
SP_PARM->_cursrow,
SP_PARM->_curscol,
"ClearScreen");
@ -1660,7 +1666,9 @@ InsStr(NCURSES_SP_DCLx NCURSES_CH_T * line, int count)
count--;
}
}
position_check(SP_PARM, SP_PARM->_cursrow, SP_PARM->_curscol, "InsStr");
position_check(NCURSES_SP_ARGx
SP_PARM->_cursrow,
SP_PARM->_curscol, "InsStr");
}
/*

4
package/debian-mingw/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (5.9-20140705) unstable; urgency=low
ncurses6 (5.9-20140712) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 05 Jul 2014 14:50:25 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 12 Jul 2014 10:47:53 -0400
ncurses6 (5.9-20131005) unstable; urgency=low

4
package/debian-mingw64/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (5.9-20140705) unstable; urgency=low
ncurses6 (5.9-20140712) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 05 Jul 2014 14:50:25 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 12 Jul 2014 10:47:53 -0400
ncurses6 (5.9-20131005) unstable; urgency=low

4
package/debian/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (5.9-20140705) unstable; urgency=low
ncurses6 (5.9-20140712) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 05 Jul 2014 14:50:25 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 12 Jul 2014 10:47:53 -0400
ncurses6 (5.9-20120608) unstable; urgency=low

4
package/mingw-ncurses.nsi
View File

@ -1,4 +1,4 @@
; $Id: mingw-ncurses.nsi,v 1.50 2014/07/05 18:50:25 tom Exp $
; $Id: mingw-ncurses.nsi,v 1.51 2014/07/12 14:47:53 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 "2014"
!define VERSION_MMDD "0705"
!define VERSION_MMDD "0712"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"

2
package/mingw-ncurses.spec
View File

@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 5.9
Release: 20140705
Release: 20140712
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

2
package/ncurses.spec
View File

@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 5.9
Release: 20140705
Release: 20140712
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz