mirror of
https://github.com/Aigor44/ncursesw-morphos.git
synced 2025-01-06 14:44:25 +08:00
ncurses 5.9 - patch 20140607
+ separate masking for sgr in vidputs from sitm/ritm, which do not overlap with sgr functionality. + remove unneeded -i option from adacurses-config; put -a in the -I option for consistency (patch by Pascal Pignard). + update xterm-new to patch #305 -TD + change format of test-scripts for Debian Ada95 and ncurses-examples packages to quilted to work around Debian #700177 (cf: 20130907). + build fix for form_driver_w.c as part of ncurses-examples package for older ncurses than 20131207. + add Hello World example to adacurses-config manpage. + remove unused --enable-pc-files option from Ada95/configure. + add --disable-gnat-projects option for testing. + revert changes to Ada95 project-files configuration (cf: 20140524). + corrected usage message in adacurses-config.
This commit is contained in:
parent
34d602f272
commit
bd0d93918c
Ada95
MANIFESTNEWSaclocal.m4configureconfigure.indist.mkman
misc
ncurses
package
test
85
Ada95/aclocal.m4
vendored
85
Ada95/aclocal.m4
vendored
@ -28,7 +28,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.82 2014/05/24 21:09:10 Nicolas.Boulenguez Exp $
|
||||
dnl $Id: aclocal.m4,v 1.86 2014/06/01 15:36:34 tom Exp $
|
||||
dnl Macros used in NCURSES Ada95 auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -709,6 +709,17 @@ AC_SUBST(SHOW_CC)
|
||||
AC_SUBST(ECHO_CC)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_DISABLE_GNAT_PROJECTS version: 1 updated: 2014/06/01 11:34:00
|
||||
dnl ------------------------
|
||||
AC_DEFUN([CF_DISABLE_GNAT_PROJECTS],[
|
||||
AC_MSG_CHECKING(if we want to use GNAT projects)
|
||||
CF_ARG_DISABLE(gnat-projects,
|
||||
[ --disable-gnat-projects test: disable GNAT projects even if usable],
|
||||
[enable_gnat_projects=no],
|
||||
[enable_gnat_projects=yes])
|
||||
AC_MSG_RESULT($enable_gnat_projects)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_ENABLE_PC_FILES version: 9 updated: 2012/08/04 13:59:54
|
||||
dnl ------------------
|
||||
dnl This is the "--enable-pc-files" option, which is available if there is a
|
||||
@ -1207,16 +1218,19 @@ AC_SUBST(cf_compile_generics)
|
||||
AC_SUBST(cf_generic_objects)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_GNAT_PROJECTS version: 4 updated: 2013/09/07 14:05:46
|
||||
dnl CF_GNAT_PROJECTS version: 7 updated: 2014/06/01 10:46:34
|
||||
dnl ----------------
|
||||
dnl GNAT projects are configured with ".gpr" project files.
|
||||
dnl GNAT libraries are a further development, using the project feature.
|
||||
AC_DEFUN([CF_GNAT_PROJECTS],
|
||||
[
|
||||
AC_REQUIRE([CF_GNAT_VERSION])
|
||||
AC_REQUIRE([CF_DISABLE_GNAT_PROJECTS])
|
||||
|
||||
cf_gnat_libraries=no
|
||||
cf_gnat_projects=no
|
||||
|
||||
if test "$enable_gnat_projects" != no ; then
|
||||
AC_MSG_CHECKING(if GNAT supports project files)
|
||||
case $cf_gnat_version in #(vi
|
||||
3.[[0-9]]*) #(vi
|
||||
@ -1226,17 +1240,20 @@ case $cf_gnat_version in #(vi
|
||||
cygwin*|msys*) #(vi
|
||||
;;
|
||||
*)
|
||||
mkdir conftest
|
||||
cd conftest
|
||||
mkdir lib obj
|
||||
mkdir conftest.src conftest.bin conftest.lib
|
||||
cd conftest.src
|
||||
rm -rf conftest* *~conftest*
|
||||
cat >>library.gpr <<CF_EOF
|
||||
project Library is
|
||||
Kind := External ("LIB_KIND");
|
||||
for Library_Name use "ConfTest";
|
||||
for Object_Dir use "obj";
|
||||
for Library_Version use "libConfTest.so.1";
|
||||
for Library_Kind use "dynamic";
|
||||
for Library_Dir use "lib";
|
||||
for Source_Dirs use (".");
|
||||
for Object_Dir use ".";
|
||||
for Library_ALI_Dir use External("LIBRARY_DIR");
|
||||
for Library_Version use External ("SONAME");
|
||||
for Library_Kind use Kind;
|
||||
for Library_Dir use External("BUILD_DIR");
|
||||
Source_Dir := External ("SOURCE_DIR");
|
||||
for Source_Dirs use (Source_Dir);
|
||||
end Library;
|
||||
CF_EOF
|
||||
cat >>confpackage.ads <<CF_EOF
|
||||
@ -1254,16 +1271,53 @@ package body ConfPackage is
|
||||
end conftest;
|
||||
end ConfPackage;
|
||||
CF_EOF
|
||||
if ( $cf_ada_make -Plibrary.gpr 1>&AC_FD_CC 2>&1 ); then
|
||||
if ( $cf_ada_make $ADAFLAGS \
|
||||
-Plibrary.gpr \
|
||||
-XBUILD_DIR=`cd ../conftest.bin;pwd` \
|
||||
-XLIBRARY_DIR=`cd ../conftest.lib;pwd` \
|
||||
-XSOURCE_DIR=`pwd` \
|
||||
-XSONAME=libConfTest.so.1 \
|
||||
-XLIB_KIND=static 1>&AC_FD_CC 2>&1 ) ; then
|
||||
cf_gnat_projects=yes
|
||||
fi
|
||||
cd ..
|
||||
rm -rf conftest
|
||||
if test -f conftest.lib/confpackage.ali
|
||||
then
|
||||
cf_gnat_libraries=yes
|
||||
fi
|
||||
rm -rf conftest* *~conftest*
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
AC_MSG_RESULT($cf_gnat_projects)
|
||||
fi # enable_gnat_projects
|
||||
|
||||
if test $cf_gnat_projects = yes
|
||||
then
|
||||
AC_MSG_CHECKING(if GNAT supports libraries)
|
||||
AC_MSG_RESULT($cf_gnat_libraries)
|
||||
fi
|
||||
|
||||
if test "$cf_gnat_projects" = yes
|
||||
then
|
||||
USE_OLD_MAKERULES="#"
|
||||
USE_GNAT_PROJECTS=""
|
||||
else
|
||||
USE_OLD_MAKERULES=""
|
||||
USE_GNAT_PROJECTS="#"
|
||||
fi
|
||||
|
||||
if test "$cf_gnat_libraries" = yes
|
||||
then
|
||||
USE_GNAT_LIBRARIES=""
|
||||
else
|
||||
USE_GNAT_LIBRARIES="#"
|
||||
fi
|
||||
|
||||
AC_SUBST(USE_OLD_MAKERULES)
|
||||
AC_SUBST(USE_GNAT_PROJECTS)
|
||||
AC_SUBST(USE_GNAT_LIBRARIES)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_GNAT_SIGINT version: 1 updated: 2011/03/27 20:07:59
|
||||
@ -3437,12 +3491,11 @@ AC_SUBST(ADA_OBJECTS)
|
||||
AC_MSG_RESULT($ADA_OBJECTS)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_WITH_ADA_SHAREDLIB version: 2 updated: 2010/06/26 17:35:58
|
||||
dnl CF_WITH_ADA_SHAREDLIB version: 4 updated: 2014/05/31 21:08:37
|
||||
dnl ---------------------
|
||||
dnl Command-line option to specify if an Ada95 shared-library should be built,
|
||||
dnl and optionally what its soname should be.
|
||||
AC_DEFUN([CF_WITH_ADA_SHAREDLIB],[
|
||||
AC_REQUIRE([CF_GNAT_PROJECTS])
|
||||
AC_MSG_CHECKING(if an Ada95 shared-library should be built)
|
||||
AC_ARG_WITH(ada-sharedlib,
|
||||
[ --with-ada-sharedlib=soname build shared-library (requires GNAT projects)],
|
||||
@ -3455,10 +3508,6 @@ MAKE_ADA_SHAREDLIB="#"
|
||||
|
||||
if test "x$with_ada_sharedlib" != xno
|
||||
then
|
||||
if test "$cf_gnat_projects" != yes
|
||||
then
|
||||
AC_MSG_ERROR(ada-sharedlib requires GNAT support for shared library projects,1)
|
||||
fi
|
||||
MAKE_ADA_SHAREDLIB=
|
||||
if test "x$with_ada_sharedlib" != xyes
|
||||
then
|
||||
|
2155
Ada95/configure
vendored
2155
Ada95/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -28,14 +28,14 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey
|
||||
dnl
|
||||
dnl $Id: configure.in,v 1.52 2014/05/24 21:31:05 tom Exp $
|
||||
dnl $Id: configure.in,v 1.55 2014/06/01 16:40:55 tom Exp $
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
dnl
|
||||
dnl See http://invisible-island.net/autoconf/ for additional information.
|
||||
dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
AC_PREREQ(2.52.20030208)
|
||||
AC_REVISION($Revision: 1.52 $)
|
||||
AC_REVISION($Revision: 1.55 $)
|
||||
AC_INIT(gen/gen.c)
|
||||
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
|
||||
|
||||
@ -67,7 +67,6 @@ AC_SYS_LONG_FILE_NAMES
|
||||
# if we find pkg-config, check if we should install the ".pc" files.
|
||||
CF_PKG_CONFIG
|
||||
CF_WITH_PKG_CONFIG_LIBDIR
|
||||
CF_ENABLE_PC_FILES
|
||||
|
||||
AC_MSG_CHECKING(if you want to build test-programs)
|
||||
AC_ARG_WITH(tests,
|
||||
@ -432,6 +431,8 @@ fi
|
||||
|
||||
AC_SUBST(ADA_TRACE)
|
||||
|
||||
CF_DISABLE_GNAT_PROJECTS
|
||||
|
||||
### Checks for libraries.
|
||||
case $cf_cv_system_name in #(vi
|
||||
*mingw32*) #(vi
|
||||
@ -478,6 +479,7 @@ if test "$cf_with_ada" != "no" ; then
|
||||
|
||||
CF_GNAT_GENERICS
|
||||
CF_GNAT_SIGINT
|
||||
CF_GNAT_PROJECTS
|
||||
|
||||
CF_WITH_ADA_COMPILER
|
||||
|
||||
@ -547,17 +549,6 @@ CF_ADD_CFLAGS($EXTRA_CFLAGS)
|
||||
|
||||
################################################################################
|
||||
|
||||
if test x"$enable_pc_files" = xyes ; then \
|
||||
SUB_MAKEFILES="$SUB_MAKEFILES misc/gen-pkgconfig:misc/gen-pkgconfig.in"
|
||||
MAKE_PC_FILES=
|
||||
else
|
||||
MAKE_PC_FILES="#"
|
||||
fi
|
||||
AC_SUBST(MAKE_PC_FILES)
|
||||
AC_SUBST(cross_compiling)
|
||||
|
||||
################################################################################
|
||||
|
||||
TEST_ARG2=
|
||||
AC_SUBST(TEST_ARG2)
|
||||
|
||||
@ -592,7 +583,9 @@ AC_OUTPUT( \
|
||||
$SUB_MAKEFILES \
|
||||
doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in \
|
||||
Makefile,[
|
||||
if test -z "$USE_OLD_MAKERULES" ; then
|
||||
$AWK -f $srcdir/mk-1st.awk <$srcdir/src/modules >>src/Makefile
|
||||
fi
|
||||
],[
|
||||
### Special initialization commands, used to pass information from the
|
||||
### configuration-run into config.status
|
||||
@ -607,6 +600,7 @@ LN_S="$LN_S"
|
||||
NCURSES_MAJOR="$NCURSES_MAJOR"
|
||||
NCURSES_MINOR="$NCURSES_MINOR"
|
||||
NCURSES_PATCH="$NCURSES_PATCH"
|
||||
USE_OLD_MAKERULES="$USE_OLD_MAKERULES"
|
||||
cf_cv_abi_version="$cf_cv_abi_version"
|
||||
cf_cv_rel_version="$cf_cv_rel_version"
|
||||
cf_cv_rm_so_locs="$cf_cv_rm_so_locs"
|
||||
|
@ -28,7 +28,7 @@
|
||||
#
|
||||
# Author: Juergen Pfeifer, 1996
|
||||
#
|
||||
# $Id: Makefile.in,v 1.80 2014/05/24 21:31:05 tom Exp $
|
||||
# $Id: Makefile.in,v 1.81 2014/05/31 23:38:17 tom Exp $
|
||||
#
|
||||
.SUFFIXES:
|
||||
|
||||
@ -297,7 +297,8 @@ adahtml:
|
||||
@find $(HTML_DIR) -type f -exec rm -f {} \;
|
||||
@mkdir -p $(HTML_DIR)
|
||||
cp -p ../src/*.ad[sb] . && chmod +w *.ad[sb]
|
||||
ln -sf ../src/*.ali .
|
||||
@USE_OLD_MAKERULES@ ln -sf ../src/*.ali .
|
||||
@USE_GNAT_PROJECTS@ ln -sf ../static-ali/*.ali .
|
||||
@echo "Filtering generated files"
|
||||
@for f in $(GEN_SRC); do \
|
||||
h=`basename $$f` ;\
|
||||
|
@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
# $Id: adacurses-config.in,v 1.6 2010/03/06 21:05:01 tom Exp $
|
||||
# $Id: adacurses-config.in,v 1.9 2014/06/07 19:32:22 Pascal.Pignard Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 2007-2009,2010 Free Software Foundation, Inc. #
|
||||
# Copyright (c) 2007-2010,2014 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 "Software"), #
|
||||
@ -40,7 +40,7 @@ ADA_OBJECTS=@ADA_OBJECTS@
|
||||
|
||||
VERSION=@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@
|
||||
|
||||
CFLAGS="-I$ADA_INCLUDE -aO$ADA_OBJECTS"
|
||||
CFLAGS="-aI$ADA_INCLUDE -aO$ADA_OBJECTS"
|
||||
LIBS="-L$ADA_OBJECTS -lAdaCurses"
|
||||
|
||||
THIS="adacurses"
|
||||
@ -57,19 +57,21 @@ case "x$1" in
|
||||
;;
|
||||
x)
|
||||
# if no parameter is given, give what gnatmake needs
|
||||
echo "$CFLAGS -i -largs $LIBS"
|
||||
echo "$CFLAGS -largs $LIBS"
|
||||
;;
|
||||
x--help)
|
||||
cat <<ENDHELP
|
||||
Usage: ${THIS}-config [options]
|
||||
|
||||
Options:
|
||||
--cflags echos the C compiler flags needed to compile with ${THIS}
|
||||
--libs echos the libraries needed to link with ${THIS}
|
||||
--cflags echos the gnat (Ada compiler) flags needed to compile with ${THIS}
|
||||
--libs echos the gnat libraries needed to link with ${THIS}
|
||||
|
||||
--version echos the release+patchdate version of ${THIS}
|
||||
|
||||
--help prints this message
|
||||
|
||||
If no options are given, echos the full set of flags needed by gnatmake.
|
||||
ENDHELP
|
||||
;;
|
||||
*)
|
||||
|
@ -32,7 +32,7 @@
|
||||
|
||||
/*
|
||||
Version Control
|
||||
$Id: gen.c,v 1.68 2014/05/24 21:34:53 tom Exp $
|
||||
$Id: gen.c,v 1.69 2014/05/31 21:00:08 tom Exp $
|
||||
--------------------------------------------------------------------------*/
|
||||
/*
|
||||
This program prints on its standard output the source for the
|
||||
@ -153,7 +153,7 @@ find_pos(const UCHAR * const data,
|
||||
UINT first, last; \
|
||||
record mask; \
|
||||
memset (&mask, 0, sizeof (mask)); \
|
||||
mask.field = -1; \
|
||||
memset (&mask.field, 0xff, sizeof(mask.field)); \
|
||||
if (!find_pos ((UCHAR *)&mask, sizeof (mask), &first, &last)) \
|
||||
my_error ("failed to locate" #record "_" #field); \
|
||||
print_constant (#record "_" #field "_First", first); \
|
||||
|
@ -2,7 +2,7 @@ Summary: AdaCurses - Ada95 binding for ncurses
|
||||
%define AppProgram AdaCurses
|
||||
%define AppVersion MAJOR.MINOR
|
||||
%define AppRelease YYYYMMDD
|
||||
# $Id: AdaCurses.spec,v 1.12 2011/04/01 00:08:32 tom Exp $
|
||||
# $Id: AdaCurses.spec,v 1.13 2014/06/07 17:49:23 tom Exp $
|
||||
Name: %{AppProgram}
|
||||
Version: %{AppVersion}
|
||||
Release: %{AppRelease}
|
||||
@ -68,11 +68,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
||||
%changelog
|
||||
# each patch should add its ChangeLog entries here
|
||||
|
||||
* Thu Mar 31 2010 Thomas Dickey
|
||||
* Thu Mar 31 2011 Thomas Dickey
|
||||
- use --with-shared option for consistency with --with-ada-sharelib
|
||||
- ensure that MY_DATADIR is set when installing examples
|
||||
- add ada_libdir symbol to handle special case where libdir is /usr/lib64
|
||||
- use --disable-rpath-link to link sample programs without rpath
|
||||
|
||||
* Fri Mar 25 2010 Thomas Dickey
|
||||
* Fri Mar 25 2011 Thomas Dickey
|
||||
- initial version
|
||||
|
@ -1 +1 @@
|
||||
3.0 (native)
|
||||
3.0 (quilt)
|
||||
|
@ -28,7 +28,7 @@
|
||||
#
|
||||
# Author: Juergen Pfeifer, 1996
|
||||
#
|
||||
# $Id: Makefile.in,v 1.68 2014/05/24 21:29:11 tom Exp $
|
||||
# $Id: Makefile.in,v 1.69 2014/06/01 00:10:58 tom Exp $
|
||||
#
|
||||
.SUFFIXES:
|
||||
|
||||
@ -97,6 +97,16 @@ BUILD_DIR_LIB = $(BUILD_DIR)/lib
|
||||
SOURCE_DIR_SRC = $(SOURCE_DIR)/src
|
||||
|
||||
ADAMAKE = @cf_ada_make@
|
||||
ADAMAKEFLAGS = \
|
||||
-P$(GNAT_PROJECT) \
|
||||
-XBUILD_DIR=`cd $(BUILD_DIR);pwd` \
|
||||
-XSOURCE_DIR=`cd $(SOURCE_DIR);pwd` \
|
||||
-XSOURCE_DIR2=`cd $(srcdir);pwd` \
|
||||
-XLIB_NAME=$(LIB_NAME) \
|
||||
-XSONAME=$(SONAME)
|
||||
|
||||
CARGS = -cargs $(ADAFLAGS)
|
||||
LARGS =
|
||||
|
||||
STATIC_LIBNAME = lib$(LIB_NAME).a
|
||||
SHARED_LIBNAME = $(SONAME)
|
||||
@ -210,7 +220,7 @@ $(ABASE)-trace.adb : $(srcdir)/$(ABASE)-trace.adb_p
|
||||
###############################################################################
|
||||
# Use these definitions when building a shared library.
|
||||
SHARED_C_OBJS = c_varargs_to_ada.o c_threaded_variables.o ncurses_compat.o
|
||||
SHARED_OBJS = $(SHARED_C_OBJS) $(LIBOBJS) @cf_generic_objects@
|
||||
SHARED_OBJS = $(SHARED_C_OBJS) @USE_OLD_MAKERULES@$(LIBOBJS) @cf_generic_objects@
|
||||
|
||||
c_varargs_to_ada.o : $(srcdir)/c_varargs_to_ada.c
|
||||
$(CC) $(CFLAGS_DEFAULT) -c -o $@ $(srcdir)/c_varargs_to_ada.c
|
||||
@ -224,7 +234,7 @@ ncurses_compat.o : $(srcdir)/ncurses_compat.c
|
||||
###############################################################################
|
||||
# Use these definitions when building a static library.
|
||||
STATIC_C_OBJS = static_c_varargs_to_ada.o static_c_threaded_variables.o static_ncurses_compat.o
|
||||
STATIC_OBJS = $(STATIC_C_OBJS) $(LIBOBJS) @cf_generic_objects@
|
||||
STATIC_OBJS = $(STATIC_C_OBJS) @USE_OLD_MAKERULES@$(LIBOBJS) @cf_generic_objects@
|
||||
|
||||
static_c_varargs_to_ada.o : $(srcdir)/c_varargs_to_ada.c
|
||||
$(CC) $(CFLAGS_NORMAL) -c -o $@ $(srcdir)/c_varargs_to_ada.c
|
||||
@ -237,10 +247,40 @@ static_ncurses_compat.o : $(srcdir)/ncurses_compat.c
|
||||
|
||||
###############################################################################
|
||||
|
||||
$(BUILD_DIR_LIB)/$(STATIC_LIBNAME) :: \
|
||||
$(BUILD_DIR_LIB) \
|
||||
$(STATIC_OBJS)
|
||||
$(AR) $(ARFLAGS) $@ $(STATIC_OBJS)
|
||||
@USE_OLD_MAKERULES@$(BUILD_DIR_LIB)/$(STATIC_LIBNAME) :: \
|
||||
@USE_OLD_MAKERULES@ $(BUILD_DIR_LIB) \
|
||||
@USE_OLD_MAKERULES@ $(STATIC_OBJS)
|
||||
@USE_OLD_MAKERULES@ $(AR) $(ARFLAGS) $@ $(STATIC_OBJS)
|
||||
|
||||
$(BUILD_DIR)/static-ali : ; mkdir -p $@
|
||||
$(BUILD_DIR)/static-obj : ; mkdir -p $@
|
||||
|
||||
STATIC_DIRS = \
|
||||
$(BUILD_DIR_LIB) \
|
||||
$(BUILD_DIR)/static-ali \
|
||||
$(BUILD_DIR)/static-obj
|
||||
|
||||
@USE_GNAT_PROJECTS@$(BUILD_DIR_LIB)/$(STATIC_LIBNAME) :: \
|
||||
@USE_GNAT_PROJECTS@ $(ABASE)-trace.adb \
|
||||
@USE_GNAT_PROJECTS@ $(STATIC_C_OBJS) \
|
||||
@USE_GNAT_PROJECTS@ $(STATIC_DIRS)
|
||||
@USE_GNAT_PROJECTS@ $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=static
|
||||
@USE_GNAT_PROJECTS@ $(AR) $(ARFLAGS) $@ $(STATIC_C_OBJS)
|
||||
@USE_GNAT_PROJECTS@
|
||||
@USE_GNAT_LIBRARIES@install \
|
||||
@USE_GNAT_LIBRARIES@install.libs :: \
|
||||
@USE_GNAT_LIBRARIES@ $(ADA_OBJECTS)
|
||||
@USE_GNAT_LIBRARIES@ $(INSTALL_LIB) \
|
||||
@USE_GNAT_LIBRARIES@ $(BUILD_DIR)/static-ali/*.ali \
|
||||
@USE_GNAT_LIBRARIES@ $(ADA_OBJECTS)
|
||||
|
||||
uninstall \
|
||||
uninstall.libs ::
|
||||
@rm -f $(ADA_OBJECTS)/$(STATIC_LIBNAME)
|
||||
|
||||
@USE_GNAT_LIBRARIES@uninstall \
|
||||
@USE_GNAT_LIBRARIES@uninstall.libs ::
|
||||
@USE_GNAT_LIBRARIES@ @$(SHELL) -c 'for name in $(BUILD_DIR)/static-ali/*.ali ; do rm -f $(ADA_OBJECTS)/`basename $$name`; done'
|
||||
|
||||
$(BUILD_DIR)/dynamic-ali : ; mkdir -p $@
|
||||
$(BUILD_DIR)/dynamic-obj : ; mkdir -p $@
|
||||
@ -250,29 +290,13 @@ SHARED_DIRS = \
|
||||
$(BUILD_DIR)/dynamic-ali \
|
||||
$(BUILD_DIR)/dynamic-obj
|
||||
|
||||
GPR_EMPTY :=
|
||||
GPR_SPACE := $(GPR_EMPTY) $(GPR_EMPTY)
|
||||
GPR_COMMA := ,
|
||||
GPR_LIST = ("$(subst $(GPR_SPACE),"$(GPR_COMMA) ",$(strip $(1)))")
|
||||
$(GNAT_PROJECT) : $(GNAT_PROJECT).sed
|
||||
sed \
|
||||
-e "s|External (\"BUILD_DIR\")|\"`cd $(BUILD_DIR);pwd`\"|" \
|
||||
-e 's/External ("LIB_NAME")/"$(LIB_NAME)"/' \
|
||||
-e 's/External ("SONAME")/"$(SONAME)"/' \
|
||||
-e 's/External_As_List\ ("ADAFLAGS", " ")/$(call GPR_LIST,$(ADAFLAGS))/' \
|
||||
-e 's/External_As_List\ ("LDFLAGS", " ")/$(call GPR_LIST,$(LDFLAGS))/' \
|
||||
$< > $@
|
||||
clean ::
|
||||
rm -rf $(GNAT_PROJECT)
|
||||
|
||||
@MAKE_ADA_SHAREDLIB@all :: $(BUILD_DIR_LIB)/$(SHARED_LIBNAME)
|
||||
@MAKE_ADA_SHAREDLIB@$(BUILD_DIR_LIB)/$(SHARED_LIBNAME) :: \
|
||||
@MAKE_ADA_SHAREDLIB@ $(GNAT_PROJECT) \
|
||||
@MAKE_ADA_SHAREDLIB@ $(ABASE)-trace.adb \
|
||||
@MAKE_ADA_SHAREDLIB@ $(SHARED_DIRS) \
|
||||
@MAKE_ADA_SHAREDLIB@ $(SHARED_OBJS)
|
||||
@MAKE_ADA_SHAREDLIB@ cp $(SHARED_OBJS) $(BUILD_DIR)/dynamic-obj/
|
||||
@MAKE_ADA_SHAREDLIB@ $(ADAMAKE) -P$(GNAT_PROJECT)
|
||||
@MAKE_ADA_SHAREDLIB@ $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=dynamic
|
||||
|
||||
install \
|
||||
install.libs :: $(ADA_INCLUDE)
|
||||
@ -310,6 +334,6 @@ uninstall.libs ::
|
||||
@MAKE_ADA_SHAREDLIB@ rm -f $(LIBDIR)/$(SHARED_LIBNAME)
|
||||
|
||||
clean ::
|
||||
rm -rf $(BUILD_DIR)/dynamic-ali
|
||||
rm -rf $(BUILD_DIR)/dynamic-obj
|
||||
rm -rf $(BUILD_DIR)/*-ali
|
||||
rm -rf $(BUILD_DIR)/*-obj
|
||||
rm -rf $(BUILD_DIR_LIB)
|
||||
|
@ -25,32 +25,32 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
------------------------------------------------------------------------------
|
||||
-- $Id: library.gpr.sed,v 1.2 2014/05/24 21:28:29 tom Exp $
|
||||
-- $Id: library.gpr,v 1.9 2014/06/01 01:13:09 tom Exp $
|
||||
-- http://gcc.gnu.org/onlinedocs/gnat_ugn_unw/Library-Projects.html
|
||||
-- http://www.adaworld.com/debian/debian-ada-policy.html
|
||||
project Library is
|
||||
Build_Dir := External ("BUILD_DIR");
|
||||
Source_Dir := External ("SOURCE_DIR");
|
||||
Source_Dir2 := External ("SOURCE_DIR2");
|
||||
Kind := External ("LIB_KIND");
|
||||
for Library_Name use External ("LIB_NAME");
|
||||
for Library_Version use External ("SONAME");
|
||||
for Library_Kind use "dynamic";
|
||||
|
||||
for Library_Kind use Kind;
|
||||
for Library_Dir use Build_Dir & "/lib";
|
||||
for Object_Dir use Build_Dir & "/dynamic-obj";
|
||||
for Library_ALI_Dir use Build_Dir & "/dynamic-ali";
|
||||
for Source_Dirs use (".");
|
||||
for Library_Options use
|
||||
External_As_List ("LDFLAGS", " ") -- before libraries.
|
||||
& ("-lncurses", "-lpanel", "-lmenu", "-lform");
|
||||
for Object_Dir use Build_Dir & "/" & Kind & "-obj";
|
||||
for Library_ALI_Dir use Build_Dir & "/" & Kind & "-ali";
|
||||
for Source_Dirs use (Source_Dir & "/src",
|
||||
Source_Dir2,
|
||||
Build_Dir & "/src");
|
||||
for Library_Options use ("-lncurses", "-lpanel", "-lmenu", "-lform");
|
||||
package Compiler is
|
||||
for Default_Switches ("Ada") use
|
||||
("-g",
|
||||
"-O2",
|
||||
"-gnatafno",
|
||||
"-gnatVa", -- All validity checks
|
||||
"-gnatwa") -- Activate all optional errors
|
||||
& External_As_List ("ADAFLAGS", " "); -- after default options
|
||||
"-gnatwa"); -- Activate all optional errors
|
||||
end Compiler;
|
||||
|
||||
-- gnatmake ignores C sources, but this option will let it embed
|
||||
-- objects found in the Object_Dir.
|
||||
for Languages use ("C", "Ada");
|
||||
end Library;
|
2
MANIFEST
2
MANIFEST
@ -132,7 +132,7 @@
|
||||
./Ada95/src/c_threaded_variables.h
|
||||
./Ada95/src/c_varargs_to_ada.c
|
||||
./Ada95/src/c_varargs_to_ada.h
|
||||
./Ada95/src/library.gpr.sed
|
||||
./Ada95/src/library.gpr
|
||||
./Ada95/src/modules
|
||||
./Ada95/src/ncurses_compat.c
|
||||
./Ada95/src/terminal_interface-curses-aux.adb
|
||||
|
18
NEWS
18
NEWS
@ -25,7 +25,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: NEWS,v 1.2209 2014/05/24 21:40:16 tom Exp $
|
||||
-- $Id: NEWS,v 1.2221 2014/06/07 22:17:18 tom Exp $
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
This is a log of changes that ncurses has gone through since Zeyd started
|
||||
@ -45,6 +45,22 @@ 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.
|
||||
|
||||
20140607
|
||||
+ separate masking for sgr in vidputs from sitm/ritm, which do not
|
||||
overlap with sgr functionality.
|
||||
+ remove unneeded -i option from adacurses-config; put -a in the -I
|
||||
option for consistency (patch by Pascal Pignard).
|
||||
+ update xterm-new to patch #305 -TD
|
||||
+ change format of test-scripts for Debian Ada95 and ncurses-examples
|
||||
packages to quilted to work around Debian #700177 (cf: 20130907).
|
||||
+ build fix for form_driver_w.c as part of ncurses-examples package for
|
||||
older ncurses than 20131207.
|
||||
+ add Hello World example to adacurses-config manpage.
|
||||
+ remove unused --enable-pc-files option from Ada95/configure.
|
||||
+ add --disable-gnat-projects option for testing.
|
||||
+ revert changes to Ada95 project-files configuration (cf: 20140524).
|
||||
+ corrected usage message in adacurses-config.
|
||||
|
||||
20140524
|
||||
+ fix typo in ncurses manpage for the NCURSES_NO_MAGIC_COOKIE
|
||||
environment variable.
|
||||
|
85
aclocal.m4
vendored
85
aclocal.m4
vendored
@ -28,7 +28,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.692 2014/05/24 21:24:50 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.698 2014/06/01 15:35:36 tom Exp $
|
||||
dnl Macros used in NCURSES auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -1224,6 +1224,17 @@ AC_SUBST(SHOW_CC)
|
||||
AC_SUBST(ECHO_CC)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_DISABLE_GNAT_PROJECTS version: 1 updated: 2014/06/01 11:34:00
|
||||
dnl ------------------------
|
||||
AC_DEFUN([CF_DISABLE_GNAT_PROJECTS],[
|
||||
AC_MSG_CHECKING(if we want to use GNAT projects)
|
||||
CF_ARG_DISABLE(gnat-projects,
|
||||
[ --disable-gnat-projects test: disable GNAT projects even if usable],
|
||||
[enable_gnat_projects=no],
|
||||
[enable_gnat_projects=yes])
|
||||
AC_MSG_RESULT($enable_gnat_projects)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_DISABLE_LEAKS version: 7 updated: 2012/10/02 20:55:03
|
||||
dnl ----------------
|
||||
dnl Combine no-leak checks with the libraries or tools that are used for the
|
||||
@ -2150,16 +2161,19 @@ AC_SUBST(cf_compile_generics)
|
||||
AC_SUBST(cf_generic_objects)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_GNAT_PROJECTS version: 5 updated: 2014/05/24 13:30:20
|
||||
dnl CF_GNAT_PROJECTS version: 7 updated: 2014/06/01 10:46:34
|
||||
dnl ----------------
|
||||
dnl GNAT projects are configured with ".gpr" project files.
|
||||
dnl GNAT libraries are a further development, using the project feature.
|
||||
AC_DEFUN([CF_GNAT_PROJECTS],
|
||||
[
|
||||
AC_REQUIRE([CF_GNAT_VERSION])
|
||||
AC_REQUIRE([CF_DISABLE_GNAT_PROJECTS])
|
||||
|
||||
cf_gnat_libraries=no
|
||||
cf_gnat_projects=no
|
||||
|
||||
if test "$enable_gnat_projects" != no ; then
|
||||
AC_MSG_CHECKING(if GNAT supports project files)
|
||||
case $cf_gnat_version in #(vi
|
||||
3.[[0-9]]*) #(vi
|
||||
@ -2169,17 +2183,20 @@ case $cf_gnat_version in #(vi
|
||||
cygwin*|msys*) #(vi
|
||||
;;
|
||||
*)
|
||||
mkdir conftest
|
||||
cd conftest
|
||||
mkdir lib obj
|
||||
mkdir conftest.src conftest.bin conftest.lib
|
||||
cd conftest.src
|
||||
rm -rf conftest* *~conftest*
|
||||
cat >>library.gpr <<CF_EOF
|
||||
project Library is
|
||||
Kind := External ("LIB_KIND");
|
||||
for Library_Name use "ConfTest";
|
||||
for Object_Dir use "obj";
|
||||
for Library_Version use "libConfTest.so.1";
|
||||
for Library_Kind use "dynamic";
|
||||
for Library_Dir use "lib";
|
||||
for Source_Dirs use (".");
|
||||
for Object_Dir use ".";
|
||||
for Library_ALI_Dir use External("LIBRARY_DIR");
|
||||
for Library_Version use External ("SONAME");
|
||||
for Library_Kind use Kind;
|
||||
for Library_Dir use External("BUILD_DIR");
|
||||
Source_Dir := External ("SOURCE_DIR");
|
||||
for Source_Dirs use (Source_Dir);
|
||||
end Library;
|
||||
CF_EOF
|
||||
cat >>confpackage.ads <<CF_EOF
|
||||
@ -2197,16 +2214,53 @@ package body ConfPackage is
|
||||
end conftest;
|
||||
end ConfPackage;
|
||||
CF_EOF
|
||||
if ( $cf_ada_make -Plibrary.gpr 1>&AC_FD_CC 2>&1 ); then
|
||||
if ( $cf_ada_make $ADAFLAGS \
|
||||
-Plibrary.gpr \
|
||||
-XBUILD_DIR=`cd ../conftest.bin;pwd` \
|
||||
-XLIBRARY_DIR=`cd ../conftest.lib;pwd` \
|
||||
-XSOURCE_DIR=`pwd` \
|
||||
-XSONAME=libConfTest.so.1 \
|
||||
-XLIB_KIND=static 1>&AC_FD_CC 2>&1 ) ; then
|
||||
cf_gnat_projects=yes
|
||||
fi
|
||||
cd ..
|
||||
rm -rf conftest
|
||||
if test -f conftest.lib/confpackage.ali
|
||||
then
|
||||
cf_gnat_libraries=yes
|
||||
fi
|
||||
rm -rf conftest* *~conftest*
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
AC_MSG_RESULT($cf_gnat_projects)
|
||||
fi # enable_gnat_projects
|
||||
|
||||
if test $cf_gnat_projects = yes
|
||||
then
|
||||
AC_MSG_CHECKING(if GNAT supports libraries)
|
||||
AC_MSG_RESULT($cf_gnat_libraries)
|
||||
fi
|
||||
|
||||
if test "$cf_gnat_projects" = yes
|
||||
then
|
||||
USE_OLD_MAKERULES="#"
|
||||
USE_GNAT_PROJECTS=""
|
||||
else
|
||||
USE_OLD_MAKERULES=""
|
||||
USE_GNAT_PROJECTS="#"
|
||||
fi
|
||||
|
||||
if test "$cf_gnat_libraries" = yes
|
||||
then
|
||||
USE_GNAT_LIBRARIES=""
|
||||
else
|
||||
USE_GNAT_LIBRARIES="#"
|
||||
fi
|
||||
|
||||
AC_SUBST(USE_OLD_MAKERULES)
|
||||
AC_SUBST(USE_GNAT_PROJECTS)
|
||||
AC_SUBST(USE_GNAT_LIBRARIES)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_GNAT_SIGINT version: 1 updated: 2011/03/27 20:07:59
|
||||
@ -6580,12 +6634,11 @@ AC_SUBST(ADA_OBJECTS)
|
||||
AC_MSG_RESULT($ADA_OBJECTS)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_WITH_ADA_SHAREDLIB version: 3 updated: 2014/05/24 13:30:20
|
||||
dnl CF_WITH_ADA_SHAREDLIB version: 4 updated: 2014/05/31 21:08:37
|
||||
dnl ---------------------
|
||||
dnl Command-line option to specify if an Ada95 shared-library should be built,
|
||||
dnl and optionally what its soname should be.
|
||||
AC_DEFUN([CF_WITH_ADA_SHAREDLIB],[
|
||||
AC_REQUIRE([CF_GNAT_PROJECTS])
|
||||
AC_MSG_CHECKING(if an Ada95 shared-library should be built)
|
||||
AC_ARG_WITH(ada-sharedlib,
|
||||
[ --with-ada-sharedlib=soname build shared-library (requires GNAT projects)],
|
||||
@ -6598,10 +6651,6 @@ MAKE_ADA_SHAREDLIB="#"
|
||||
|
||||
if test "x$with_ada_sharedlib" != xno
|
||||
then
|
||||
if test "$cf_gnat_projects" != yes
|
||||
then
|
||||
AC_MSG_ERROR(ada-sharedlib requires GNAT support for shared library projects,1)
|
||||
fi
|
||||
MAKE_ADA_SHAREDLIB=
|
||||
if test "x$with_ada_sharedlib" != xyes
|
||||
then
|
||||
|
10
configure.in
10
configure.in
@ -28,14 +28,14 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: configure.in,v 1.580 2014/05/24 21:23:43 tom Exp $
|
||||
dnl $Id: configure.in,v 1.582 2014/06/01 14:05:06 tom Exp $
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
dnl
|
||||
dnl See http://invisible-island.net/autoconf/ for additional information.
|
||||
dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
AC_PREREQ(2.52.20030208)
|
||||
AC_REVISION($Revision: 1.580 $)
|
||||
AC_REVISION($Revision: 1.582 $)
|
||||
AC_INIT(ncurses/base/lib_initscr.c)
|
||||
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
|
||||
|
||||
@ -1353,6 +1353,8 @@ fi
|
||||
|
||||
AC_SUBST(ADA_TRACE)
|
||||
|
||||
CF_DISABLE_GNAT_PROJECTS
|
||||
|
||||
### Checks for libraries.
|
||||
case $cf_cv_system_name in #(vi
|
||||
*mingw32*) #(vi
|
||||
@ -1620,6 +1622,7 @@ dnl At the moment we support no other Ada95 compiler.
|
||||
|
||||
CF_GNAT_GENERICS
|
||||
CF_GNAT_SIGINT
|
||||
CF_GNAT_PROJECTS
|
||||
|
||||
CF_WITH_ADA_COMPILER
|
||||
|
||||
@ -2017,8 +2020,10 @@ fi
|
||||
CF_LIB_RULES($SRC_SUBDIRS)
|
||||
|
||||
if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = "xyes"; then
|
||||
if test -z "$USE_OLD_MAKERULES" ; then
|
||||
$AWK -f $srcdir/Ada95/mk-1st.awk <$srcdir/Ada95/src/modules >>Ada95/src/Makefile
|
||||
fi
|
||||
fi
|
||||
],[
|
||||
### Special initialization commands, used to pass information from the
|
||||
### configuration-run into config.status
|
||||
@ -2050,6 +2055,7 @@ TINFO_ARG_SUFFIX="$TINFO_ARG_SUFFIX"
|
||||
TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX"
|
||||
TINFO_NAME="$TINFO_NAME"
|
||||
TINFO_SUFFIX="$TINFO_SUFFIX"
|
||||
USE_OLD_MAKERULES="$USE_OLD_MAKERULES"
|
||||
WITH_CURSES_H="$with_curses_h"
|
||||
WITH_ECHO="${enable_echo:=yes}"
|
||||
WITH_OVERWRITE="$with_overwrite"
|
||||
|
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.986 2014/05/21 10:14:18 tom Exp $
|
||||
# $Id: dist.mk,v 1.989 2014/06/07 15:13:29 tom Exp $
|
||||
# Makefile for creating ncurses distributions.
|
||||
#
|
||||
# This only needs to be used directly as a makefile by developers, but
|
||||
@ -37,7 +37,7 @@ SHELL = /bin/sh
|
||||
# These define the major/minor/patch versions of ncurses.
|
||||
NCURSES_MAJOR = 5
|
||||
NCURSES_MINOR = 9
|
||||
NCURSES_PATCH = 20140524
|
||||
NCURSES_PATCH = 20140607
|
||||
|
||||
# We don't append the patch to the version, since this only applies to releases
|
||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||
|
@ -1,5 +1,5 @@
|
||||
.\"***************************************************************************
|
||||
.\" Copyright (c) 2010,2011 Free Software Foundation, Inc. *
|
||||
.\" Copyright (c) 2010-2011,2014 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 *
|
||||
@ -26,7 +26,7 @@
|
||||
.\" authorization. *
|
||||
.\"***************************************************************************
|
||||
.\"
|
||||
.\" $Id: MKada_config.in,v 1.5 2011/03/26 14:44:51 tom Exp $
|
||||
.\" $Id: MKada_config.in,v 1.8 2014/06/07 19:32:52 tom Exp $
|
||||
.TH ADACURSES "1" "" "" "User Commands"
|
||||
.SH NAME
|
||||
adacurses\-config \- helper script for AdaCurses libraries
|
||||
@ -50,6 +50,71 @@ to configure and build AdaCurses.
|
||||
.TP
|
||||
\fB\-\-help\fR
|
||||
prints a list of the \fBadacurses\-config\fP script's options.
|
||||
.PP
|
||||
If no options are given, \fBadacurses\-config\fP prints the combination
|
||||
of
|
||||
\fB\-\-cflags\fR and
|
||||
\fB\-\-libs\fR
|
||||
that \fBgnatmake\fP expects (see example).
|
||||
.SH EXAMPLE
|
||||
.PP
|
||||
For example, supposing that you want to compile the "Hello World!"
|
||||
program for AdaCurses.
|
||||
Make a file named "hello.adb":
|
||||
.RS
|
||||
.nf
|
||||
.ft CW
|
||||
with Terminal_Interface.Curses; use Terminal_Interface.Curses;
|
||||
|
||||
procedure Hello is
|
||||
|
||||
Visibility : Cursor_Visibility := Invisible;
|
||||
done : Boolean := False;
|
||||
c : Key_Code;
|
||||
|
||||
begin
|
||||
|
||||
Init_Screen;
|
||||
Set_Echo_Mode (False);
|
||||
|
||||
Set_Cursor_Visibility (Visibility);
|
||||
Set_Timeout_Mode (Standard_Window, Non_Blocking, 0);
|
||||
|
||||
Move_Cursor (Line => Lines / 2, Column => (Columns - 12) / 2);
|
||||
Add (Str => "Hello World!");
|
||||
|
||||
while not done loop
|
||||
|
||||
c := Get_Keystroke (Standard_Window);
|
||||
case c is
|
||||
when Character'Pos ('q') => done := True;
|
||||
when others => null;
|
||||
end case;
|
||||
|
||||
Nap_Milli_Seconds (50);
|
||||
end loop;
|
||||
|
||||
End_Windows;
|
||||
|
||||
end Hello;
|
||||
.fi
|
||||
.RE
|
||||
.PP
|
||||
Then, using
|
||||
.RS
|
||||
.ft CW
|
||||
gnatmake `adacurses-config --cflags` hello -largs `adacurses-config --libs`
|
||||
.ft
|
||||
.RE
|
||||
.PP
|
||||
or (simpler):
|
||||
.RS
|
||||
.ft CW
|
||||
gnatmake hello `adacurses-config`
|
||||
.ft
|
||||
.RE
|
||||
.PP
|
||||
you will compile and link the program.
|
||||
.SH "SEE ALSO"
|
||||
\fBcurses\fR(3X)
|
||||
.PP
|
||||
|
@ -6,8 +6,8 @@
|
||||
# Report bugs and new terminal descriptions to
|
||||
# bug-ncurses@gnu.org
|
||||
#
|
||||
# $Revision: 1.494 $
|
||||
# $Date: 2014/05/24 16:04:53 $
|
||||
# $Revision: 1.500 $
|
||||
# $Date: 2014/06/07 17:07:45 $
|
||||
#
|
||||
# The original header is preserved below for reference. It is noted that there
|
||||
# is a "newer" version which differs in some cosmetic details (but actually
|
||||
@ -3426,7 +3426,7 @@ vt525|DEC VT525,
|
||||
#
|
||||
# In trying to get the function keys to work, I had to cobble my own
|
||||
# terminfo.src entry, since the existing vt520 entry doesn't include most of
|
||||
# the function keys. If I blend the entries for "vt420f" and "vt220+keypad"
|
||||
# the function keys. If I blend the entries for "vt420f" and "vt220+keypad"
|
||||
# I seem to get them all -Mike Gran
|
||||
vt520ansi|Boundless VT520 ANSI,
|
||||
use=ansi+rca, use=vt420f, use=vt220+keypad,
|
||||
@ -4087,24 +4087,25 @@ xterm-basic|modern xterm terminal emulator - common,
|
||||
csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
|
||||
cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
|
||||
cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
|
||||
cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
|
||||
dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
|
||||
flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
|
||||
ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
|
||||
ind=^J, invis=\E[8m, is2=\E[!p\E[?3;4l\E[4l\E>,
|
||||
kmous=\E[M, meml=\El, memu=\Em, op=\E[39;49m, rc=\E8,
|
||||
rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l,
|
||||
rmcup=\E[?1049l, rmir=\E[4l, rmkx=\E[?1l\E>,
|
||||
rmm=\E[?1034l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
|
||||
rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7, setab=\E[4%p1%dm,
|
||||
setaf=\E[3%p1%dm,
|
||||
cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m,
|
||||
dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
|
||||
el1=\E[1K, flash=\E[?5h$<100/>\E[?5l, home=\E[H,
|
||||
hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@,
|
||||
il=\E[%p1%dL, il1=\E[L, ind=^J, invis=\E[8m,
|
||||
is2=\E[!p\E[?3;4l\E[4l\E>, kmous=\E[M, meml=\El,
|
||||
memu=\Em, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
|
||||
ritm=\E[23m, rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?1049l,
|
||||
rmir=\E[4l, rmkx=\E[?1l\E>, rmm=\E[?1034l, rmso=\E[27m,
|
||||
rmul=\E[24m, rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7,
|
||||
setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
|
||||
setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
|
||||
setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
|
||||
sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
|
||||
sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smcup=\E[?1049h,
|
||||
smir=\E[4h, smkx=\E[?1h\E=, smm=\E[?1034h, smso=\E[7m,
|
||||
smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, E3=\E[3;J,
|
||||
use=ansi+pp, use=xterm+kbs, use=vt100+enq,
|
||||
sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
|
||||
sgr0=\E(B\E[m, sitm=\E[3m, smacs=\E(0, smam=\E[?7h,
|
||||
smcup=\E[?1049h, smir=\E[4h, smkx=\E[?1h\E=,
|
||||
smm=\E[?1034h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
|
||||
vpa=\E[%i%p1%dd, E3=\E[3;J, use=ansi+pp, use=xterm+kbs,
|
||||
use=vt100+enq,
|
||||
|
||||
# From: David J. MacKenzie <djm@va.pubnix.com>, 14 Nov 1997
|
||||
# In retrospect, something like xterm-r6 was intended here -TD
|
||||
@ -5294,9 +5295,11 @@ decansi|ANSI emulation with DEC compatibility hacks,
|
||||
u7=\E[6n, vpa=\E[%i%p1%dd,
|
||||
|
||||
#### VWM
|
||||
# http://vwm.sourceforge.net/
|
||||
#
|
||||
# vwmterm is a terminal emulator written for the VWM console window manager
|
||||
#
|
||||
# VWM 2.0.2 (2009-05-01)
|
||||
# vwmterm is a terminal emulator written for the VWM console window manager.
|
||||
# This version is obsolete, replaced by libvterm in 2.1.0 (2009-10-23).
|
||||
vwmterm|(vwm term),
|
||||
am, bce, ccc, mir, msgr, npc, xenl, xon,
|
||||
colors#8, pairs#64,
|
||||
@ -5472,7 +5475,7 @@ st-256color|stterm-256color|simpleterm with 256 colors,
|
||||
use=xterm+256color, use=st,
|
||||
|
||||
#### TERMINATOR
|
||||
# http://software.jessies.org/terminator/
|
||||
# https://code.google.com/p/jessies/
|
||||
# Tested using their Debian package org.jessies.terminator 6.104.3256 on 64-bit
|
||||
# Debian/current -TD (2011/8/20)
|
||||
#
|
||||
@ -5698,9 +5701,9 @@ screen|VT 100/ANSI X3.64 virtual terminal,
|
||||
nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
|
||||
rmcup=\E[?1049l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[23m,
|
||||
rmul=\E[24m, rs2=\Ec\E[?1000l\E[?25h, sc=\E7,
|
||||
sgr=\E[0%?%p6%t;1%;%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
|
||||
sgr=\E[0%?%p6%t;1%;%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
|
||||
sgr0=\E[m\017, smacs=^N, smcup=\E[?1049h, smir=\E[4h,
|
||||
smkx=\E[?1h\E=, smso=\E[3m, smul=\E[4m, tbc=\E[3g, E0=\E(B,
|
||||
smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, E0=\E(B,
|
||||
S0=\E(%p1%c, use=ecma+color,
|
||||
# The bce and status-line entries are from screen 3.9.13 (and require some
|
||||
# changes to .screenrc).
|
||||
@ -5781,7 +5784,7 @@ screen+fkeys|function-keys according to screen,
|
||||
screen.xterm-xfree86|screen.xterm-new|screen customized for modern xterm,
|
||||
bce@, bw,
|
||||
invis@, kIC@, kNXT@, kPRV@, meml@, memu@,
|
||||
sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m,
|
||||
sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p5%t;2%;m,
|
||||
E3@, use=screen+fkeys, use=xterm-new,
|
||||
# xterm-r6 does not really support khome/kend unless it is propped up by
|
||||
# the translations resource.
|
||||
@ -18142,7 +18145,7 @@ osexec|Osborne executive,
|
||||
#
|
||||
|
||||
# See
|
||||
# http://www.minix3.org/manpages/man4/console.4.html
|
||||
# http://www.minix3.org/manpages/html4/console.html
|
||||
minix|minix console (v3),
|
||||
acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
|
||||
kdch1=\177, kend=\E[Y, kf0=\E[21~, kf1=\E[11~, kf10=\E[21~,
|
||||
@ -23309,4 +23312,10 @@ v3220|LANPAR Vision II model 3220/3221/3222,
|
||||
# * correct ti924-8 which had confused padding versus octal escapes -TD
|
||||
# * correct padding in sbi entry -TD
|
||||
#
|
||||
# 2014-06-07
|
||||
# * update xterm-new to patch #305 -TD
|
||||
# + change screen's smso to use SGR 7 (ECMA-80 reverse) rather than SGR 3
|
||||
# (italic). This was a long-ago typo in screen 3.1.1 which was
|
||||
# overlooked until a few terminal emulators implemented the feature -TD
|
||||
#
|
||||
######## SHANTIH! SHANTIH! SHANTIH!
|
||||
|
@ -69,7 +69,7 @@
|
||||
#define CUR SP_TERMTYPE
|
||||
#endif
|
||||
|
||||
MODULE_ID("$Id: lib_vidattr.c,v 1.68 2014/03/08 20:32:59 tom Exp $")
|
||||
MODULE_ID("$Id: lib_vidattr.c,v 1.70 2014/06/07 22:21:14 tom Exp $")
|
||||
|
||||
#define doPut(mode) \
|
||||
TPUTS_TRACE(#mode); \
|
||||
@ -214,6 +214,7 @@ NCURSES_SP_NAME(vidputs) (NCURSES_SP_DCLx
|
||||
|
||||
turn_off = (~newmode & PreviousAttr) & ALL_BUT_COLOR;
|
||||
turn_on = (newmode & ~PreviousAttr) & ALL_BUT_COLOR;
|
||||
turn_on = (newmode & ~(PreviousAttr & TPARM_ATTR)) & ALL_BUT_COLOR;
|
||||
|
||||
SetColorsIf(((pair == 0) && !fix_pair0), PreviousAttr);
|
||||
|
||||
|
@ -36,7 +36,7 @@
|
||||
#define CUR SP_TERMTYPE
|
||||
#endif
|
||||
|
||||
MODULE_ID("$Id: lib_vid_attr.c,v 1.22 2014/02/01 22:09:27 tom Exp $")
|
||||
MODULE_ID("$Id: lib_vid_attr.c,v 1.23 2014/06/07 22:13:46 tom Exp $")
|
||||
|
||||
#define doPut(mode) \
|
||||
TPUTS_TRACE(#mode); \
|
||||
@ -144,7 +144,7 @@ NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
|
||||
}
|
||||
|
||||
turn_off = (~newmode & previous_attr) & ALL_BUT_COLOR;
|
||||
turn_on = (newmode & ~previous_attr) & ALL_BUT_COLOR;
|
||||
turn_on = (newmode & ~(previous_attr & TPARM_ATTR)) & ALL_BUT_COLOR;
|
||||
|
||||
SetColorsIf(((pair == 0) && !fix_pair0), previous_attr, previous_pair);
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
ncurses6 (5.9-20140524) unstable; urgency=low
|
||||
ncurses6 (5.9-20140607) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Wed, 21 May 2014 06:14:18 -0400
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 07 Jun 2014 11:13:30 -0400
|
||||
|
||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
ncurses6 (5.9-20140524) unstable; urgency=low
|
||||
ncurses6 (5.9-20140607) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Wed, 21 May 2014 06:14:18 -0400
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 07 Jun 2014 11:13:30 -0400
|
||||
|
||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
ncurses6 (5.9-20140524) unstable; urgency=low
|
||||
ncurses6 (5.9-20140607) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Wed, 21 May 2014 06:14:18 -0400
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 07 Jun 2014 11:13:30 -0400
|
||||
|
||||
ncurses6 (5.9-20120608) unstable; urgency=low
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
; $Id: mingw-ncurses.nsi,v 1.41 2014/05/21 10:14:18 tom Exp $
|
||||
; $Id: mingw-ncurses.nsi,v 1.44 2014/06/07 15:13:30 tom Exp $
|
||||
|
||||
; TODO add examples
|
||||
; TODO bump ABI to 6
|
||||
@ -10,7 +10,7 @@
|
||||
!define VERSION_MAJOR "5"
|
||||
!define VERSION_MINOR "9"
|
||||
!define VERSION_YYYY "2014"
|
||||
!define VERSION_MMDD "0524"
|
||||
!define VERSION_MMDD "0607"
|
||||
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
|
||||
|
||||
!define MY_ABI "5"
|
||||
|
@ -3,7 +3,7 @@
|
||||
Summary: shared libraries for terminal handling
|
||||
Name: mingw32-ncurses6
|
||||
Version: 5.9
|
||||
Release: 20140524
|
||||
Release: 20140607
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
@ -1,7 +1,7 @@
|
||||
Summary: shared libraries for terminal handling
|
||||
Name: ncurses6
|
||||
Version: 5.9
|
||||
Release: 20140524
|
||||
Release: 20140607
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
@ -31,7 +31,7 @@
|
||||
****************************************************************************/
|
||||
|
||||
/*
|
||||
* $Id: form_driver_w.c,v 1.11 2014/02/09 22:20:27 tom Exp $
|
||||
* $Id: form_driver_w.c,v 1.12 2014/06/01 20:37:19 tom Exp $
|
||||
*
|
||||
* Test form_driver_w (int, int, wchar_t), a wide char aware
|
||||
* replacement of form_driver.
|
||||
@ -41,7 +41,7 @@
|
||||
|
||||
#include <test.priv.h>
|
||||
|
||||
#if USE_WIDEC_SUPPORT && USE_LIBFORM
|
||||
#if USE_WIDEC_SUPPORT && USE_LIBFORM && (defined(NCURSES_VERSION_PATCH) && NCURSES_VERSION_PATCH >= 20131207)
|
||||
|
||||
#include <form.h>
|
||||
|
||||
|
@ -1 +1 @@
|
||||
3.0 (native)
|
||||
3.0 (quilt)
|
||||
|
Loading…
Reference in New Issue
Block a user