ncurses 6.2 - patch 20200926

+ correct configure-check for gnurx library.
+ regenerate llib-* files.
+ modify tracemunch and the panel library to show readable traces for
  panel- and user-pointers.
This commit is contained in:
Thomas E. Dickey 2020-09-27 01:45:57 +00:00
parent 2ba352d86b
commit 5079dc1dbb
36 changed files with 2266 additions and 2068 deletions

17
Ada95/aclocal.m4 vendored
View File

@ -29,7 +29,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey
dnl
dnl $Id: aclocal.m4,v 1.161 2020/08/29 13:18:29 tom Exp $
dnl $Id: aclocal.m4,v 1.162 2020/09/26 23:08:42 tom Exp $
dnl Macros used in NCURSES Ada95 auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@ -978,9 +978,15 @@ fi
AC_SUBST(BROKEN_LINKER)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_ENABLE_WARNINGS version: 6 updated: 2020/08/28 04:10:22
dnl CF_ENABLE_WARNINGS version: 7 updated: 2020/08/29 09:05:21
dnl ------------------
dnl Configure-option to enable gcc warnings
dnl
dnl $1 = extra options to add, if supported
dnl $2 = option for checking attributes. By default, this is done when
dnl warnings are enabled. For other values:
dnl yes: always do this, e.g., to use in generated library-headers
dnl no: never do this
AC_DEFUN([CF_ENABLE_WARNINGS],[
if ( test "$GCC" = yes || test "$GXX" = yes )
then
@ -995,9 +1001,10 @@ CF_ARG_ENABLE(warnings,
AC_MSG_RESULT($with_warnings)
if test "$with_warnings" = "yes"
then
CF_GCC_ATTRIBUTES
ifelse($2,,[CF_GCC_ATTRIBUTES])
CF_GCC_WARNINGS($1)
fi
ifelse($2,yes,[CF_GCC_ATTRIBUTES])
fi
])dnl
dnl ---------------------------------------------------------------------------
@ -1235,14 +1242,14 @@ fi
AC_SUBST(EXTRA_CFLAGS)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_GCC_ATTRIBUTES version: 18 updated: 2020/03/10 18:53:47
dnl CF_GCC_ATTRIBUTES version: 19 updated: 2020/08/29 09:05:21
dnl -----------------
dnl Test for availability of useful gcc __attribute__ directives to quiet
dnl compiler warnings. Though useful, not all are supported -- and contrary
dnl to documentation, unrecognized directives cause older compilers to barf.
AC_DEFUN([CF_GCC_ATTRIBUTES],
[
if test "$GCC" = yes
if ( test "$GCC" = yes || test "$GXX" = yes )
then
cat > conftest.i <<EOF
#ifndef GCC_PRINTF

909
Ada95/configure vendored

File diff suppressed because it is too large Load Diff

8
NEWS
View File

@ -26,7 +26,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- $Id: NEWS,v 1.3565 2020/09/19 22:13:53 tom Exp $
-- $Id: NEWS,v 1.3569 2020/09/26 23:50:37 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@ -46,6 +46,12 @@ 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.
20200926
+ correct configure-check for gnurx library.
+ regenerate llib-* files.
+ modify tracemunch and the panel library to show readable traces for
panel- and user-pointers.
20200919
+ update mlterm3 for 3.9.0 (report by Premysl Eric Janouch) -TD

View File

@ -1 +1 @@
5:0:10 6.2 20200919
5:0:10 6.2 20200926

8
aclocal.m4 vendored
View File

@ -29,7 +29,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
dnl $Id: aclocal.m4,v 1.931 2020/09/12 22:30:53 tom Exp $
dnl $Id: aclocal.m4,v 1.933 2020/09/26 23:57:07 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@ -6444,7 +6444,7 @@ AC_MSG_RESULT($cf_prog_ln_sf)
test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_REGEX version: 15 updated: 2020/09/12 18:30:01
dnl CF_REGEX version: 16 updated: 2020/09/26 19:56:36
dnl --------
dnl Attempt to determine if we've got one of the flavors of regular-expression
dnl code that we can support.
@ -6463,7 +6463,9 @@ case $host_os in
CF_ADD_LIB(systre)
cf_regex_func=regcomp
],[
AC_CHECK_LIB(gnurx,regcomp,cf_regex_func=regcomp)
AC_CHECK_LIB(gnurx,regcomp,[
CF_ADD_LIB(gnurx)
cf_regex_func=regcomp])
])
;;
(*)

1547
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -26,7 +26,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
# $Id: dist.mk,v 1.1377 2020/09/19 14:15:12 tom Exp $
# $Id: dist.mk,v 1.1378 2020/09/26 12:43:24 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@ -38,7 +38,7 @@ SHELL = /bin/sh
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 6
NCURSES_MINOR = 2
NCURSES_PATCH = 20200919
NCURSES_PATCH = 20200926
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

View File

@ -452,85 +452,85 @@ int flash(void)
/* ./lib_gen.c */
#undef addch
int (addch)(
int addch(
const chtype z)
{ return(*(int *)0); }
#undef addchnstr
int (addchnstr)(
int addchnstr(
const chtype *a1,
int z)
{ return(*(int *)0); }
#undef addchstr
int (addchstr)(
int addchstr(
const chtype *z)
{ return(*(int *)0); }
#undef addnstr
int (addnstr)(
int addnstr(
const char *a1,
int z)
{ return(*(int *)0); }
#undef addstr
int (addstr)(
int addstr(
const char *z)
{ return(*(int *)0); }
#undef attroff
int (attroff)(
NCURSES_ATTR_T z)
int attroff(
int z)
{ return(*(int *)0); }
#undef attron
int (attron)(
NCURSES_ATTR_T z)
int attron(
int z)
{ return(*(int *)0); }
#undef attrset
int (attrset)(
NCURSES_ATTR_T z)
int attrset(
int z)
{ return(*(int *)0); }
#undef attr_get
int (attr_get)(
int attr_get(
attr_t *a1,
short *a2,
void *z)
{ return(*(int *)0); }
#undef attr_off
int (attr_off)(
int attr_off(
attr_t a1,
void *z)
{ return(*(int *)0); }
#undef attr_on
int (attr_on)(
int attr_on(
attr_t a1,
void *z)
{ return(*(int *)0); }
#undef attr_set
int (attr_set)(
int attr_set(
attr_t a1,
short a2,
void *z)
{ return(*(int *)0); }
#undef bkgd
int (bkgd)(
int bkgd(
chtype z)
{ return(*(int *)0); }
#undef bkgdset
void (bkgdset)(
void bkgdset(
chtype z)
{ /* void */ }
#undef border
int (border)(
int border(
chtype a1,
chtype a2,
chtype a3,
@ -542,14 +542,14 @@ int (border)(
{ return(*(int *)0); }
#undef box
int (box)(
int box(
WINDOW *a1,
chtype a2,
chtype z)
{ return(*(int *)0); }
#undef chgat
int (chgat)(
int chgat(
int a1,
attr_t a2,
short a3,
@ -557,137 +557,137 @@ int (chgat)(
{ return(*(int *)0); }
#undef clear
int (clear)(void)
int clear(void)
{ return(*(int *)0); }
#undef clrtobot
int (clrtobot)(void)
int clrtobot(void)
{ return(*(int *)0); }
#undef clrtoeol
int (clrtoeol)(void)
int clrtoeol(void)
{ return(*(int *)0); }
#undef color_set
int (color_set)(
int color_set(
short a1,
void *z)
{ return(*(int *)0); }
#undef COLOR_PAIR
int (COLOR_PAIR)(
int COLOR_PAIR(
int z)
{ return(*(int *)0); }
#undef delch
int (delch)(void)
int delch(void)
{ return(*(int *)0); }
#undef deleteln
int (deleteln)(void)
int deleteln(void)
{ return(*(int *)0); }
#undef echochar
int (echochar)(
int echochar(
const chtype z)
{ return(*(int *)0); }
#undef erase
int (erase)(void)
int erase(void)
{ return(*(int *)0); }
#undef getbkgd
chtype (getbkgd)(
chtype getbkgd(
WINDOW *z)
{ return(*(chtype *)0); }
#undef getch
int (getch)(void)
int getch(void)
{ return(*(int *)0); }
#undef getnstr
int (getnstr)(
int getnstr(
char *a1,
int z)
{ return(*(int *)0); }
#undef getstr
int (getstr)(
int getstr(
char *z)
{ return(*(int *)0); }
#undef hline
int (hline)(
int hline(
chtype a1,
int z)
{ return(*(int *)0); }
#undef inch
chtype (inch)(void)
chtype inch(void)
{ return(*(chtype *)0); }
#undef inchnstr
int (inchnstr)(
int inchnstr(
chtype *a1,
int z)
{ return(*(int *)0); }
#undef inchstr
int (inchstr)(
int inchstr(
chtype *z)
{ return(*(int *)0); }
#undef innstr
int (innstr)(
int innstr(
char *a1,
int z)
{ return(*(int *)0); }
#undef insch
int (insch)(
int insch(
chtype z)
{ return(*(int *)0); }
#undef insdelln
int (insdelln)(
int insdelln(
int z)
{ return(*(int *)0); }
#undef insertln
int (insertln)(void)
int insertln(void)
{ return(*(int *)0); }
#undef insnstr
int (insnstr)(
int insnstr(
const char *a1,
int z)
{ return(*(int *)0); }
#undef insstr
int (insstr)(
int insstr(
const char *z)
{ return(*(int *)0); }
#undef instr
int (instr)(
int instr(
char *z)
{ return(*(int *)0); }
#undef move
int (move)(
int move(
int a1,
int z)
{ return(*(int *)0); }
#undef mvaddch
int (mvaddch)(
int mvaddch(
int a1,
int a2,
const chtype z)
{ return(*(int *)0); }
#undef mvaddchnstr
int (mvaddchnstr)(
int mvaddchnstr(
int a1,
int a2,
const chtype *a3,
@ -695,14 +695,14 @@ int (mvaddchnstr)(
{ return(*(int *)0); }
#undef mvaddchstr
int (mvaddchstr)(
int mvaddchstr(
int a1,
int a2,
const chtype *z)
{ return(*(int *)0); }
#undef mvaddnstr
int (mvaddnstr)(
int mvaddnstr(
int a1,
int a2,
const char *a3,
@ -710,14 +710,14 @@ int (mvaddnstr)(
{ return(*(int *)0); }
#undef mvaddstr
int (mvaddstr)(
int mvaddstr(
int a1,
int a2,
const char *z)
{ return(*(int *)0); }
#undef mvchgat
int (mvchgat)(
int mvchgat(
int a1,
int a2,
int a3,
@ -727,19 +727,19 @@ int (mvchgat)(
{ return(*(int *)0); }
#undef mvdelch
int (mvdelch)(
int mvdelch(
int a1,
int z)
{ return(*(int *)0); }
#undef mvgetch
int (mvgetch)(
int mvgetch(
int a1,
int z)
{ return(*(int *)0); }
#undef mvgetnstr
int (mvgetnstr)(
int mvgetnstr(
int a1,
int a2,
char *a3,
@ -747,14 +747,14 @@ int (mvgetnstr)(
{ return(*(int *)0); }
#undef mvgetstr
int (mvgetstr)(
int mvgetstr(
int a1,
int a2,
char *z)
{ return(*(int *)0); }
#undef mvhline
int (mvhline)(
int mvhline(
int a1,
int a2,
chtype a3,
@ -762,13 +762,13 @@ int (mvhline)(
{ return(*(int *)0); }
#undef mvinch
chtype (mvinch)(
chtype mvinch(
int a1,
int z)
{ return(*(chtype *)0); }
#undef mvinchnstr
int (mvinchnstr)(
int mvinchnstr(
int a1,
int a2,
chtype *a3,
@ -776,14 +776,14 @@ int (mvinchnstr)(
{ return(*(int *)0); }
#undef mvinchstr
int (mvinchstr)(
int mvinchstr(
int a1,
int a2,
chtype *z)
{ return(*(int *)0); }
#undef mvinnstr
int (mvinnstr)(
int mvinnstr(
int a1,
int a2,
char *a3,
@ -791,14 +791,14 @@ int (mvinnstr)(
{ return(*(int *)0); }
#undef mvinsch
int (mvinsch)(
int mvinsch(
int a1,
int a2,
chtype z)
{ return(*(int *)0); }
#undef mvinsnstr
int (mvinsnstr)(
int mvinsnstr(
int a1,
int a2,
const char *a3,
@ -806,21 +806,21 @@ int (mvinsnstr)(
{ return(*(int *)0); }
#undef mvinsstr
int (mvinsstr)(
int mvinsstr(
int a1,
int a2,
const char *z)
{ return(*(int *)0); }
#undef mvinstr
int (mvinstr)(
int mvinstr(
int a1,
int a2,
char *z)
{ return(*(int *)0); }
#undef mvvline
int (mvvline)(
int mvvline(
int a1,
int a2,
chtype a3,
@ -828,7 +828,7 @@ int (mvvline)(
{ return(*(int *)0); }
#undef mvwaddch
int (mvwaddch)(
int mvwaddch(
WINDOW *a1,
int a2,
int a3,
@ -836,7 +836,7 @@ int (mvwaddch)(
{ return(*(int *)0); }
#undef mvwaddchnstr
int (mvwaddchnstr)(
int mvwaddchnstr(
WINDOW *a1,
int a2,
int a3,
@ -845,7 +845,7 @@ int (mvwaddchnstr)(
{ return(*(int *)0); }
#undef mvwaddchstr
int (mvwaddchstr)(
int mvwaddchstr(
WINDOW *a1,
int a2,
int a3,
@ -853,7 +853,7 @@ int (mvwaddchstr)(
{ return(*(int *)0); }
#undef mvwaddnstr
int (mvwaddnstr)(
int mvwaddnstr(
WINDOW *a1,
int a2,
int a3,
@ -862,7 +862,7 @@ int (mvwaddnstr)(
{ return(*(int *)0); }
#undef mvwaddstr
int (mvwaddstr)(
int mvwaddstr(
WINDOW *a1,
int a2,
int a3,
@ -870,7 +870,7 @@ int (mvwaddstr)(
{ return(*(int *)0); }
#undef mvwchgat
int (mvwchgat)(
int mvwchgat(
WINDOW *a1,
int a2,
int a3,
@ -881,21 +881,21 @@ int (mvwchgat)(
{ return(*(int *)0); }
#undef mvwdelch
int (mvwdelch)(
int mvwdelch(
WINDOW *a1,
int a2,
int z)
{ return(*(int *)0); }
#undef mvwgetch
int (mvwgetch)(
int mvwgetch(
WINDOW *a1,
int a2,
int z)
{ return(*(int *)0); }
#undef mvwgetnstr
int (mvwgetnstr)(
int mvwgetnstr(
WINDOW *a1,
int a2,
int a3,
@ -904,7 +904,7 @@ int (mvwgetnstr)(
{ return(*(int *)0); }
#undef mvwgetstr
int (mvwgetstr)(
int mvwgetstr(
WINDOW *a1,
int a2,
int a3,
@ -912,7 +912,7 @@ int (mvwgetstr)(
{ return(*(int *)0); }
#undef mvwhline
int (mvwhline)(
int mvwhline(
WINDOW *a1,
int a2,
int a3,
@ -921,14 +921,14 @@ int (mvwhline)(
{ return(*(int *)0); }
#undef mvwinch
chtype (mvwinch)(
chtype mvwinch(
WINDOW *a1,
int a2,
int z)
{ return(*(chtype *)0); }
#undef mvwinchnstr
int (mvwinchnstr)(
int mvwinchnstr(
WINDOW *a1,
int a2,
int a3,
@ -937,7 +937,7 @@ int (mvwinchnstr)(
{ return(*(int *)0); }
#undef mvwinchstr
int (mvwinchstr)(
int mvwinchstr(
WINDOW *a1,
int a2,
int a3,
@ -945,7 +945,7 @@ int (mvwinchstr)(
{ return(*(int *)0); }
#undef mvwinnstr
int (mvwinnstr)(
int mvwinnstr(
WINDOW *a1,
int a2,
int a3,
@ -954,7 +954,7 @@ int (mvwinnstr)(
{ return(*(int *)0); }
#undef mvwinsch
int (mvwinsch)(
int mvwinsch(
WINDOW *a1,
int a2,
int a3,
@ -962,7 +962,7 @@ int (mvwinsch)(
{ return(*(int *)0); }
#undef mvwinsnstr
int (mvwinsnstr)(
int mvwinsnstr(
WINDOW *a1,
int a2,
int a3,
@ -971,7 +971,7 @@ int (mvwinsnstr)(
{ return(*(int *)0); }
#undef mvwinsstr
int (mvwinsstr)(
int mvwinsstr(
WINDOW *a1,
int a2,
int a3,
@ -979,7 +979,7 @@ int (mvwinsstr)(
{ return(*(int *)0); }
#undef mvwinstr
int (mvwinstr)(
int mvwinstr(
WINDOW *a1,
int a2,
int a3,
@ -987,7 +987,7 @@ int (mvwinstr)(
{ return(*(int *)0); }
#undef mvwvline
int (mvwvline)(
int mvwvline(
WINDOW *a1,
int a2,
int a3,
@ -996,103 +996,103 @@ int (mvwvline)(
{ return(*(int *)0); }
#undef PAIR_NUMBER
int (PAIR_NUMBER)(
int PAIR_NUMBER(
int z)
{ return(*(int *)0); }
#undef redrawwin
int (redrawwin)(
int redrawwin(
WINDOW *z)
{ return(*(int *)0); }
#undef refresh
int (refresh)(void)
int refresh(void)
{ return(*(int *)0); }
#undef scrl
int (scrl)(
int scrl(
int z)
{ return(*(int *)0); }
#undef scroll
int (scroll)(
int scroll(
WINDOW *z)
{ return(*(int *)0); }
#undef setscrreg
int (setscrreg)(
int setscrreg(
int a1,
int z)
{ return(*(int *)0); }
#undef standout
int (standout)(void)
int standout(void)
{ return(*(int *)0); }
#undef standend
int (standend)(void)
int standend(void)
{ return(*(int *)0); }
#undef timeout
void (timeout)(
void timeout(
int z)
{ /* void */ }
#undef touchline
int (touchline)(
int touchline(
WINDOW *a1,
int a2,
int z)
{ return(*(int *)0); }
#undef touchwin
int (touchwin)(
int touchwin(
WINDOW *z)
{ return(*(int *)0); }
#undef untouchwin
int (untouchwin)(
int untouchwin(
WINDOW *z)
{ return(*(int *)0); }
#undef vline
int (vline)(
int vline(
chtype a1,
int z)
{ return(*(int *)0); }
#undef waddchstr
int (waddchstr)(
int waddchstr(
WINDOW *a1,
const chtype *z)
{ return(*(int *)0); }
#undef waddstr
int (waddstr)(
int waddstr(
WINDOW *a1,
const char *z)
{ return(*(int *)0); }
#undef wattron
int (wattron)(
int wattron(
WINDOW *a1,
int z)
{ return(*(int *)0); }
#undef wattroff
int (wattroff)(
int wattroff(
WINDOW *a1,
int z)
{ return(*(int *)0); }
#undef wattrset
int (wattrset)(
int wattrset(
WINDOW *a1,
int z)
{ return(*(int *)0); }
#undef wattr_get
int (wattr_get)(
int wattr_get(
WINDOW *a1,
attr_t *a2,
short *a3,
@ -1100,7 +1100,7 @@ int (wattr_get)(
{ return(*(int *)0); }
#undef wattr_set
int (wattr_set)(
int wattr_set(
WINDOW *a1,
attr_t a2,
short a3,
@ -1108,173 +1108,173 @@ int (wattr_set)(
{ return(*(int *)0); }
#undef wdeleteln
int (wdeleteln)(
int wdeleteln(
WINDOW *z)
{ return(*(int *)0); }
#undef wgetstr
int (wgetstr)(
int wgetstr(
WINDOW *a1,
char *z)
{ return(*(int *)0); }
#undef winchstr
int (winchstr)(
int winchstr(
WINDOW *a1,
chtype *z)
{ return(*(int *)0); }
#undef winsertln
int (winsertln)(
int winsertln(
WINDOW *z)
{ return(*(int *)0); }
#undef winsstr
int (winsstr)(
int winsstr(
WINDOW *a1,
const char *z)
{ return(*(int *)0); }
#undef winstr
int (winstr)(
int winstr(
WINDOW *a1,
char *z)
{ return(*(int *)0); }
#undef wstandout
int (wstandout)(
int wstandout(
WINDOW *z)
{ return(*(int *)0); }
#undef wstandend
int (wstandend)(
int wstandend(
WINDOW *z)
{ return(*(int *)0); }
#undef getattrs
int (getattrs)(
int getattrs(
const WINDOW *z)
{ return(*(int *)0); }
#undef getcurx
int (getcurx)(
int getcurx(
const WINDOW *z)
{ return(*(int *)0); }
#undef getcury
int (getcury)(
int getcury(
const WINDOW *z)
{ return(*(int *)0); }
#undef getbegx
int (getbegx)(
int getbegx(
const WINDOW *z)
{ return(*(int *)0); }
#undef getbegy
int (getbegy)(
int getbegy(
const WINDOW *z)
{ return(*(int *)0); }
#undef getmaxx
int (getmaxx)(
int getmaxx(
const WINDOW *z)
{ return(*(int *)0); }
#undef getmaxy
int (getmaxy)(
int getmaxy(
const WINDOW *z)
{ return(*(int *)0); }
#undef getparx
int (getparx)(
int getparx(
const WINDOW *z)
{ return(*(int *)0); }
#undef getpary
int (getpary)(
int getpary(
const WINDOW *z)
{ return(*(int *)0); }
#undef wgetparent
WINDOW *(wgetparent)(
WINDOW *wgetparent(
const WINDOW *z)
{ return(*(WINDOW **)0); }
#undef is_cleared
NCURSES_BOOL (is_cleared)(
NCURSES_BOOL is_cleared(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef is_idcok
NCURSES_BOOL (is_idcok)(
NCURSES_BOOL is_idcok(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef is_idlok
NCURSES_BOOL (is_idlok)(
NCURSES_BOOL is_idlok(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef is_immedok
NCURSES_BOOL (is_immedok)(
NCURSES_BOOL is_immedok(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef is_keypad
NCURSES_BOOL (is_keypad)(
NCURSES_BOOL is_keypad(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef is_leaveok
NCURSES_BOOL (is_leaveok)(
NCURSES_BOOL is_leaveok(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef is_nodelay
NCURSES_BOOL (is_nodelay)(
NCURSES_BOOL is_nodelay(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef is_notimeout
NCURSES_BOOL (is_notimeout)(
NCURSES_BOOL is_notimeout(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef is_pad
NCURSES_BOOL (is_pad)(
NCURSES_BOOL is_pad(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef is_scrollok
NCURSES_BOOL (is_scrollok)(
NCURSES_BOOL is_scrollok(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef is_subwin
NCURSES_BOOL (is_subwin)(
NCURSES_BOOL is_subwin(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef is_syncok
NCURSES_BOOL (is_syncok)(
NCURSES_BOOL is_syncok(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef wgetdelay
int (wgetdelay)(
int wgetdelay(
const WINDOW *z)
{ return(*(int *)0); }
#undef wgetscrreg
int (wgetscrreg)(
int wgetscrreg(
const WINDOW *a1,
int *a2,
int *z)
{ return(*(int *)0); }
#undef mouse_trafo
NCURSES_BOOL (mouse_trafo)(
NCURSES_BOOL mouse_trafo(
int *a1,
int *a2,
NCURSES_BOOL z)
@ -3632,6 +3632,13 @@ char *tiparm(
...)
{ return(*(char **)0); }
#undef _nc_tiparm
char *_nc_tiparm(
int expected,
const char *string,
...)
{ return(*(char **)0); }
/* ./tinfo/lib_tputs.c */
#undef PC

View File

@ -455,85 +455,85 @@ int flash(void)
/* ./lib_gen.c */
#undef addch
int (addch)(
int addch(
const chtype z)
{ return(*(int *)0); }
#undef addchnstr
int (addchnstr)(
int addchnstr(
const chtype *a1,
int z)
{ return(*(int *)0); }
#undef addchstr
int (addchstr)(
int addchstr(
const chtype *z)
{ return(*(int *)0); }
#undef addnstr
int (addnstr)(
int addnstr(
const char *a1,
int z)
{ return(*(int *)0); }
#undef addstr
int (addstr)(
int addstr(
const char *z)
{ return(*(int *)0); }
#undef attroff
int (attroff)(
NCURSES_ATTR_T z)
int attroff(
int z)
{ return(*(int *)0); }
#undef attron
int (attron)(
NCURSES_ATTR_T z)
int attron(
int z)
{ return(*(int *)0); }
#undef attrset
int (attrset)(
NCURSES_ATTR_T z)
int attrset(
int z)
{ return(*(int *)0); }
#undef attr_get
int (attr_get)(
int attr_get(
attr_t *a1,
short *a2,
void *z)
{ return(*(int *)0); }
#undef attr_off
int (attr_off)(
int attr_off(
attr_t a1,
void *z)
{ return(*(int *)0); }
#undef attr_on
int (attr_on)(
int attr_on(
attr_t a1,
void *z)
{ return(*(int *)0); }
#undef attr_set
int (attr_set)(
int attr_set(
attr_t a1,
short a2,
void *z)
{ return(*(int *)0); }
#undef bkgd
int (bkgd)(
int bkgd(
chtype z)
{ return(*(int *)0); }
#undef bkgdset
void (bkgdset)(
void bkgdset(
chtype z)
{ /* void */ }
#undef border
int (border)(
int border(
chtype a1,
chtype a2,
chtype a3,
@ -545,14 +545,14 @@ int (border)(
{ return(*(int *)0); }
#undef box
int (box)(
int box(
WINDOW *a1,
chtype a2,
chtype z)
{ return(*(int *)0); }
#undef chgat
int (chgat)(
int chgat(
int a1,
attr_t a2,
short a3,
@ -560,137 +560,137 @@ int (chgat)(
{ return(*(int *)0); }
#undef clear
int (clear)(void)
int clear(void)
{ return(*(int *)0); }
#undef clrtobot
int (clrtobot)(void)
int clrtobot(void)
{ return(*(int *)0); }
#undef clrtoeol
int (clrtoeol)(void)
int clrtoeol(void)
{ return(*(int *)0); }
#undef color_set
int (color_set)(
int color_set(
short a1,
void *z)
{ return(*(int *)0); }
#undef COLOR_PAIR
int (COLOR_PAIR)(
int COLOR_PAIR(
int z)
{ return(*(int *)0); }
#undef delch
int (delch)(void)
int delch(void)
{ return(*(int *)0); }
#undef deleteln
int (deleteln)(void)
int deleteln(void)
{ return(*(int *)0); }
#undef echochar
int (echochar)(
int echochar(
const chtype z)
{ return(*(int *)0); }
#undef erase
int (erase)(void)
int erase(void)
{ return(*(int *)0); }
#undef getbkgd
chtype (getbkgd)(
chtype getbkgd(
WINDOW *z)
{ return(*(chtype *)0); }
#undef getch
int (getch)(void)
int getch(void)
{ return(*(int *)0); }
#undef getnstr
int (getnstr)(
int getnstr(
char *a1,
int z)
{ return(*(int *)0); }
#undef getstr
int (getstr)(
int getstr(
char *z)
{ return(*(int *)0); }
#undef hline
int (hline)(
int hline(
chtype a1,
int z)
{ return(*(int *)0); }
#undef inch
chtype (inch)(void)
chtype inch(void)
{ return(*(chtype *)0); }
#undef inchnstr
int (inchnstr)(
int inchnstr(
chtype *a1,
int z)
{ return(*(int *)0); }
#undef inchstr
int (inchstr)(
int inchstr(
chtype *z)
{ return(*(int *)0); }
#undef innstr
int (innstr)(
int innstr(
char *a1,
int z)
{ return(*(int *)0); }
#undef insch
int (insch)(
int insch(
chtype z)
{ return(*(int *)0); }
#undef insdelln
int (insdelln)(
int insdelln(
int z)
{ return(*(int *)0); }
#undef insertln
int (insertln)(void)
int insertln(void)
{ return(*(int *)0); }
#undef insnstr
int (insnstr)(
int insnstr(
const char *a1,
int z)
{ return(*(int *)0); }
#undef insstr
int (insstr)(
int insstr(
const char *z)
{ return(*(int *)0); }
#undef instr
int (instr)(
int instr(
char *z)
{ return(*(int *)0); }
#undef move
int (move)(
int move(
int a1,
int z)
{ return(*(int *)0); }
#undef mvaddch
int (mvaddch)(
int mvaddch(
int a1,
int a2,
const chtype z)
{ return(*(int *)0); }
#undef mvaddchnstr
int (mvaddchnstr)(
int mvaddchnstr(
int a1,
int a2,
const chtype *a3,
@ -698,14 +698,14 @@ int (mvaddchnstr)(
{ return(*(int *)0); }
#undef mvaddchstr
int (mvaddchstr)(
int mvaddchstr(
int a1,
int a2,
const chtype *z)
{ return(*(int *)0); }
#undef mvaddnstr
int (mvaddnstr)(
int mvaddnstr(
int a1,
int a2,
const char *a3,
@ -713,14 +713,14 @@ int (mvaddnstr)(
{ return(*(int *)0); }
#undef mvaddstr
int (mvaddstr)(
int mvaddstr(
int a1,
int a2,
const char *z)
{ return(*(int *)0); }
#undef mvchgat
int (mvchgat)(
int mvchgat(
int a1,
int a2,
int a3,
@ -730,19 +730,19 @@ int (mvchgat)(
{ return(*(int *)0); }
#undef mvdelch
int (mvdelch)(
int mvdelch(
int a1,
int z)
{ return(*(int *)0); }
#undef mvgetch
int (mvgetch)(
int mvgetch(
int a1,
int z)
{ return(*(int *)0); }
#undef mvgetnstr
int (mvgetnstr)(
int mvgetnstr(
int a1,
int a2,
char *a3,
@ -750,14 +750,14 @@ int (mvgetnstr)(
{ return(*(int *)0); }
#undef mvgetstr
int (mvgetstr)(
int mvgetstr(
int a1,
int a2,
char *z)
{ return(*(int *)0); }
#undef mvhline
int (mvhline)(
int mvhline(
int a1,
int a2,
chtype a3,
@ -765,13 +765,13 @@ int (mvhline)(
{ return(*(int *)0); }
#undef mvinch
chtype (mvinch)(
chtype mvinch(
int a1,
int z)
{ return(*(chtype *)0); }
#undef mvinchnstr
int (mvinchnstr)(
int mvinchnstr(
int a1,
int a2,
chtype *a3,
@ -779,14 +779,14 @@ int (mvinchnstr)(
{ return(*(int *)0); }
#undef mvinchstr
int (mvinchstr)(
int mvinchstr(
int a1,
int a2,
chtype *z)
{ return(*(int *)0); }
#undef mvinnstr
int (mvinnstr)(
int mvinnstr(
int a1,
int a2,
char *a3,
@ -794,14 +794,14 @@ int (mvinnstr)(
{ return(*(int *)0); }
#undef mvinsch
int (mvinsch)(
int mvinsch(
int a1,
int a2,
chtype z)
{ return(*(int *)0); }
#undef mvinsnstr
int (mvinsnstr)(
int mvinsnstr(
int a1,
int a2,
const char *a3,
@ -809,21 +809,21 @@ int (mvinsnstr)(
{ return(*(int *)0); }
#undef mvinsstr
int (mvinsstr)(
int mvinsstr(
int a1,
int a2,
const char *z)
{ return(*(int *)0); }
#undef mvinstr
int (mvinstr)(
int mvinstr(
int a1,
int a2,
char *z)
{ return(*(int *)0); }
#undef mvvline
int (mvvline)(
int mvvline(
int a1,
int a2,
chtype a3,
@ -831,7 +831,7 @@ int (mvvline)(
{ return(*(int *)0); }
#undef mvwaddch
int (mvwaddch)(
int mvwaddch(
WINDOW *a1,
int a2,
int a3,
@ -839,7 +839,7 @@ int (mvwaddch)(
{ return(*(int *)0); }
#undef mvwaddchnstr
int (mvwaddchnstr)(
int mvwaddchnstr(
WINDOW *a1,
int a2,
int a3,
@ -848,7 +848,7 @@ int (mvwaddchnstr)(
{ return(*(int *)0); }
#undef mvwaddchstr
int (mvwaddchstr)(
int mvwaddchstr(
WINDOW *a1,
int a2,
int a3,
@ -856,7 +856,7 @@ int (mvwaddchstr)(
{ return(*(int *)0); }
#undef mvwaddnstr
int (mvwaddnstr)(
int mvwaddnstr(
WINDOW *a1,
int a2,
int a3,
@ -865,7 +865,7 @@ int (mvwaddnstr)(
{ return(*(int *)0); }
#undef mvwaddstr
int (mvwaddstr)(
int mvwaddstr(
WINDOW *a1,
int a2,
int a3,
@ -873,7 +873,7 @@ int (mvwaddstr)(
{ return(*(int *)0); }
#undef mvwchgat
int (mvwchgat)(
int mvwchgat(
WINDOW *a1,
int a2,
int a3,
@ -884,21 +884,21 @@ int (mvwchgat)(
{ return(*(int *)0); }
#undef mvwdelch
int (mvwdelch)(
int mvwdelch(
WINDOW *a1,
int a2,
int z)
{ return(*(int *)0); }
#undef mvwgetch
int (mvwgetch)(
int mvwgetch(
WINDOW *a1,
int a2,
int z)
{ return(*(int *)0); }
#undef mvwgetnstr
int (mvwgetnstr)(
int mvwgetnstr(
WINDOW *a1,
int a2,
int a3,
@ -907,7 +907,7 @@ int (mvwgetnstr)(
{ return(*(int *)0); }
#undef mvwgetstr
int (mvwgetstr)(
int mvwgetstr(
WINDOW *a1,
int a2,
int a3,
@ -915,7 +915,7 @@ int (mvwgetstr)(
{ return(*(int *)0); }
#undef mvwhline
int (mvwhline)(
int mvwhline(
WINDOW *a1,
int a2,
int a3,
@ -924,14 +924,14 @@ int (mvwhline)(
{ return(*(int *)0); }
#undef mvwinch
chtype (mvwinch)(
chtype mvwinch(
WINDOW *a1,
int a2,
int z)
{ return(*(chtype *)0); }
#undef mvwinchnstr
int (mvwinchnstr)(
int mvwinchnstr(
WINDOW *a1,
int a2,
int a3,
@ -940,7 +940,7 @@ int (mvwinchnstr)(
{ return(*(int *)0); }
#undef mvwinchstr
int (mvwinchstr)(
int mvwinchstr(
WINDOW *a1,
int a2,
int a3,
@ -948,7 +948,7 @@ int (mvwinchstr)(
{ return(*(int *)0); }
#undef mvwinnstr
int (mvwinnstr)(
int mvwinnstr(
WINDOW *a1,
int a2,
int a3,
@ -957,7 +957,7 @@ int (mvwinnstr)(
{ return(*(int *)0); }
#undef mvwinsch
int (mvwinsch)(
int mvwinsch(
WINDOW *a1,
int a2,
int a3,
@ -965,7 +965,7 @@ int (mvwinsch)(
{ return(*(int *)0); }
#undef mvwinsnstr
int (mvwinsnstr)(
int mvwinsnstr(
WINDOW *a1,
int a2,
int a3,
@ -974,7 +974,7 @@ int (mvwinsnstr)(
{ return(*(int *)0); }
#undef mvwinsstr
int (mvwinsstr)(
int mvwinsstr(
WINDOW *a1,
int a2,
int a3,
@ -982,7 +982,7 @@ int (mvwinsstr)(
{ return(*(int *)0); }
#undef mvwinstr
int (mvwinstr)(
int mvwinstr(
WINDOW *a1,
int a2,
int a3,
@ -990,7 +990,7 @@ int (mvwinstr)(
{ return(*(int *)0); }
#undef mvwvline
int (mvwvline)(
int mvwvline(
WINDOW *a1,
int a2,
int a3,
@ -999,103 +999,103 @@ int (mvwvline)(
{ return(*(int *)0); }
#undef PAIR_NUMBER
int (PAIR_NUMBER)(
int PAIR_NUMBER(
int z)
{ return(*(int *)0); }
#undef redrawwin
int (redrawwin)(
int redrawwin(
WINDOW *z)
{ return(*(int *)0); }
#undef refresh
int (refresh)(void)
int refresh(void)
{ return(*(int *)0); }
#undef scrl
int (scrl)(
int scrl(
int z)
{ return(*(int *)0); }
#undef scroll
int (scroll)(
int scroll(
WINDOW *z)
{ return(*(int *)0); }
#undef setscrreg
int (setscrreg)(
int setscrreg(
int a1,
int z)
{ return(*(int *)0); }
#undef standout
int (standout)(void)
int standout(void)
{ return(*(int *)0); }
#undef standend
int (standend)(void)
int standend(void)
{ return(*(int *)0); }
#undef timeout
void (timeout)(
void timeout(
int z)
{ /* void */ }
#undef touchline
int (touchline)(
int touchline(
WINDOW *a1,
int a2,
int z)
{ return(*(int *)0); }
#undef touchwin
int (touchwin)(
int touchwin(
WINDOW *z)
{ return(*(int *)0); }
#undef untouchwin
int (untouchwin)(
int untouchwin(
WINDOW *z)
{ return(*(int *)0); }
#undef vline
int (vline)(
int vline(
chtype a1,
int z)
{ return(*(int *)0); }
#undef waddchstr
int (waddchstr)(
int waddchstr(
WINDOW *a1,
const chtype *z)
{ return(*(int *)0); }
#undef waddstr
int (waddstr)(
int waddstr(
WINDOW *a1,
const char *z)
{ return(*(int *)0); }
#undef wattron
int (wattron)(
int wattron(
WINDOW *a1,
int z)
{ return(*(int *)0); }
#undef wattroff
int (wattroff)(
int wattroff(
WINDOW *a1,
int z)
{ return(*(int *)0); }
#undef wattrset
int (wattrset)(
int wattrset(
WINDOW *a1,
int z)
{ return(*(int *)0); }
#undef wattr_get
int (wattr_get)(
int wattr_get(
WINDOW *a1,
attr_t *a2,
short *a3,
@ -1103,7 +1103,7 @@ int (wattr_get)(
{ return(*(int *)0); }
#undef wattr_set
int (wattr_set)(
int wattr_set(
WINDOW *a1,
attr_t a2,
short a3,
@ -1111,173 +1111,173 @@ int (wattr_set)(
{ return(*(int *)0); }
#undef wdeleteln
int (wdeleteln)(
int wdeleteln(
WINDOW *z)
{ return(*(int *)0); }
#undef wgetstr
int (wgetstr)(
int wgetstr(
WINDOW *a1,
char *z)
{ return(*(int *)0); }
#undef winchstr
int (winchstr)(
int winchstr(
WINDOW *a1,
chtype *z)
{ return(*(int *)0); }
#undef winsertln
int (winsertln)(
int winsertln(
WINDOW *z)
{ return(*(int *)0); }
#undef winsstr
int (winsstr)(
int winsstr(
WINDOW *a1,
const char *z)
{ return(*(int *)0); }
#undef winstr
int (winstr)(
int winstr(
WINDOW *a1,
char *z)
{ return(*(int *)0); }
#undef wstandout
int (wstandout)(
int wstandout(
WINDOW *z)
{ return(*(int *)0); }
#undef wstandend
int (wstandend)(
int wstandend(
WINDOW *z)
{ return(*(int *)0); }
#undef getattrs
int (getattrs)(
int getattrs(
const WINDOW *z)
{ return(*(int *)0); }
#undef getcurx
int (getcurx)(
int getcurx(
const WINDOW *z)
{ return(*(int *)0); }
#undef getcury
int (getcury)(
int getcury(
const WINDOW *z)
{ return(*(int *)0); }
#undef getbegx
int (getbegx)(
int getbegx(
const WINDOW *z)
{ return(*(int *)0); }
#undef getbegy
int (getbegy)(
int getbegy(
const WINDOW *z)
{ return(*(int *)0); }
#undef getmaxx
int (getmaxx)(
int getmaxx(
const WINDOW *z)
{ return(*(int *)0); }
#undef getmaxy
int (getmaxy)(
int getmaxy(
const WINDOW *z)
{ return(*(int *)0); }
#undef getparx
int (getparx)(
int getparx(
const WINDOW *z)
{ return(*(int *)0); }
#undef getpary
int (getpary)(
int getpary(
const WINDOW *z)
{ return(*(int *)0); }
#undef wgetparent
WINDOW *(wgetparent)(
WINDOW *wgetparent(
const WINDOW *z)
{ return(*(WINDOW **)0); }
#undef is_cleared
NCURSES_BOOL (is_cleared)(
NCURSES_BOOL is_cleared(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef is_idcok
NCURSES_BOOL (is_idcok)(
NCURSES_BOOL is_idcok(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef is_idlok
NCURSES_BOOL (is_idlok)(
NCURSES_BOOL is_idlok(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef is_immedok
NCURSES_BOOL (is_immedok)(
NCURSES_BOOL is_immedok(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef is_keypad
NCURSES_BOOL (is_keypad)(
NCURSES_BOOL is_keypad(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef is_leaveok
NCURSES_BOOL (is_leaveok)(
NCURSES_BOOL is_leaveok(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef is_nodelay
NCURSES_BOOL (is_nodelay)(
NCURSES_BOOL is_nodelay(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef is_notimeout
NCURSES_BOOL (is_notimeout)(
NCURSES_BOOL is_notimeout(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef is_pad
NCURSES_BOOL (is_pad)(
NCURSES_BOOL is_pad(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef is_scrollok
NCURSES_BOOL (is_scrollok)(
NCURSES_BOOL is_scrollok(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef is_subwin
NCURSES_BOOL (is_subwin)(
NCURSES_BOOL is_subwin(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef is_syncok
NCURSES_BOOL (is_syncok)(
NCURSES_BOOL is_syncok(
const WINDOW *z)
{ return(*(NCURSES_BOOL *)0); }
#undef wgetdelay
int (wgetdelay)(
int wgetdelay(
const WINDOW *z)
{ return(*(int *)0); }
#undef wgetscrreg
int (wgetscrreg)(
int wgetscrreg(
const WINDOW *a1,
int *a2,
int *z)
{ return(*(int *)0); }
#undef mouse_trafo
NCURSES_BOOL (mouse_trafo)(
NCURSES_BOOL mouse_trafo(
int *a1,
int *a2,
NCURSES_BOOL z)
@ -3717,6 +3717,13 @@ char *tiparm(
...)
{ return(*(char **)0); }
#undef _nc_tiparm
char *_nc_tiparm(
int expected,
const char *string,
...)
{ return(*(char **)0); }
/* ./tinfo/lib_tputs.c */
#undef PC

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -264,6 +264,11 @@ void _nc_free_entries(
void _nc_leaks_tinfo(void)
{ /* void */ }
#undef exit_terminfo
void exit_terminfo(
int code)
{ /* void */ }
/* ./fallback.c */
#undef _nc_fallback
@ -898,6 +903,13 @@ char *tiparm(
...)
{ return(*(char **)0); }
#undef _nc_tiparm
char *_nc_tiparm(
int expected,
const char *string,
...)
{ return(*(char **)0); }
/* ./tinfo/lib_tputs.c */
#undef PC
@ -1009,6 +1021,11 @@ const char *_nc_tputs_trace = {0};
#undef _nc_outchars
long _nc_outchars;
#undef curses_trace
unsigned curses_trace(
unsigned tracelevel)
{ return(*(unsigned *)0); }
#undef trace
void trace(
const unsigned int tracelevel)

View File

@ -269,6 +269,11 @@ void _nc_free_entries(
void _nc_leaks_tinfo(void)
{ /* void */ }
#undef exit_terminfo
void exit_terminfo(
int code)
{ /* void */ }
/* ./fallback.c */
#undef _nc_fallback
@ -974,6 +979,13 @@ char *tiparm(
...)
{ return(*(char **)0); }
#undef _nc_tiparm
char *_nc_tiparm(
int expected,
const char *string,
...)
{ return(*(char **)0); }
/* ./tinfo/lib_tputs.c */
#undef PC
@ -1099,6 +1111,11 @@ void _nc_count_outchars(
long increment)
{ /* void */ }
#undef curses_trace
unsigned curses_trace(
unsigned tracelevel)
{ return(*(unsigned *)0); }
#undef trace
void trace(
const unsigned int tracelevel)

View File

@ -281,6 +281,11 @@ void _nc_free_entries(
void _nc_leaks_tinfo(void)
{ /* void */ }
#undef exit_terminfo
void exit_terminfo(
int code)
{ /* void */ }
/* ./fallback.c */
#undef _nc_fallback2
@ -996,6 +1001,13 @@ char *tiparm(
...)
{ return(*(char **)0); }
#undef _nc_tiparm
char *_nc_tiparm(
int expected,
const char *string,
...)
{ return(*(char **)0); }
/* ./tinfo/lib_tputs.c */
#undef PC
@ -1121,6 +1133,11 @@ void _nc_count_outchars(
long increment)
{ /* void */ }
#undef curses_trace
unsigned curses_trace(
unsigned tracelevel)
{ return(*(unsigned *)0); }
#undef trace
void trace(
const unsigned int tracelevel)

View File

@ -276,6 +276,11 @@ void _nc_free_entries(
void _nc_leaks_tinfo(void)
{ /* void */ }
#undef exit_terminfo
void exit_terminfo(
int code)
{ /* void */ }
/* ./fallback.c */
#undef _nc_fallback2
@ -920,6 +925,13 @@ char *tiparm(
...)
{ return(*(char **)0); }
#undef _nc_tiparm
char *_nc_tiparm(
int expected,
const char *string,
...)
{ return(*(char **)0); }
/* ./tinfo/lib_tputs.c */
#undef PC
@ -1031,6 +1043,11 @@ const char *_nc_tputs_trace = {0};
#undef _nc_outchars
long _nc_outchars;
#undef curses_trace
unsigned curses_trace(
unsigned tracelevel)
{ return(*(unsigned *)0); }
#undef trace
void trace(
const unsigned int tracelevel)

View File

@ -1,8 +1,8 @@
ncurses6 (6.2+20200919) unstable; urgency=low
ncurses6 (6.2+20200926) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 19 Sep 2020 10:15:12 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 26 Sep 2020 08:43:24 -0400
ncurses6 (5.9-20131005) unstable; urgency=low

View File

@ -1,8 +1,8 @@
ncurses6 (6.2+20200919) unstable; urgency=low
ncurses6 (6.2+20200926) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 19 Sep 2020 10:15:12 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 26 Sep 2020 08:43:24 -0400
ncurses6 (5.9-20131005) unstable; urgency=low

View File

@ -1,8 +1,8 @@
ncurses6 (6.2+20200919) unstable; urgency=low
ncurses6 (6.2+20200926) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 19 Sep 2020 10:15:12 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 26 Sep 2020 08:43:24 -0400
ncurses6 (5.9-20120608) unstable; urgency=low

View File

@ -1,4 +1,4 @@
; $Id: mingw-ncurses.nsi,v 1.421 2020/09/19 14:15:12 tom Exp $
; $Id: mingw-ncurses.nsi,v 1.422 2020/09/26 12:43:24 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@ -10,7 +10,7 @@
!define VERSION_MAJOR "6"
!define VERSION_MINOR "2"
!define VERSION_YYYY "2020"
!define VERSION_MMDD "0919"
!define VERSION_MMDD "0926"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"

View File

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

View File

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

View File

@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.2
Release: 20200919
Release: 20200926
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

View File

@ -43,7 +43,8 @@ PANEL *_nc_retrace_panel(
#undef _nc_my_visbuf
const char *_nc_my_visbuf(
const void *ptr)
const void *ptr,
int n)
{ return(*(const char **)0); }
#undef _nc_dPanel

View File

@ -43,7 +43,8 @@ PANEL *_nc_retrace_panel(
#undef _nc_my_visbuf
const char *_nc_my_visbuf(
const void *ptr)
const void *ptr,
int n)
{ return(*(const char **)0); }
#undef _nc_dPanel

View File

@ -43,7 +43,8 @@ PANEL *_nc_retrace_panel(
#undef _nc_my_visbuf
const char *_nc_my_visbuf(
const void *ptr)
const void *ptr,
int n)
{ return(*(const char **)0); }
#undef _nc_dPanel

View File

@ -43,7 +43,8 @@ PANEL *_nc_retrace_panel(
#undef _nc_my_visbuf
const char *_nc_my_visbuf(
const void *ptr)
const void *ptr,
int n)
{ return(*(const char **)0); }
#undef _nc_dPanel

View File

@ -38,7 +38,7 @@
*/
#include "panel.priv.h"
MODULE_ID("$Id: p_bottom.c,v 1.15 2020/05/24 01:40:20 anonymous.maarten Exp $")
MODULE_ID("$Id: p_bottom.c,v 1.16 2020/09/26 18:02:35 tom Exp $")
PANEL_EXPORT(int)
bottom_panel(PANEL * pan)
@ -52,7 +52,7 @@ bottom_panel(PANEL * pan)
if (!Is_Bottom(pan))
{
dBug(("--> bottom_panel %s", USER_PTR(pan->user)));
dBug(("--> bottom_panel %s", USER_PTR(pan->user, 1)));
HIDE_PANEL(pan, err, OK);
assert(_nc_bottom_panel == _nc_stdscr_pseudo_panel);

View File

@ -38,7 +38,7 @@
*/
#include "panel.priv.h"
MODULE_ID("$Id: p_delete.c,v 1.12 2020/05/24 01:40:20 anonymous.maarten Exp $")
MODULE_ID("$Id: p_delete.c,v 1.16 2020/09/26 23:58:55 tom Exp $")
PANEL_EXPORT(int)
del_panel(PANEL * pan)
@ -48,12 +48,11 @@ del_panel(PANEL * pan)
T((T_CALLED("del_panel(%p)"), (void *)pan));
if (pan)
{
dBug(("--> del_panel %s", USER_PTR(pan->user)));
{
GetHook(pan);
HIDE_PANEL(pan, err, OK);
free((void *)pan);
}
GetHook(pan);
HIDE_PANEL(pan, err, OK);
dBug(("...discard ptr=%s", USER_PTR(pan->user, 1)));
dBug(("...deleted pan=%p", pan));
free((void *)pan);
}
else
err = ERR;

View File

@ -37,7 +37,7 @@
*/
#include "panel.priv.h"
MODULE_ID("$Id: p_hide.c,v 1.13 2020/05/24 01:40:20 anonymous.maarten Exp $")
MODULE_ID("$Id: p_hide.c,v 1.14 2020/09/26 18:02:35 tom Exp $")
PANEL_EXPORT(int)
hide_panel(register PANEL * pan)
@ -50,7 +50,7 @@ hide_panel(register PANEL * pan)
{
GetHook(pan);
dBug(("--> hide_panel %s", USER_PTR(pan->user)));
dBug(("--> hide_panel %s", USER_PTR(pan->user, 1)));
dStack("<u%d>", 1, pan);
HIDE_PANEL(pan, err, ERR);

View File

@ -39,11 +39,29 @@
*/
#include "panel.priv.h"
MODULE_ID("$Id: p_new.c,v 1.18 2020/05/24 01:40:20 anonymous.maarten Exp $")
MODULE_ID("$Id: p_new.c,v 1.21 2020/09/26 19:35:49 tom Exp $")
#ifdef TRACE
static char *stdscr_id;
static char *new_id;
static PANEL *
AllocPanel(const char *name)
{
PANEL *result = typeMalloc(PANEL, 1);
_tracef("create :%s %p", name, result);
return result;
}
#define InitUser(name) \
if (!name ## _id) \
name ## _id = strdup(#name); \
pan->user = name ## _id; \
_tracef("create :user_ptr %p", pan->user)
#else
#define AllocPanel(name) typeMalloc(PANEL, 1)
#define InitUser(name) \
pan->user = (void *)0
#endif
/*+-------------------------------------------------------------------------
@ -67,7 +85,7 @@ root_panel(NCURSES_SP_DCL0)
#if NO_LEAKS
ph->destroy = del_panel;
#endif
_nc_stdscr_pseudo_panel = typeMalloc(PANEL, 1);
_nc_stdscr_pseudo_panel = AllocPanel("root_panel");
if (_nc_stdscr_pseudo_panel != 0)
{
PANEL *pan = _nc_stdscr_pseudo_panel;
@ -76,13 +94,7 @@ root_panel(NCURSES_SP_DCL0)
pan->win = win;
pan->below = (PANEL *) 0;
pan->above = (PANEL *) 0;
#ifdef TRACE
if (!stdscr_id)
stdscr_id = strdup("stdscr");
pan->user = stdscr_id;
#else
pan->user = (void *)0;
#endif
InitUser(stdscr);
_nc_bottom_panel = _nc_top_panel = pan;
}
}
@ -105,18 +117,12 @@ new_panel(WINDOW *win)
(void)root_panel(NCURSES_SP_ARG);
assert(_nc_stdscr_pseudo_panel);
if (!(win->_flags & _ISPAD) && (pan = typeMalloc(PANEL, 1)))
if (!(win->_flags & _ISPAD) && (pan = AllocPanel("new_panel")))
{
pan->win = win;
pan->above = (PANEL *) 0;
pan->below = (PANEL *) 0;
#ifdef TRACE
if (!new_id)
new_id = strdup("new");
pan->user = new_id;
#else
pan->user = (char *)0;
#endif
InitUser(new);
(void)show_panel(pan);
}
returnPanel(pan);

View File

@ -37,7 +37,7 @@
*/
#include "panel.priv.h"
MODULE_ID("$Id: p_show.c,v 1.15 2020/05/24 01:40:20 anonymous.maarten Exp $")
MODULE_ID("$Id: p_show.c,v 1.16 2020/09/26 18:02:35 tom Exp $")
PANEL_EXPORT(int)
show_panel(PANEL * pan)
@ -53,7 +53,7 @@ show_panel(PANEL * pan)
if (Is_Top(pan))
returnCode(OK);
dBug(("--> show_panel %s", USER_PTR(pan->user)));
dBug(("--> show_panel %s", USER_PTR(pan->user, 1)));
HIDE_PANEL(pan, err, OK);

View File

@ -37,7 +37,7 @@
/* panel.c -- implementation of panels library, some core routines */
#include "panel.priv.h"
MODULE_ID("$Id: panel.c,v 1.28 2020/05/24 01:40:20 anonymous.maarten Exp $")
MODULE_ID("$Id: panel.c,v 1.30 2020/09/26 18:05:17 tom Exp $")
/*+-------------------------------------------------------------------------
_nc_retrace_panel (pan)
@ -57,15 +57,15 @@ _nc_retrace_panel(PANEL * pan)
#ifdef TRACE
#ifndef TRACE_TXT
PANEL_EXPORT(const char *)
_nc_my_visbuf(const void *ptr)
_nc_my_visbuf(const void *ptr, int n)
{
char temp[32];
if (ptr != 0)
_nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "ptr:%p", ptr);
_nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "%p", ptr);
else
_nc_STRCPY(temp, "<null>", sizeof(temp));
return _nc_visbuf(temp);
return _nc_visbuf2(n, temp);
}
#endif
#endif
@ -78,9 +78,9 @@ PANEL_EXPORT(void)
_nc_dPanel(const char *text, const PANEL * pan)
{
_tracef("%s id=%s b=%s a=%s y=%d x=%d",
text, USER_PTR(pan->user),
(pan->below) ? USER_PTR(pan->below->user) : "--",
(pan->above) ? USER_PTR(pan->above->user) : "--",
text, USER_PTR(pan->user, 1),
(pan->below) ? USER_PTR(pan->below->user, 2) : "--",
(pan->above) ? USER_PTR(pan->above->user, 3) : "--",
PSTARTY(pan), PSTARTX(pan));
}
#endif
@ -98,10 +98,10 @@ _nc_dStack(const char *fmt, int num, const PANEL * pan)
_nc_SPRINTF(s80, _nc_SLIMIT(sizeof(s80)) fmt, num, pan);
_tracef("%s b=%s t=%s", s80,
(_nc_bottom_panel) ? USER_PTR(_nc_bottom_panel->user) : "--",
(_nc_top_panel) ? USER_PTR(_nc_top_panel->user) : "--");
(_nc_bottom_panel) ? USER_PTR(_nc_bottom_panel->user, 1) : "--",
(_nc_top_panel) ? USER_PTR(_nc_top_panel->user, 2) : "--");
if (pan)
_tracef("pan id=%s", USER_PTR(pan->user));
_tracef("pan id=%s", USER_PTR(pan->user, 1));
pan = _nc_bottom_panel;
while (pan)
{

View File

@ -27,7 +27,7 @@
* authorization. *
****************************************************************************/
/* $Id: panel.priv.h,v 1.29 2020/05/24 01:40:20 anonymous.maarten Exp $ */
/* $Id: panel.priv.h,v 1.30 2020/09/26 18:05:32 tom Exp $ */
#ifndef NCURSES_PANEL_PRIV_H
#define NCURSES_PANEL_PRIV_H 1
@ -50,11 +50,11 @@ struct screen; /* forward declaration */
#include "panel.h"
#ifdef TRACE
extern PANEL_EXPORT(const char *) _nc_my_visbuf (const void *);
extern PANEL_EXPORT(const char *) _nc_my_visbuf (const void *, int);
# ifdef TRACE_TXT
# define USER_PTR(ptr) _nc_visbuf((const char *)ptr)
# define USER_PTR(ptr,n) _nc_visbuf2(n, (const char *)ptr)
# else
# define USER_PTR(ptr) _nc_my_visbuf((const char *)ptr)
# define USER_PTR(ptr,n) _nc_my_visbuf((const char *)ptr, n)
# endif
# define returnPanel(code) TRACE_RETURN1(code,panel)

17
test/aclocal.m4 vendored
View File

@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written *
dnl authorization. *
dnl***************************************************************************
dnl
dnl $Id: aclocal.m4,v 1.182 2020/08/29 13:24:15 tom Exp $
dnl $Id: aclocal.m4,v 1.183 2020/09/26 22:13:19 tom Exp $
dnl
dnl Author: Thomas E. Dickey
dnl
@ -1311,9 +1311,15 @@ if test "x$with_string_hacks" = "xyes"; then
fi
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_ENABLE_WARNINGS version: 6 updated: 2020/08/28 04:10:22
dnl CF_ENABLE_WARNINGS version: 7 updated: 2020/08/29 09:05:21
dnl ------------------
dnl Configure-option to enable gcc warnings
dnl
dnl $1 = extra options to add, if supported
dnl $2 = option for checking attributes. By default, this is done when
dnl warnings are enabled. For other values:
dnl yes: always do this, e.g., to use in generated library-headers
dnl no: never do this
AC_DEFUN([CF_ENABLE_WARNINGS],[
if ( test "$GCC" = yes || test "$GXX" = yes )
then
@ -1328,9 +1334,10 @@ CF_ARG_ENABLE(warnings,
AC_MSG_RESULT($with_warnings)
if test "$with_warnings" = "yes"
then
CF_GCC_ATTRIBUTES
ifelse($2,,[CF_GCC_ATTRIBUTES])
CF_GCC_WARNINGS($1)
fi
ifelse($2,yes,[CF_GCC_ATTRIBUTES])
fi
])dnl
dnl ---------------------------------------------------------------------------
@ -1599,14 +1606,14 @@ AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
])
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_GCC_ATTRIBUTES version: 18 updated: 2020/03/10 18:53:47
dnl CF_GCC_ATTRIBUTES version: 19 updated: 2020/08/29 09:05:21
dnl -----------------
dnl Test for availability of useful gcc __attribute__ directives to quiet
dnl compiler warnings. Though useful, not all are supported -- and contrary
dnl to documentation, unrecognized directives cause older compilers to barf.
AC_DEFUN([CF_GCC_ATTRIBUTES],
[
if test "$GCC" = yes
if ( test "$GCC" = yes || test "$GXX" = yes )
then
cat > conftest.i <<EOF
#ifndef GCC_PRINTF

163
test/configure vendored
View File

@ -3093,7 +3093,7 @@ includesubdir=""
cf_cv_screen=curses
cf_cv_libtype=
if test "$GCC" = yes
if ( test "$GCC" = yes || test "$GXX" = yes )
then
cat > conftest.i <<EOF
#ifndef GCC_PRINTF
@ -21260,7 +21260,7 @@ echo "${ECHO_T}$with_warnings" >&6
if test "$with_warnings" = "yes"
then
if test "$GCC" = yes
if ( test "$GCC" = yes || test "$GXX" = yes )
then
cat > conftest.i <<EOF
#ifndef GCC_PRINTF
@ -21622,9 +21622,10 @@ fi
rm -rf conftest*
fi
fi
echo "$as_me:21627: checking if you want to use dmalloc for testing" >&5
echo "$as_me:21628: checking if you want to use dmalloc for testing" >&5
echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
# Check whether --with-dmalloc or --without-dmalloc was given.
@ -21641,7 +21642,7 @@ EOF
else
with_dmalloc=
fi;
echo "$as_me:21644: result: ${with_dmalloc:-no}" >&5
echo "$as_me:21645: result: ${with_dmalloc:-no}" >&5
echo "${ECHO_T}${with_dmalloc:-no}" >&6
case .$with_cflags in
@ -21755,23 +21756,23 @@ fi
esac
if test "$with_dmalloc" = yes ; then
echo "$as_me:21758: checking for dmalloc.h" >&5
echo "$as_me:21759: checking for dmalloc.h" >&5
echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
if test "${ac_cv_header_dmalloc_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
#line 21764 "configure"
#line 21765 "configure"
#include "confdefs.h"
#include <dmalloc.h>
_ACEOF
if { (eval echo "$as_me:21768: \"$ac_cpp conftest.$ac_ext\"") >&5
if { (eval echo "$as_me:21769: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:21774: \$? = $ac_status" >&5
echo "$as_me:21775: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@ -21790,11 +21791,11 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
echo "$as_me:21793: result: $ac_cv_header_dmalloc_h" >&5
echo "$as_me:21794: result: $ac_cv_header_dmalloc_h" >&5
echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
if test $ac_cv_header_dmalloc_h = yes; then
echo "$as_me:21797: checking for dmalloc_debug in -ldmalloc" >&5
echo "$as_me:21798: checking for dmalloc_debug in -ldmalloc" >&5
echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@ -21802,7 +21803,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldmalloc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line 21805 "configure"
#line 21806 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@ -21821,16 +21822,16 @@ dmalloc_debug ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:21824: \"$ac_link\"") >&5
if { (eval echo "$as_me:21825: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:21827: \$? = $ac_status" >&5
echo "$as_me:21828: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:21830: \"$ac_try\"") >&5
{ (eval echo "$as_me:21831: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:21833: \$? = $ac_status" >&5
echo "$as_me:21834: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dmalloc_dmalloc_debug=yes
else
@ -21841,7 +21842,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:21844: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
echo "$as_me:21845: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
cat >>confdefs.h <<EOF
@ -21856,7 +21857,7 @@ fi
fi
echo "$as_me:21859: checking if you want to use dbmalloc for testing" >&5
echo "$as_me:21860: checking if you want to use dbmalloc for testing" >&5
echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
# Check whether --with-dbmalloc or --without-dbmalloc was given.
@ -21873,7 +21874,7 @@ EOF
else
with_dbmalloc=
fi;
echo "$as_me:21876: result: ${with_dbmalloc:-no}" >&5
echo "$as_me:21877: result: ${with_dbmalloc:-no}" >&5
echo "${ECHO_T}${with_dbmalloc:-no}" >&6
case .$with_cflags in
@ -21987,23 +21988,23 @@ fi
esac
if test "$with_dbmalloc" = yes ; then
echo "$as_me:21990: checking for dbmalloc.h" >&5
echo "$as_me:21991: checking for dbmalloc.h" >&5
echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
if test "${ac_cv_header_dbmalloc_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
#line 21996 "configure"
#line 21997 "configure"
#include "confdefs.h"
#include <dbmalloc.h>
_ACEOF
if { (eval echo "$as_me:22000: \"$ac_cpp conftest.$ac_ext\"") >&5
if { (eval echo "$as_me:22001: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:22006: \$? = $ac_status" >&5
echo "$as_me:22007: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@ -22022,11 +22023,11 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
echo "$as_me:22025: result: $ac_cv_header_dbmalloc_h" >&5
echo "$as_me:22026: result: $ac_cv_header_dbmalloc_h" >&5
echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
if test $ac_cv_header_dbmalloc_h = yes; then
echo "$as_me:22029: checking for debug_malloc in -ldbmalloc" >&5
echo "$as_me:22030: checking for debug_malloc in -ldbmalloc" >&5
echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@ -22034,7 +22035,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldbmalloc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line 22037 "configure"
#line 22038 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@ -22053,16 +22054,16 @@ debug_malloc ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:22056: \"$ac_link\"") >&5
if { (eval echo "$as_me:22057: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:22059: \$? = $ac_status" >&5
echo "$as_me:22060: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:22062: \"$ac_try\"") >&5
{ (eval echo "$as_me:22063: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:22065: \$? = $ac_status" >&5
echo "$as_me:22066: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dbmalloc_debug_malloc=yes
else
@ -22073,7 +22074,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:22076: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
echo "$as_me:22077: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
cat >>confdefs.h <<EOF
@ -22088,7 +22089,7 @@ fi
fi
echo "$as_me:22091: checking if you want to use valgrind for testing" >&5
echo "$as_me:22092: checking if you want to use valgrind for testing" >&5
echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
# Check whether --with-valgrind or --without-valgrind was given.
@ -22105,7 +22106,7 @@ EOF
else
with_valgrind=
fi;
echo "$as_me:22108: result: ${with_valgrind:-no}" >&5
echo "$as_me:22109: result: ${with_valgrind:-no}" >&5
echo "${ECHO_T}${with_valgrind:-no}" >&6
case .$with_cflags in
@ -22218,7 +22219,7 @@ fi
;;
esac
echo "$as_me:22221: checking if you want to perform memory-leak testing" >&5
echo "$as_me:22222: checking if you want to perform memory-leak testing" >&5
echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
# Check whether --enable-leaks or --disable-leaks was given.
@ -22228,7 +22229,7 @@ if test "${enable_leaks+set}" = set; then
else
: ${with_no_leaks:=no}
fi;
echo "$as_me:22231: result: $with_no_leaks" >&5
echo "$as_me:22232: result: $with_no_leaks" >&5
echo "${ECHO_T}$with_no_leaks" >&6
if test "$with_no_leaks" = yes ; then
@ -22246,7 +22247,7 @@ fi
LD_RPATH_OPT=
if test "x$cf_cv_enable_rpath" != xno
then
echo "$as_me:22249: checking for an rpath option" >&5
echo "$as_me:22250: checking for an rpath option" >&5
echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
case $cf_cv_system_name in
(irix*)
@ -22277,12 +22278,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
(*)
;;
esac
echo "$as_me:22280: result: $LD_RPATH_OPT" >&5
echo "$as_me:22281: result: $LD_RPATH_OPT" >&5
echo "${ECHO_T}$LD_RPATH_OPT" >&6
case "x$LD_RPATH_OPT" in
(x-R*)
echo "$as_me:22285: checking if we need a space after rpath option" >&5
echo "$as_me:22286: checking if we need a space after rpath option" >&5
echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
cf_save_LIBS="$LIBS"
@ -22303,7 +22304,7 @@ done
LIBS="$cf_add_libs"
cat >conftest.$ac_ext <<_ACEOF
#line 22306 "configure"
#line 22307 "configure"
#include "confdefs.h"
int
@ -22315,16 +22316,16 @@ main (void)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:22318: \"$ac_link\"") >&5
if { (eval echo "$as_me:22319: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:22321: \$? = $ac_status" >&5
echo "$as_me:22322: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:22324: \"$ac_try\"") >&5
{ (eval echo "$as_me:22325: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:22327: \$? = $ac_status" >&5
echo "$as_me:22328: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_rpath_space=no
else
@ -22334,14 +22335,14 @@ cf_rpath_space=yes
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS="$cf_save_LIBS"
echo "$as_me:22337: result: $cf_rpath_space" >&5
echo "$as_me:22338: result: $cf_rpath_space" >&5
echo "${ECHO_T}$cf_rpath_space" >&6
test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
;;
esac
fi
echo "$as_me:22344: checking if rpath-hack should be disabled" >&5
echo "$as_me:22345: checking if rpath-hack should be disabled" >&5
echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
# Check whether --enable-rpath-hack or --disable-rpath-hack was given.
@ -22358,21 +22359,21 @@ else
cf_disable_rpath_hack=no
fi;
echo "$as_me:22361: result: $cf_disable_rpath_hack" >&5
echo "$as_me:22362: result: $cf_disable_rpath_hack" >&5
echo "${ECHO_T}$cf_disable_rpath_hack" >&6
if test "$cf_disable_rpath_hack" = no ; then
echo "$as_me:22365: checking for updated LDFLAGS" >&5
echo "$as_me:22366: checking for updated LDFLAGS" >&5
echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
if test -n "$LD_RPATH_OPT" ; then
echo "$as_me:22368: result: maybe" >&5
echo "$as_me:22369: result: maybe" >&5
echo "${ECHO_T}maybe" >&6
for ac_prog in ldd
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo "$as_me:22375: checking for $ac_word" >&5
echo "$as_me:22376: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@ -22387,7 +22388,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_cf_ldd_prog="$ac_prog"
echo "$as_me:22390: found $ac_dir/$ac_word" >&5
echo "$as_me:22391: found $ac_dir/$ac_word" >&5
break
done
@ -22395,10 +22396,10 @@ fi
fi
cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
if test -n "$cf_ldd_prog"; then
echo "$as_me:22398: result: $cf_ldd_prog" >&5
echo "$as_me:22399: result: $cf_ldd_prog" >&5
echo "${ECHO_T}$cf_ldd_prog" >&6
else
echo "$as_me:22401: result: no" >&5
echo "$as_me:22402: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@ -22412,7 +22413,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
cf_rpath_oops=
cat >conftest.$ac_ext <<_ACEOF
#line 22415 "configure"
#line 22416 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@ -22424,16 +22425,16 @@ printf("Hello");
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:22427: \"$ac_link\"") >&5
if { (eval echo "$as_me:22428: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:22430: \$? = $ac_status" >&5
echo "$as_me:22431: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:22433: \"$ac_try\"") >&5
{ (eval echo "$as_me:22434: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:22436: \$? = $ac_status" >&5
echo "$as_me:22437: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@ -22461,7 +22462,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
then
test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
echo "${as_me:-configure}:22464: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
echo "${as_me:-configure}:22465: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
break
@ -22473,11 +22474,11 @@ echo "${as_me:-configure}:22464: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
echo "${as_me:-configure}:22476: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
echo "${as_me:-configure}:22477: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6
echo "${as_me:-configure}:22480: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
echo "${as_me:-configure}:22481: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
cf_rpath_dst=
for cf_rpath_src in $LDFLAGS
@ -22514,7 +22515,7 @@ do
then
test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
echo "${as_me:-configure}:22517: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
echo "${as_me:-configure}:22518: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
fi
@ -22527,11 +22528,11 @@ LDFLAGS=$cf_rpath_dst
test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6
echo "${as_me:-configure}:22530: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
echo "${as_me:-configure}:22531: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6
echo "${as_me:-configure}:22534: testing ...checking LIBS $LIBS ..." 1>&5
echo "${as_me:-configure}:22535: testing ...checking LIBS $LIBS ..." 1>&5
cf_rpath_dst=
for cf_rpath_src in $LIBS
@ -22568,7 +22569,7 @@ do
then
test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
echo "${as_me:-configure}:22571: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
echo "${as_me:-configure}:22572: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
fi
@ -22581,14 +22582,14 @@ LIBS=$cf_rpath_dst
test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6
echo "${as_me:-configure}:22584: testing ...checked LIBS $LIBS ..." 1>&5
echo "${as_me:-configure}:22585: testing ...checked LIBS $LIBS ..." 1>&5
test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
echo "${as_me:-configure}:22588: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
echo "${as_me:-configure}:22589: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
else
echo "$as_me:22591: result: no" >&5
echo "$as_me:22592: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@ -22678,7 +22679,7 @@ DEFS=-DHAVE_CONFIG_H
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
{ echo "$as_me:22681: creating $CONFIG_STATUS" >&5
{ echo "$as_me:22682: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
@ -22856,7 +22857,7 @@ cat >>$CONFIG_STATUS <<\EOF
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
{ { echo "$as_me:22859: error: ambiguous option: $1
{ { echo "$as_me:22860: error: ambiguous option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: ambiguous option: $1
Try \`$0 --help' for more information." >&2;}
@ -22875,7 +22876,7 @@ Try \`$0 --help' for more information." >&2;}
ac_need_defaults=false;;
# This is an error.
-*) { { echo "$as_me:22878: error: unrecognized option: $1
-*) { { echo "$as_me:22879: error: unrecognized option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2;}
@ -22925,7 +22926,7 @@ do
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
"ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
*) { { echo "$as_me:22928: error: invalid argument: $ac_config_target" >&5
*) { { echo "$as_me:22929: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
@ -23224,7 +23225,7 @@ done; }
esac
if test x"$ac_file" != x-; then
{ echo "$as_me:23227: creating $ac_file" >&5
{ echo "$as_me:23228: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
@ -23242,7 +23243,7 @@ echo "$as_me: creating $ac_file" >&6;}
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
test -f "$f" || { { echo "$as_me:23245: error: cannot find input file: $f" >&5
test -f "$f" || { { echo "$as_me:23246: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@ -23255,7 +23256,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
echo $srcdir/$f
else
# /dev/null tree
{ { echo "$as_me:23258: error: cannot find input file: $f" >&5
{ { echo "$as_me:23259: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@ -23271,7 +23272,7 @@ cat >>$CONFIG_STATUS <<\EOF
if test -n "$ac_seen"; then
ac_used=`grep '@datarootdir@' $ac_item`
if test -z "$ac_used"; then
{ echo "$as_me:23274: WARNING: datarootdir was used implicitly but not set:
{ echo "$as_me:23275: WARNING: datarootdir was used implicitly but not set:
$ac_seen" >&5
echo "$as_me: WARNING: datarootdir was used implicitly but not set:
$ac_seen" >&2;}
@ -23280,7 +23281,7 @@ $ac_seen" >&2;}
fi
ac_seen=`grep '${datarootdir}' $ac_item`
if test -n "$ac_seen"; then
{ echo "$as_me:23283: WARNING: datarootdir was used explicitly but not set:
{ echo "$as_me:23284: WARNING: datarootdir was used explicitly but not set:
$ac_seen" >&5
echo "$as_me: WARNING: datarootdir was used explicitly but not set:
$ac_seen" >&2;}
@ -23317,7 +23318,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file`
if test -z "$ac_init"; then
ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
{ echo "$as_me:23320: WARNING: Variable $ac_name is used but was not set:
{ echo "$as_me:23321: WARNING: Variable $ac_name is used but was not set:
$ac_seen" >&5
echo "$as_me: WARNING: Variable $ac_name is used but was not set:
$ac_seen" >&2;}
@ -23328,7 +23329,7 @@ $ac_seen" >&2;}
egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
if test -s $tmp/out; then
ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
{ echo "$as_me:23331: WARNING: Some variables may not be substituted:
{ echo "$as_me:23332: WARNING: Some variables may not be substituted:
$ac_seen" >&5
echo "$as_me: WARNING: Some variables may not be substituted:
$ac_seen" >&2;}
@ -23377,7 +23378,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
* ) ac_file_in=$ac_file.in ;;
esac
test x"$ac_file" != x- && { echo "$as_me:23380: creating $ac_file" >&5
test x"$ac_file" != x- && { echo "$as_me:23381: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
@ -23388,7 +23389,7 @@ echo "$as_me: creating $ac_file" >&6;}
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
test -f "$f" || { { echo "$as_me:23391: error: cannot find input file: $f" >&5
test -f "$f" || { { echo "$as_me:23392: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@ -23401,7 +23402,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
echo $srcdir/$f
else
# /dev/null tree
{ { echo "$as_me:23404: error: cannot find input file: $f" >&5
{ { echo "$as_me:23405: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@ -23459,7 +23460,7 @@ cat >>$CONFIG_STATUS <<\EOF
rm -f $tmp/in
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
{ echo "$as_me:23462: $ac_file is unchanged" >&5
{ echo "$as_me:23463: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \

View File

@ -1,5 +1,5 @@
#!/usr/bin/env perl
# $Id: tracemunch,v 1.30 2020/08/29 18:59:58 tom Exp $
# $Id: tracemunch,v 1.32 2020/09/26 19:40:55 tom Exp $
##############################################################################
# Copyright 2018-2019,2020 Thomas E. Dickey #
# Copyright 1998-2005,2017 Free Software Foundation, Inc. #
@ -72,6 +72,7 @@ our $tracelevel = 0;
# 1 = SCREEN*
# 2 = WINDOW*
# 4 = TERMINAL*
# 8 = PANEL*
our %known_p1 = qw(
TransformLine 1
_nc_console_read 1
@ -90,6 +91,7 @@ our %known_p1 = qw(
baudrate 1
beep 1
border_set 2
bottom_panel 8
box 2
box_set 2
can_change_color 1
@ -103,6 +105,7 @@ our %known_p1 = qw(
def_shell_mode 1
define_key 1
del_curterm 1
del_panel 8
delay_output 1
delscreen 1
delwin 2
@ -130,6 +133,7 @@ our %known_p1 = qw(
has_ic 1
has_il 1
has_key 1
hide_panel 8
idcok 2
idlok 2
immedok 2
@ -162,6 +166,7 @@ our %known_p1 = qw(
meta 2
mouseinterval 1
mousemask 1
move_panel 8
mvcur 1
mvderwin 2
mvwadd_wch 2
@ -201,6 +206,7 @@ our %known_p1 = qw(
mvwinwstr 2
mvwvline 2
mvwvline_set 2
new_panel 2
newpad 1
newterm 1
newwin 1
@ -217,6 +223,11 @@ our %known_p1 = qw(
overlay 2
overwrite 2
pair_content 1
panel_above 8
panel_below 8
panel_hidden 8
panel_userptr 8
panel_window 8
pecho_wchar 2
pechochar 2
pnoutrefresh 2
@ -224,6 +235,7 @@ our %known_p1 = qw(
qiflush 1
raw 1
redrawwin 2
replace_panel 8
reset_prog_mode 1
reset_shell_mode 1
resetty 1
@ -238,7 +250,9 @@ our %known_p1 = qw(
scroll 2
scrollok 2
set_curterm 4
set_panel_userptr 8
set_term 1
show_panel 8
slk_attr 1
slk_attr_set 1
slk_attroff 1
@ -264,6 +278,7 @@ our %known_p1 = qw(
tigetnum 1
tigetstr 1
tinfo 1
top_panel 8
touchline 2
touchwin 2
typeahead 1
@ -362,18 +377,24 @@ our %known_p1 = qw(
wvline 2
);
our $pan_nums = 0;
our $scr_nums = 0;
our $thr_nums = 0;
our $trm_nums = 0;
our $try_nums = 0;
our $usr_nums = 0;
our $win_nums = 0;
our $curscr = "";
our $newscr = "";
our $stdscr = "";
our $curscr = "";
our $newscr = "";
our $stdscr = "";
our %pan_addr;
our %scr_addr;
our %thr_addr;
our %trm_addr;
our %try_addr;
our %usr_addr;
our %win_addr;
sub has_addr($) {
@ -390,6 +411,12 @@ sub transaddr($) {
$arg =~ s/\b$curscr\b/curscr/g if ($curscr);
$arg =~ s/\b$newscr\b/newscr/g if ($newscr);
$arg =~ s/\b$stdscr\b/stdscr/g if ($stdscr);
if ( &has_addr($arg) ) {
foreach my $addr ( keys %pan_addr ) {
$n = $pan_addr{$addr};
$arg =~ s/\b$addr\b/panel$n/g if ( defined $n );
}
}
if ( &has_addr($arg) ) {
foreach my $addr ( keys %scr_addr ) {
$n = $scr_addr{$addr};
@ -414,6 +441,12 @@ sub transaddr($) {
$arg =~ s/\b$addr\b/tries_$n/g if ( defined $n );
}
}
if ( &has_addr($arg) ) {
foreach my $addr ( keys %usr_addr ) {
$n = $usr_addr{$addr};
$arg =~ s/\b$addr\b/user_ptr$n/g if ( defined $n );
}
}
if ( &has_addr($arg) ) {
foreach my $addr ( keys %win_addr ) {
$n = $win_addr{$addr};
@ -458,6 +491,10 @@ sub transaddr($) {
$trm_addr{$addr} = ++$trm_nums;
$arg = &transaddr($arg);
}
elsif ( $type == 8 ) {
$pan_addr{$addr} = ++$pan_nums;
$arg = &transaddr($arg);
}
}
}
@ -514,6 +551,16 @@ sub muncher($) {
}
$awaiting = "";
}
elsif ( $_ =~ /^create :(root|new)_panel 0x([[:xdigit:]]+)/ ) {
$addr = "0x$2";
$pan_addr{$addr} = $pan_nums++;
$_ = &transaddr($_);
}
elsif ( $_ =~ /^create :user_ptr 0x([[:xdigit:]]+)/ ) {
$addr = "0x$1";
$usr_addr{$addr} = $usr_nums++;
$_ = &transaddr($_);
}
elsif ( $_ =~ /^(\+ )*called \{set_curterm\((0x[[:xdigit:]]+)\)/ ) {
$trm_addr{$2} = ++$trm_nums unless defined $trm_addr{$2};
}
@ -548,6 +595,11 @@ sub muncher($) {
undef $win_addr{$addr};
}
}
elsif ( $_ =~ /^\.\.\.deleted pan=\"0x([[:xdigit:]]+)\"/ ) {
$addr = "0x$1";
$_ = &transaddr($_);
undef $pan_addr{$addr};
}
# Compactify runs of PutAttrChar
if ( ( ( $tracelevel & $TR{CHARPUT} ) != 0 ) and $_ =~ /$putattr/ )