-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.1171 2007/09/29 21:53:42 tom Exp $
+-- $Id: NEWS,v 1.1172 2007/10/06 21:32:14 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20071006
+ + add code to curses.priv.h ifdef'd with NCURSES_CHAR_EQ, which
+ changes the CharEq() macro to an inline function to allow comparing
+ cchar_t struct's without comparing gaps in a possibly unpacked
+ memory layout (report by Miroslav Lichvar).
+
20070929
+ add new functions to lib_trace.c to setup mutex's for the _tracef()
calls within the ncurses library.
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.611 2007/09/29 15:48:09 tom Exp $
+# $Id: dist.mk,v 1.612 2007/10/06 19:39:13 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 5
NCURSES_MINOR = 6
-NCURSES_PATCH = 20070929
+NCURSES_PATCH = 20071006
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
/*
- * $Id: curses.priv.h,v 1.343 2007/09/29 21:33:24 tom Exp $
+ * $Id: curses.priv.h,v 1.344 2007/10/06 21:29:02 tom Exp $
*
* curses.priv.h
*
#define NulColor /* nothing */
#endif
+#define AttrEq(a,b) ((a).attr == (b).attr)
+#define ExtcEq(a,b) ((a).ext_color == (b).ext_color)
+#define TextEq(a,b) (!memcmp((a).chars, (b).chars, sizeof(a.chars)))
+
+/*
+ * cchar_t may not be packed, e.g., on a 64-bit platform.
+ *
+ * Set "NCURSES_CHAR_EQ" to use a workaround that compares the structure
+ * member-by-member so that valgrind will not see compares against the
+ * uninitialized filler bytes.
+ */
+#if NCURSES_CHAR_EQ
+#if defined(USE_TERMLIB) && !defined(NEED_NCURSES_CH_T)
+#else
+static NCURSES_INLINE int
+_nc_char_eq(NCURSES_CH_T a, NCURSES_CH_T b)
+{
+#if NCURSES_EXT_COLORS
+ return (AttrEq(a,b) && TextEq(a,b) && ExtcEq(a,b));
+#else
+ return (AttrEq(a,b) && TextEq(a,b));
+#endif
+}
+#define CharEq(a,b) _nc_char_eq(a,b)
+#endif
+#else
+#define CharEq(a,b) (!memcmp(&(a), &(b), sizeof(a)))
+#endif
+
#define NulChar 0,0,0,0 /* FIXME: see CCHARW_MAX */
#define CharOf(c) ((c).chars[0])
#define AttrOf(c) ((c).attr)
#define SetAttr(c,a) AttrOf(c) = ((a) & A_ATTRIBUTES) | WidecExt(c)
#define NewChar2(c,a) { a, { c, NulChar } NulColor }
#define NewChar(ch) NewChar2(ChCharOf(ch), ChAttrOf(ch))
-#define CharEq(a,b) (!memcmp(&(a), &(b), sizeof(a)))
#define SetChar(ch,c,a) do { \
NCURSES_CH_T *_cp = &ch; \
memset(_cp, 0, sizeof(ch)); \
COUNT_OUTCHARS(PUTC_i); \
} } } while (0)
-#define BLANK { WA_NORMAL, {' '} NulColor }
-#define ZEROS { WA_NORMAL, {'\0'} NulColor }
+#define BLANK NewChar2(' ', WA_NORMAL)
+#define ZEROS NewChar2('\0', WA_NORMAL)
#define ISBLANK(ch) ((ch).chars[0] == L' ' && (ch).chars[1] == L'\0')
/*