mirror of
https://github.com/Aigor44/ncursesw-morphos.git
synced 2024-11-27 06:49:54 +08:00
ncurses 5.6 - patch 20070428
+ add a configure check for gcc's options for inlining, use that to
quiet a warning message where gcc's default behavior changed from
3.x to 4.x.
+ improve warning message when checking if GPM is linked to curses
library by not warning if its use of "wgetch" is via a weak symbol.
+ add loader options when building with static libraries to ensure that
an installed shared library for ncurses does not conflict. This is
reported as problem with Tru64, but could affect other platforms
(report Martin Mokrejs, analysis by Tim Mooney).
+ fix build on cygwin after recent ticlib/termlib changes, i.e.,
+ adjust TINFO_SUFFIX value to work with cygwin's dll naming
+ revert a change from 20070303 which commented out dependency of
SHLIB_LIST in form/menu/panel/c++ libraries.
+ fix initialization of ripoff stack pointer (cf: 20070421).
This commit is contained in:
Thomas E. Dickey
parent
7a27c7d49c
commit
3faafb2efc
24
NEWS
24
NEWS
@ -25,7 +25,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: NEWS,v 1.1118 2007/04/21 23:57:53 tom Exp $
|
||||
-- $Id: NEWS,v 1.1121 2007/04/28 19:06:11 tom Exp $
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
This is a log of changes that ncurses has gone through since Zeyd started
|
||||
@ -45,7 +45,23 @@ 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.
|
||||
|
||||
20060421
|
||||
20070428
|
||||
+ add a configure check for gcc's options for inlining, use that to
|
||||
quiet a warning message where gcc's default behavior changed from
|
||||
3.x to 4.x.
|
||||
+ improve warning message when checking if GPM is linked to curses
|
||||
library by not warning if its use of "wgetch" is via a weak symbol.
|
||||
+ add loader options when building with static libraries to ensure that
|
||||
an installed shared library for ncurses does not conflict. This is
|
||||
reported as problem with Tru64, but could affect other platforms
|
||||
(report Martin Mokrejs, analysis by Tim Mooney).
|
||||
+ fix build on cygwin after recent ticlib/termlib changes, i.e.,
|
||||
+ adjust TINFO_SUFFIX value to work with cygwin's dll naming
|
||||
+ revert a change from 20070303 which commented out dependency of
|
||||
SHLIB_LIST in form/menu/panel/c++ libraries.
|
||||
+ fix initialization of ripoff stack pointer (cf: 20070421).
|
||||
|
||||
20070421
|
||||
+ move most static variables into structures _nc_globals and
|
||||
_nc_prescreen, to simplify storage.
|
||||
+ add/use configure script macro CF_SIG_ATOMIC_T, use the corresponding
|
||||
@ -54,13 +70,13 @@ it is not possible to add this information.
|
||||
+ modify CF_WITH_LIBTOOL to allow one to pass options such as -static
|
||||
to the libtool create- and link-operations.
|
||||
|
||||
20060414
|
||||
20070414
|
||||
+ fix whitespace in curs_opaque.3x which caused a spurious ';' in
|
||||
the installed aliases (report by Peter Santoro).
|
||||
+ fix configure script to not try to generate adacurses-config when
|
||||
Ada95 tree is not built.
|
||||
|
||||
20060407
|
||||
20070407
|
||||
+ add man/curs_legacy.3x, man/curs_opaque.3x
|
||||
+ fix acs_map binding for Ada95 when --enable-reentrant is used.
|
||||
+ add adacurses-config to the Ada95 install, based on version from
|
||||
|
||||
117
aclocal.m4
vendored
117
aclocal.m4
vendored
@ -28,7 +28,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.429 2007/04/19 20:04:46 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.433 2007/04/28 19:26:13 tom Exp $
|
||||
dnl Macros used in NCURSES auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -612,6 +612,50 @@ fi
|
||||
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_CHECK_GPM_WGETCH version: 1 updated: 2007/04/28 14:38:06
|
||||
dnl -------------------
|
||||
dnl Check if GPM is already linked with curses. If so - and if the linkage
|
||||
dnl is not "weak" - warn about this because it can create problems linking
|
||||
dnl applications with ncurses.
|
||||
AC_DEFUN([CF_CHECK_GPM_WGETCH],[
|
||||
AC_CHECK_LIB(gpm,Gpm_Wgetch,[
|
||||
|
||||
AC_CACHE_CHECK(if GPM is weakly bound to curses library, cf_cv_check_gpm_wgetch,[
|
||||
cf_cv_check_gpm_wgetch=unknown
|
||||
if test "$cross_compiling" != yes ; then
|
||||
|
||||
cat >conftest.$ac_ext <<CF_EOF
|
||||
#include <gpm.h>
|
||||
int main()
|
||||
{
|
||||
Gpm_Wgetch();
|
||||
${cf_cv_main_return:-return}(0);
|
||||
}
|
||||
CF_EOF
|
||||
|
||||
cf_save_LIBS="$LIBS"
|
||||
# This only works if we can look at the symbol table. If a shared
|
||||
# library is stripped for install, we cannot use that. So we're forced
|
||||
# to rely on the static library, noting that some packagers may not
|
||||
# include it.
|
||||
LIBS="-static -lgpm -dynamic $LIBS"
|
||||
if AC_TRY_EVAL(ac_compile) ; then
|
||||
if AC_TRY_EVAL(ac_link) ; then
|
||||
cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[[vVwW]]\>'`
|
||||
test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
|
||||
test -z "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=no
|
||||
fi
|
||||
fi
|
||||
rm -f conftest*
|
||||
LIBS="$cf_save_LIBS"
|
||||
fi
|
||||
])
|
||||
|
||||
if test "$cf_cv_check_gpm_wgetch" != yes ; then
|
||||
AC_MSG_WARN(GPM library is already linked with curses - read the FAQ)
|
||||
fi
|
||||
])])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_CPP_PARAM_INIT version: 4 updated: 2001/04/07 22:31:18
|
||||
dnl -----------------
|
||||
dnl Check if the C++ compiler accepts duplicate parameter initialization. This
|
||||
@ -703,6 +747,35 @@ fi
|
||||
test "$cf_cv_cpp_static_cast" = yes && AC_DEFINE(CPP_HAS_STATIC_CAST)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_C_INLINE version: 1 updated: 2007/04/28 15:03:44
|
||||
dnl -----------
|
||||
dnl Check if the C compiler supports "inline".
|
||||
dnl $1 is the name of a shell variable to set if inline is supported
|
||||
dnl $2 is the threshold for gcc 4.x's option controlling maximum inline size
|
||||
AC_DEFUN([CF_C_INLINE],[
|
||||
AC_C_INLINE
|
||||
$1=
|
||||
if test "$ac_cv_c_inline" != no ; then
|
||||
$1=inline
|
||||
if test "$GCC" = yes
|
||||
then
|
||||
AC_CACHE_CHECK(if gcc supports options to tune inlining,cf_cv_gcc_inline,[
|
||||
cf_save_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS --param max-inline-insns-single=$2"
|
||||
AC_TRY_COMPILE([inline int foo(void) { return 1; }],
|
||||
[${cf_cv_main_return:-return} foo()],
|
||||
[cf_cv_gcc_inline=yes],
|
||||
[cf_cv_gcc_inline=no])
|
||||
CFLAGS=$cf_save_CFLAGS
|
||||
])
|
||||
if test "$cf_cv_gcc_inline" = yes ; then
|
||||
CF_ADD_CFLAGS([--param max-inline-insns-single=$2])
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
AC_SUBST($1)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52
|
||||
dnl ----------
|
||||
dnl "dirname" is not portable, so we fake it with a shell script.
|
||||
@ -1738,6 +1811,48 @@ ifdef([AC_FUNC_FSEEKO],[
|
||||
])
|
||||
])
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_LDFLAGS_STATIC version: 2 updated: 2007/04/28 15:25:27
|
||||
dnl -----------------
|
||||
dnl Check for compiler/linker flags used to temporarily force usage of static
|
||||
dnl libraries. This depends on the compiler and platform. Use this to help
|
||||
dnl ensure that the linker picks up a given library based on its position in
|
||||
dnl the list of linker options and libraries.
|
||||
AC_DEFUN([CF_LDFLAGS_STATIC],[
|
||||
|
||||
if test "$GCC" = yes ; then
|
||||
LDFLAGS_STATIC=-static
|
||||
LDFLAGS_SHARED=-dynamic
|
||||
else
|
||||
case $cf_cv_system_name in #(
|
||||
aix[[45]]*) #( from ld manpage
|
||||
LDFLAGS_STATIC=-bstatic
|
||||
LDFLAGS_SHARED=-bdynamic
|
||||
;;
|
||||
hpux*) #( from ld manpage for hpux10.20, hpux11.11
|
||||
# We could also use just "archive" and "shared".
|
||||
LDFLAGS_STATIC=-Wl,-a,archive_shared
|
||||
LDFLAGS_SHARED=-Wl,-a,shared_archive
|
||||
;;
|
||||
irix*) #( from ld manpage IRIX64
|
||||
LDFLAGS_STATIC=-Bstatic
|
||||
LDFLAGS_SHARED=-Bdynamic
|
||||
;;
|
||||
osf[[45]]*) #( from ld manpage osf4.0d, osf5.1
|
||||
# alternative "-oldstyle_liblookup" (not in cc manpage)
|
||||
LDFLAGS_STATIC=-noso
|
||||
LDFLAGS_SHARED=-so_archive
|
||||
;;
|
||||
solaris2*)
|
||||
LDFLAGS_STATIC=-Bstatic
|
||||
LDFLAGS_SHARED=-Bdynamic
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
AC_SUBST(LDFLAGS_STATIC)
|
||||
AC_SUBST(LDFLAGS_SHARED)
|
||||
])
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_LIBUTF8 version: 2 updated: 2002/01/19 22:51:32
|
||||
dnl ----------
|
||||
dnl Check for libutf8
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.82 2007/04/19 20:13:32 tom Exp $
|
||||
# $Id: Makefile.in,v 1.84 2007/04/28 15:29:12 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -95,7 +95,7 @@ LOCAL_LIBDIR = @top_builddir@/lib
|
||||
|
||||
LINK = @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@
|
||||
SHLIB_DIRS = -L../lib
|
||||
SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ # @SHLIB_LIST@
|
||||
SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
|
||||
|
||||
LIBROOT = ncurses++
|
||||
|
||||
@ -111,7 +111,9 @@ LINK_DEBUG = $(LINK_FLAGS)
|
||||
LINK_PROFILE = $(LINK_FLAGS)
|
||||
LINK_SHARED = $(LINK_FLAGS)
|
||||
|
||||
LDFLAGS = @TEST_ARGS@ @LDFLAGS@ \
|
||||
TEST_ARGS = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@
|
||||
|
||||
LDFLAGS = $(TEST_ARGS) @LDFLAGS@ \
|
||||
@LD_MODEL@ @LIBS@ @LOCAL_LDFLAGS@ $(CXXLIBS)
|
||||
|
||||
LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LIBTOOL)
|
||||
|
||||
41
configure.in
41
configure.in
@ -28,14 +28,14 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: configure.in,v 1.414 2007/04/19 20:04:08 tom Exp $
|
||||
dnl $Id: configure.in,v 1.418 2007/04/28 18:54:05 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.13.20020210)
|
||||
AC_REVISION($Revision: 1.414 $)
|
||||
AC_REVISION($Revision: 1.418 $)
|
||||
AC_INIT(ncurses/base/lib_initscr.c)
|
||||
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
|
||||
|
||||
@ -314,9 +314,7 @@ if test "$with_gpm" != no ; then
|
||||
SHLIB_LIST="-lgpm $SHLIB_LIST"
|
||||
fi
|
||||
AC_DEFINE(HAVE_LIBGPM)
|
||||
AC_CHECK_LIB(gpm,Gpm_Wgetch,[
|
||||
AC_MSG_WARN(GPM library is already linked with curses - read the FAQ)
|
||||
])
|
||||
CF_CHECK_GPM_WGETCH
|
||||
fi
|
||||
|
||||
CF_WITH_SYSMOUSE
|
||||
@ -1139,16 +1137,9 @@ CF_SYS_TIME_SELECT
|
||||
### checks for compiler characteristics
|
||||
AC_LANG_C
|
||||
AC_C_CONST
|
||||
AC_C_INLINE
|
||||
CF_C_INLINE(NCURSES_INLINE,500)
|
||||
CF_SIG_ATOMIC_T
|
||||
|
||||
NCURSES_INLINE=
|
||||
if test "$ac_cv_c_inline" != no ; then
|
||||
AC_DEFINE(CC_HAS_INLINE_FUNCS)
|
||||
NCURSES_INLINE=inline
|
||||
fi
|
||||
AC_SUBST(NCURSES_INLINE)
|
||||
|
||||
if test $NCURSES_CHTYPE = auto ; then
|
||||
CF_TYPEOF_CHTYPE
|
||||
else
|
||||
@ -1474,10 +1465,12 @@ AC_MSG_RESULT($DFT_ARG_SUFFIX)
|
||||
|
||||
AC_MSG_CHECKING(default library-dependency suffix)
|
||||
CF_LIB_SUFFIX($DFT_LWR_MODEL,DFT_DEP_SUFFIX)dnl
|
||||
DFT_LIB_SUFFIX=$DFT_DEP_SUFFIX
|
||||
if test $DFT_LWR_MODEL = shared ; then
|
||||
case $cf_cv_system_name in #(vi
|
||||
cygwin*)
|
||||
DFT_DEP_SUFFIX=".dll.a"
|
||||
DFT_LIB_SUFFIX=".dll"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@ -1542,12 +1535,12 @@ if test "$with_termlib" != no ; then
|
||||
|
||||
if test "$with_termlib" != yes ; then
|
||||
TINFO_NAME=$with_termlib
|
||||
TINFO_SUFFIX="`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
|
||||
TINFO_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
|
||||
TINFO_ARG_SUFFIX="${with_termlib}`echo ${DFT_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
|
||||
TINFO_DEP_SUFFIX="${with_termlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
|
||||
TINFO_LIB_SUFFIX="${with_termlib}"
|
||||
else
|
||||
TINFO_SUFFIX=${DFT_DEP_SUFFIX}
|
||||
TINFO_SUFFIX=${DFT_LIB_SUFFIX}
|
||||
TINFO_ARG_SUFFIX="${TINFO_NAME}${DFT_ARG_SUFFIX}"
|
||||
TINFO_DEP_SUFFIX="${TINFO_NAME}${DFT_DEP_SUFFIX}"
|
||||
TINFO_LIB_SUFFIX="${TINFO_NAME}${LIB_SUFFIX}"
|
||||
@ -1569,12 +1562,22 @@ if test "$with_termlib" != no ; then
|
||||
else
|
||||
# the next lines are needed for linking libtic over libncurses
|
||||
TINFO_NAME=${LIB_NAME}
|
||||
TINFO_SUFFIX=${DFT_DEP_SUFFIX}
|
||||
TINFO_SUFFIX=${DFT_LIB_SUFFIX}
|
||||
TINFO_ARG_SUFFIX=${LIB_NAME}${DFT_ARG_SUFFIX}
|
||||
TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${DFT_ARG_SUFFIX}"
|
||||
|
||||
TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
|
||||
fi
|
||||
|
||||
if test "$DFT_LWR_MODEL" = shared ; then
|
||||
case $cf_cv_system_name in #(vi
|
||||
cygwin*)
|
||||
# "lib" files have ".dll.a" suffix, "cyg" files have ".dll"
|
||||
TINFO_SUFFIX=.dll
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
AC_SUBST(TINFO_ARG_SUFFIX)
|
||||
AC_SUBST(TINFO_DEP_SUFFIX)
|
||||
AC_SUBST(TINFO_LIB_SUFFIX)
|
||||
@ -1588,6 +1591,12 @@ fi
|
||||
TINFO_ARGS2=`echo "$TINFO_ARGS" | sed -e 's,-L\.\./,-L../../,'`
|
||||
AC_SUBST(TINFO_ARGS2)
|
||||
|
||||
case $DFT_LWR_MODEL in
|
||||
normal|debug|profile)
|
||||
CF_LDFLAGS_STATIC
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_MSG_CHECKING(where we will install curses.h)
|
||||
test "$with_overwrite" = no && \
|
||||
test "x$includedir" = 'x${prefix}/include' && \
|
||||
|
||||
4
dist.mk
4
dist.mk
@ -25,7 +25,7 @@
|
||||
# use or other dealings in this Software without prior written #
|
||||
# authorization. #
|
||||
##############################################################################
|
||||
# $Id: dist.mk,v 1.590 2007/04/19 19:47:27 tom Exp $
|
||||
# $Id: dist.mk,v 1.591 2007/04/26 19:32:38 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 = 6
|
||||
NCURSES_PATCH = 20070421
|
||||
NCURSES_PATCH = 20070428
|
||||
|
||||
# We don't append the patch to the version, since this only applies to releases
|
||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.46 2007/04/19 20:14:01 tom Exp $
|
||||
# $Id: Makefile.in,v 1.47 2007/04/28 14:56:11 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -95,7 +95,7 @@ LINK = $(LIBTOOL_LINK)
|
||||
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
|
||||
|
||||
SHLIB_DIRS = -L../lib
|
||||
SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ # @SHLIB_LIST@
|
||||
SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
|
||||
|
||||
MK_SHARED_LIB = @MK_SHARED_LIB@
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
# vile:awkmode
|
||||
BEGIN {
|
||||
print "/****************************************************************************"
|
||||
print " * Copyright (c) 1998-2003,2006 Free Software Foundation, Inc. *"
|
||||
print " * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *"
|
||||
print " * *"
|
||||
print " * Permission is hereby granted, free of charge, to any person obtaining a *"
|
||||
print " * copy of this software and associated documentation files (the *"
|
||||
@ -33,7 +34,7 @@ BEGIN {
|
||||
print "/* and: Thomas E. Dickey 1995-on */"
|
||||
print "/****************************************************************************/"
|
||||
print ""
|
||||
print "/* $Id: MKterm.h.awk.in,v 1.47 2006/11/26 01:18:23 tom Exp $ */"
|
||||
print "/* $Id: MKterm.h.awk.in,v 1.48 2007/04/28 20:35:34 tom Exp $ */"
|
||||
print ""
|
||||
print "/*"
|
||||
print "** term.h -- Definition of struct term"
|
||||
@ -291,10 +292,10 @@ END {
|
||||
print "extern NCURSES_EXPORT(int) tigetnum (NCURSES_CONST char *);"
|
||||
print ""
|
||||
print "#if @NCURSES_TPARM_VARARGS@ /* NCURSES_TPARM_VARARGS */"
|
||||
print "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...); /* implemented */"
|
||||
print "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...); /* special */"
|
||||
print "#else"
|
||||
print "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long); /* implemented */"
|
||||
print "extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...); /* implemented */"
|
||||
print "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long); /* special */"
|
||||
print "extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...); /* special */"
|
||||
print "#endif"
|
||||
print ""
|
||||
print "#endif /* __NCURSES_H */"
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
* and: Thomas E. Dickey 1996-on *
|
||||
****************************************************************************/
|
||||
|
||||
/* $Id: curses.h.in,v 1.172 2007/03/31 20:46:06 tom Exp $ */
|
||||
/* $Id: curses.h.in,v 1.173 2007/04/28 20:34:23 tom Exp $ */
|
||||
|
||||
#ifndef __NCURSES_H
|
||||
#define __NCURSES_H
|
||||
@ -796,10 +796,10 @@ extern NCURSES_EXPORT(char *) tigetstr (NCURSES_CONST char *); /* implemented *
|
||||
extern NCURSES_EXPORT(int) putp (const char *); /* implemented */
|
||||
|
||||
#if NCURSES_TPARM_VARARGS
|
||||
extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...); /* implemented */
|
||||
extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...); /* special */
|
||||
#else
|
||||
extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long); /* implemented */
|
||||
extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...); /* implemented */
|
||||
extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long); /* special */
|
||||
extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...); /* special */
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: ncurses_defs,v 1.33 2007/04/07 17:07:27 tom Exp $
|
||||
# $Id: ncurses_defs,v 1.34 2007/04/28 18:48:33 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 2000-2006,2007 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -33,7 +33,6 @@
|
||||
|
||||
BROKEN_LINKER
|
||||
BSD_TPUTS
|
||||
CC_HAS_INLINE_FUNCS
|
||||
CC_HAS_PROTOS
|
||||
CPP_HAS_PARAM_INIT
|
||||
CURSES_ACS_ARRAY acs_map
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.47 2007/04/19 20:14:11 tom Exp $
|
||||
# $Id: Makefile.in,v 1.48 2007/04/28 14:56:11 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -95,7 +95,7 @@ LINK = $(LIBTOOL_LINK)
|
||||
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
|
||||
|
||||
SHLIB_DIRS = -L../lib
|
||||
SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ # @SHLIB_LIST@
|
||||
SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
|
||||
|
||||
MK_SHARED_LIB = @MK_SHARED_LIB@
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.106 2007/04/22 00:09:18 tom Exp $
|
||||
# $Id: Makefile.in,v 1.107 2007/04/28 15:41:08 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -154,7 +154,7 @@ AUTO_SRC = \
|
||||
names-stamp
|
||||
|
||||
TEST_DEPS = ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@
|
||||
TEST_ARGS = -L../lib -lncurses@DFT_ARG_SUFFIX@
|
||||
TEST_ARGS = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@
|
||||
TEST_LDFLAGS = @LD_MODEL@ $(TEST_ARGS) @LIBS@ @LOCAL_LDFLAGS@ @LDFLAGS@
|
||||
|
||||
TEST_PROGS = \
|
||||
|
||||
@ -44,7 +44,7 @@
|
||||
#include <term.h> /* cur_term */
|
||||
#include <tic.h>
|
||||
|
||||
MODULE_ID("$Id: lib_set_term.c,v 1.96 2007/04/21 20:51:44 tom Exp $")
|
||||
MODULE_ID("$Id: lib_set_term.c,v 1.97 2007/04/26 19:39:48 tom Exp $")
|
||||
|
||||
NCURSES_EXPORT(SCREEN *)
|
||||
set_term(SCREEN *screenp)
|
||||
@ -608,6 +608,8 @@ _nc_ripoffline(int line, int (*init) (WINDOW *, int))
|
||||
|
||||
if (line != 0) {
|
||||
|
||||
if (ripoff_sp == 0)
|
||||
ripoff_sp = ripoff_stack;
|
||||
if (ripoff_sp >= ripoff_stack + N_RIPS)
|
||||
returnCode(ERR);
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* Copyright (c) 1998-2000,2006 Free Software Foundation, Inc. *
|
||||
* Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *
|
||||
* *
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a *
|
||||
* copy of this software and associated documentation files (the *
|
||||
@ -145,7 +145,7 @@ AUTHOR
|
||||
|
||||
#include <curses.priv.h>
|
||||
|
||||
MODULE_ID("$Id: hardscroll.c,v 1.38 2006/12/30 22:19:34 tom Exp $")
|
||||
MODULE_ID("$Id: hardscroll.c,v 1.39 2007/04/28 20:14:08 tom Exp $")
|
||||
|
||||
#if defined(SCROLLDEBUG) || defined(HASHDEBUG)
|
||||
|
||||
@ -158,6 +158,8 @@ oldnums[MAXLINES];
|
||||
# undef TR
|
||||
# define TR(n, a) if (_nc_tracing & (n)) { _tracef a ; putchar('\n'); }
|
||||
|
||||
extern NCURSES_EXPORT_VAR(unsigned) _nc_tracing;
|
||||
|
||||
#else /* no debug */
|
||||
|
||||
/* OLDNUM(n) indicates which line will be shifted to the position n.
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
|
||||
* Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *
|
||||
* *
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a *
|
||||
* copy of this software and associated documentation files (the *
|
||||
@ -70,7 +70,7 @@ AUTHOR
|
||||
#include <curses.priv.h>
|
||||
#include <term.h> /* for back_color_erase */
|
||||
|
||||
MODULE_ID("$Id: hashmap.c,v 1.50 2006/12/30 22:19:58 tom Exp $")
|
||||
MODULE_ID("$Id: hashmap.c,v 1.51 2007/04/28 20:14:15 tom Exp $")
|
||||
|
||||
#ifdef HASHDEBUG
|
||||
|
||||
@ -87,6 +87,8 @@ static chtype oldtext[MAXLINES][TEXTWIDTH], newtext[MAXLINES][TEXTWIDTH];
|
||||
# define NEWTEXT(m) newtext[m]
|
||||
# define PENDING(n) 1
|
||||
|
||||
extern NCURSES_EXPORT_VAR(unsigned) _nc_tracing;
|
||||
|
||||
#else /* !HASHDEBUG */
|
||||
|
||||
# define OLDNUM(n) SP->_oldnum_list[n]
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
|
||||
* Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. *
|
||||
* *
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a *
|
||||
* copy of this software and associated documentation files (the *
|
||||
@ -155,7 +155,7 @@
|
||||
#include <term.h>
|
||||
#include <ctype.h>
|
||||
|
||||
MODULE_ID("$Id: lib_mvcur.c,v 1.107 2006/11/25 22:31:59 tom Exp $")
|
||||
MODULE_ID("$Id: lib_mvcur.c,v 1.108 2007/04/28 19:58:24 tom Exp $")
|
||||
|
||||
#define WANT_CHAR(y, x) SP->_newscr->_line[y].text[x] /* desired state */
|
||||
#define BAUDRATE cur_term->_baudrate /* bits per second */
|
||||
@ -959,6 +959,7 @@ NCURSES_EXPORT_VAR(int) _nc_optimize_enable = OPTIMIZE_ALL;
|
||||
|
||||
#include <tic.h>
|
||||
#include <dump_entry.h>
|
||||
#include <time.h>
|
||||
|
||||
NCURSES_EXPORT_VAR(const char *) _nc_progname = "mvcur";
|
||||
|
||||
@ -1116,7 +1117,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
|
||||
}
|
||||
} else if (buf[0] == 'i') {
|
||||
dump_init((char *) NULL, F_TERMINFO, S_TERMINFO, 70, 0, FALSE);
|
||||
dump_entry(&cur_term->type, FALSE, TRUE, 0, 0, 0);
|
||||
dump_entry(&cur_term->type, FALSE, TRUE, 0, 0);
|
||||
putchar('\n');
|
||||
} else if (buf[0] == 'o') {
|
||||
if (_nc_optimize_enable & OPTIMIZE_MVCUR) {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.51 2007/04/19 20:14:53 tom Exp $
|
||||
# $Id: Makefile.in,v 1.52 2007/04/28 14:56:11 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -96,7 +96,7 @@ LINK = $(LIBTOOL_LINK)
|
||||
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
|
||||
|
||||
SHLIB_DIRS = -L../lib
|
||||
SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ # @SHLIB_LIST@
|
||||
SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
|
||||
|
||||
MK_SHARED_LIB = @MK_SHARED_LIB@
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.73 2007/04/19 20:15:02 tom Exp $
|
||||
# $Id: Makefile.in,v 1.74 2007/04/28 15:47:19 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -99,8 +99,7 @@ LOCAL_LIBDIR = @top_builddir@/lib
|
||||
|
||||
LD = @LD@
|
||||
LINK = @LINK_PROGS@ $(LIBTOOL_LINK)
|
||||
LDFLAGS = @EXTRA_LDFLAGS@ \
|
||||
@TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@
|
||||
LDFLAGS = @EXTRA_LDFLAGS@ @LDFLAGS_STATIC@ @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LDFLAGS@ @LD_MODEL@ @LIBS@
|
||||
|
||||
LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LIBTOOL)
|
||||
LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.96 2007/04/19 20:15:16 tom Exp $
|
||||
# $Id: Makefile.in,v 1.97 2007/04/28 15:28:28 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -87,16 +87,18 @@ LDFLAGS_DEBUG = $(LDFLAGS) $(CFLAGS_DEBUG)
|
||||
LDFLAGS_PROFILE = $(LDFLAGS) $(CFLAGS_PROFILE)
|
||||
LDFLAGS_SHARED = $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@
|
||||
|
||||
TEST_ARGS = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@
|
||||
|
||||
# use these for linking with all of the libraries
|
||||
LIBS_DEFAULT = @TEST_ARGS@ @LIBS@ $(MATH_LIB)
|
||||
LIBS_DEFAULT = $(TEST_ARGS) @LIBS@ $(MATH_LIB)
|
||||
LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_DEFAULT)
|
||||
|
||||
# use these for linking with the (n)curses library
|
||||
LIBS_CURSES = `echo "@TEST_ARGS@ @LIBS@" | sed -e 's/-lform.*-lpanel[^ ]*//'` $(MATH_LIB)
|
||||
LIBS_CURSES = `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-lform.*-lpanel[^ ]*//'` $(MATH_LIB)
|
||||
LDFLAGS_CURSES = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_CURSES)
|
||||
|
||||
# use these for linking with the tinfo library if we have it, or curses library if not
|
||||
LIBS_TINFO = @TINFO_ARGS@ @LIBS@ $(MATH_LIB)
|
||||
LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LIBS@ $(MATH_LIB)
|
||||
LDFLAGS_TINFO = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
|
||||
|
||||
LINT = @LINT@
|
||||
|
||||
Loading…
Reference in New Issue
Block a user