Changeset 18eabd2

Timestamp:

Sep 12, 2009, 8:55:54 AM (15 years ago)

Author:

jim <jim@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

0cbb4b7

Parents:

badccbe

Message:

Updated Ncurses Patch to -20

Files:

• BOOK/introduction/common/changelog.xml (modified) (1 diff)
• BOOK/patches.ent (modified) (1 diff)
• patches/ncurses-5.7-branch_update-20.patch (moved) (moved from patches/ncurses-5.7-branch_update-18.patch ) (631 diffs)

BOOK/introduction/common/changelog.xml

@@ -45 +45 @@
         <listitem>
           <para>[Jim] - Updated Vim Patch to -21.</para>
+        </listitem>
+        <listitem>
+          <para>[Jim] - Updated Ncurses Patch to -20.</para>
         </listitem>
       </itemizedlist>

BOOK/patches.ent

@@ -81 +81 @@
 <!ENTITY ncurses-bashfix-patch-size ".7 KB">
 
-<!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-18.patch">
-<!ENTITY ncurses-branch_update-patch-md5 "6b17e03f6191a79f90666c25af0d758b">
-<!ENTITY ncurses-branch_update-patch-size "1,822 KB">
+<!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-20.patch">
+<!ENTITY ncurses-branch_update-patch-md5 "5deb073f3cd21781f593fee791d40e87">
+<!ENTITY ncurses-branch_update-patch-size "1,927 KB">
 
 <!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">

patches/ncurses-5.7-branch_update-20.patch

@@ -1 +1 @@
 Submitted By: Jim Gifford (jim at cross-lfs dot org)
-Date: 07-19-2009
+Date: 09-12-2009
 Initial Package Version: 5.7
 Origin: Upstream
 Upstream Status: Applied
 Description: This is a branch update for NCurses-5.7, and should be
-             rechecked periodically. This patch covers up to 5.7-20090718.
+             rechecked periodically. This patch covers up to 5.7-20090906.
 
 diff -Naur ncurses-5.7.orig/aclocal.m4 ncurses-5.7/aclocal.m4
 --- ncurses-5.7.orig/aclocal.m4 2008-10-25 15:15:32.000000000 -0700
-+++ ncurses-5.7/aclocal.m4      2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/aclocal.m4      2009-09-12 08:51:54.000000000 -0700
 @@ -1,5 +1,5 @@
  dnl***************************************************************************
@@ -966 +966 @@
 diff -Naur ncurses-5.7.orig/Ada95/gen/adacurses-config.in ncurses-5.7/Ada95/gen/adacurses-config.in
 --- ncurses-5.7.orig/Ada95/gen/adacurses-config.in      2007-04-07 14:06:50.000000000 -0700
-+++ ncurses-5.7/Ada95/gen/adacurses-config.in   2009-07-19 15:02:13.000000000 -0700
++++ ncurses-5.7/Ada95/gen/adacurses-config.in   2009-09-12 08:51:08.000000000 -0700
 @@ -1,18 +1,47 @@
  #! /bin/sh
@@ -1040 +1040 @@
 diff -Naur ncurses-5.7.orig/Ada95/gen/gen.c ncurses-5.7/Ada95/gen/gen.c
 --- ncurses-5.7.orig/Ada95/gen/gen.c    2008-10-04 14:59:37.000000000 -0700
-+++ ncurses-5.7/Ada95/gen/gen.c 2009-07-19 15:03:45.000000000 -0700
++++ ncurses-5.7/Ada95/gen/gen.c 2009-09-12 08:51:23.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -1079 +1079 @@
 diff -Naur ncurses-5.7.orig/Ada95/gen/Makefile.in ncurses-5.7/Ada95/gen/Makefile.in
 --- ncurses-5.7.orig/Ada95/gen/Makefile.in      2008-10-04 15:58:31.000000000 -0700
-+++ ncurses-5.7/Ada95/gen/Makefile.in   2009-07-19 15:02:13.000000000 -0700
++++ ncurses-5.7/Ada95/gen/Makefile.in   2009-09-12 08:51:08.000000000 -0700
 @@ -1,5 +1,5 @@
  ##############################################################################
@@ -1135 +1135 @@
 diff -Naur ncurses-5.7.orig/Ada95/samples/Makefile.in ncurses-5.7/Ada95/samples/Makefile.in
 --- ncurses-5.7.orig/Ada95/samples/Makefile.in  2006-12-17 08:45:02.000000000 -0800
-+++ ncurses-5.7/Ada95/samples/Makefile.in       2009-07-19 15:02:13.000000000 -0700
++++ ncurses-5.7/Ada95/samples/Makefile.in       2009-09-12 08:51:08.000000000 -0700
 @@ -1,5 +1,5 @@
  ##############################################################################
@@ -1174 +1174 @@
 diff -Naur ncurses-5.7.orig/Ada95/src/Makefile.in ncurses-5.7/Ada95/src/Makefile.in
 --- ncurses-5.7.orig/Ada95/src/Makefile.in      2007-09-15 11:22:24.000000000 -0700
-+++ ncurses-5.7/Ada95/src/Makefile.in   2009-07-19 15:02:13.000000000 -0700
++++ ncurses-5.7/Ada95/src/Makefile.in   2009-09-12 08:51:08.000000000 -0700
 @@ -1,5 +1,5 @@
  ##############################################################################
@@ -1266 +1266 @@
 diff -Naur ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb
 --- ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb      2008-07-26 11:51:11.000000000 -0700
-+++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb   2009-07-19 15:01:57.000000000 -0700
++++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb   2009-09-12 08:50:52.000000000 -0700
 @@ -35,8 +35,8 @@
  ------------------------------------------------------------------------------
@@ -1289 +1289 @@
 diff -Naur ncurses-5.7.orig/c++/cursesw.cc ncurses-5.7/c++/cursesw.cc
 --- ncurses-5.7.orig/c++/cursesw.cc     2007-12-15 15:01:57.000000000 -0800
-+++ ncurses-5.7/c++/cursesw.cc  2009-07-19 15:03:48.000000000 -0700
++++ ncurses-5.7/c++/cursesw.cc  2009-09-12 08:51:25.000000000 -0700
 @@ -1,6 +1,6 @@
  // * this is for making emacs happy: -*-Mode: C++;-*-
@@ -1336 +1336 @@
 diff -Naur ncurses-5.7.orig/c++/demo.cc ncurses-5.7/c++/demo.cc
 --- ncurses-5.7.orig/c++/demo.cc        2008-08-04 10:16:57.000000000 -0700
-+++ ncurses-5.7/c++/demo.cc     2009-07-19 15:03:58.000000000 -0700
++++ ncurses-5.7/c++/demo.cc     2009-09-12 08:51:35.000000000 -0700
 @@ -35,7 +35,7 @@
   *   Demo code for NCursesMenu and NCursesForm written by
@@ -1362 +1362 @@
 diff -Naur ncurses-5.7.orig/c++/internal.h ncurses-5.7/c++/internal.h
 --- ncurses-5.7.orig/c++/internal.h     2008-10-25 14:35:44.000000000 -0700
-+++ ncurses-5.7/c++/internal.h  2009-07-19 15:03:58.000000000 -0700
++++ ncurses-5.7/c++/internal.h  2009-09-12 08:51:35.000000000 -0700
 @@ -31,7 +31,7 @@
   *   Author: Juergen Pfeifer, 1997                                          *
@@ -1386 +1386 @@
 diff -Naur ncurses-5.7.orig/c++/Makefile.in ncurses-5.7/c++/Makefile.in
 --- ncurses-5.7.orig/c++/Makefile.in    2007-04-28 08:29:12.000000000 -0700
-+++ ncurses-5.7/c++/Makefile.in 2009-07-19 15:03:48.000000000 -0700
++++ ncurses-5.7/c++/Makefile.in 2009-09-12 08:51:25.000000000 -0700
 @@ -1,6 +1,6 @@
 -# $Id: Makefile.in,v 1.84 2007/04/28 15:29:12 tom Exp $
@@ -1444 +1444 @@
 diff -Naur ncurses-5.7.orig/config.guess ncurses-5.7/config.guess
 --- ncurses-5.7.orig/config.guess       2008-08-30 13:25:07.000000000 -0700
-+++ ncurses-5.7/config.guess    2009-07-19 15:02:08.000000000 -0700
++++ ncurses-5.7/config.guess    2009-09-12 08:51:04.000000000 -0700
 @@ -4,7 +4,7 @@
  #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
@@ -1514 +1514 @@
 diff -Naur ncurses-5.7.orig/config.sub ncurses-5.7/config.sub
 --- ncurses-5.7.orig/config.sub 2008-08-30 13:25:02.000000000 -0700
-+++ ncurses-5.7/config.sub      2009-07-19 15:02:08.000000000 -0700
++++ ncurses-5.7/config.sub      2009-09-12 08:51:04.000000000 -0700
 @@ -4,7 +4,7 @@
  #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
@@ -1598 +1598 @@
 diff -Naur ncurses-5.7.orig/configure ncurses-5.7/configure
 --- ncurses-5.7.orig/configure  2008-10-25 17:04:38.000000000 -0700
-+++ ncurses-5.7/configure       2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/configure       2009-09-12 08:52:04.000000000 -0700
 @@ -1,7 +1,7 @@
  #! /bin/sh
 -# From configure.in Revision: 1.454 .
-+# From configure.in Revision: 1.472 .
++# From configure.in Revision: 1.473 .
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated by Autoconf 2.52.20080325.
@@ -3904 +3904 @@
 +break
 +done
- 
--echo "$as_me:3831: checking for archiver options (symbol AR_OPTS)" >&5
--echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6
++
 +fi
 +fi
@@ -3918 +3916 @@
 +fi
  
--if test -z "$AR_OPTS" ; then
--       AR_OPTS=rv
+-echo "$as_me:3831: checking for archiver options (symbol AR_OPTS)" >&5
+-echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6
 +fi
 +if test -z "$ac_cv_prog_AR"; then
@@ -3944 +3942 @@
 +done
  
+-if test -z "$AR_OPTS" ; then
+-       AR_OPTS=rv
 +  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="ar"
 +fi
- fi
++fi
 +ac_ct_AR=$ac_cv_prog_ac_ct_AR
 +if test -n "$ac_ct_AR"; then
@@ -3955 +3955 @@
 +echo "${ECHO_T}no" >&6
 +fi
-+
+ 
 +  AR=$ac_ct_AR
 +else
 +  AR="$ac_cv_prog_AR"
-+fi
-+
+ fi
+ 
+-cf_cv_subst_AR_OPTS=$AR_OPTS
+-echo "$as_me:3840: result: $AR_OPTS" >&5
+-echo "${ECHO_T}$AR_OPTS" >&6
 +echo "$as_me:4049: checking for options to update archives" >&5
 +echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
@@ -3989 +3992 @@
 +               else
 +                       test -n "$verbose" && echo "    cannot compile test-program" 1>&6
- 
--cf_cv_subst_AR_OPTS=$AR_OPTS
--echo "$as_me:3840: result: $AR_OPTS" >&5
--echo "${ECHO_T}$AR_OPTS" >&6
++
 +echo "${as_me-configure}:4078: testing cannot compile test-program ..." 1>&5
 +
@@ -5265 +5265 @@
  
  if test "$use_database" != no ; then
-@@ -5393,7 +5690,7 @@
+@@ -5393,18 +5690,18 @@
  #define USE_DATABASE 1
  EOF
@@ -5273 +5273 @@
  echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
  
- # Check whether --enable-database or --disable-database was given.
-@@ -5401,10 +5698,10 @@
-   enableval="$enable_database"
+-# Check whether --enable-database or --disable-database was given.
+-if test "${enable_database+set}" = set; then
+-  enableval="$enable_database"
++# Check whether --with-database or --without-database was given.
++if test "${with_database+set}" = set; then
++  withval="$with_database"
    TERMINFO_SRC=$withval
  fi;
@@ -13420 +13423 @@
  s,@USE_CXX_BOOL@,$USE_CXX_BOOL,;t t
  s,@gnat_exists@,$gnat_exists,;t t
-@@ -17493,6 +17964,7 @@
+@@ -17493,6 +17964,8 @@
  s,@HAVE_TCGETATTR@,$HAVE_TCGETATTR,;t t
  s,@HAVE_TERMIO_H@,$HAVE_TERMIO_H,;t t
  s,@HAVE_TERMIOS_H@,$HAVE_TERMIOS_H,;t t
 +s,@MAKE_PC_FILES@,$MAKE_PC_FILES,;t t
++s,@cross_compiling@,$cross_compiling,;t t
  CEOF
  
  EOF
-@@ -17607,7 +18079,7 @@
+@@ -17607,7 +18080,7 @@
    esac
  
    if test x"$ac_file" != x-; then
 -    { echo "$as_me:17610: creating $ac_file" >&5
-+    { echo "$as_me:18082: creating $ac_file" >&5
++    { echo "$as_me:18083: creating $ac_file" >&5
  echo "$as_me: creating $ac_file" >&6;}
      rm -f "$ac_file"
    fi
-@@ -17625,7 +18097,7 @@
+@@ -17625,7 +18098,7 @@
        -) echo $tmp/stdin ;;
        [\\/$]*)
           # Absolute (can't be DOS-style, as IFS=:)
 -         test -f "$f" || { { echo "$as_me:17628: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:18100: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:18101: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           echo $f;;
-@@ -17638,7 +18110,7 @@
+@@ -17638,7 +18111,7 @@
             echo $srcdir/$f
           else
             # /dev/null tree
 -           { { echo "$as_me:17641: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:18113: error: cannot find input file: $f" >&5
++           { { echo "$as_me:18114: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           fi;;
-@@ -17704,7 +18176,7 @@
+@@ -17704,7 +18177,7 @@
    * )   ac_file_in=$ac_file.in ;;
    esac
  
 -  test x"$ac_file" != x- && { echo "$as_me:17707: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:18179: creating $ac_file" >&5
++  test x"$ac_file" != x- && { echo "$as_me:18180: creating $ac_file" >&5
  echo "$as_me: creating $ac_file" >&6;}
  
    # First look for the input files in the build tree, otherwise in the
-@@ -17715,7 +18187,7 @@
+@@ -17715,7 +18188,7 @@
        -) echo $tmp/stdin ;;
        [\\/$]*)
           # Absolute (can't be DOS-style, as IFS=:)
 -         test -f "$f" || { { echo "$as_me:17718: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:18190: error: cannot find input file: $f" >&5
++         test -f "$f" || { { echo "$as_me:18191: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           echo $f;;
-@@ -17728,7 +18200,7 @@
+@@ -17728,7 +18201,7 @@
             echo $srcdir/$f
           else
             # /dev/null tree
 -           { { echo "$as_me:17731: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:18203: error: cannot find input file: $f" >&5
++           { { echo "$as_me:18204: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
     { (exit 1); exit 1; }; }
           fi;;
-@@ -17786,7 +18258,7 @@
+@@ -17786,7 +18259,7 @@
    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:17789: $ac_file is unchanged" >&5
-+      { echo "$as_me:18261: $ac_file is unchanged" >&5
++      { echo "$as_me:18262: $ac_file is unchanged" >&5
  echo "$as_me: $ac_file is unchanged" >&6;}
      else
        ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-@@ -17873,40 +18345,44 @@
+@@ -17873,40 +18346,44 @@
                 for cf_item in $cf_LIST_MODELS
                 do
@@ -13547 +13551 @@
                                 cf_depsuf=$cf_suffix
                                 ;;
-@@ -18020,40 +18496,44 @@
+@@ -18020,40 +18497,44 @@
  
  cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -13603 +13607 @@
                                 cf_depsuf=$cf_suffix
                                 ;;
-@@ -18234,18 +18714,28 @@
+@@ -18234,18 +18715,28 @@
  install.libs uninstall.libs \\
  install.data uninstall.data ::
@@ -13632 +13636 @@
  if test -f $srcdir/$tack.h; then
  cat >> Makefile <<CF_EOF
-@@ -18256,6 +18746,7 @@
+@@ -18256,6 +18747,7 @@
  CF_EOF
  fi
@@ -13642 +13646 @@
 diff -Naur ncurses-5.7.orig/configure.in ncurses-5.7/configure.in
 --- ncurses-5.7.orig/configure.in       2008-10-18 07:53:32.000000000 -0700
-+++ ncurses-5.7/configure.in    2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/configure.in    2009-09-12 08:52:04.000000000 -0700
 @@ -1,5 +1,5 @@
  dnl***************************************************************************
@@ -13655 +13659 @@
  dnl
 -dnl $Id: configure.in,v 1.454 2008/10/18 14:53:32 tom Exp $
-+dnl $Id: configure.in,v 1.472 2009/07/18 16:18:30 tom Exp $
++dnl $Id: configure.in,v 1.473 2009/08/15 16:28:00 tom Exp $
  dnl Process this file with autoconf to produce a configure script.
  dnl
@@ -13663 +13667 @@
  AC_PREREQ(2.13.20020210)
 -AC_REVISION($Revision: 1.454 $)
-+AC_REVISION($Revision: 1.472 $)
++AC_REVISION($Revision: 1.473 $)
  AC_INIT(ncurses/base/lib_initscr.c)
  AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
@@ -13722 +13726 @@
  dnl Special option for use by system-builders: the install-prefix is used to
  dnl adjust the location into which the actual install is done, so that an
+@@ -413,7 +445,7 @@
+        AC_DEFINE(USE_DATABASE)
+ 
+        AC_MSG_CHECKING(which terminfo source-file will be installed)
+-       AC_ARG_ENABLE(database,
++       AC_ARG_WITH(database,
+                [  --with-database=XXX     specify terminfo source to install],
+                [TERMINFO_SRC=$withval])
+        AC_MSG_RESULT($TERMINFO_SRC)
 @@ -797,6 +829,15 @@
         [NCURSES_MMASK_T=auto])
@@ -13925 +13938 @@
  AC_DEFINE_UNQUOTED(NCURSES_VERSION_STRING, "${NCURSES_MAJOR}.${NCURSES_MINOR}.${NCURSES_PATCH}")
  
-@@ -1765,11 +1860,23 @@
+@@ -1765,11 +1860,24 @@
  CF_SUBST_IF(["$ac_cv_header_termios_h" = yes], HAVE_TERMIOS_H, 1, 0)
  
@@ -13942 +13955 @@
 +fi
 +AC_SUBST(MAKE_PC_FILES)
++AC_SUBST(cross_compiling)
 +
  AC_OUTPUT( \
@@ -13950 +13964 @@
         include/unctrl.h \
         $SUB_MAKEFILES \
-@@ -1796,13 +1903,13 @@
+@@ -1796,13 +1904,13 @@
  NCURSES_PATCH="$NCURSES_PATCH"
  SRC_SUBDIRS="$SRC_SUBDIRS"
@@ -13967 +13981 @@
  WITH_ECHO="$with_echo"
  WITH_OVERWRITE="$with_overwrite"
-@@ -1821,6 +1928,7 @@
+@@ -1821,6 +1929,7 @@
  cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix"
  cf_cv_system_name="$cf_cv_system_name"
@@ -13977 +13991 @@
 diff -Naur ncurses-5.7.orig/dist.mk ncurses-5.7/dist.mk
 --- ncurses-5.7.orig/dist.mk    2008-11-01 17:58:38.000000000 -0700
-+++ ncurses-5.7/dist.mk 2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/dist.mk 2009-09-12 08:52:10.000000000 -0700
 @@ -25,7 +25,7 @@
  # use or other dealings in this Software without prior written               #
@@ -13983 +13997 @@
  ##############################################################################
 -# $Id: dist.mk,v 1.671 2008/11/02 00:58:38 tom Exp $
-+# $Id: dist.mk,v 1.709 2009/07/15 23:12:22 tom Exp $
++# $Id: dist.mk,v 1.719 2009/09/06 14:11:10 tom Exp $
  # Makefile for creating ncurses distributions.
  #
@@ -13992 +14006 @@
  NCURSES_MINOR = 7
 -NCURSES_PATCH = 20081102
-+NCURSES_PATCH = 20090718
++NCURSES_PATCH = 20090906
  
  # We don't append the patch to the version, since this only applies to releases
@@ -13998 +14012 @@
 diff -Naur ncurses-5.7.orig/form/fld_def.c ncurses-5.7/form/fld_def.c
 --- ncurses-5.7.orig/form/fld_def.c     2007-10-13 12:29:58.000000000 -0700
-+++ ncurses-5.7/form/fld_def.c  2009-07-19 15:02:23.000000000 -0700
++++ ncurses-5.7/form/fld_def.c  2009-09-12 08:51:19.000000000 -0700
 @@ -32,7 +32,7 @@
  
@@ -14020 +14034 @@
 diff -Naur ncurses-5.7.orig/form/fld_newftyp.c ncurses-5.7/form/fld_newftyp.c
 --- ncurses-5.7.orig/form/fld_newftyp.c 2007-10-13 12:30:55.000000000 -0700
-+++ ncurses-5.7/form/fld_newftyp.c      2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/form/fld_newftyp.c      2009-09-12 08:51:28.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -14051 +14065 @@
 diff -Naur ncurses-5.7.orig/form/form.priv.h ncurses-5.7/form/form.priv.h
 --- ncurses-5.7.orig/form/form.priv.h   2008-09-08 13:29:05.000000000 -0700
-+++ ncurses-5.7/form/form.priv.h        2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/form/form.priv.h        2009-09-12 08:51:28.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -14116 +14130 @@
 diff -Naur ncurses-5.7.orig/form/frm_driver.c ncurses-5.7/form/frm_driver.c
 --- ncurses-5.7.orig/form/frm_driver.c  2008-10-18 09:25:00.000000000 -0700
-+++ ncurses-5.7/form/frm_driver.c       2009-07-19 15:02:00.000000000 -0700
++++ ncurses-5.7/form/frm_driver.c       2009-09-12 08:52:07.000000000 -0700
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2008,2009 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            *
 @@ -32,7 +32,7 @@
  
@@ -14122 +14143 @@
  
 -MODULE_ID("$Id: frm_driver.c,v 1.88 2008/10/18 16:25:00 tom Exp $")
-+MODULE_ID("$Id: frm_driver.c,v 1.89 2008/12/06 23:08:12 tom Exp $")
++MODULE_ID("$Id: frm_driver.c,v 1.90 2009/08/29 19:02:25 tom Exp $")
  
  /*----------------------------------------------------------------------------
    This is the core module of the form library. It contains the majority
-@@ -4366,6 +4366,7 @@
+@@ -188,7 +188,7 @@
+ /* Macro to set the attributes for a fields window */
+ #define Set_Field_Window_Attributes(field,win) \
+ (  wbkgdset((win),(chtype)((field)->pad | (field)->back)), \
+-   wattrset((win),(field)->fore) )
++   (void) wattrset((win),(field)->fore) )
+ 
+ /* Logic to decide whether or not a field really appears on the form */
+ #define Field_Really_Appears(field)         \
+@@ -1073,9 +1073,13 @@
+   else
+     {
+       if (field->opts & O_VISIBLE)
+-       Set_Field_Window_Attributes(field, win);
++       {
++         Set_Field_Window_Attributes(field, win);
++       }
+       else
+-       wattrset(win, WINDOW_ATTRS(fwin));
++       {
++         (void)wattrset(win, WINDOW_ATTRS(fwin));
++       }
+       werase(win);
+     }
+ 
+@@ -4366,6 +4370,7 @@
        delwin(field->working);
        field->working = newpad(field->drows, field->dcols);
@@ -14136 +14182 @@
 diff -Naur ncurses-5.7.orig/form/frm_sub.c ncurses-5.7/form/frm_sub.c
 --- ncurses-5.7.orig/form/frm_sub.c     2004-12-11 14:13:39.000000000 -0800
-+++ ncurses-5.7/form/frm_sub.c  2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/form/frm_sub.c  2009-09-12 08:51:28.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -14183 +14229 @@
 diff -Naur ncurses-5.7.orig/form/frm_win.c ncurses-5.7/form/frm_win.c
 --- ncurses-5.7.orig/form/frm_win.c     2004-12-11 14:15:27.000000000 -0800
-+++ ncurses-5.7/form/frm_win.c  2009-07-19 15:03:53.000000000 -0700
++++ ncurses-5.7/form/frm_win.c  2009-09-12 08:51:30.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -14244 +14290 @@
 diff -Naur ncurses-5.7.orig/form/fty_generic.c ncurses-5.7/form/fty_generic.c
 --- ncurses-5.7.orig/form/fty_generic.c 1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/form/fty_generic.c      2009-07-19 15:04:11.000000000 -0700
++++ ncurses-5.7/form/fty_generic.c      2009-09-12 08:51:49.000000000 -0700
 @@ -0,0 +1,287 @@
 +/****************************************************************************
@@ -14535 +14581 @@
 diff -Naur ncurses-5.7.orig/form/Makefile.in ncurses-5.7/form/Makefile.in
 --- ncurses-5.7.orig/form/Makefile.in   2007-04-28 07:56:11.000000000 -0700
-+++ ncurses-5.7/form/Makefile.in        2009-07-19 15:03:48.000000000 -0700
++++ ncurses-5.7/form/Makefile.in        2009-09-12 08:51:25.000000000 -0700
 @@ -1,6 +1,6 @@
 -# $Id: Makefile.in,v 1.47 2007/04/28 14:56:11 tom Exp $
@@ -14564 +14610 @@
 diff -Naur ncurses-5.7.orig/include/capdefaults.c ncurses-5.7/include/capdefaults.c
 --- ncurses-5.7.orig/include/capdefaults.c      2008-08-04 05:33:42.000000000 -0700
-+++ ncurses-5.7/include/capdefaults.c   2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/include/capdefaults.c   2009-09-12 08:51:17.000000000 -0700
 @@ -32,7 +32,7 @@
   *     and: Thomas E. Dickey                        1996-on                 *
@@ -14590 +14636 @@
 diff -Naur ncurses-5.7.orig/include/curses.h.in ncurses-5.7/include/curses.h.in
 --- ncurses-5.7.orig/include/curses.h.in        2008-08-30 13:11:29.000000000 -0700
-+++ ncurses-5.7/include/curses.h.in     2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/include/curses.h.in     2009-09-12 08:52:10.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -14603 +14649 @@
  
 -/* $Id: curses.h.in,v 1.187 2008/08/30 20:11:29 tom Exp $ */
-+/* $Id: curses.h.in,v 1.204 2009/07/18 16:02:07 tom Exp $ */
++/* $Id: curses.h.in,v 1.206 2009/09/06 15:55:10 tom Exp $ */
  
  #ifndef __NCURSES_H
@@ -14729 +14775 @@
  extern NCURSES_EXPORT(int) keyok (int, bool);
  extern NCURSES_EXPORT(int) resize_term (int, int);
-@@ -856,23 +869,133 @@
+@@ -856,23 +869,135 @@
   * These extensions provide access to information stored in the WINDOW even
   * when NCURSES_OPAQUE is set:
@@ -14754 +14800 @@
 +extern NCURSES_EXPORT(bool) is_nodelay (const WINDOW *);       /* @GENERATED_EXT_FUNCS@ */
 +extern NCURSES_EXPORT(bool) is_notimeout (const WINDOW *);     /* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(bool) is_pad (const WINDOW *);           /* @GENERATED_EXT_FUNCS@ */
 +extern NCURSES_EXPORT(bool) is_scrollok (const WINDOW *);      /* @GENERATED_EXT_FUNCS@ */
++extern NCURSES_EXPORT(bool) is_subwin (const WINDOW *);                /* @GENERATED_EXT_FUNCS@ */
 +extern NCURSES_EXPORT(bool) is_syncok (const WINDOW *);                /* @GENERATED_EXT_FUNCS@ */
 +extern NCURSES_EXPORT(int) wgetscrreg (const WINDOW *, int *, int *); /* @GENERATED_EXT_FUNCS@ */
@@ -14875 +14923 @@
  
  #define NCURSES_ATTR_SHIFT       8
-@@ -971,9 +1094,9 @@
+@@ -971,9 +1096,11 @@
  #if !NCURSES_OPAQUE
  #if defined(_XOPEN_SOURCE_EXTENDED) && @NCURSES_EXT_COLORS@
  #define wattrset(win,at)       ((win)->_color = PAIR_NUMBER(at), \
 -                                (win)->_attrs = (at))
-+                                 NCURSES_CAST(int, (win)->_attrs = (at)))
++                                 (win)->_attrs = (at), \
++                                 NCURSES_CAST(int, (win)->_attrs))
  #else
 -#define wattrset(win,at)       ((win)->_attrs = (at))
-+#define wattrset(win,at)        NCURSES_CAST(int, (win)->_attrs = (at))
++#define wattrset(win,at)        ((win)->_attrs = (at), \
++                                NCURSES_CAST(int, (win)->_attrs))
  #endif
  #endif /* NCURSES_OPAQUE */
  
-@@ -1173,7 +1296,7 @@
+@@ -1148,16 +1275,18 @@
+  */
+ #if @NCURSES_EXT_FUNCS@
+ #if !NCURSES_OPAQUE
+-#define is_cleared(win)                ((win)->_clear)
+-#define is_idcok(win)          ((win)->_idcok)
+-#define is_idlok(win)          ((win)->_idlok)
+-#define is_immedok(win)                ((win)->_immed)
+-#define is_keypad(win)         ((win)->_use_keypad)
+-#define is_leaveok(win)                ((win)->_leaveok)
+-#define is_nodelay(win)                ((win)->_delay == 0)
+-#define is_notimeout(win)      ((win)->_notimeout)
+-#define is_scrollok(win)       ((win)->_scroll)
+-#define is_syncok(win)         ((win)->_sync)
++#define is_cleared(win)                ((win) ? (win)->_clear : FALSE)
++#define is_idcok(win)          ((win) ? (win)->_idcok : FALSE)
++#define is_idlok(win)          ((win) ? (win)->_idlok : FALSE)
++#define is_immedok(win)                ((win) ? (win)->_immed : FALSE)
++#define is_keypad(win)         ((win) ? (win)->_use_keypad : FALSE)
++#define is_leaveok(win)                ((win) ? (win)->_leaveok : FALSE)
++#define is_nodelay(win)                ((win) ? ((win)->_delay == 0) : FALSE)
++#define is_notimeout(win)      ((win) ? (win)->_notimeout : FALSE)
++#define is_pad(win)            ((win) ? ((win)->_flags & _ISPAD) != 0 : FALSE)
++#define is_scrollok(win)       ((win) ? (win)->_scroll : FALSE)
++#define is_subwin(win)         ((win) ? ((win)->_flags & _SUBWIN) != 0 : FALSE)
++#define is_syncok(win)         ((win) ? (win)->_sync : FALSE)
+ #define wgetparent(win)                ((win) ? (win)->_parent : 0)
+ #define wgetscrreg(win,t,b)    ((win) ? (*(t) = (win)->_regtop, *(b) = (win)->_regbottom, OK) : ERR)
+ #endif
+@@ -1173,7 +1302,7 @@
   *        It gives the ESC expire time in milliseconds.
   *     b. ttytype is needed for backward compatibility
@@ -14898 +14977 @@
 diff -Naur ncurses-5.7.orig/include/curses.tail ncurses-5.7/include/curses.tail
 --- ncurses-5.7.orig/include/curses.tail        2008-07-05 13:20:38.000000000 -0700
-+++ ncurses-5.7/include/curses.tail     2009-07-19 15:04:03.000000000 -0700
++++ ncurses-5.7/include/curses.tail     2009-09-12 08:51:40.000000000 -0700
 @@ -1,4 +1,4 @@
 -/* $Id: curses.tail,v 1.16 2008/07/05 20:20:38 tom Exp $ */
@@ -14957 +15036 @@
 diff -Naur ncurses-5.7.orig/include/curses.wide ncurses-5.7/include/curses.wide
 --- ncurses-5.7.orig/include/curses.wide        2007-03-10 09:52:23.000000000 -0800
-+++ ncurses-5.7/include/curses.wide     2009-07-19 15:03:59.000000000 -0700
++++ ncurses-5.7/include/curses.wide     2009-09-12 08:51:37.000000000 -0700
 @@ -1,9 +1,11 @@
 -/* $Id: curses.wide,v 1.34 2007/03/10 17:52:23 tom Exp $ */
@@ -14995 +15074 @@
  
  /*
+diff -Naur ncurses-5.7.orig/include/headers ncurses-5.7/include/headers
+--- ncurses-5.7.orig/include/headers    2007-01-20 11:57:04.000000000 -0800
++++ ncurses-5.7/include/headers 2009-09-12 08:52:09.000000000 -0700
+@@ -1,6 +1,6 @@
+-# $Id: headers,v 1.9 2007/01/20 19:57:04 Miroslav.Lichvar Exp $
++# $Id: headers,v 1.10 2009/09/05 17:46:30 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2007,2009 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"), #
+@@ -33,7 +33,7 @@
+ curses.h
+ unctrl.h
+ termcap.h
+-$(srcdir)/ncurses_dll.h
++ncurses_dll.h
+ @ ticlib
+ $(srcdir)/tic.h
+ $(srcdir)/term_entry.h
 diff -Naur ncurses-5.7.orig/include/Makefile.in ncurses-5.7/include/Makefile.in
 --- ncurses-5.7.orig/include/Makefile.in        2001-12-08 10:50:06.000000000 -0800
-+++ ncurses-5.7/include/Makefile.in     2009-07-19 15:04:09.000000000 -0700
-@@ -1,4 +1,4 @@
++++ ncurses-5.7/include/Makefile.in     2009-09-12 08:52:04.000000000 -0700
+@@ -1,6 +1,6 @@
 -# $Id: Makefile.in,v 1.35 2001/12/08 18:50:06 tom Exp $
-+# $Id: Makefile.in,v 1.36 2009/06/13 21:42:45 tom Exp $
++# $Id: Makefile.in,v 1.37 2009/08/10 20:50:04 tom Exp $
  ##############################################################################
- # Copyright (c) 1998,2000,2001 Free Software Foundation, Inc.                #
+-# Copyright (c) 1998,2000,2001 Free Software Foundation, Inc.                #
++# Copyright (c) 1998,2001,2009 Free Software Foundation, Inc.                #
  #                                                                            #
-@@ -72,6 +72,7 @@
-        curses.h \
-        hashsize.h \
-        ncurses_def.h \
+ # Permission is hereby granted, free of charge, to any person obtaining a    #
+ # copy of this software and associated documentation files (the "Software"), #
+@@ -64,6 +64,7 @@
+ CONFIG_SRC = \
+        MKterm.h.awk \
+        curses.head \
 +       ncurses_dll.h \
-        parametrized.h \
-        term.h
+        termcap.h \
+        unctrl.h
  
 diff -Naur ncurses-5.7.orig/include/MKterm.h.awk.in ncurses-5.7/include/MKterm.h.awk.in
 --- ncurses-5.7.orig/include/MKterm.h.awk.in    2008-05-24 16:13:59.000000000 -0700
-+++ ncurses-5.7/include/MKterm.h.awk.in 2009-07-19 15:03:59.000000000 -0700
++++ ncurses-5.7/include/MKterm.h.awk.in 2009-09-12 08:51:37.000000000 -0700
 @@ -1,7 +1,7 @@
  # vile:awkmode
@@ -15125 +15228 @@
 diff -Naur ncurses-5.7.orig/include/nc_alloc.h ncurses-5.7/include/nc_alloc.h
 --- ncurses-5.7.orig/include/nc_alloc.h 2008-09-27 15:30:33.000000000 -0700
-+++ ncurses-5.7/include/nc_alloc.h      2009-07-19 15:03:53.000000000 -0700
++++ ncurses-5.7/include/nc_alloc.h      2009-09-12 08:51:30.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -15161 +15264 @@
 diff -Naur ncurses-5.7.orig/include/nc_mingw.h ncurses-5.7/include/nc_mingw.h
 --- ncurses-5.7.orig/include/nc_mingw.h 1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/include/nc_mingw.h      2009-07-19 15:04:11.000000000 -0700
++++ ncurses-5.7/include/nc_mingw.h      2009-09-12 08:51:49.000000000 -0700
 @@ -0,0 +1,59 @@
 +/****************************************************************************
@@ -15224 +15327 @@
 diff -Naur ncurses-5.7.orig/include/nc_panel.h ncurses-5.7/include/nc_panel.h
 --- ncurses-5.7.orig/include/nc_panel.h 2008-08-04 11:26:46.000000000 -0700
-+++ ncurses-5.7/include/nc_panel.h      2009-07-19 15:04:13.000000000 -0700
++++ ncurses-5.7/include/nc_panel.h      2009-09-12 08:51:50.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -15290 +15393 @@
 diff -Naur ncurses-5.7.orig/include/ncurses_defs ncurses-5.7/include/ncurses_defs
 --- ncurses-5.7.orig/include/ncurses_defs       2008-09-06 08:57:41.000000000 -0700
-+++ ncurses-5.7/include/ncurses_defs    2009-07-19 15:03:58.000000000 -0700
++++ ncurses-5.7/include/ncurses_defs    2009-09-12 08:51:35.000000000 -0700
 @@ -1,4 +1,4 @@
 -# $Id: ncurses_defs,v 1.40 2008/09/06 15:57:41 tom Exp $
@@ -15307 +15410 @@
 diff -Naur ncurses-5.7.orig/include/ncurses_dll.h ncurses-5.7/include/ncurses_dll.h
 --- ncurses-5.7.orig/include/ncurses_dll.h      2007-03-10 11:21:49.000000000 -0800
-+++ ncurses-5.7/include/ncurses_dll.h   2009-07-19 15:03:53.000000000 -0700
++++ ncurses-5.7/include/ncurses_dll.h   2009-09-12 08:51:30.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -15347 +15450 @@
 diff -Naur ncurses-5.7.orig/include/ncurses_dll.h.in ncurses-5.7/include/ncurses_dll.h.in
 --- ncurses-5.7.orig/include/ncurses_dll.h.in   1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/include/ncurses_dll.h.in        2009-07-19 15:04:09.000000000 -0700
++++ ncurses-5.7/include/ncurses_dll.h.in        2009-09-12 08:51:47.000000000 -0700
 @@ -0,0 +1,86 @@
 +/****************************************************************************
@@ -15437 +15540 @@
 diff -Naur ncurses-5.7.orig/include/ncurses_mingw.h ncurses-5.7/include/ncurses_mingw.h
 --- ncurses-5.7.orig/include/ncurses_mingw.h    1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/include/ncurses_mingw.h 2009-07-19 15:04:11.000000000 -0700
++++ ncurses-5.7/include/ncurses_mingw.h 2009-09-12 08:51:49.000000000 -0700
 @@ -0,0 +1,164 @@
 +/****************************************************************************
@@ -15605 +15708 @@
 diff -Naur ncurses-5.7.orig/include/term_entry.h ncurses-5.7/include/term_entry.h
 --- ncurses-5.7.orig/include/term_entry.h       2008-08-16 09:16:03.000000000 -0700
-+++ ncurses-5.7/include/term_entry.h    2009-07-19 15:04:15.000000000 -0700
++++ ncurses-5.7/include/term_entry.h    2009-09-12 08:51:52.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -15644 +15747 @@
 diff -Naur ncurses-5.7.orig/include/tic.h ncurses-5.7/include/tic.h
 --- ncurses-5.7.orig/include/tic.h      2007-08-11 09:12:43.000000000 -0700
-+++ ncurses-5.7/include/tic.h   2009-07-19 15:04:15.000000000 -0700
++++ ncurses-5.7/include/tic.h   2009-09-12 08:52:02.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -15657 +15760 @@
  /*
 - * $Id: tic.h,v 1.62 2007/08/11 16:12:43 tom Exp $
-+ * $Id: tic.h,v 1.63 2009/07/11 18:11:15 tom Exp $
++ * $Id: tic.h,v 1.65 2009/08/08 17:52:46 tom Exp $
   *     tic.h - Global variables and structures for the terminfo
   *                     compiler.
   */
-@@ -246,7 +246,7 @@
+@@ -183,6 +183,8 @@
+ 
+ #endif
+ 
++typedef short HashValue;
++
+        /*
+         * The file comp_captab.c contains an array of these structures, one
+         * per possible capability.  These are indexed by a hash table array of
+@@ -193,10 +195,21 @@
+ {
+        const char *nte_name;   /* name to hash on */
+        int     nte_type;       /* BOOLEAN, NUMBER or STRING */
+-       short   nte_index;      /* index of associated variable in its array */
+-       short   nte_link;       /* index in table of next hash, or -1 */
++       HashValue nte_index;    /* index of associated variable in its array */
++       HashValue nte_link;     /* index in table of next hash, or -1 */
+ };
+ 
++       /*
++        * Use this structure to hide differences between terminfo and termcap
++        * tables.
++        */
++typedef struct {
++       unsigned table_size;
++       const HashValue *table_data;
++       HashValue (*hash_of)(const char *);
++       int (*compare_names)(const char *, const char *);
++} HashData;
++
+ struct alias
+ {
+        const char      *from;
+@@ -205,7 +218,8 @@
+ };
+ 
+ extern NCURSES_EXPORT(const struct name_table_entry *) _nc_get_table (bool);
+-extern NCURSES_EXPORT(const short *) _nc_get_hash_table (bool);
++extern NCURSES_EXPORT(const HashData *) _nc_get_hash_info (bool);
++extern NCURSES_EXPORT(const HashValue *) _nc_get_hash_table (bool);
+ extern NCURSES_EXPORT(const struct alias *) _nc_get_alias_table (bool);
+ 
+ #define NOTFOUND       ((struct name_table_entry *) 0)
+@@ -244,9 +258,9 @@
+ 
+ /* comp_hash.c: name lookup */
  extern NCURSES_EXPORT(struct name_table_entry const *) _nc_find_entry
-        (const char *, const short *);
+-       (const char *, const short *);
++       (const char *, const HashValue *);
  extern NCURSES_EXPORT(struct name_table_entry const *) _nc_find_type_entry
 -       (const char *, int, const struct name_table_entry *);
@@ -15672 +15821 @@
 diff -Naur ncurses-5.7.orig/include/unctrl.h.in ncurses-5.7/include/unctrl.h.in
 --- ncurses-5.7.orig/include/unctrl.h.in        2001-03-24 13:53:25.000000000 -0800
-+++ ncurses-5.7/include/unctrl.h.in     2009-07-19 15:03:53.000000000 -0700
++++ ncurses-5.7/include/unctrl.h.in     2009-09-12 08:51:30.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -15702 +15851 @@
 diff -Naur ncurses-5.7.orig/INSTALL ncurses-5.7/INSTALL
 --- ncurses-5.7.orig/INSTALL    2008-11-02 13:13:51.000000000 -0800
-+++ ncurses-5.7/INSTALL 2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/INSTALL 2009-09-12 08:51:59.000000000 -0700
 @@ -1,5 +1,5 @@
  -------------------------------------------------------------------------------
@@ -15715 +15864 @@
  -------------------------------------------------------------------------------
 --- $Id: INSTALL,v 1.135 2008/11/02 21:13:51 tom Exp $
-+-- $Id: INSTALL,v 1.139 2009/07/18 20:50:08 tom Exp $
++-- $Id: INSTALL,v 1.140 2009/08/01 19:32:04 tom Exp $
  ---------------------------------------------------------------------
               How to install Ncurses/Terminfo on your system
@@ -15780 +15929 @@
         Tell the configure script to suppress the build of ncurses' application
         programs (e.g., tic).  The test applications will still be built if you
+@@ -1584,7 +1610,8 @@
+        tree is accessible (that is, in single-user mode or at OS installation
+        time) the ncurses library can be compiled to include an array of
+        pre-fetched fallback entries.  This must be done on a machine which
+-       has ncurses' infocmp and terminfo database installed.
++       has ncurses' infocmp and terminfo database installed (as well as
++       ncurses' tic and infocmp programs).
+ 
+        These entries are checked by setupterm() only when the conventional
+        fetches from the terminfo tree and the termcap fallback (if configured)
+@@ -1735,6 +1762,10 @@
+        option), ncurses uses the development platform's tic to do the
+        "make install.data" portion.
+ 
++       The system's tic program is used to install the terminal database,
++       even for cross-compiles.  For best results, the tic program should
++       be from the most current version of ncurses.
++
+ BUGS:
+        Send any feedback to the ncurses mailing list at
+        bug-ncurses@gnu.org. To subscribe send mail to
 diff -Naur ncurses-5.7.orig/Makefile.in ncurses-5.7/Makefile.in
 --- ncurses-5.7.orig/Makefile.in        2005-01-29 11:30:06.000000000 -0800
-+++ ncurses-5.7/Makefile.in     2009-07-19 15:04:11.000000000 -0700
++++ ncurses-5.7/Makefile.in     2009-09-12 08:51:49.000000000 -0700
 @@ -1,4 +1,4 @@
 -# $Id: Makefile.in,v 1.24 2005/01/29 19:30:06 tom Exp $
@@ -15806 +15976 @@
 diff -Naur ncurses-5.7.orig/man/curs_color.3x ncurses-5.7/man/curs_color.3x
 --- ncurses-5.7.orig/man/curs_color.3x  2005-12-17 16:00:37.000000000 -0800
-+++ ncurses-5.7/man/curs_color.3x       2009-07-19 15:02:16.000000000 -0700
++++ ncurses-5.7/man/curs_color.3x       2009-09-12 08:51:11.000000000 -0700
 @@ -1,5 +1,5 @@
  .\"***************************************************************************
@@ -15837 +16007 @@
 diff -Naur ncurses-5.7.orig/man/curs_getcchar.3x ncurses-5.7/man/curs_getcchar.3x
 --- ncurses-5.7.orig/man/curs_getcchar.3x       2008-05-17 12:37:05.000000000 -0700
-+++ ncurses-5.7/man/curs_getcchar.3x    2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/man/curs_getcchar.3x    2009-09-12 08:51:54.000000000 -0700
 @@ -1,5 +1,5 @@
  .\"***************************************************************************
@@ -15866 +16036 @@
 diff -Naur ncurses-5.7.orig/man/curs_mouse.3x ncurses-5.7/man/curs_mouse.3x
 --- ncurses-5.7.orig/man/curs_mouse.3x  2006-12-30 15:43:34.000000000 -0800
-+++ ncurses-5.7/man/curs_mouse.3x       2009-07-19 15:01:57.000000000 -0700
++++ ncurses-5.7/man/curs_mouse.3x       2009-09-12 08:52:07.000000000 -0700
 @@ -1,6 +1,6 @@
  '\" t
  .\"***************************************************************************
 -.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
++.\" Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
  .\"                                                                          *
  .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -15880 +16050 @@
  .\"
 -.\" $Id: curs_mouse.3x,v 1.30 2006/12/30 23:43:34 tom Exp $
-+.\" $Id: curs_mouse.3x,v 1.31 2008/11/23 00:09:53 tom Exp $
++.\" $Id: curs_mouse.3x,v 1.32 2009/08/29 18:11:58 tom Exp $
  .TH curs_mouse 3X ""
  .na
@@ -15910 +16080 @@
  cause an error beep when cooked mode is being simulated in a window by a
  function such as \fBgetstr\fR that expects a linefeed for input-loop
+@@ -256,7 +262,7 @@
+ xterm's built-in mouse-tracking API or
+ platform-specific drivers including
+ .RS
+-Alessandro Rubini's gpm server.
++Alessandro Rubini's gpm server
+ .br
+ FreeBSD sysmouse
+ .br
+diff -Naur ncurses-5.7.orig/man/curs_opaque.3x ncurses-5.7/man/curs_opaque.3x
+--- ncurses-5.7.orig/man/curs_opaque.3x 2007-09-08 11:49:13.000000000 -0700
++++ ncurses-5.7/man/curs_opaque.3x      2009-09-12 08:52:10.000000000 -0700
+@@ -1,5 +1,5 @@
+ .\"***************************************************************************
+-.\" Copyright (c) 2007 Free Software Foundation, Inc.                        *
++.\" Copyright (c) 2007,2009 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: curs_opaque.3x,v 1.6 2007/09/08 18:49:13 tom Exp $
++.\" $Id: curs_opaque.3x,v 1.7 2009/09/06 16:01:55 tom Exp $
+ .TH curs_opaque 3X ""
+ .na
+ .hy 0
+@@ -38,8 +38,10 @@
+ \fBis_keypad\fR,
+ \fBis_leaveok\fR,
+ \fBis_nodelay\fR,
+-\fBis_timeout\fR,
++\fBis_notimeout\fR,
++\fBis_pad\fR,
+ \fBis_scrollok\fR,
++\fBis_subwin\fR,
+ \fBis_syncok\fR - \fBcurses\fR window properties
+ .ad
+ .hy
+@@ -62,8 +64,12 @@
+ .br
+ \fBbool is_notimeout(const WINDOW *win);\fR
+ .br
++\fBbool is_pad(const WINDOW *win);\fR
++.br
+ \fBbool is_scrollok(const WINDOW *win);\fR
+ .br
++\fBbool is_subwin(const WINDOW *win);\fR
++.br
+ \fBbool is_syncok(const WINDOW *win);\fR
+ .br
+ \fBWINDOW * wgetparent(const WINDOW *win);\fR
+@@ -99,9 +105,17 @@
+ \fBis_notimeout\fR
+ returns the value set in \fBnotimeout\fR
+ .TP 5
++\fBis_pad\fR
++returns TRUE if the window is a pad
++i.e., created by \fBnewpad\fP
++.TP 5
+ \fBis_scrollok\fR
+ returns the value set in \fBscrollok\fR
+ .TP 5
++\fBis_subwin\fR
++returns TRUE if the window is a subwindow,
++i.e., created by \fBsubwin\fP or \fBderwin\fP
++.TP 5
+ \fBis_syncok\fR
+ returns the value set in \fBsyncok\fR
+ .TP 5
 diff -Naur ncurses-5.7.orig/man/form_field_validation.3x ncurses-5.7/man/form_field_validation.3x
 --- ncurses-5.7.orig/man/form_field_validation.3x       2006-12-24 08:08:08.000000000 -0800
-+++ ncurses-5.7/man/form_field_validation.3x    2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/man/form_field_validation.3x    2009-09-12 08:51:28.000000000 -0700
 @@ -26,7 +26,7 @@
  .\" authorization.                                                           *
@@ -15935 +16176 @@
 diff -Naur ncurses-5.7.orig/man/keybound.3x ncurses-5.7/man/keybound.3x
 --- ncurses-5.7.orig/man/keybound.3x    2006-02-25 13:47:06.000000000 -0800
-+++ ncurses-5.7/man/keybound.3x 2009-07-19 15:02:02.000000000 -0700
++++ ncurses-5.7/man/keybound.3x 2009-09-12 08:50:57.000000000 -0700
 @@ -1,5 +1,5 @@
  .\"***************************************************************************
@@ -15954 +16195 @@
  \fBkeybound\fP \- return definition of keycode
  .SH SYNOPSIS
+diff -Naur ncurses-5.7.orig/man/man_db.renames ncurses-5.7/man/man_db.renames
+--- ncurses-5.7.orig/man/man_db.renames 2008-10-25 16:24:03.000000000 -0700
++++ ncurses-5.7/man/man_db.renames      2009-09-12 08:52:01.000000000 -0700
+@@ -1,5 +1,5 @@
+ ##############################################################################
+-# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2008,2009 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"), #
+@@ -25,7 +25,7 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: man_db.renames,v 0.41 2008/10/25 23:24:03 tom Exp $
++# $Id: man_db.renames,v 0.43 2009/08/04 00:30:32 tom Exp $
+ # Manual-page renamings for the man_db program
+ #
+ # Files:
+@@ -152,6 +152,7 @@
+ resizeterm.3x                  resizeterm.3ncurses
+ scanf.3s                       scanf.3
+ system.3s                      system.3
++tabs.1                         tabs.1
+ term.5                         term.5
+ term.7                         term.7
+ terminfo.5                     terminfo.5
 diff -Naur ncurses-5.7.orig/man/tabs.1 ncurses-5.7/man/tabs.1
 --- ncurses-5.7.orig/man/tabs.1 1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/man/tabs.1      2009-07-19 15:01:56.000000000 -0700
++++ ncurses-5.7/man/tabs.1      2009-09-12 08:52:09.000000000 -0700
 @@ -0,0 +1,143 @@
 +.\"***************************************************************************
-+.\" Copyright (c) 2008 Free Software Foundation, Inc.                        *
++.\" Copyright (c) 2008,2009 Free Software Foundation, Inc.                   *
 +.\"                                                                          *
 +.\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -15986 +16254 @@
 +.\"***************************************************************************
 +.\"
-+.\" $Id: tabs.1,v 1.2 2008/11/15 23:03:45 tom Exp $
-+.TH @TABS@ 1M ""
++.\" $Id: tabs.1,v 1.3 2009/09/05 17:06:08 tom Exp $
++.TH @TABS@ 1 ""
 +.ds n 5
 +.SH NAME
@@ -16103 +16371 @@
 diff -Naur ncurses-5.7.orig/man/tset.1 ncurses-5.7/man/tset.1
 --- ncurses-5.7.orig/man/tset.1 2006-12-24 07:00:30.000000000 -0800
-+++ ncurses-5.7/man/tset.1      2009-07-19 15:01:56.000000000 -0700
++++ ncurses-5.7/man/tset.1      2009-09-12 08:50:51.000000000 -0700
 @@ -1,5 +1,5 @@
  .\"***************************************************************************
@@ -16124 +16392 @@
 diff -Naur ncurses-5.7.orig/MANIFEST ncurses-5.7/MANIFEST
 --- ncurses-5.7.orig/MANIFEST   2008-10-25 16:47:24.000000000 -0700
-+++ ncurses-5.7/MANIFEST        2009-07-19 15:04:15.000000000 -0700
++++ ncurses-5.7/MANIFEST        2009-09-12 08:52:02.000000000 -0700
 @@ -172,6 +172,7 @@
  ./Makefile.os2
@@ -16196 +16464 @@
  ./ncurses/modules
  ./ncurses/tinfo/MKcaptab.awk
-@@ -870,6 +879,7 @@
+@@ -863,6 +872,7 @@
+ ./ncurses/tinfo/lib_tparm.c
+ ./ncurses/tinfo/lib_tputs.c
+ ./ncurses/tinfo/lib_ttyflags.c
++./ncurses/tinfo/make_hash.c
+ ./ncurses/tinfo/make_keys.c
+ ./ncurses/tinfo/name_match.c
+ ./ncurses/tinfo/parse_entry.c
+@@ -870,6 +880,7 @@
  ./ncurses/tinfo/read_termcap.c
  ./ncurses/tinfo/setbuf.c
@@ -16204 +16480 @@
  ./ncurses/tinfo/use_screen.c
  ./ncurses/tinfo/write_entry.c
-@@ -915,6 +925,8 @@
+@@ -915,6 +926,8 @@
  ./ncurses/widechar/lib_vline_set.c
  ./ncurses/widechar/lib_wacs.c
@@ -16213 +16489 @@
  ./panel/headers
  ./panel/llib-lpanel
-@@ -947,9 +959,11 @@
+@@ -947,9 +960,11 @@
  ./progs/infocmp.c
  ./progs/modules
@@ -16225 +16501 @@
  ./tar-copy.sh
  ./test/Makefile.in
-@@ -963,6 +977,7 @@
+@@ -963,6 +978,7 @@
  ./test/cardfile.c
  ./test/cardfile.dat
@@ -16233 +16509 @@
  ./test/configure
  ./test/configure.in
-@@ -973,6 +988,7 @@
+@@ -973,6 +989,7 @@
  ./test/demo_menus.c
  ./test/demo_panels.c
@@ -16241 +16517 @@
  ./test/dots.c
  ./test/dots_mvcur.c
-@@ -990,6 +1006,7 @@
+@@ -990,6 +1007,7 @@
  ./test/inch_wide.c
  ./test/inchs.c
@@ -16251 +16527 @@
 diff -Naur ncurses-5.7.orig/menu/Makefile.in ncurses-5.7/menu/Makefile.in
 --- ncurses-5.7.orig/menu/Makefile.in   2007-04-28 07:56:11.000000000 -0700
-+++ ncurses-5.7/menu/Makefile.in        2009-07-19 15:03:48.000000000 -0700
++++ ncurses-5.7/menu/Makefile.in        2009-09-12 08:51:25.000000000 -0700
 @@ -1,6 +1,6 @@
 -# $Id: Makefile.in,v 1.48 2007/04/28 14:56:11 tom Exp $
@@ -16280 +16556 @@
 diff -Naur ncurses-5.7.orig/menu/m_attribs.c ncurses-5.7/menu/m_attribs.c
 --- ncurses-5.7.orig/menu/m_attribs.c   2004-12-11 15:29:12.000000000 -0800
-+++ ncurses-5.7/menu/m_attribs.c        2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/menu/m_attribs.c        2009-09-12 08:51:28.000000000 -0700
 @@ -37,7 +37,7 @@
  
@@ -16310 +16586 @@
 diff -Naur ncurses-5.7.orig/menu/m_cursor.c ncurses-5.7/menu/m_cursor.c
 --- ncurses-5.7.orig/menu/m_cursor.c    2005-10-22 16:03:32.000000000 -0700
-+++ ncurses-5.7/menu/m_cursor.c 2009-07-19 15:02:23.000000000 -0700
++++ ncurses-5.7/menu/m_cursor.c 2009-09-12 08:51:19.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -16338 +16614 @@
 diff -Naur ncurses-5.7.orig/menu/m_driver.c ncurses-5.7/menu/m_driver.c
 --- ncurses-5.7.orig/menu/m_driver.c    2008-08-03 15:08:22.000000000 -0700
-+++ ncurses-5.7/menu/m_driver.c 2009-07-19 15:02:23.000000000 -0700
++++ ncurses-5.7/menu/m_driver.c 2009-09-12 08:51:19.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -16366 +16642 @@
 diff -Naur ncurses-5.7.orig/menu/menu.h ncurses-5.7/menu/menu.h
 --- ncurses-5.7.orig/menu/menu.h        2007-02-24 09:32:13.000000000 -0800
-+++ ncurses-5.7/menu/menu.h     2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/menu/menu.h     2009-09-12 08:51:28.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -16396 +16672 @@
 diff -Naur ncurses-5.7.orig/menu/menu.priv.h ncurses-5.7/menu/menu.priv.h
 --- ncurses-5.7.orig/menu/menu.priv.h   2005-01-15 17:02:23.000000000 -0800
-+++ ncurses-5.7/menu/menu.priv.h        2009-07-19 15:02:23.000000000 -0700
++++ ncurses-5.7/menu/menu.priv.h        2009-09-12 08:51:19.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -16429 +16705 @@
 diff -Naur ncurses-5.7.orig/menu/m_global.c ncurses-5.7/menu/m_global.c
 --- ncurses-5.7.orig/menu/m_global.c    2005-12-31 13:51:52.000000000 -0800
-+++ ncurses-5.7/menu/m_global.c 2009-07-19 15:02:23.000000000 -0700
++++ ncurses-5.7/menu/m_global.c 2009-09-12 08:51:19.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -16470 +16746 @@
 diff -Naur ncurses-5.7.orig/menu/m_new.c ncurses-5.7/menu/m_new.c
 --- ncurses-5.7.orig/menu/m_new.c       2006-11-04 11:04:06.000000000 -0800
-+++ ncurses-5.7/menu/m_new.c    2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/menu/m_new.c    2009-09-12 08:51:28.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -16557 +16833 @@
 diff -Naur ncurses-5.7.orig/menu/m_pad.c ncurses-5.7/menu/m_pad.c
 --- ncurses-5.7.orig/menu/m_pad.c       2004-12-25 13:40:58.000000000 -0800
-+++ ncurses-5.7/menu/m_pad.c    2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/menu/m_pad.c    2009-09-12 08:51:28.000000000 -0700
 @@ -37,19 +37,19 @@
  
@@ -16583 +16859 @@
 diff -Naur ncurses-5.7.orig/menu/m_post.c ncurses-5.7/menu/m_post.c
 --- ncurses-5.7.orig/menu/m_post.c      2004-12-25 15:57:04.000000000 -0800
-+++ ncurses-5.7/menu/m_post.c   2009-07-19 15:02:23.000000000 -0700
++++ ncurses-5.7/menu/m_post.c   2009-09-12 08:51:19.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -16620 +16896 @@
 diff -Naur ncurses-5.7.orig/menu/m_sub.c ncurses-5.7/menu/m_sub.c
 --- ncurses-5.7.orig/menu/m_sub.c       2004-12-25 13:38:31.000000000 -0800
-+++ ncurses-5.7/menu/m_sub.c    2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/menu/m_sub.c    2009-09-12 08:51:28.000000000 -0700
 @@ -37,7 +37,7 @@
  
@@ -16666 +16942 @@
 diff -Naur ncurses-5.7.orig/menu/m_win.c ncurses-5.7/menu/m_win.c
 --- ncurses-5.7.orig/menu/m_win.c       2004-12-25 13:39:20.000000000 -0800
-+++ ncurses-5.7/menu/m_win.c    2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/menu/m_win.c    2009-09-12 08:51:28.000000000 -0700
 @@ -37,7 +37,7 @@
  
@@ -16721 +16997 @@
 diff -Naur ncurses-5.7.orig/misc/gen-pkgconfig.in ncurses-5.7/misc/gen-pkgconfig.in
 --- ncurses-5.7.orig/misc/gen-pkgconfig.in      1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/misc/gen-pkgconfig.in   2009-07-19 15:03:43.000000000 -0700
++++ ncurses-5.7/misc/gen-pkgconfig.in   2009-09-12 08:51:21.000000000 -0700
 @@ -0,0 +1,140 @@
 +#!@SHELL@
@@ -16865 +17141 @@
 diff -Naur ncurses-5.7.orig/misc/Makefile.in ncurses-5.7/misc/Makefile.in
 --- ncurses-5.7.orig/misc/Makefile.in   2007-03-31 08:54:17.000000000 -0700
-+++ ncurses-5.7/misc/Makefile.in        2009-07-19 15:02:18.000000000 -0700
++++ ncurses-5.7/misc/Makefile.in        2009-09-12 08:52:04.000000000 -0700
 @@ -1,6 +1,6 @@
 -# $Id: Makefile.in,v 1.43 2007/03/31 15:54:17 tom Exp $
-+# $Id: Makefile.in,v 1.51 2009/02/07 18:17:17 Miroslav.Lichvar Exp $
++# $Id: Makefile.in,v 1.52 2009/08/15 17:13:49 tom Exp $
  ##############################################################################
 -# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
@@ -16875 +17151 @@
  # Permission is hereby granted, free of charge, to any person obtaining a    #
  # copy of this software and associated documentation files (the "Software"), #
-@@ -66,15 +66,17 @@
+@@ -57,24 +57,23 @@
+ libdir         = @libdir@
+ datadir                = @datadir@
+ 
+-CC             = @CC@
+-HOSTCC         = @BUILD_CC@
+-
+ tabsetdir      = $(datadir)/tabset
+ ticdir         = @TERMINFO@
+ ticfile                = $(ticdir).db
  source         = @TERMINFO_SRC@
  
@@ -16895 +17180 @@
  install : install.data install.libs
  
-@@ -103,9 +105,17 @@
+@@ -91,8 +90,7 @@
+        datadir=${datadir} \
+        ticdir=${ticdir} \
+        source=terminfo.tmp \
+-       THIS_CC="$(CC)" \
+-       THAT_CC="$(HOSTCC)" \
++       cross_compiling=@cross_compiling@ \
+        $(SHELL) ./run_tic.sh
+        @cd $(srcdir)/tabset && \
+                $(SHELL) -c 'for i in * ; do \
+@@ -103,9 +101,17 @@
  
  NCURSES_CONFIG = ncurses@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config
@@ -16914 +17209 @@
         echo '** adjusting tabset paths'
         sed -f run_tic.sed $(source) >terminfo.tmp
-@@ -118,7 +128,8 @@
+@@ -118,7 +124,8 @@
  $(DESTDIR)$(bindir) \
  $(DESTDIR)$(libdir) \
@@ -16924 +17219 @@
  
  uninstall : uninstall.data uninstall.libs
-@@ -130,6 +141,7 @@
+@@ -130,6 +137,7 @@
  
  uninstall.libs :
@@ -16932 +17227 @@
  tags :
  
-@@ -138,11 +150,13 @@
+@@ -138,11 +146,13 @@
  mostlyclean :
         -rm -f terminfo.tmp
@@ -16948 +17243 @@
 diff -Naur ncurses-5.7.orig/misc/ncu-indent ncurses-5.7/misc/ncu-indent
 --- ncurses-5.7.orig/misc/ncu-indent    2008-08-03 08:46:44.000000000 -0700
-+++ ncurses-5.7/misc/ncu-indent 2009-07-19 15:02:23.000000000 -0700
++++ ncurses-5.7/misc/ncu-indent 2009-09-12 08:51:19.000000000 -0700
 @@ -26,7 +26,7 @@
  #* sale, use or other dealings in this Software without prior written       *
@@ -16997 +17292 @@
 diff -Naur ncurses-5.7.orig/misc/ncurses-config.in ncurses-5.7/misc/ncurses-config.in
 --- ncurses-5.7.orig/misc/ncurses-config.in     2007-03-17 13:02:19.000000000 -0700
-+++ ncurses-5.7/misc/ncurses-config.in  2009-07-19 15:03:43.000000000 -0700
++++ ncurses-5.7/misc/ncurses-config.in  2009-09-12 08:51:21.000000000 -0700
 @@ -1,7 +1,7 @@
  #!@SHELL@
@@ -17130 +17425 @@
    --mandir           echos the directory containing ${THIS} manpages
    --terminfo         echos the \$TERMINFO terminfo database path
+diff -Naur ncurses-5.7.orig/misc/run_tic.in ncurses-5.7/misc/run_tic.in
+--- ncurses-5.7.orig/misc/run_tic.in    2006-10-28 12:43:30.000000000 -0700
++++ ncurses-5.7/misc/run_tic.in 2009-09-12 08:52:04.000000000 -0700
+@@ -1,7 +1,7 @@
+ #!@SHELL@
+-# $Id: run_tic.in,v 1.23 2006/10/28 19:43:30 tom Exp $
++# $Id: run_tic.in,v 1.24 2009/08/15 17:19:36 tom Exp $
+ ##############################################################################
+-# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
++# Copyright (c) 1998-2006,2009 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"), #
+@@ -28,7 +28,7 @@
+ # authorization.                                                             #
+ ##############################################################################
+ #
+-# Author: Thomas E. Dickey 1996,2000
++# Author: Thomas E. Dickey 1996-on
+ #
+ # This script is used to install terminfo.src using tic.  We use a script
+ # because the path checking is too awkward to do in a makefile.
+@@ -52,8 +52,7 @@
+ : ${ticdir=@TERMINFO@}
+ : ${source=@TERMINFO_SRC@}
+ : ${LN_S="@LN_S@"}
+-: ${THAT_CC=cc}
+-: ${THIS_CC=cc}
++: ${cross_compiling=no}
+ : ${ext_funcs=@NCURSES_EXT_FUNCS@}
+ 
+ test -z "${DESTDIR}" && DESTDIR=
+@@ -61,10 +60,10 @@
+ # Allow tic to run either from the install-path, or from the build-directory.
+ # Do not do this if we appear to be cross-compiling.  In that case, we rely
+ # on the host's copy of tic to compile the terminfo database.
+-if test "$THAT_CC" = "$THIS_CC" ; then
++if test "x$cross_compiling" = "xno" ; then
+ case "$PATH" in
+-:*) PATH=../progs:../lib:${DESTDIR}$bindir$PATH ;;
+-*) PATH=../progs:../lib:${DESTDIR}$bindir:$PATH ;;
++@PATH_SEPARATOR@*) PATH=../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${DESTDIR}$bindir$PATH ;;
++*) PATH=../progs@PATH_SEPARATOR@../lib@PATH_SEPARATOR@${DESTDIR}$bindir@PATH_SEPARATOR@$PATH ;;
+ esac
+ export PATH
+ SHLIB="sh $srcdir/shlib"
 diff -Naur ncurses-5.7.orig/misc/terminfo.src ncurses-5.7/misc/terminfo.src
 --- ncurses-5.7.orig/misc/terminfo.src  2008-10-12 16:03:54.000000000 -0700
-+++ ncurses-5.7/misc/terminfo.src       2009-07-19 15:03:58.000000000 -0700
++++ ncurses-5.7/misc/terminfo.src       2009-09-12 08:51:35.000000000 -0700
 @@ -6,8 +6,8 @@
  # Report bugs and new terminal descriptions to
@@ -17432 +17773 @@
 diff -Naur ncurses-5.7.orig/mk-1st.awk ncurses-5.7/mk-1st.awk
 --- ncurses-5.7.orig/mk-1st.awk 2007-03-24 15:10:55.000000000 -0700
-+++ ncurses-5.7/mk-1st.awk      2009-07-19 15:03:48.000000000 -0700
++++ ncurses-5.7/mk-1st.awk      2009-09-12 08:51:25.000000000 -0700
 @@ -1,6 +1,6 @@
 -# $Id: mk-1st.awk,v 1.78 2007/03/24 22:10:55 tom Exp $
@@ -17477 +17818 @@
 diff -Naur ncurses-5.7.orig/mk-dlls.sh ncurses-5.7/mk-dlls.sh
 --- ncurses-5.7.orig/mk-dlls.sh 1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/mk-dlls.sh      2009-07-19 15:04:11.000000000 -0700
++++ ncurses-5.7/mk-dlls.sh      2009-09-12 08:51:49.000000000 -0700
 @@ -0,0 +1,93 @@
 +#!/bin/sh
@@ -17574 +17915 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/define_key.c ncurses-5.7/ncurses/base/define_key.c
 --- ncurses-5.7.orig/ncurses/base/define_key.c  2006-12-30 15:23:31.000000000 -0800
-+++ ncurses-5.7/ncurses/base/define_key.c       2009-07-19 15:03:59.000000000 -0700
++++ ncurses-5.7/ncurses/base/define_key.c       2009-09-12 08:51:37.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -17647 +17988 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/keybound.c ncurses-5.7/ncurses/base/keybound.c
 --- ncurses-5.7.orig/ncurses/base/keybound.c    2006-06-17 11:19:24.000000000 -0700
-+++ ncurses-5.7/ncurses/base/keybound.c 2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/base/keybound.c 2009-09-12 08:51:17.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -17698 +18039 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/key_defined.c ncurses-5.7/ncurses/base/key_defined.c
 --- ncurses-5.7.orig/ncurses/base/key_defined.c 2006-12-30 15:22:55.000000000 -0800
-+++ ncurses-5.7/ncurses/base/key_defined.c      2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/base/key_defined.c      2009-09-12 08:51:17.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -17744 +18085 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/keyok.c ncurses-5.7/ncurses/base/keyok.c
 --- ncurses-5.7.orig/ncurses/base/keyok.c       2006-12-30 08:22:33.000000000 -0800
-+++ ncurses-5.7/ncurses/base/keyok.c    2009-07-19 15:04:06.000000000 -0700
++++ ncurses-5.7/ncurses/base/keyok.c    2009-09-12 08:51:43.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -17828 +18169 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/legacy_coding.c ncurses-5.7/ncurses/base/legacy_coding.c
 --- ncurses-5.7.orig/ncurses/base/legacy_coding.c       2005-12-17 15:38:17.000000000 -0800
-+++ ncurses-5.7/ncurses/base/legacy_coding.c    2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/base/legacy_coding.c    2009-09-12 08:51:17.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -17877 +18218 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_addch.c ncurses-5.7/ncurses/base/lib_addch.c
 --- ncurses-5.7.orig/ncurses/base/lib_addch.c   2008-08-16 12:20:04.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_addch.c        2009-07-19 15:04:01.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_addch.c        2009-09-12 08:52:01.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -17890 +18231 @@
  
 -MODULE_ID("$Id: lib_addch.c,v 1.113 2008/08/16 19:20:04 tom Exp $")
-+MODULE_ID("$Id: lib_addch.c,v 1.119 2009/05/15 23:47:26 tom Exp $")
++MODULE_ID("$Id: lib_addch.c,v 1.121 2009/08/04 00:20:09 tom Exp $")
  
  static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
@@ -17901 +18242 @@
 +#define DeriveSP() SCREEN *sp = _nc_screen_of(win);
 +#else
-+#define DeriveSP() /*nothing*/
++#define DeriveSP()             /*nothing */
 +#endif
      if_WIDEC({
@@ -17910 +18251 @@
             if (len >= -1) {
 -               /* handle EILSEQ */
-+               attr_t attr = AttrOf(ch);
-+
-+               /* handle EILSEQ (i.e., when len >= -1) */
-                if (is8bits(CharOf(ch))) {
+-               if (is8bits(CharOf(ch))) {
 -                   const char *s = unctrl((chtype) CharOf(ch));
 -                   if (s[1] != 0) {
 -                       return waddstr(win, s);
++               attr_t attr = AttrOf(ch);
++
++               /* handle EILSEQ (i.e., when len >= -1) */
++               if (len == -1 && is8bits(CharOf(ch))) {
 +                   int rc = OK;
 +                   const char *s = NCURSES_SP_NAME(unctrl)
@@ -17983 +18325 @@
 -
 +#if USE_REENTRANT
-+       tabsize = sp->_TABSIZE;
++       tabsize = *ptrTabsize(sp);
 +#else
 +       tabsize = TABSIZE;
@@ -17993 +18335 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_beep.c ncurses-5.7/ncurses/base/lib_beep.c
 --- ncurses-5.7.orig/ncurses/base/lib_beep.c    2005-04-09 08:20:04.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_beep.c 2009-07-19 15:04:03.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_beep.c 2009-09-12 08:51:40.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -18059 +18401 @@
 +}
 +#endif
+diff -Naur ncurses-5.7.orig/ncurses/base/lib_bkgd.c ncurses-5.7/ncurses/base/lib_bkgd.c
+--- ncurses-5.7.orig/ncurses/base/lib_bkgd.c    2008-03-22 17:09:14.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_bkgd.c 2009-09-12 08:52:07.000000000 -0700
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2008,2009 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            *
+@@ -36,7 +36,7 @@
+ 
+ #include <curses.priv.h>
+ 
+-MODULE_ID("$Id: lib_bkgd.c,v 1.36 2008/03/23 00:09:14 tom Exp $")
++MODULE_ID("$Id: lib_bkgd.c,v 1.37 2009/08/29 19:02:25 tom Exp $")
+ 
+ /*
+  * Set the window's background information.
+@@ -126,8 +126,8 @@
+        NCURSES_CH_T old_bkgrnd;
+        wgetbkgrnd(win, &old_bkgrnd);
+ 
+-       wbkgrndset(win, CHREF(new_bkgd));
+-       wattrset(win, AttrOf(win->_nc_bkgd));
++       (void) wbkgrndset(win, CHREF(new_bkgd));
++       (void) wattrset(win, AttrOf(win->_nc_bkgd));
+ 
+        for (y = 0; y <= win->_maxy; y++) {
+            for (x = 0; x <= win->_maxx; x++) {
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_color.c ncurses-5.7/ncurses/base/lib_color.c
 --- ncurses-5.7.orig/ncurses/base/lib_color.c   2007-04-07 10:07:28.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_color.c        2009-07-19 15:04:06.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_color.c        2009-09-12 08:52:05.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -18077 +18449 @@
  
  /* lib_color.c
-@@ -42,7 +43,11 @@
- #include <term.h>
+@@ -38,12 +39,33 @@
+  */
+ 
+ #include <curses.priv.h>
+-
+-#include <term.h>
  #include <tic.h>
  
@@ -18086 +18462 @@
 +#endif
 +
-+MODULE_ID("$Id: lib_color.c,v 1.92 2009/06/06 20:26:16 tom Exp $")
- 
++MODULE_ID("$Id: lib_color.c,v 1.95 2009/08/22 19:04:36 tom Exp $")
++
++#ifdef USE_TERM_DRIVER
++#define CanChange      InfoOf(SP_PARM).canchange
++#define DefaultPalette InfoOf(SP_PARM).defaultPalette
++#define HasColor       InfoOf(SP_PARM).hascolor
++#define InitColor      InfoOf(SP_PARM).initcolor
++#define MaxColors      InfoOf(SP_PARM).maxcolors
++#define MaxPairs       InfoOf(SP_PARM).maxpairs
++#define UseHlsPalette  (DefaultPalette == _nc_hls_palette)
++#else
++#define CanChange      can_change
++#define DefaultPalette (hue_lightness_saturation ? hls_palette : cga_palette)
++#define HasColor       has_color
++#define InitColor      initialize_color
++#define MaxColors      max_colors
++#define MaxPairs       max_pairs
++#define UseHlsPalette  (hue_lightness_saturation)
++#endif
+ 
++#ifndef USE_TERM_DRIVER
  /*
   * These should be screen structure members.  They need to be globals for
-@@ -108,6 +113,13 @@
+  * historical reasons.  So we assign them in start_color() and also in
+@@ -64,6 +86,7 @@
+ NCURSES_EXPORT_VAR(int) COLOR_PAIRS = 0;
+ NCURSES_EXPORT_VAR(int) COLORS = 0;
+ #endif
++#endif /* !USE_TERM_DRIVER */
+ 
+ #define DATA(r,g,b) {r,g,b, 0,0,0, 0}
+ 
+@@ -71,7 +94,7 @@
+ 
+ #define MAX_PALETTE    8
+ 
+-#define OkColorHi(n)   (((n) < COLORS) && ((n) < max_colors))
++#define OkColorHi(n)   (((n) < COLORS) && ((n) < maxcolors))
+ #define InPalette(n)   ((n) >= 0 && (n) < MAX_PALETTE)
+ 
+ /*
+@@ -106,29 +129,43 @@
+     DATA(      300,    50,     100),           /* COLOR_CYAN */
+     DATA(      0,      50,     100),           /* COLOR_WHITE */
  };
++
++#ifdef USE_TERM_DRIVER
++NCURSES_EXPORT_VAR(const color_t*) _nc_cga_palette = cga_palette;
++NCURSES_EXPORT_VAR(const color_t*) _nc_hls_palette = hls_palette;
++#endif
++
  /* *INDENT-ON* */
  
@@ -18099 +18520 @@
 + */
 +#define ValidPair(pair) \
-+    ((SP != 0) && (pair >= 0) && (pair < SP->_pair_limit) && SP->_coloron)
++    ((SP_PARM != 0) && (pair >= 0) && (pair < SP_PARM->_pair_limit) && SP_PARM->_coloron)
 +
  #if NCURSES_EXT_FUNCS
  /*
   * These are called from _nc_do_color(), which in turn is called from
-@@ -147,31 +159,39 @@
+- * vidattr - so we have to assume that SP may be null.
++ * vidattr - so we have to assume that sp may be null.
+  */
+ static int
+-default_fg(void)
++default_fg(NCURSES_SP_DCL0)
+ {
+-    return (SP != 0) ? SP->_default_fg : COLOR_WHITE;
++    return (SP_PARM != 0) ? SP_PARM->_default_fg : COLOR_WHITE;
  }
+ 
+ static int
+-default_bg(void)
++default_bg(NCURSES_SP_DCL0)
+ {
+-    return SP != 0 ? SP->_default_bg : COLOR_BLACK;
++    return SP_PARM != 0 ? SP_PARM->_default_bg : COLOR_BLACK;
+ }
+ #else
+-#define default_fg() COLOR_WHITE
+-#define default_bg() COLOR_BLACK
++#define default_fg(sp) COLOR_WHITE
++#define default_bg(sp) COLOR_BLACK
+ #endif
+ 
++#ifndef USE_TERM_DRIVER
+ /*
+  * SVr4 curses is known to interchange color codes (1,4) and (3,6), possibly
+  * to maintain compatibility with a pre-ANSI scheme.  The same scheme is
+@@ -145,52 +182,70 @@
+     }
+     return c;
+ }
++#endif
  
  static void
@@ -18111 +18564 @@
 +set_background_color(NCURSES_SP_DCLx int bg, NCURSES_SP_OUTC outc)
  {
++#ifdef USE_TERM_DRIVER
++    CallDriver_3(SP_PARM, color, FALSE, bg, outc);
++#else
      if (set_a_background) {
         TPUTS_TRACE("set_a_background");
@@ -18124 +18580 @@
 +                               1, outc);
      }
++#endif
  }
  
@@ -18130 +18587 @@
 +set_foreground_color(NCURSES_SP_DCLx int fg, NCURSES_SP_OUTC outc)
  {
++#ifdef USE_TERM_DRIVER
++    CallDriver_3(SP_PARM, color, TRUE, fg, outc);
++#else
      if (set_a_foreground) {
         TPUTS_TRACE("set_a_foreground");
@@ -18143 +18603 @@
 +                               1, outc);
      }
++#endif
  }
  
@@ -18149 +18610 @@
 +init_color_table(NCURSES_SP_DCL0)
  {
-     const color_t *tp;
+-    const color_t *tp;
++    const color_t *tp = DefaultPalette;
      int n;
-@@ -179,18 +199,18 @@
-     tp = (hue_lightness_saturation) ? hls_palette : cga_palette;
+ 
+-    tp = (hue_lightness_saturation) ? hls_palette : cga_palette;
++    assert(tp != 0);
++
      for (n = 0; n < COLORS; n++) {
         if (InPalette(n)) {
@@ -18159 +18623 @@
         } else {
 -           SP->_color_table[n] = tp[n % MAX_PALETTE];
+-           if (hue_lightness_saturation) {
+-               SP->_color_table[n].green = 100;
 +           SP_PARM->_color_table[n] = tp[n % MAX_PALETTE];
-            if (hue_lightness_saturation) {
--               SP->_color_table[n].green = 100;
++           if (UseHlsPalette) {
 +               SP_PARM->_color_table[n].green = 100;
             } else {
@@ -18179 +18644 @@
         }
      }
-@@ -200,7 +220,7 @@
+@@ -200,8 +255,11 @@
   * Reset the color pair, e.g., to whatever color pair 0 is.
   */
@@ -18186 +18651 @@
 +reset_color_pair(NCURSES_SP_DCL0)
  {
++#ifdef USE_TERM_DRIVER
++    return CallDriver(SP_PARM, rescol);
++#else
      bool result = FALSE;
  
-@@ -218,15 +238,14 @@
+     if (orig_pair != 0) {
+@@ -210,6 +268,7 @@
+        result = TRUE;
+     }
+     return result;
++#endif
+ }
+ 
+ /*
+@@ -217,65 +276,93 @@
+  * badly-written terminal descriptions than for the relatively rare case where
   * someone has changed the color definitions.
   */
- bool
+-bool
 -_nc_reset_colors(void)
--{
-+NCURSES_SP_NAME(_nc_reset_colors) (NCURSES_SP_DCL0) {
++NCURSES_EXPORT(bool)
++NCURSES_SP_NAME(_nc_reset_colors) (NCURSES_SP_DCL0)
+ {
      int result = FALSE;
  
-     T((T_CALLED("_nc_reset_colors()")));
+-    T((T_CALLED("_nc_reset_colors()")));
 -    if (SP->_color_defs > 0)
 -       SP->_color_defs = -(SP->_color_defs);
+-
+-    if (reset_color_pair())
++    T((T_CALLED("_nc_reset_colors(%p)"), SP_PARM));
 +    if (SP_PARM->_color_defs > 0)
 +       SP_PARM->_color_defs = -(SP_PARM->_color_defs);
- 
--    if (reset_color_pair())
 +    if (reset_color_pair(NCURSES_SP_ARG))
         result = TRUE;
++
++#ifdef USE_TERM_DRIVER
++    result = CallDriver(SP_PARM, rescolors);
++#else
      if (orig_colors != 0) {
         TPUTS_TRACE("orig_colors");
-@@ -236,46 +255,69 @@
+        putp(orig_colors);
+        result = TRUE;
+     }
++#endif
      returnBool(result);
  }
  
 +#if NCURSES_SP_FUNCS
-+bool
++NCURSES_EXPORT(bool)
 +_nc_reset_colors(void)
 +{
@@ -18225 +18712 @@
  {
      int result = ERR;
- 
-     T((T_CALLED("start_color()")));
++    int maxpairs = 0, maxcolors = 0;
+ 
+-    T((T_CALLED("start_color()")));
++    T((T_CALLED("start_color(%p)"), SP_PARM));
  
 -    if (SP == 0) {
@@ -18235 +18724 @@
         result = OK;
      } else {
- 
+-
 -       if (reset_color_pair() != TRUE) {
 -           set_foreground_color(default_fg(), _nc_outch);
 -           set_background_color(default_bg(), _nc_outch);
++       maxpairs = MaxPairs;
++       maxcolors = MaxColors;
 +       if (reset_color_pair(NCURSES_SP_ARG) != TRUE) {
 +           set_foreground_color(NCURSES_SP_ARGx
-+                                default_fg(),
++                                default_fg(NCURSES_SP_ARG),
 +                                NCURSES_SP_NAME(_nc_outch));
 +           set_background_color(NCURSES_SP_ARGx
-+                                default_bg(),
++                                default_bg(NCURSES_SP_ARG),
 +                                NCURSES_SP_NAME(_nc_outch));
         }
  
-        if (max_pairs > 0 && max_colors > 0) {
+-       if (max_pairs > 0 && max_colors > 0) {
 -           SP->_pair_count = max_pairs;
 -           SP->_color_count = max_colors;
-+           SP_PARM->_pair_limit = max_pairs;
++       if (maxpairs > 0 && maxcolors > 0) {
++           SP_PARM->_pair_limit = maxpairs;
 +
 +#if NCURSES_EXT_FUNCS
@@ -18258 +18750 @@
 +            * allow for default-color as a component of a color-pair.
 +            */
-+           SP_PARM->_pair_limit += (1 + (2 * max_colors));
++           SP_PARM->_pair_limit += (1 + (2 * maxcolors));
 +#endif
-+           SP_PARM->_pair_count = max_pairs;
-+           SP_PARM->_color_count = max_colors;
++           SP_PARM->_pair_count = maxpairs;
++           SP_PARM->_color_count = maxcolors;
  #if !USE_REENTRANT
-            COLOR_PAIRS = max_pairs;
-            COLORS = max_colors;
+-           COLOR_PAIRS = max_pairs;
+-           COLORS = max_colors;
++           COLOR_PAIRS = maxpairs;
++           COLORS = maxcolors;
  #endif
  
@@ -18273 +18767 @@
 -                   SP->_color_pairs[0] = PAIR_OF(default_fg(), default_bg());
 -                   init_color_table();
-+           SP_PARM->_color_pairs = TYPE_CALLOC(colorpair_t,
-+                                               SP_PARM->_pair_limit);
++           SP_PARM->_color_pairs = TYPE_CALLOC(colorpair_t, SP_PARM->_pair_limit);
 +           if (SP_PARM->_color_pairs != 0) {
-+               SP_PARM->_color_table = TYPE_CALLOC(color_t, max_colors);
++               SP_PARM->_color_table = TYPE_CALLOC(color_t, maxcolors);
 +               if (SP_PARM->_color_table != 0) {
-+                   SP_PARM->_color_pairs[0] = PAIR_OF(default_fg(),
-+                                                      default_bg());
++                   SP_PARM->_color_pairs[0] = PAIR_OF(default_fg(NCURSES_SP_ARG),
++                                                      default_bg(NCURSES_SP_ARG));
 +                   init_color_table(NCURSES_SP_ARG);
  
@@ -18295 +18788 @@
             }
         } else {
-@@ -285,6 +327,14 @@
+@@ -285,6 +372,14 @@
      returnCode(result);
  }
@@ -18310 +18803 @@
  static void
  rgb2hls(short r, short g, short b, short *h, short *l, short *s)
-@@ -328,24 +378,72 @@
+@@ -328,24 +423,75 @@
   * values.
   */
@@ -18319 +18812 @@
      colorpair_t result;
 +    colorpair_t previous;
- 
-     T((T_CALLED("init_pair(%d,%d,%d)"), pair, f, b));
++    int maxcolors;
+ 
+-    T((T_CALLED("init_pair(%d,%d,%d)"), pair, f, b));
++    T((T_CALLED("init_pair(%p,%d,%d,%d)"), SP_PARM, pair, f, b));
  
 -    if ((pair < 0) || (pair >= COLOR_PAIRS) || SP == 0 || !SP->_coloron)
 +    if (!ValidPair(pair))
         returnCode(ERR);
++
++    maxcolors = MaxColors;
 +
 +    previous = SP_PARM->_color_pairs[pair];
@@ -18390 +18887 @@
  #endif
      {
-@@ -361,8 +459,8 @@
+@@ -361,14 +507,14 @@
       * pair colors with the new ones).
       */
@@ -18400 +18897 @@
         int y, x;
  
-        for (y = 0; y <= curscr->_maxy; y++) {
-@@ -381,9 +479,9 @@
-                _nc_make_oldhash(y);
+-       for (y = 0; y <= curscr->_maxy; y++) {
+-           struct ldat *ptr = &(curscr->_line[y]);
++       for (y = 0; y <= CurScreen(SP_PARM)->_maxy; y++) {
++           struct ldat *ptr = &(CurScreen(SP_PARM)->_line[y]);
+            bool changed = FALSE;
+-           for (x = 0; x <= curscr->_maxx; x++) {
++           for (x = 0; x <= CurScreen(SP_PARM)->_maxx; x++) {
+                if (GetPair(ptr->text[x]) == pair) {
+                    /* Set the old cell to zero to ensure it will be
+                       updated on the next doupdate() */
+@@ -378,15 +524,19 @@
+                }
+            }
+            if (changed)
+-               _nc_make_oldhash(y);
++               NCURSES_SP_NAME(_nc_make_oldhash) (NCURSES_SP_ARGx y);
         }
      }
@@ -18408 +18918 @@
 -    if (GET_SCREEN_PAIR(SP) == pair)
 -       SET_SCREEN_PAIR(SP, (chtype) (~0));     /* force attribute update */
+ 
 +    SP_PARM->_color_pairs[pair] = result;
 +    if (GET_SCREEN_PAIR(SP_PARM) == pair)
 +       SET_SCREEN_PAIR(SP_PARM, (chtype) (~0));        /* force attribute update */
- 
++
++#ifdef USE_TERM_DRIVER
++    CallDriver_3(SP_PARM, initpair, pair, f, b);
++#else
      if (initialize_pair && InPalette(f) && InPalette(b)) {
-        const color_t *tp = hue_lightness_saturation ? hls_palette : cga_palette;
-@@ -404,54 +502,79 @@
+-       const color_t *tp = hue_lightness_saturation ? hls_palette : cga_palette;
++       const color_t *tp = DefaultPalette;
+ 
+        TR(TRACE_ATTRS,
+           ("initializing pair: pair = %d, fg=(%d,%d,%d), bg=(%d,%d,%d)",
+@@ -400,80 +550,139 @@
+                     tp[f].red, tp[f].green, tp[f].blue,
+                     tp[b].red, tp[b].green, tp[b].blue));
+     }
++#endif
+ 
      returnCode(OK);
  }
@@ -18434 +18957 @@
  {
      int result = ERR;
- 
-     T((T_CALLED("init_color(%d,%d,%d,%d)"), color, r, g, b));
- 
-     if (initialize_color != NULL
++    int maxcolors;
++
++    T((T_CALLED("init_color(%p,%d,%d,%d,%d)"), SP_PARM, color, r, g, b));
+ 
+-    T((T_CALLED("init_color(%d,%d,%d,%d)"), color, r, g, b));
++    if (SP_PARM == 0)
++       returnCode(result);
+ 
+-    if (initialize_color != NULL
 -       && SP != 0
 -       && SP->_coloron
-+       && SP_PARM != 0
++    maxcolors = MaxColors;
++
++    if (InitColor
 +       && SP_PARM->_coloron
         && (color >= 0 && OkColorHi(color))
@@ -18454 +18984 @@
 +       SP_PARM->_color_table[color].b = b;
  
-        if (hue_lightness_saturation) {
+-       if (hue_lightness_saturation) {
++       if (UseHlsPalette) {
             rgb2hls(r, g, b,
 -                   &SP->_color_table[color].red,
@@ -18471 +19002 @@
         }
  
++#ifdef USE_TERM_DRIVER
++       CallDriver_4(SP_PARM, initcolor, color, r, g, b);
++#else
         TPUTS_TRACE("initialize_color");
         putp(TPARM_4(initialize_color, color, r, g, b));
 -       SP->_color_defs = max(color + 1, SP->_color_defs);
++#endif
 +       SP_PARM->_color_defs = max(color + 1, SP_PARM->_color_defs);
++
         result = OK;
      }
@@ -18488 +19024 @@
 +#endif
 +
- NCURSES_EXPORT(bool)
--can_change_color(void)
-+NCURSES_SP_NAME(can_change_color) (NCURSES_SP_DCL0)
- {
-     T((T_CALLED("can_change_color()")));
-     returnCode((can_change != 0) ? TRUE : FALSE);
- }
- 
++NCURSES_EXPORT(bool)
++NCURSES_SP_NAME(can_change_color) (NCURSES_SP_DCL)
++{
++    T((T_CALLED("can_change_color(%p)"), SP_PARM));
++    returnCode((CanChange != 0) ? TRUE : FALSE);
++}
++
 +#if NCURSES_SP_FUNCS
  NCURSES_EXPORT(bool)
+ can_change_color(void)
+ {
+-    T((T_CALLED("can_change_color()")));
+-    returnCode((can_change != 0) ? TRUE : FALSE);
++    return NCURSES_SP_NAME(can_change_color) (CURRENT_SCREEN);
+ }
++#endif
+ 
+ NCURSES_EXPORT(bool)
 -has_colors(void)
-+can_change_color(void)
-+{
-+    return NCURSES_SP_NAME(can_change_color) (CURRENT_SCREEN);
-+}
-+#endif
-+
-+NCURSES_EXPORT(bool)
 +NCURSES_SP_NAME(has_colors) (NCURSES_SP_DCL0)
  {
++    int code;
++
      T((T_CALLED("has_colors()")));
-     returnCode((VALID_NUMERIC(max_colors) && VALID_NUMERIC(max_pairs)
-@@ -462,18 +585,27 @@
-                    || set_color_pair)) ? TRUE : FALSE);
+-    returnCode((VALID_NUMERIC(max_colors) && VALID_NUMERIC(max_pairs)
+-               && (((set_foreground != NULL)
+-                    && (set_background != NULL))
+-                   || ((set_a_foreground != NULL)
+-                       && (set_a_background != NULL))
+-                   || set_color_pair)) ? TRUE : FALSE);
++#ifdef USE_TERM_DRIVER
++    code = HasColor;
++#else
++    code = ((VALID_NUMERIC(max_colors) && VALID_NUMERIC(max_pairs)
++            && (((set_foreground != NULL)
++                 && (set_background != NULL))
++                || ((set_a_foreground != NULL)
++                    && (set_a_background != NULL))
++                || set_color_pair)) ? TRUE : FALSE);
++#endif
++    returnCode(code);
  }
  
@@ -18524 +19077 @@
  NCURSES_EXPORT(int)
 -color_content(short color, short *r, short *g, short *b)
-+NCURSES_SP_NAME(color_content) (NCURSES_SP_DCLx short color, short *r,
-+                               short *g, short *b)
++NCURSES_SP_NAME(color_content) (NCURSES_SP_DCLx
++                               short color, short *r, short *g, short *b)
  {
-     int result;
- 
-     T((T_CALLED("color_content(%d,%p,%p,%p)"), color, r, g, b));
+-    int result;
++    int result = ERR;
++    int maxcolors;
++
++    T((T_CALLED("color_content(%p,%d,%p,%p,%p)"), SP_PARM, color, r, g, b));
++
++    if (SP_PARM == 0)
++       returnCode(result);
+ 
+-    T((T_CALLED("color_content(%d,%p,%p,%p)"), color, r, g, b));
 -    if (color < 0 || !OkColorHi(color) || SP == 0 || !SP->_coloron) {
-+    if (color < 0 || !OkColorHi(color) || SP_PARM == 0 || !SP_PARM->_coloron) {
++    maxcolors = MaxColors;
++
++    if (color < 0 || !OkColorHi(color) || !SP_PARM->_coloron) {
         result = ERR;
      } else {
@@ -18543 +19105 @@
         if (r)
             *r = c_r;
-@@ -489,18 +621,27 @@
+@@ -489,18 +698,27 @@
      returnCode(result);
  }
@@ -18557 +19119 @@
 +
 +NCURSES_EXPORT(int)
-+NCURSES_SP_NAME(pair_content) (NCURSES_SP_DCLx short pair, short *f,
-+                              short *b)
++NCURSES_SP_NAME(pair_content) (NCURSES_SP_DCLx
++                              short pair, short *f, short *b)
  {
      int result;
  
-     T((T_CALLED("pair_content(%d,%p,%p)"), pair, f, b));
+-    T((T_CALLED("pair_content(%d,%p,%p)"), pair, f, b));
++    T((T_CALLED("pair_content(%p,%d,%p,%p)"), SP_PARM, pair, f, b));
  
 -    if ((pair < 0) || (pair >= COLOR_PAIRS) || SP == 0 || !SP->_coloron) {
@@ -18575 +19138 @@
  #if NCURSES_EXT_FUNCS
         if (fg == COLOR_DEFAULT)
-@@ -520,27 +661,41 @@
+@@ -514,33 +732,50 @@
+        if (b)
+            *b = bg;
+ 
+-       TR(TRACE_ATTRS, ("...pair_content(%d,%d,%d)", pair, fg, bg));
++       TR(TRACE_ATTRS, ("...pair_content(%p,%d,%d,%d)", SP_PARM, pair, fg, bg));
+        result = OK;
+     }
      returnCode(result);
  }
@@ -18595 +19165 @@
 +                              NCURSES_SP_OUTC outc)
  {
++#ifdef USE_TERM_DRIVER
++    CallDriver_4(SP_PARM, docolor, old_pair, pair, reverse, outc);
++#else
      NCURSES_COLOR_T fg = COLOR_DEFAULT;
      NCURSES_COLOR_T bg = COLOR_DEFAULT;
@@ -18622 +19195 @@
         if ((isDefaultColor(fg) && !isDefaultColor(old_fg))
             || (isDefaultColor(bg) && !isDefaultColor(old_bg))) {
-@@ -550,20 +705,20 @@
+@@ -550,29 +785,29 @@
              * the terminal description, treat it as screen's indicator of ECMA
              * SGR 39 and SGR 49, and assume the two sequences are independent.
@@ -18649 +19222 @@
             return;
      }
-@@ -585,9 +740,22 @@
+ 
+ #if NCURSES_EXT_FUNCS
+     if (isDefaultColor(fg))
+-       fg = default_fg();
++       fg = default_fg(NCURSES_SP_ARG);
+     if (isDefaultColor(bg))
+-       bg = default_bg();
++       bg = default_bg(NCURSES_SP_ARG);
+ #endif
+ 
+     if (reverse) {
+@@ -585,9 +820,23 @@
                      fg, bg));
  
@@ -18660 +19244 @@
 +       set_background_color(NCURSES_SP_ARGx bg, outc);
      }
++#endif
  }
 +
@@ -18676 +19261 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_colorset.c ncurses-5.7/ncurses/base/lib_colorset.c
 --- ncurses-5.7.orig/ncurses/base/lib_colorset.c        2005-01-29 13:40:51.000000000 -0800
-+++ ncurses-5.7/ncurses/base/lib_colorset.c     2009-07-19 15:02:16.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_colorset.c     2009-09-12 08:51:11.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -18724 +19309 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_delwin.c ncurses-5.7/ncurses/base/lib_delwin.c
 --- ncurses-5.7.orig/ncurses/base/lib_delwin.c  2008-06-07 07:10:56.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_delwin.c       2009-07-19 15:04:03.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_delwin.c       2009-09-12 08:51:40.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -18781 +19366 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_dft_fgbg.c ncurses-5.7/ncurses/base/lib_dft_fgbg.c
 --- ncurses-5.7.orig/ncurses/base/lib_dft_fgbg.c        2005-11-26 12:03:38.000000000 -0800
-+++ ncurses-5.7/ncurses/base/lib_dft_fgbg.c     2009-07-19 15:04:04.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_dft_fgbg.c     2009-09-12 08:51:42.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -18888 +19473 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_driver.c ncurses-5.7/ncurses/base/lib_driver.c
 --- ncurses-5.7.orig/ncurses/base/lib_driver.c  1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/ncurses/base/lib_driver.c       2009-07-19 15:04:11.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_driver.c       2009-09-12 08:51:49.000000000 -0700
 @@ -0,0 +1,142 @@
 +/****************************************************************************
@@ -19034 +19619 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_echo.c ncurses-5.7/ncurses/base/lib_echo.c
 --- ncurses-5.7.orig/ncurses/base/lib_echo.c    2000-12-09 18:43:27.000000000 -0800
-+++ ncurses-5.7/ncurses/base/lib_echo.c 2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_echo.c 2009-09-12 08:51:17.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -19100 +19685 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_endwin.c ncurses-5.7/ncurses/base/lib_endwin.c
 --- ncurses-5.7.orig/ncurses/base/lib_endwin.c  2000-12-09 18:43:27.000000000 -0800
-+++ ncurses-5.7/ncurses/base/lib_endwin.c       2009-07-19 15:04:13.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_endwin.c       2009-09-12 08:51:50.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -19168 +19753 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_flash.c ncurses-5.7/ncurses/base/lib_flash.c
 --- ncurses-5.7.orig/ncurses/base/lib_flash.c   2000-12-09 18:43:27.000000000 -0800
-+++ ncurses-5.7/ncurses/base/lib_flash.c        2009-07-19 15:04:03.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_flash.c        2009-09-12 08:51:40.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -19237 +19822 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_freeall.c ncurses-5.7/ncurses/base/lib_freeall.c
 --- ncurses-5.7.orig/ncurses/base/lib_freeall.c 2008-09-27 06:09:57.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_freeall.c      2009-07-19 15:03:59.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_freeall.c      2009-09-12 08:51:37.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -19363 +19948 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_getch.c ncurses-5.7/ncurses/base/lib_getch.c
 --- ncurses-5.7.orig/ncurses/base/lib_getch.c   2008-09-20 12:46:13.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_getch.c        2009-07-19 15:04:13.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_getch.c        2009-09-12 08:52:04.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -19384 +19969 @@
  
 -MODULE_ID("$Id: lib_getch.c,v 1.99 2008/09/20 19:46:13 tom Exp $")
-+MODULE_ID("$Id: lib_getch.c,v 1.104 2009/07/04 20:41:13 tom Exp $")
++MODULE_ID("$Id: lib_getch.c,v 1.107 2009/08/15 20:41:24 Clemens.Ladisch Exp $")
  
  #include <fifo_defs.h>
@@ -19391 +19976 @@
 -#define GetEscdelay(sp) (sp)->_ESCDELAY
 +#define GetEscdelay(sp) *_nc_ptr_Escdelay(sp)
-+NCURSES_EXPORT(int *)
-+_nc_ptr_Escdelay(SCREEN *sp)
-+{
-+    return ptrEscdelay(sp);
-+}
  NCURSES_EXPORT(int)
  NCURSES_PUBLIC_VAR(ESCDELAY) (void)
@@ -19401 +19981 @@
 -    return SP ? GetEscdelay(SP) : 1000;
 +    return *(_nc_ptr_Escdelay(CURRENT_SCREEN));
++}
++
++NCURSES_EXPORT(int *)
++_nc_ptr_Escdelay(SCREEN *sp)
++{
++    return ptrEscdelay(sp);
  }
  #else
@@ -19406 +19992 @@
 -NCURSES_EXPORT_VAR(int)
 -ESCDELAY = 1000;               /* max interval betw. chars in funkeys, in millisecs */
-+NCURSES_EXPORT_VAR (int)
-+  ESCDELAY = 1000;             /* max interval betw. chars in funkeys, in millisecs */
++NCURSES_EXPORT_VAR(int) ESCDELAY = 1000;
  #endif
  
@@ -19426 +20011 @@
  #else
 +    (void) SP_PARM;
-     ESCDELAY = value;
- #endif
-     return code;
- }
++    ESCDELAY = value;
++#endif
++    return code;
++}
 +
 +#if NCURSES_SP_FUNCS
@@ -19439 +20024 @@
 +    code = NCURSES_SP_NAME(set_escdelay) (CURRENT_SCREEN, value);
 +#else
-+    ESCDELAY = value;
+     ESCDELAY = value;
 +    code = OK;
-+#endif
-+    return code;
-+}
-+#endif
+ #endif
+     return code;
+ }
+ #endif
 +#endif /* NCURSES_EXT_FUNCS */
 +
@@ -19459 +20044 @@
 +#if NCURSES_SP_FUNCS
 +NCURSES_EXPORT(int)
-+get_escdelay (void)
++get_escdelay(void)
 +{
-+    return NCURSES_SP_NAME(get_escdelay)(CURRENT_SCREEN);
++    return NCURSES_SP_NAME(get_escdelay) (CURRENT_SCREEN);
 +}
- #endif
++#endif
 +#endif /* NCURSES_EXT_FUNCS */
  
@@ -19591 +20176 @@
  #ifdef NCURSES_WGETCH_EVENTS
         /* Return it first */
-@@ -402,7 +461,7 @@
+@@ -402,13 +461,13 @@
             rc = check_mouse_activity(sp, delay EVENTLIST_2nd(evl));
  
@@ -19600 +20185 @@
                 returnCode(KEY_CODE_YES);
             }
+ #endif
+            if (!rc) {
+-               returnCode(ERR);
++               goto check_sigwinch;
+            }
+        }
+        /* else go on to read data available */
 @@ -427,7 +486,7 @@
          * increase the wait with mouseinterval().
@@ -19639 +20231 @@
             }
         }
-@@ -645,7 +704,7 @@
+@@ -470,6 +529,7 @@
+     }
+ 
+     if (ch == ERR) {
++      check_sigwinch:
+ #if USE_SIZECHANGE
+        if (_nc_handle_sigwinch(sp)) {
+            _nc_update_screensize(sp);
+@@ -645,7 +705,7 @@
             TR(TRACE_IEVENT, ("waiting for rest of sequence"));
             rc = check_mouse_activity(sp, timeleft EVENTLIST_2nd(evl));
@@ -19650 +20250 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_getstr.c ncurses-5.7/ncurses/base/lib_getstr.c
 --- ncurses-5.7.orig/ncurses/base/lib_getstr.c  2008-08-16 12:20:04.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_getstr.c       2009-07-19 15:03:59.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_getstr.c       2009-09-12 08:51:37.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -19716 +20316 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_initscr.c ncurses-5.7/ncurses/base/lib_initscr.c
 --- ncurses-5.7.orig/ncurses/base/lib_initscr.c 2008-08-16 14:20:48.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_initscr.c      2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_initscr.c      2009-09-12 08:51:28.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -19747 +20347 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_insch.c ncurses-5.7/ncurses/base/lib_insch.c
 --- ncurses-5.7.orig/ncurses/base/lib_insch.c   2008-02-02 16:14:37.000000000 -0800
-+++ ncurses-5.7/ncurses/base/lib_insch.c        2009-07-19 15:04:04.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_insch.c        2009-09-12 08:51:42.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -19849 +20449 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_insnstr.c ncurses-5.7/ncurses/base/lib_insnstr.c
 --- ncurses-5.7.orig/ncurses/base/lib_insnstr.c 2004-02-28 15:44:56.000000000 -0800
-+++ ncurses-5.7/ncurses/base/lib_insnstr.c      2009-07-19 15:04:04.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_insnstr.c      2009-09-12 08:51:42.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -19882 +20482 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_isendwin.c ncurses-5.7/ncurses/base/lib_isendwin.c
 --- ncurses-5.7.orig/ncurses/base/lib_isendwin.c        2000-12-09 18:43:27.000000000 -0800
-+++ ncurses-5.7/ncurses/base/lib_isendwin.c     2009-07-19 15:02:20.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_isendwin.c     2009-09-12 08:51:16.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -19926 +20526 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_mouse.c ncurses-5.7/ncurses/base/lib_mouse.c
 --- ncurses-5.7.orig/ncurses/base/lib_mouse.c   2008-10-18 14:48:55.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_mouse.c        2009-07-19 15:04:13.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_mouse.c        2009-09-12 08:51:50.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -20313 +20913 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_mvwin.c ncurses-5.7/ncurses/base/lib_mvwin.c
 --- ncurses-5.7.orig/ncurses/base/lib_mvwin.c   2006-02-25 14:53:46.000000000 -0800
-+++ ncurses-5.7/ncurses/base/lib_mvwin.c        2009-07-19 15:04:06.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_mvwin.c        2009-09-12 08:51:43.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -20360 +20960 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_newterm.c ncurses-5.7/ncurses/base/lib_newterm.c
 --- ncurses-5.7.orig/ncurses/base/lib_newterm.c 2008-08-16 14:20:48.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_newterm.c      2009-07-19 15:03:59.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_newterm.c      2009-09-12 08:52:10.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -20376 +20976 @@
  
  /*
-@@ -45,10 +46,14 @@
+@@ -45,10 +46,19 @@
  #define _POSIX_SOURCE
  #endif
  
+-#include <term.h>              /* clear_screen, cup & friends, cur_term */
 +#ifndef CUR
-+#define CUR SP_TERMTYPE 
++#define CUR SP_TERMTYPE
 +#endif
 +
- #include <term.h>              /* clear_screen, cup & friends, cur_term */
  #include <tic.h>
  
 -MODULE_ID("$Id: lib_newterm.c,v 1.73 2008/08/16 21:20:48 Werner.Fink Exp $")
-+MODULE_ID("$Id: lib_newterm.c,v 1.77 2009/05/10 00:48:29 tom Exp $")
++MODULE_ID("$Id: lib_newterm.c,v 1.79 2009/09/06 15:13:41 tom Exp $")
++
++#ifdef USE_TERM_DRIVER
++#define NumLabels      InfoOf(SP_PARM).numlabels
++#else
++#define NumLabels      num_labels
++#endif
  
  #ifndef ONLCR                  /* Allows compilation under the QNX 4.2 OS */
  #define ONLCR 0
-@@ -95,7 +100,7 @@
+@@ -63,16 +73,17 @@
+  * is supposed to behave as if it calls newterm, we do it here.
+  */
+ static NCURSES_INLINE int
+-_nc_initscr(void)
++_nc_initscr(NCURSES_SP_DCL0)
+ {
+     int result = ERR;
++    TERMINAL *term = TerminalOf(SP_PARM);
+ 
+     /* for extended XPG4 conformance requires cbreak() at this point */
+     /* (SVr4 curses does this anyway) */
+-    if (cbreak() == OK) {
++    if (NCURSES_SP_NAME(cbreak) (NCURSES_SP_ARG) == OK) {
+        TTY buf;
+ 
+-       buf = cur_term->Nttyb;
++       buf = term->Nttyb;
+ #ifdef TERMIOS
+        buf.c_lflag &= ~(ECHO | ECHONL);
+        buf.c_iflag &= ~(ICRNL | INLCR | IGNCR);
+@@ -82,8 +93,9 @@
+ #else
+        memset(&buf, 0, sizeof(buf));
+ #endif
+-       if ((result = _nc_set_tty_mode(&buf)) == OK)
+-           cur_term->Nttyb = buf;
++       result = NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf);
++       if (result == OK)
++           term->Nttyb = buf;
+     }
+     return result;
+ }
+@@ -95,13 +107,30 @@
   * initialized.
   */
  NCURSES_EXPORT(void)
--filter(void)
 +NCURSES_SP_NAME(filter) (NCURSES_SP_DCL0)
++{
++    START_TRACE();
++    T((T_CALLED("filter(%p)"), SP_PARM));
++#if NCURSES_SP_FUNCS
++    if (IsPreScreen(SP_PARM)) {
++       SP_PARM->_filtered = TRUE;
++    }
++#else
++    _nc_prescreen.filter_mode = TRUE;
++#endif
++    returnVoid;
++}
++
++#if NCURSES_SP_FUNCS
++NCURSES_EXPORT(void)
+ filter(void)
  {
      START_TRACE();
-     T((T_CALLED("filter")));
-@@ -103,23 +108,42 @@
+-    T((T_CALLED("filter")));
++    T((T_CALLED("filter()")));
+     _nc_prescreen.filter_mode = TRUE;
      returnVoid;
  }
- 
-+#if NCURSES_SP_FUNCS
-+NCURSES_EXPORT(void)
-+filter(void)
-+{
-+    NCURSES_SP_NAME(filter) (CURRENT_SCREEN);
-+}
 +#endif
-+
+ 
  #if NCURSES_EXT_FUNCS
  /*
-  * An extension, allowing the application to open a new screen without
+@@ -109,62 +138,105 @@
   * requiring it to also be filtered.
   */
  NCURSES_EXPORT(void)
--nofilter(void)
 +NCURSES_SP_NAME(nofilter) (NCURSES_SP_DCL0)
++{
++    START_TRACE();
++    T((T_CALLED("nofilter(%p)"), SP_PARM));
++#if NCURSES_SP_FUNCS
++    if (IsPreScreen(SP_PARM)) {
++       SP_PARM->_filtered = FALSE;
++    }
++#else
++    _nc_prescreen.filter_mode = FALSE;
++#endif
++    returnVoid;
++}
++
++#if NCURSES_SP_FUNCS
++NCURSES_EXPORT(void)
+ nofilter(void)
  {
      START_TRACE();
-     T((T_CALLED("nofilter")));
+-    T((T_CALLED("nofilter")));
++    T((T_CALLED("nofilter()")));
      _nc_prescreen.filter_mode = FALSE;
      returnVoid;
  }
-+
-+#if NCURSES_SP_FUNCS
-+NCURSES_EXPORT(void)
-+nofilter(void)
-+{
-+    NCURSES_SP_NAME(nofilter) (CURRENT_SCREEN);
-+}
  #endif
 +#endif /* NCURSES_EXT_FUNCS */
@@ -20446 +21103 @@
      int value;
      int errret;
-@@ -133,8 +157,8 @@
+-    SCREEN *current;
+     SCREEN *result = 0;
++    SCREEN *current;
+     TERMINAL *its_term;
++    FILE *_ofp = ofp ? ofp : stdout;
++    FILE *_ifp = ifp ? ifp : stdin;
++    int cols;
++    int numlab;
++#ifdef USE_TERM_DRIVER
++    TERMINAL *new_term;
++#endif
+ 
+     START_TRACE();
+-    T((T_CALLED("newterm(\"%s\",%p,%p)"), name, ofp, ifp));
++    T((T_CALLED("newterm(%p, \"%s\", %p,%p)"), SP_PARM, name, ofp, ifp));
+ 
      _nc_init_pthreads();
      _nc_lock_global(curses);
@@ -20456 +21128 @@
  
      /* this loads the capability entry, then sets LINES and COLS */
-     if (setupterm(name, fileno(ofp), &errret) != ERR) {
-@@ -159,7 +183,7 @@
+-    if (setupterm(name, fileno(ofp), &errret) != ERR) {
++    if (setupterm(name, fileno(_ofp), &errret) != ERR) {
+        int slk_format = _nc_globals.slk_format;
+ 
+-       /*
+-        * This actually allocates the screen structure, and saves the original
+-        * terminal settings.
+-        */
+        _nc_set_screen(0);
++#ifdef USE_TERM_DRIVER
++       assert(new_term != 0);
++#endif
+ 
+        /* allow user to set maximum escape delay from the environment */
+        if ((value = _nc_getenv_num("ESCDELAY")) >= 0) {
+            set_escdelay(value);
+        }
+ 
++       /*
++        * This actually allocates the screen structure, and saves the original
++        * terminal settings.
++        */
+        if (_nc_setupscreen(LINES,
+                            COLS,
+-                           ofp,
++                           _ofp,
+                            _nc_prescreen.filter_mode,
+                            slk_format) == ERR) {
             _nc_set_screen(current);
             result = 0;
         } else {
 -           assert(SP != 0);
++#ifdef USE_TERM_DRIVER
++           TERMINAL_CONTROL_BLOCK *TCB;
++#else
++           SP_PARM = CURRENT_SCREEN;
++#endif
 +           assert(SP_PARM != 0);
++           cols = *(ptrCols(SP_PARM));
++#ifdef USE_TERM_DRIVER
++           TCB = (TERMINAL_CONTROL_BLOCK *) new_term;
++           TCB->csp = SP_PARM;
++#endif
++           numlab = NumLabels;
++
             /*
              * In setupterm() we did a set_curterm(), but it was before we set
-             * SP.  So the "current" screen's terminal pointer was overwritten
-@@ -233,3 +257,11 @@
+-            * SP.  So the "current" screen's terminal pointer was overwritten
+-            * with a different terminal.  Later, in _nc_setupscreen(), we set
+-            * SP and the terminal pointer in the new screen.
++            * CURRENT_SCREEN.  So the "current" screen's terminal pointer was
++            * overwritten with a different terminal.  Later, in
++            * _nc_setupscreen(), we set CURRENT_SCREEN and the terminal
++            * pointer in the new screen.
+             *
+             * Restore the terminal-pointer for the pre-existing screen, if
+             * any.
+@@ -173,36 +245,41 @@
+                current->_term = its_term;
+ 
+            /* if the terminal type has real soft labels, set those up */
+-           if (slk_format && num_labels > 0 && SLK_STDFMT(slk_format))
++           if (slk_format && NumLabels > 0 && SLK_STDFMT(slk_format))
+                _nc_slk_initialize(stdscr, COLS);
+ 
+-           SP->_ifd = fileno(ifp);
+-           typeahead(fileno(ifp));
++           SP_PARM->_ifd = fileno(_ifp);
++           NCURSES_SP_NAME(typeahead) (NCURSES_SP_ARGx fileno(_ifp));
+ #ifdef TERMIOS
+-           SP->_use_meta = ((cur_term->Ottyb.c_cflag & CSIZE) == CS8 &&
+-                            !(cur_term->Ottyb.c_iflag & ISTRIP));
++           SP_PARM->_use_meta = ((cur_term->Ottyb.c_cflag & CSIZE) == CS8 &&
++                                 !(cur_term->Ottyb.c_iflag & ISTRIP));
+ #else
+-           SP->_use_meta = FALSE;
++           SP_PARM->_use_meta = FALSE;
+ #endif
+-           SP->_endwin = FALSE;
+-
++           SP_PARM->_endwin = FALSE;
++#ifndef USE_TERM_DRIVER
+            /*
+             * Check whether we can optimize scrolling under dumb terminals in
+             * case we do not have any of these capabilities, scrolling
+             * optimization will be useless.
+             */
+-           SP->_scrolling = ((scroll_forward && scroll_reverse) ||
+-                             ((parm_rindex ||
+-                               parm_insert_line ||
+-                               insert_line) &&
+-                              (parm_index ||
+-                               parm_delete_line ||
+-                               delete_line)));
++           SP_PARM->_scrolling = ((scroll_forward && scroll_reverse) ||
++                                  ((parm_rindex ||
++                                    parm_insert_line ||
++                                    insert_line) &&
++                                   (parm_index ||
++                                    parm_delete_line ||
++                                    delete_line)));
++#endif
+ 
+-           baudrate();         /* sets a field in the SP structure */
++           NCURSES_SP_NAME(baudrate) (NCURSES_SP_ARG);         /* sets a field in the screen structure */
+ 
+-           SP->_keytry = 0;
++           SP_PARM->_keytry = 0;
+ 
++           /* compute movement costs so we can do better move optimization */
++#ifdef USE_TERM_DRIVER
++           TCBOf(SP_PARM)->drv->scinit(SP_PARM);
++#else
+            /*
+             * Check for mismatched graphic-rendition capabilities.  Most SVr4
+             * terminfo trees contain entries that have rmul or rmso equated to
+@@ -213,23 +290,31 @@
+             * shouldn't be looking at this detail.
+             */
+ #define SGR0_TEST(mode) (mode != 0) && (exit_attribute_mode == 0 || strcmp(mode, exit_attribute_mode))
+-           SP->_use_rmso = SGR0_TEST(exit_standout_mode);
+-           SP->_use_rmul = SGR0_TEST(exit_underline_mode);
++           SP_PARM->_use_rmso = SGR0_TEST(exit_standout_mode);
++           SP_PARM->_use_rmul = SGR0_TEST(exit_underline_mode);
+ 
+            /* compute movement costs so we can do better move optimization */
+            _nc_mvcur_init();
+ 
+            /* initialize terminal to a sane state */
+            _nc_screen_init();
++#endif
+ 
+            /* Initialize the terminal line settings. */
+-           _nc_initscr();
++           _nc_initscr(NCURSES_SP_ARG);
+ 
+            _nc_signal_handler(TRUE);
+-
+-           result = SP;
++           result = SP_PARM;
+        }
+     }
      _nc_unlock_global(curses);
      returnSP(result);
@@ -20480 +21283 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_newwin.c ncurses-5.7/ncurses/base/lib_newwin.c
 --- ncurses-5.7.orig/ncurses/base/lib_newwin.c  2008-06-07 06:58:09.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_newwin.c       2009-07-19 15:04:06.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_newwin.c       2009-09-12 08:52:10.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -20501 +21304 @@
  
 -MODULE_ID("$Id: lib_newwin.c,v 1.52 2008/06/07 13:58:09 tom Exp $")
-+MODULE_ID("$Id: lib_newwin.c,v 1.58 2009/06/06 17:53:11 tom Exp $")
++MODULE_ID("$Id: lib_newwin.c,v 1.60 2009/09/06 16:32:48 tom Exp $")
  
  #define window_is(name) ((sp)->_##name == win)
  
-@@ -87,11 +88,11 @@
+@@ -61,6 +62,17 @@
+ {
+     SCREEN *sp;
+ 
++#ifdef USE_SP_WINDOWLIST
++    if ((sp = _nc_screen_of(win)) != 0) {
++       if (window_is(curscr)) {
++           remove_window(curscr);
++       } else if (window_is(stdscr)) {
++           remove_window(stdscr);
++       } else if (window_is(newscr)) {
++           remove_window(newscr);
++       }
++    }
++#else
+     for (each_screen(sp)) {
+        if (window_is(curscr)) {
+            remove_window(curscr);
+@@ -73,6 +85,7 @@
+            break;
+        }
+     }
++#endif
+ }
+ 
+ NCURSES_EXPORT(int)
+@@ -81,17 +94,20 @@
+     WINDOWLIST *p, *q;
+     int i;
+     int result = ERR;
++#ifdef USE_SP_WINDOWLIST
++    SCREEN *sp = _nc_screen_of(win);   /* pretend this is parameter */
++#endif
+ 
+     T((T_CALLED("_nc_freewin(%p)"), win));
+ 
      if (win != 0) {
-        if (_nc_try_global(curses) == 0) {
+-       if (_nc_try_global(curses) == 0) {
++       if (_nc_nonsp_try_global(curses) == 0) {
             q = 0;
 -           for (each_window(p)) {
-+           for (each_window(SP, p)) {
++           for (each_window(SP_PARM, p)) {
                 if (&(p->win) == win) {
                     remove_window_from_screen(win);
                     if (q == 0)
 -                       _nc_windows = p->next;
-+                       WindowList(SP) = p->next;
++                       WindowList(SP_PARM) = p->next;
                     else
                         q->next = p->next;
  
-@@ -115,7 +116,8 @@
+@@ -108,30 +124,34 @@
+                }
+                q = p;
+            }
+-           _nc_unlock_global(curses);
++           _nc_nonsp_unlock_global(curses);
+        }
+     }
+     returnCode(result);
  }
  
@@ -20529 +21376 @@
      WINDOW *win;
      NCURSES_CH_T *ptr;
-@@ -127,11 +129,13 @@
+     int i;
+ 
+-    T((T_CALLED("newwin(%d,%d,%d,%d)"), num_lines, num_columns, begy, begx));
++    T((T_CALLED("newwin(%p, %d,%d,%d,%d)"), SP_PARM, num_lines, num_columns,
++       begy, begx));
+ 
+     if (begy < 0 || begx < 0 || num_lines < 0 || num_columns < 0)
         returnWin(0);
  
@@ -20546 +21399 @@
  
      for (i = 0; i < num_lines; i++) {
-@@ -149,9 +153,22 @@
+@@ -149,12 +169,28 @@
      returnWin(win);
  }
@@ -20554 +21407 @@
 +newwin(int num_lines, int num_columns, int begy, int begx)
 +{
-+    return NCURSES_SP_NAME(newwin) (CURRENT_SCREEN,
-+                                   num_lines, num_columns,
-+                                   begy, begx);
++    WINDOW *win;
++    _nc_sp_lock_global(curses);
++    win = NCURSES_SP_NAME(newwin) (CURRENT_SCREEN,
++                                  num_lines, num_columns, begy, begx);
++    _nc_sp_unlock_global(curses);
++    return (win);
 +}
 +#endif
@@ -20563 +21419 @@
  derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx)
  {
-+#if NCURSES_SP_FUNCS
-+    SCREEN *sp = CURRENT_SCREEN;
-+#endif
      WINDOW *win;
      int i;
      int flags = _SUBWIN;
-@@ -177,8 +194,10 @@
++#if NCURSES_SP_FUNCS
++    SCREEN *sp = _nc_screen_of(orig);
++#endif
+ 
+     T((T_CALLED("derwin(%p,%d,%d,%d,%d)"), orig, num_lines, num_columns,
+        begy, begx));
+@@ -177,8 +213,10 @@
      if (orig->_flags & _ISPAD)
         flags |= _ISPAD;
@@ -20582 +21441 @@
  
      win->_pary = begy;
-@@ -211,16 +230,22 @@
+@@ -211,16 +249,22 @@
  }
  
@@ -20597 +21456 @@
      WINDOWLIST *wp;
      WINDOW *win;
-     bool is_pad = (flags & _ISPAD);
+-    bool is_pad = (flags & _ISPAD);
++    bool is_padwin = (flags & _ISPAD);
  
 -    T((T_CALLED("_nc_makenew(%d,%d,%d,%d)"), num_lines, num_columns, begy, begx));
@@ -20608 +21468 @@
  
      if (!dimension_limit(num_lines) || !dimension_limit(num_columns))
-@@ -244,14 +269,16 @@
+@@ -236,7 +280,7 @@
+        returnWin(0);
+     }
+ 
+-    _nc_lock_global(curses);
++    _nc_nonsp_lock_global(curses);
+ 
+     win->_curx = 0;
+     win->_cury = 0;
+@@ -244,14 +288,16 @@
      win->_maxx = num_columns - 1;
      win->_begy = begy;
@@ -20621 +21490 @@
 -    win->_clear = is_pad ? FALSE : (num_lines == screen_lines
 -                                   && num_columns == screen_columns);
-+    win->_clear = (is_pad
++    win->_clear = (is_padwin
 +                  ? FALSE
 +                  : (num_lines == screen_lines(SP_PARM)
@@ -20628 +21497 @@
      win->_idcok = TRUE;
      win->_scroll = FALSE;
-@@ -300,19 +327,19 @@
+@@ -300,23 +346,23 @@
         if_USE_SCROLL_HINTS(win->_line[i].oldindex = i);
      }
  
 -    if (!is_pad && (begx + num_columns == screen_columns)) {
-+    if (!is_pad && (begx + num_columns == screen_columns(SP_PARM))) {
++    if (!is_padwin && (begx + num_columns == screen_columns(SP_PARM))) {
         win->_flags |= _ENDLINE;
  
@@ -20654 +21523 @@
      T((T_CREATE("window %p"), win));
  
-@@ -320,19 +347,37 @@
+-    _nc_unlock_global(curses);
++    _nc_nonsp_unlock_global(curses);
      returnWin(win);
  }
  
-+#if NCURSES_SP_FUNCS
-+NCURSES_EXPORT(WINDOW *)
-+_nc_makenew(int num_lines, int num_columns, int begy, int begx, int flags)
-+{
-+    return NCURSES_SP_NAME(_nc_makenew) (CURRENT_SCREEN,
-+                                        num_lines, num_columns,
-+                                        begy, begx, flags);
-+}
-+#endif
-+
- /*
-  * wgetch() and other functions with a WINDOW* parameter may use a SCREEN*
+@@ -325,14 +371,22 @@
   * internally, and it is useful to allow those to be invoked without switching
   * SCREEN's, e.g., for multi-threaded applications.
@@ -20702 +21561 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_nl.c ncurses-5.7/ncurses/base/lib_nl.c
 --- ncurses-5.7.orig/ncurses/base/lib_nl.c      2000-12-09 18:43:27.000000000 -0800
-+++ ncurses-5.7/ncurses/base/lib_nl.c   2009-07-19 15:04:13.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_nl.c   2009-09-12 08:51:50.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -20788 +21647 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_pad.c ncurses-5.7/ncurses/base/lib_pad.c
 --- ncurses-5.7.orig/ncurses/base/lib_pad.c     2006-10-14 13:47:13.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_pad.c  2009-07-19 15:04:13.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_pad.c  2009-09-12 08:51:50.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -20945 +21804 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_printw.c ncurses-5.7/ncurses/base/lib_printw.c
 --- ncurses-5.7.orig/ncurses/base/lib_printw.c  2006-12-17 11:21:39.000000000 -0800
-+++ ncurses-5.7/ncurses/base/lib_printw.c       2009-07-19 15:03:53.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_printw.c       2009-09-12 08:51:30.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -20980 +21839 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_redrawln.c ncurses-5.7/ncurses/base/lib_redrawln.c
 --- ncurses-5.7.orig/ncurses/base/lib_redrawln.c        2007-10-13 13:08:56.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_redrawln.c     2009-07-19 15:03:53.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_redrawln.c     2009-09-12 08:51:30.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -21048 +21907 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_refresh.c ncurses-5.7/ncurses/base/lib_refresh.c
 --- ncurses-5.7.orig/ncurses/base/lib_refresh.c 2007-09-29 13:39:34.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_refresh.c      2009-07-19 15:04:06.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_refresh.c      2009-09-12 08:51:43.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -21182 +22041 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_restart.c ncurses-5.7/ncurses/base/lib_restart.c
 --- ncurses-5.7.orig/ncurses/base/lib_restart.c 2008-06-21 10:31:22.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_restart.c      2009-07-19 15:03:58.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_restart.c      2009-09-12 08:52:09.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -21198 +22057 @@
  
  /*
-@@ -44,49 +45,52 @@
+@@ -44,49 +45,58 @@
  #define _POSIX_SOURCE
  #endif
@@ -21205 +22064 @@
 -
 -MODULE_ID("$Id: lib_restart.c,v 1.10 2008/06/21 17:31:22 tom Exp $")
-+MODULE_ID("$Id: lib_restart.c,v 1.11 2009/05/02 20:47:42 tom Exp $")
++MODULE_ID("$Id: lib_restart.c,v 1.12 2009/08/30 17:59:13 tom Exp $")
  
  NCURSES_EXPORT(int)
@@ -21215 +22074 @@
  {
      int result;
++#ifdef USE_TERM_DRIVER
++    TERMINAL *new_term;
++#endif
  
 -    T((T_CALLED("restartterm(%s,%d,%p)"), termp, filenum, errret));
 +    T((T_CALLED("restartterm(%p,%s,%d,%p)"), SP_PARM, termp, filenum, errret));
  
-     if (setupterm(termp, filenum, errret) != OK) {
+-    if (setupterm(termp, filenum, errret) != OK) {
++    if (TINFO_SETUP_TERM(&new_term, termp, filenum, errret, FALSE) != OK) {
         result = ERR;
 -    } else if (SP != 0) {
@@ -21237 +22100 @@
 +       int savenl = SP_PARM->_nl;
 +
++#ifdef USE_TERM_DRIVER
++       SP_PARM->_term = new_term;
++#endif
 +       if (saveecho) {
 +           NCURSES_SP_NAME(echo) (NCURSES_SP_ARG);
@@ -21253 +22119 @@
 +           NCURSES_SP_NAME(nocbreak) (NCURSES_SP_ARG);
 +           NCURSES_SP_NAME(raw) (NCURSES_SP_ARG);
-+       } else {
+        } else {
+-           nocbreak();
+-           noraw();
 +           NCURSES_SP_NAME(nocbreak) (NCURSES_SP_ARG);
 +           NCURSES_SP_NAME(noraw) (NCURSES_SP_ARG);
@@ -21259 +22127 @@
 +       if (savenl) {
 +           NCURSES_SP_NAME(nl) (NCURSES_SP_ARG);
-        } else {
--           nocbreak();
--           noraw();
++       } else {
 +           NCURSES_SP_NAME(nonl) (NCURSES_SP_ARG);
         }
@@ -21278 +22144 @@
  
         result = OK;
-@@ -95,3 +99,11 @@
+@@ -95,3 +105,11 @@
      }
      returnCode(result);
@@ -21292 +22158 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_screen.c ncurses-5.7/ncurses/base/lib_screen.c
 --- ncurses-5.7.orig/ncurses/base/lib_screen.c  2008-08-16 12:05:37.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_screen.c       2009-07-19 15:04:06.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_screen.c       2009-09-12 08:51:43.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -21480 +22346 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_set_term.c ncurses-5.7/ncurses/base/lib_set_term.c
 --- ncurses-5.7.orig/ncurses/base/lib_set_term.c        2008-08-04 11:11:12.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_set_term.c     2009-07-19 15:04:11.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_set_term.c     2009-09-12 08:52:09.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -21496 +22362 @@
  
  /*
-@@ -44,7 +45,11 @@
- #include <term.h>              /* cur_term */
+@@ -41,10 +42,21 @@
+ 
+ #include <curses.priv.h>
+ 
+-#include <term.h>              /* cur_term */
  #include <tic.h>
  
@@ -21505 +22374 @@
 +#endif
 +
-+MODULE_ID("$Id: lib_set_term.c,v 1.124 2009/06/27 21:36:14 tom Exp $")
++MODULE_ID("$Id: lib_set_term.c,v 1.126 2009/09/05 18:18:10 tom Exp $")
++
++#ifdef USE_TERM_DRIVER
++#define MaxColors      InfoOf(sp).maxcolors
++#define NumLabels      InfoOf(sp).numlabels
++#else
++#define MaxColors      max_colors
++#define NumLabels      num_labels
++#endif
  
  NCURSES_EXPORT(SCREEN *)
  set_term(SCREEN *screenp)
-@@ -256,6 +261,9 @@
+@@ -61,7 +73,7 @@
+     newSP = SP;
+ 
+     if (newSP != 0) {
+-       set_curterm(newSP->_term);
++       TINFO_SET_CURTERM(newSP, newSP->_term);
+ #if !USE_REENTRANT
+        curscr = newSP->_curscr;
+        newscr = newSP->_newscr;
+@@ -70,7 +82,7 @@
+        COLOR_PAIRS = newSP->_pair_count;
+ #endif
+     } else {
+-       set_curterm(0);
++       TINFO_SET_CURTERM(oldSP, 0);
+ #if !USE_REENTRANT
+        curscr = 0;
+        newscr = 0;
+@@ -129,6 +141,19 @@
+ 
+     _nc_lock_global(curses);
+     if (delink_screen(sp)) {
++#ifdef USE_SP_RIPOFF
++       ripoff_t *rop;
++       if (safe_ripoff_sp && safe_ripoff_sp != safe_ripoff_stack) {
++           for (rop = safe_ripoff_stack;
++                rop != safe_ripoff_sp && (rop - safe_ripoff_stack) < N_RIPS;
++                rop++) {
++               if (rop->win) {
++                   (void) delwin(rop->win);
++                   rop->win = 0;
++               }
++           }
++       }
++#endif
+ 
+        (void) _nc_freewin(sp->_curscr);
+        (void) _nc_freewin(sp->_newscr);
+@@ -176,7 +201,7 @@
+            free(sp->_setbuf);
+        }
+ 
+-       del_curterm(sp->_term);
++       NCURSES_SP_NAME(del_curterm) (NCURSES_SP_ARGx sp->_term);
+        free(sp);
+ 
+        /*
+@@ -248,6 +273,41 @@
+ }
+ #endif
+ 
++#if NCURSES_SP_FUNCS
++/*
++ * In case of handling multiple screens, we need to have a screen before
++ * initialization in setupscreen takes place.  This is to extend the substitute
++ * for some of the stuff in _nc_prescreen, especially for slk and ripoff
++ * handling which should be done per screen.
++ */
++NCURSES_EXPORT(SCREEN *)
++new_prescr(void)
++{
++    SCREEN *sp = _nc_alloc_screen_sp();
++    if (sp) {
++       sp->rsp = sp->rippedoff;
++       sp->_filtered = _nc_prescreen.filter_mode;
++       sp->_use_env = _nc_prescreen.use_env;
++#if NCURSES_NO_PADDING
++       sp->_no_padding = _nc_prescreen._no_padding;
++#endif
++       sp->slk_format = 0;
++       sp->_slk = 0;
++       sp->_prescreen = TRUE;
++       SP_PRE_INIT(sp);
++#if USE_REENTRANT
++       sp->_TABSIZE = _nc_prescreen._TABSIZE;
++       sp->_ESCDELAY = _nc_prescreen._ESCDELAY;
++#endif
++       _nc_set_screen(sp);
++    }
++    return sp;
++}
++#endif
++
++#define ReturnScreenError() _nc_set_screen(0); \
++                            returnCode(ERR)
++
+ /* OS-independent screen initializations */
+ NCURSES_EXPORT(int)
+ _nc_setupscreen(int slines GCC_UNUSED,
+@@ -256,6 +316,9 @@
                 bool filtered,
                 int slk_format)
@@ -21519 +22485 @@
      int bottom_stolen = 0;
      bool support_cookies = USE_XMC_SUPPORT;
-@@ -272,6 +280,9 @@
+@@ -272,6 +335,9 @@
      }
  
@@ -21529 +22495 @@
      _nc_screen_chain = SP;
  
-@@ -546,7 +557,7 @@
+@@ -292,6 +358,9 @@
+     if (filtered) {
+        slines = 1;
+        SET_LINES(slines);
++#ifdef USE_TERM_DRIVER
++       CallDriver(sp, setfilter);
++#else
+        clear_screen = 0;
+        cursor_down = parm_down_cursor = 0;
+        cursor_address = 0;
+@@ -299,6 +368,7 @@
+        row_address = 0;
+ 
+        cursor_home = carriage_return;
++#endif
+        T(("filter screensize %dx%d", LINES, COLS));
+     }
+ #ifdef __DJGPP__
+@@ -364,9 +434,9 @@
+        char sep1, sep2;
+        int count = sscanf(env, "%d%c%d%c", &fg, &sep1, &bg, &sep2);
+        if (count >= 1) {
+-           SP->_default_fg = (fg >= 0 && fg < max_colors) ? fg : C_MASK;
++           SP->_default_fg = (fg >= 0 && fg < MaxColors) ? fg : C_MASK;
+            if (count >= 3) {
+-               SP->_default_bg = (bg >= 0 && bg < max_colors) ? bg : C_MASK;
++               SP->_default_bg = (bg >= 0 && bg < MaxColors) ? bg : C_MASK;
+            }
+            TR(TRACE_CHARPUT | TRACE_MOVE,
+               ("from environment assumed fg=%d, bg=%d",
+@@ -390,20 +460,20 @@
+            p = extract_fgbg(p, &(SP->_default_bg));
+        TR(TRACE_CHARPUT | TRACE_MOVE, ("decoded fg=%d, bg=%d",
+                                        SP->_default_fg, SP->_default_bg));
+-       if (SP->_default_fg >= max_colors) {
++       if (SP->_default_fg >= MaxColors) {
+            if (set_a_foreground != ABSENT_STRING
+                && !strcmp(set_a_foreground, "\033[3%p1%dm")) {
+                set_a_foreground = "\033[3%?%p1%{8}%>%t9%e%p1%d%;m";
+            } else {
+-               SP->_default_fg %= max_colors;
++               SP->_default_fg %= MaxColors;
+            }
+        }
+-       if (SP->_default_bg >= max_colors) {
++       if (SP->_default_bg >= MaxColors) {
+            if (set_a_background != ABSENT_STRING
+                && !strcmp(set_a_background, "\033[4%p1%dm")) {
+                set_a_background = "\033[4%?%p1%{8}%>%t9%e%p1%d%;m";
+            } else {
+-               SP->_default_bg %= max_colors;
++               SP->_default_bg %= MaxColors;
+            }
+        }
+     }
+@@ -546,7 +616,7 @@
      curscr = SP->_curscr;
  #endif
@@ -21538 +22559 @@
  
      newscr->_clear = TRUE;
-@@ -555,8 +566,8 @@
+@@ -555,8 +625,8 @@
      def_shell_mode();
      def_prog_mode();
@@ -21549 +22570 @@
  
         /* If we must simulate soft labels, grab off the line to be used.
-@@ -595,7 +606,7 @@
+@@ -564,7 +634,7 @@
+           formats (4-4 or 3-2-3) for which there may be some hardware
+           support. */
+        if (rop->hook == _nc_slk_initialize)
+-           if (!(num_labels <= 0 || !SLK_STDFMT(slk_format)))
++           if (!(NumLabels <= 0 || !SLK_STDFMT(slk_format)))
+                continue;
+        if (rop->hook) {
+            int count;
+@@ -595,7 +665,7 @@
         }
      }
@@ -21558 +22588 @@
      T(("creating stdscr"));
      assert((SP->_lines_avail + SP->_topstolen + bottom_stolen) == slines);
-@@ -615,27 +626,39 @@
+@@ -615,27 +685,39 @@
   * off from the top or bottom.
   */
@@ -21606 +22636 @@
      START_TRACE();
      T((T_CALLED("ripoffline(%d,%p)"), line, init));
-@@ -643,5 +666,15 @@
+@@ -643,5 +725,15 @@
      if (line == 0)
         returnCode(OK);
@@ -21625 +22655 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatrof.c ncurses-5.7/ncurses/base/lib_slkatrof.c
 --- ncurses-5.7.orig/ncurses/base/lib_slkatrof.c        2005-01-08 15:01:32.000000000 -0800
-+++ ncurses-5.7/ncurses/base/lib_slkatrof.c     2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_slkatrof.c     2009-09-12 08:51:17.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -21673 +22703 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatron.c ncurses-5.7/ncurses/base/lib_slkatron.c
 --- ncurses-5.7.orig/ncurses/base/lib_slkatron.c        2005-01-08 15:02:01.000000000 -0800
-+++ ncurses-5.7/ncurses/base/lib_slkatron.c     2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_slkatron.c     2009-09-12 08:51:17.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -21721 +22751 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c ncurses-5.7/ncurses/base/lib_slkatr_set.c
 --- ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c      2005-01-28 13:11:53.000000000 -0800
-+++ ncurses-5.7/ncurses/base/lib_slkatr_set.c   2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_slkatr_set.c   2009-09-12 08:51:17.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -21792 +22822 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatrset.c ncurses-5.7/ncurses/base/lib_slkatrset.c
 --- ncurses-5.7.orig/ncurses/base/lib_slkatrset.c       2005-01-08 13:46:47.000000000 -0800
-+++ ncurses-5.7/ncurses/base/lib_slkatrset.c    2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_slkatrset.c    2009-09-12 08:51:17.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -21832 +22862 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkattr.c ncurses-5.7/ncurses/base/lib_slkattr.c
 --- ncurses-5.7.orig/ncurses/base/lib_slkattr.c 2005-01-08 13:44:28.000000000 -0800
-+++ ncurses-5.7/ncurses/base/lib_slkattr.c      2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_slkattr.c      2009-09-12 08:51:17.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -21876 +22906 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slk.c ncurses-5.7/ncurses/base/lib_slk.c
 --- ncurses-5.7.orig/ncurses/base/lib_slk.c     2008-09-27 07:07:33.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_slk.c  2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_slk.c  2009-09-12 08:52:04.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -21884 +22914 @@
   * Permission is hereby granted, free of charge, to any person obtaining a  *
   * copy of this software and associated documentation files (the            *
-@@ -41,26 +41,81 @@
+@@ -41,26 +41,94 @@
   */
  
@@ -21897 +22927 @@
 +#endif
 +
-+MODULE_ID("$Id: lib_slk.c,v 1.40 2009/07/19 00:34:07 tom Exp $")
++MODULE_ID("$Id: lib_slk.c,v 1.42 2009/08/15 23:05:02 tom Exp $")
++
++#ifdef USE_TERM_DRIVER
++#define NumLabels    InfoOf(SP_PARM).numlabels
++#define NoColorVideo InfoOf(SP_PARM).nocolorvideo
++#define LabelWidth   InfoOf(SP_PARM).labelwidth
++#define LabelHeight  InfoOf(SP_PARM).labelheight
++#else
++#define NumLabels    num_labels
++#define NoColorVideo no_color_video
++#define LabelWidth   label_width
++#define LabelHeight  label_height
++#endif
  
  /*
@@ -21962 +23004 @@
 +                   x += (i == 2 || i == 4) ? gap : 1;
 +               }
-+           } else
-+               returnCode(slk_failed(NCURSES_SP_ARG));
++           } else {
++               return slk_failed(NCURSES_SP_ARG);
++           }
 +       }
 +    }
@@ -21974 +23017 @@
   * Initialize soft labels.
   * Called from newterm()
-@@ -68,108 +123,91 @@
+@@ -68,108 +136,91 @@
  NCURSES_EXPORT(int)
  _nc_slk_initialize(WINDOW *stwin, int cols)
@@ -21998 +23041 @@
 +    assert(term);
 +
-+    numlab = InfoOf(SP_PARM).numlabels;
++    numlab = NumLabels;
 +
 +    if (SP_PARM->_slk) {       /* we did this already, so simply return */
@@ -22019 +23062 @@
 -    if ((no_color_video & 1) == 0)
 -       SetAttr(SP->_slk->attr, A_STANDOUT);
-+    if ((InfoOf(SP_PARM).nocolorvideo & 1) == 0)
++    if ((NoColorVideo & 1) == 0)
 +       SetAttr(SP_PARM->_slk->attr, A_STANDOUT);
      else
@@ -22044 +23087 @@
 +                            : MAX_SKEY(SP_PARM->slk_format));
 +    SP_PARM->_slk->maxlen = ((numlab > 0)
-+                            ? InfoOf(SP_PARM).labelwidth * InfoOf(SP_PARM).labelheight
++                            ? LabelWidth * LabelHeight
 +                            : MAX_SKEY_LEN(SP_PARM->slk_format));
 +    SP_PARM->_slk->labcnt = ((SP_PARM->_slk->maxlab < MAX_SKEY(SP_PARM->slk_format))
@@ -22090 +23133 @@
 -       if (gap < 1)
 -           gap = 1;
--
++    res = _nc_format_slks(NCURSES_SP_ARGx cols);
+ 
 -       for (i = x = 0; i < SP->_slk->maxlab; i++) {
 -           SP->_slk->ent[i].ent_x = x;
@@ -22111 +23155 @@
 -               int gap = (cols - (SP->_slk->maxlab * max_length) - 5)
 -               / 2;
-+    res = _nc_format_slks(NCURSES_SP_ARGx cols);
- 
+-
 -               if (gap < 1)
 -                   gap = 1;
@@ -22139 +23182 @@
      returnCode(res);
  }
-@@ -178,14 +216,24 @@
+@@ -178,14 +229,24 @@
   * Restore the soft labels on the screen.
   */
@@ -22173 +23216 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkclear.c ncurses-5.7/ncurses/base/lib_slkclear.c
 --- ncurses-5.7.orig/ncurses/base/lib_slkclear.c        2007-12-29 09:51:47.000000000 -0800
-+++ ncurses-5.7/ncurses/base/lib_slkclear.c     2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_slkclear.c     2009-09-12 08:51:17.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -22229 +23272 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkcolor.c ncurses-5.7/ncurses/base/lib_slkcolor.c
 --- ncurses-5.7.orig/ncurses/base/lib_slkcolor.c        2005-01-28 13:11:53.000000000 -0800
-+++ ncurses-5.7/ncurses/base/lib_slkcolor.c     2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_slkcolor.c     2009-09-12 08:51:17.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -22293 +23336 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkinit.c ncurses-5.7/ncurses/base/lib_slkinit.c
 --- ncurses-5.7.orig/ncurses/base/lib_slkinit.c 2008-01-12 12:23:39.000000000 -0800
-+++ ncurses-5.7/ncurses/base/lib_slkinit.c      2009-07-19 15:04:03.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_slkinit.c      2009-09-12 08:51:40.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -22358 +23401 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slklab.c ncurses-5.7/ncurses/base/lib_slklab.c
 --- ncurses-5.7.orig/ncurses/base/lib_slklab.c  2003-03-29 14:53:48.000000000 -0800
-+++ ncurses-5.7/ncurses/base/lib_slklab.c       2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_slklab.c       2009-09-12 08:51:17.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -22405 +23448 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkrefr.c ncurses-5.7/ncurses/base/lib_slkrefr.c
 --- ncurses-5.7.orig/ncurses/base/lib_slkrefr.c 2008-09-27 07:07:53.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_slkrefr.c      2009-07-19 15:04:06.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_slkrefr.c      2009-09-12 08:52:07.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -22413 +23456 @@
   * Permission is hereby granted, free of charge, to any person obtaining a  *
   * copy of this software and associated documentation files (the            *
-@@ -38,9 +38,12 @@
+@@ -38,9 +38,18 @@
   *     Write SLK window to the (virtual) screen.
   */
@@ -22424 +23467 @@
 +#endif
 +
-+MODULE_ID("$Id: lib_slkrefr.c,v 1.21 2009/06/06 20:26:17 tom Exp $")
++MODULE_ID("$Id: lib_slkrefr.c,v 1.24 2009/08/29 18:43:13 tom Exp $")
++
++#ifdef USE_TERM_DRIVER
++#define NumLabels    InfoOf(SP_PARM).numlabels
++#else
++#define NumLabels    num_labels
++#endif
  
  /*
   * Paint the info line for the PC style SLK emulation.
-@@ -66,31 +69,47 @@
+@@ -66,31 +75,47 @@
   * Write the soft labels to the soft-key window.
   */
@@ -22446 +23495 @@
 +    slk = sp->_slk;
 +    fmt = sp->slk_format;
-+    numlab = InfoOf(sp).numlabels;
++    numlab = NumLabels;
 +
 +    if (slk->hidden)
@@ -22471 +23520 @@
 -                       wattrset(slk->win, AttrOf(SP->_slk->attr));
 +                   if (sp->_slk) {
-+                       wattrset(slk->win, AttrOf(sp->_slk->attr));
++                       (void) wattrset(slk->win, AttrOf(sp->_slk->attr));
                     }
                     waddstr(slk->win, slk->ent[i].form_text);
@@ -22478 +23527 @@
                        for the label window */
 -                   wattrset(slk->win, WINDOW_ATTRS(stdscr));
-+                   wattrset(slk->win, WINDOW_ATTRS(StdScreen(sp)));
++                   (void) wattrset(slk->win, WINDOW_ATTRS(StdScreen(sp)));
                 }
             }
             slk->ent[i].dirty = FALSE;
-@@ -98,7 +117,10 @@
+@@ -98,7 +123,10 @@
      }
      slk->dirty = FALSE;
@@ -22494 +23543 @@
             TPUTS_TRACE("label_off");
             putp(label_off);
-@@ -106,6 +128,7 @@
+@@ -106,6 +134,7 @@
             TPUTS_TRACE("label_on");
             putp(label_on);
@@ -22502 +23551 @@
  }
  
-@@ -113,32 +136,48 @@
+@@ -113,32 +142,48 @@
   * Refresh the soft labels.
   */
@@ -22520 +23569 @@
 -    slk_intern_refresh(SP->_slk);
 +    slk_intern_refresh(SP_PARM);
- 
--    returnCode(wnoutrefresh(SP->_slk->win));
++
 +    returnCode(wnoutrefresh(SP_PARM->_slk->win));
 +}
-+
+ 
+-    returnCode(wnoutrefresh(SP->_slk->win));
 +#if NCURSES_SP_FUNCS
 +NCURSES_EXPORT(int)
@@ -22565 +23614 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkset.c ncurses-5.7/ncurses/base/lib_slkset.c
 --- ncurses-5.7.orig/ncurses/base/lib_slkset.c  2007-10-13 13:08:46.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_slkset.c       2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_slkset.c       2009-09-12 08:51:17.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -22626 +23675 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slktouch.c ncurses-5.7/ncurses/base/lib_slktouch.c
 --- ncurses-5.7.orig/ncurses/base/lib_slktouch.c        2000-12-09 18:43:27.000000000 -0800
-+++ ncurses-5.7/ncurses/base/lib_slktouch.c     2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_slktouch.c     2009-09-12 08:51:17.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -22677 +23726 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_ungetch.c ncurses-5.7/ncurses/base/lib_ungetch.c
 --- ncurses-5.7.orig/ncurses/base/lib_ungetch.c 2008-05-31 09:44:54.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_ungetch.c      2009-07-19 15:03:53.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_ungetch.c      2009-09-12 08:51:30.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -22733 +23782 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_winch.c ncurses-5.7/ncurses/base/lib_winch.c
 --- ncurses-5.7.orig/ncurses/base/lib_winch.c   2001-06-02 16:42:08.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_winch.c        2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_winch.c        2009-09-12 08:51:17.000000000 -0700
 @@ -39,16 +39,16 @@
  
@@ -22757 +23806 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/lib_window.c ncurses-5.7/ncurses/base/lib_window.c
 --- ncurses-5.7.orig/ncurses/base/lib_window.c  2008-06-07 07:12:56.000000000 -0700
-+++ ncurses-5.7/ncurses/base/lib_window.c       2009-07-19 15:03:53.000000000 -0700
++++ ncurses-5.7/ncurses/base/lib_window.c       2009-09-12 08:51:30.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -22804 +23853 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/MKkeyname.awk ncurses-5.7/ncurses/base/MKkeyname.awk
 --- ncurses-5.7.orig/ncurses/base/MKkeyname.awk 2008-07-12 11:40:00.000000000 -0700
-+++ ncurses-5.7/ncurses/base/MKkeyname.awk      2009-07-19 15:03:59.000000000 -0700
++++ ncurses-5.7/ncurses/base/MKkeyname.awk      2009-09-12 08:51:37.000000000 -0700
 @@ -1,6 +1,6 @@
 -# $Id: MKkeyname.awk,v 1.40 2008/07/12 18:40:00 tom Exp $
@@ -22857 +23906 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/MKlib_gen.sh ncurses-5.7/ncurses/base/MKlib_gen.sh
 --- ncurses-5.7.orig/ncurses/base/MKlib_gen.sh  2008-08-30 12:20:50.000000000 -0700
-+++ ncurses-5.7/ncurses/base/MKlib_gen.sh       2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/base/MKlib_gen.sh       2009-09-12 08:51:17.000000000 -0700
 @@ -2,7 +2,7 @@
  #
@@ -22878 +23927 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/MKunctrl.awk ncurses-5.7/ncurses/base/MKunctrl.awk
 --- ncurses-5.7.orig/ncurses/base/MKunctrl.awk  2008-10-04 14:40:24.000000000 -0700
-+++ ncurses-5.7/ncurses/base/MKunctrl.awk       2009-07-19 15:04:13.000000000 -0700
++++ ncurses-5.7/ncurses/base/MKunctrl.awk       2009-09-12 08:51:50.000000000 -0700
 @@ -1,6 +1,6 @@
 -# $Id: MKunctrl.awk,v 1.23 2008/10/04 21:40:24 tom Exp $
@@ -22944 +23993 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/nc_panel.c ncurses-5.7/ncurses/base/nc_panel.c
 --- ncurses-5.7.orig/ncurses/base/nc_panel.c    2000-12-09 18:43:28.000000000 -0800
-+++ ncurses-5.7/ncurses/base/nc_panel.c 2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/ncurses/base/nc_panel.c 2009-09-12 08:51:28.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -22979 +24028 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/resizeterm.c ncurses-5.7/ncurses/base/resizeterm.c
 --- ncurses-5.7.orig/ncurses/base/resizeterm.c  2008-06-07 06:58:40.000000000 -0700
-+++ ncurses-5.7/ncurses/base/resizeterm.c       2009-07-19 15:04:13.000000000 -0700
++++ ncurses-5.7/ncurses/base/resizeterm.c       2009-09-12 08:52:09.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -23007 +24056 @@
  
 -#define stolen_lines (screen_lines - SP->_lines_avail)
-+MODULE_ID("$Id: resizeterm.c,v 1.40 2009/07/04 18:38:49 tom Exp $")
++MODULE_ID("$Id: resizeterm.c,v 1.41 2009/08/30 16:18:58 tom Exp $")
  
  /*
@@ -23122 +24171 @@
 +           _nc_format_slks(
 +#if NCURSES_SP_FUNCS
-+               _nc_screen_of(win),
++                              _nc_screen_of(win),
 +#endif
-+               ToCols);
++                              ToCols);
      } else if (win->_begy >= bottom) {
         /*
@@ -23197 +24246 @@
      }
  
-     _nc_lock_global(curses);
+-    _nc_lock_global(curses);
++    _nc_nonsp_lock_global(curses);
  
 -    was_stolen = (screen_lines - SP->_lines_avail);
@@ -23242 +24292 @@
 +       screen_lines(SP_PARM) = ToLines;
 +       screen_columns(SP_PARM) = ToCols;
-+
+ 
+-       SP->_lines_avail = lines - was_stolen;
 +#ifdef USE_TERM_DRIVER
 +       CallDriver_2(SP_PARM, setsize, ToLines, ToCols);
@@ -23250 +24301 @@
 +#endif
  
--       SP->_lines_avail = lines - was_stolen;
-+       SP_PARM->_lines_avail = ToLines - was_stolen;
- 
 -       if (SP->oldhash) {
 -           FreeAndNull(SP->oldhash);
++       SP_PARM->_lines_avail = ToLines - was_stolen;
++
 +       if (SP_PARM->oldhash) {
 +           FreeAndNull(SP_PARM->oldhash);
@@ -23265 +24315 @@
  #ifdef TRACE
         if (USE_TRACEF(TRACE_UPDATE)) {
-@@ -383,6 +423,18 @@
+@@ -378,11 +418,23 @@
+     SET_LINES(ToLines - was_stolen);
+     SET_COLS(ToCols);
+ 
+-    _nc_unlock_global(curses);
++    _nc_nonsp_unlock_global(curses);
+ 
      returnCode(result);
  }
@@ -23274 +24330 @@
 +{
 +    int res = ERR;
-+    _nc_lock_global(curses);
++    _nc_sp_lock_global(curses);
 +    res = NCURSES_SP_NAME(resize_term) (CURRENT_SCREEN, ToLines, ToCols);
-+    _nc_unlock_global(curses);
++    _nc_sp_unlock_global(curses);
 +    return (res);
 +}
@@ -23369 +24425 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/safe_sprintf.c ncurses-5.7/ncurses/base/safe_sprintf.c
 --- ncurses-5.7.orig/ncurses/base/safe_sprintf.c        2007-04-21 15:28:06.000000000 -0700
-+++ ncurses-5.7/ncurses/base/safe_sprintf.c     2009-07-19 15:03:53.000000000 -0700
++++ ncurses-5.7/ncurses/base/safe_sprintf.c     2009-09-12 08:51:30.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -23437 +24493 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/tries.c ncurses-5.7/ncurses/base/tries.c
 --- ncurses-5.7.orig/ncurses/base/tries.c       2008-08-16 12:22:55.000000000 -0700
-+++ ncurses-5.7/ncurses/base/tries.c    2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/base/tries.c    2009-09-12 08:51:17.000000000 -0700
 @@ -39,7 +39,7 @@
  
@@ -23460 +24516 @@
 diff -Naur ncurses-5.7.orig/ncurses/base/wresize.c ncurses-5.7/ncurses/base/wresize.c
 --- ncurses-5.7.orig/ncurses/base/wresize.c     2008-06-07 06:59:01.000000000 -0700
-+++ ncurses-5.7/ncurses/base/wresize.c  2009-07-19 15:04:03.000000000 -0700
++++ ncurses-5.7/ncurses/base/wresize.c  2009-09-12 08:51:40.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -23501 +24557 @@
 diff -Naur ncurses-5.7.orig/ncurses/curses.priv.h ncurses-5.7/ncurses/curses.priv.h
 --- ncurses-5.7.orig/ncurses/curses.priv.h      2008-10-04 14:37:45.000000000 -0700
-+++ ncurses-5.7/ncurses/curses.priv.h   2009-07-19 15:04:13.000000000 -0700
++++ ncurses-5.7/ncurses/curses.priv.h   2009-09-12 08:52:09.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -23519 +24575 @@
  /*
 - * $Id: curses.priv.h,v 1.394 2008/10/04 21:37:45 tom Exp $
-+ * $Id: curses.priv.h,v 1.430 2009/07/04 20:40:42 tom Exp $
++ * $Id: curses.priv.h,v 1.436 2009/08/30 18:13:54 tom Exp $
   *
   *     curses.priv.h
@@ -23648 +24704 @@
  #define GetNoPadding(sp)       FALSE
  #define SetNoPadding(sp)       /*nothing*/
-@@ -302,17 +375,34 @@
+@@ -301,18 +374,37 @@
+ #define GET_SCREEN_PAIR(s)     GetPair(SCREEN_ATTRS(s))
  #define SET_SCREEN_PAIR(s,p)   SetPair(SCREEN_ATTRS(s), p)
  
++#if USE_REENTRANT || NCURSES_SP_FUNCS
++NCURSES_EXPORT(int *)        _nc_ptr_Lines (SCREEN *);
++NCURSES_EXPORT(int *)        _nc_ptr_Cols (SCREEN *);
++NCURSES_EXPORT(int *)        _nc_ptr_Tabsize (SCREEN *);
++NCURSES_EXPORT(int *)        _nc_ptr_Escdelay (SCREEN *);
++#endif
++
  #if USE_REENTRANT
 -NCURSES_EXPORT(int *) _nc_ptr_Lines (void);
@@ -23664 +24728 @@
 -#define SET_COLS(value)  COLS = value
 +
-+NCURSES_EXPORT(int *)        _nc_ptr_Lines (SCREEN *);
-+NCURSES_EXPORT(int *)        _nc_ptr_Cols (SCREEN *);
-+NCURSES_EXPORT(int *)        _nc_ptr_Tabsize (SCREEN *);
-+NCURSES_EXPORT(int *)        _nc_ptr_Escdelay (SCREEN *);
-+
 +#define ptrLines(sp)         (sp ? &(sp->_LINES) : &(_nc_prescreen._LINES))
 +#define ptrCols(sp)          (sp ? &(sp->_COLS) : &(_nc_prescreen._COLS))
@@ -23694 +24753 @@
  
  #define TR_MUTEX(data) _tracef("%s@%d: me:%08lX COUNT:%2u/%2d/%6d/%2d/%s%9u: " #data, \
-@@ -404,6 +494,8 @@
+@@ -389,6 +481,36 @@
+ 
+ #endif /* USE_PTHREADS */
+ 
++/*
++ * When using sp-funcs, locks are targeted to SCREEN-level granularity.
++ * So the locking is done in the non-sp-func (which calls the sp-func) rather
++ * than in the sp-func itself.
++ *
++ * Use the _nc_nonsp_XXX functions in the function using "NCURSES_SP_NAME()".
++ * Use the _nc_sp_XXX functions in the function using "#if NCURSES_SP_FUNCS".
++ */
++#if NCURSES_SP_FUNCS
++
++#define _nc_nonsp_lock_global(name)    /* nothing */
++#define _nc_nonsp_try_global(name)    0
++#define _nc_nonsp_unlock_global(name)  /* nothing */
++
++#define _nc_sp_lock_global(name)       _nc_lock_global(name)
++#define _nc_sp_try_global(name)         _nc_try_global(name)
++#define _nc_sp_unlock_global(name)     _nc_unlock_global(name)
++
++#else
++
++#define _nc_nonsp_lock_global(name)    _nc_lock_global(name)
++#define _nc_nonsp_try_global(name)      _nc_try_global(name)
++#define _nc_nonsp_unlock_global(name)  _nc_unlock_global(name)
++
++#define _nc_sp_lock_global(name)       /* nothing */
++#define _nc_sp_try_global(name)    0
++#define _nc_sp_unlock_global(name)     /* nothing */
++
++#endif
++
+ #if HAVE_GETTIMEOFDAY
+ # define PRECISE_GETTIME 1
+ # define TimeType struct timeval
+@@ -404,6 +526,8 @@
  #define C_SHIFT 9              /* we need more bits than there are colors */
  #define C_MASK                 ((1 << C_SHIFT) - 1)
@@ -23703 +24799 @@
  
  #define COLOR_DEFAULT          C_MASK
-@@ -464,13 +556,13 @@
+@@ -464,13 +588,13 @@
  } slk_ent;
  
@@ -23723 +24819 @@
  } SLK;
  
-@@ -493,10 +585,10 @@
+@@ -493,10 +617,10 @@
  typedef int (*TYPE_Gpm_Close) (void);
  typedef int (*TYPE_Gpm_GetEvent) (Gpm_Event *);
@@ -23738 +24834 @@
  /* link statically to GPM */
  #define my_gpm_fd       &gpm_fd
-@@ -609,8 +701,10 @@
+@@ -609,8 +733,10 @@
         int             tgetent_index;
         long            tgetent_sequence;
@@ -23750 +24846 @@
  #if USE_HOME_TERMINFO
         char            *home_terminfo;
-@@ -644,7 +738,9 @@
+@@ -644,7 +770,9 @@
         char            traceatr_color_buf[2][80];
         int             traceatr_color_sel;
@@ -23761 +24857 @@
  
  #ifdef USE_PTHREADS
-@@ -669,8 +765,10 @@
+@@ -669,8 +797,10 @@
         bool            use_env;
         bool            filter_mode;
@@ -23772 +24868 @@
         TTY             *saved_tty;     /* savetty/resetty information      */
  #if NCURSES_NO_PADDING
-@@ -680,6 +778,8 @@
+@@ -680,6 +810,8 @@
         chtype          *real_acs_map;
         int             _LINES;
@@ -23781 +24877 @@
  #ifdef TRACE
         long            _outchars;
-@@ -688,8 +788,16 @@
+@@ -688,8 +820,16 @@
  #endif
  } NCURSES_PRESCREEN;
@@ -23800 +24896 @@
  extern NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen;
  
-@@ -703,6 +811,8 @@
+@@ -703,6 +843,8 @@
         char            *_setbuf;       /* buffered I/O for output          */
         bool            _filtered;      /* filter() was called              */
@@ -23809 +24905 @@
         TERMINAL        *_term;         /* terminal type information        */
         TTY             _saved_tty;     /* savetty/resetty information      */
-@@ -716,6 +826,10 @@
+@@ -716,6 +858,10 @@
         WINDOW          *_newscr;       /* virtual screen to be updated to  */
         WINDOW          *_stdscr;       /* screen's full-window context     */
@@ -23820 +24916 @@
         TRIES           *_key_ok;       /* Disabled keys via keyok(,FALSE)  */
         bool            _tried;         /* keypad mode was initialized      */
-@@ -794,11 +908,13 @@
+@@ -794,11 +940,13 @@
         int             _color_count;   /* count of colors in palette        */
         colorpair_t     *_color_pairs;  /* screen's color pair list          */
@@ -23834 +24930 @@
         chtype          _ok_attributes; /* valid attributes for terminal     */
         chtype          _xmc_suppress;  /* attributes to suppress if xmc     */
-@@ -820,8 +936,9 @@
+@@ -820,8 +968,9 @@
          */
         bool            _nc_sp_idlok;
@@ -23846 +24942 @@
         /*
          * These are the data that support the mouse interface.
-@@ -875,7 +992,7 @@
+@@ -875,7 +1024,7 @@
          * This supports automatic resizing
          */
@@ -23855 +24951 @@
  
         /*
-@@ -895,7 +1012,7 @@
+@@ -895,7 +1044,7 @@
         int             _oldnum_size;
  
@@ -23864 +24960 @@
         int             _legacy_coding; /* see use_legacy_coding() */
  
-@@ -915,6 +1032,15 @@
+@@ -915,6 +1064,15 @@
         char            tracechr_buf[40];
         char            tracemse_buf[TRACEMSE_MAX];
@@ -23880 +24976 @@
          * ncurses/ncursesw are the same up to this point.
          */
-@@ -943,6 +1069,20 @@
+@@ -943,6 +1101,20 @@
  
  #define WINDOW_EXT(win,field) (((WINDOWLIST *)(win))->field)
@@ -23901 +24997 @@
  #ifndef UCHAR_MAX
  #define UCHAR_MAX 255
-@@ -1112,7 +1252,7 @@
+@@ -1112,7 +1284,7 @@
                                 AttrOf(dst) |= (ext + 1)
  
@@ -23910 +25006 @@
                          || (!isWidecExt(ch) &&                         \
                              (ch).chars[1] == L'\0' &&                  \
-@@ -1214,8 +1354,8 @@
+@@ -1214,8 +1386,8 @@
   * Standardize/simplify common loops
   */
@@ -23921 +25017 @@
  /*
   * Prefixes for call/return points of library function traces.  We use these to
-@@ -1263,7 +1403,7 @@
+@@ -1263,7 +1435,7 @@
  #define returnBool(code)       TRACE_RETURN(code,bool)
  #define returnCPtr(code)       TRACE_RETURN(code,cptr)
@@ -23930 +25026 @@
  #define returnPtr(code)                TRACE_RETURN(code,ptr)
  #define returnSP(code)         TRACE_RETURN(code,sp)
-@@ -1322,7 +1462,7 @@
+@@ -1322,7 +1494,7 @@
  #define returnBool(code)       return code
  #define returnCPtr(code)       return code
@@ -23939 +25035 @@
  #define returnPtr(code)                return code
  #define returnSP(code)         return code
-@@ -1348,7 +1488,7 @@
+@@ -1348,7 +1520,7 @@
  
  #define ALL_BUT_COLOR ((chtype)~(A_COLOR))
@@ -23948 +25044 @@
  #define toggle_attr_on(S,at) {\
     if (PAIR_NUMBER(at) > 0) {\
-@@ -1367,38 +1507,38 @@
+@@ -1367,38 +1539,38 @@
     }\
     TR(TRACE_ATTRS, ("new attribute is %s", _traceattr((S))));}
@@ -24003 +25099 @@
  
  /*
-@@ -1425,16 +1565,28 @@
+@@ -1425,16 +1597,28 @@
  extern NCURSES_EXPORT(void) _nc_toggle_attr_off (attr_t *, attr_t);
  
@@ -24038 +25134 @@
  #else
  
-@@ -1483,8 +1635,8 @@
+@@ -1483,8 +1667,8 @@
  #endif
  
@@ -24049 +25145 @@
  /* lib_addch.c */
  #if USE_WIDEC_SUPPORT
-@@ -1503,7 +1655,7 @@
+@@ -1503,7 +1687,7 @@
  extern NCURSES_EXPORT(int) _nc_wgetch(WINDOW *, unsigned long *, int EVENTLIST_2nd(_nc_eventlist *));
  
@@ -24058 +25154 @@
  /* lib_mvcur.c */
  #define INFINITY       1000000 /* cost: too high to use */
-@@ -1519,7 +1671,7 @@
+@@ -1519,7 +1703,7 @@
  extern NCURSES_EXPORT(void) _nc_screen_wrap (void);
  
@@ -24067 +25163 @@
  /* lib_mvcur.c */
  #define INFINITY       1000000 /* cost: too high to use */
-@@ -1527,10 +1679,13 @@
+@@ -1527,10 +1711,12 @@
  
  /* lib_setup.c */
@@ -24078 +25174 @@
 +extern NCURSES_EXPORT(int)    _nc_locale_breaks_acs(TERMINAL *);
 +extern NCURSES_EXPORT(int)    _nc_setupterm(NCURSES_CONST char *, int, int *, bool);
-+extern NCURSES_EXPORT(void)   _nc_get_screensize(SCREEN *, int *, int *);
 +
 +/* lib_set_term.c */
@@ -24085 +25180 @@
  /* lib_tstp.c */
  #if USE_SIGWINCH
-@@ -1539,9 +1694,6 @@
+@@ -1539,9 +1725,6 @@
  #define _nc_handle_sigwinch(a) /* nothing */
  #endif
@@ -24095 +25190 @@
  #if USE_WIDEC_SUPPORT
  extern NCURSES_EXPORT(void) _nc_init_wacs(void);
-@@ -1577,8 +1729,6 @@
+@@ -1577,9 +1760,8 @@
  
  /* elsewhere ... */
@@ -24102 +25197 @@
 -extern NCURSES_EXPORT(NCURSES_CONST char *) _nc_unctrl (SCREEN *, chtype);
  extern NCURSES_EXPORT(SCREEN *) _nc_screen_of (WINDOW *);
++extern NCURSES_EXPORT(TERMINAL*) _nc_get_cur_term (void);
  extern NCURSES_EXPORT(WINDOW *) _nc_makenew (int, int, int, int, int);
  extern NCURSES_EXPORT(char *) _nc_trace_buf (int, size_t);
-@@ -1592,12 +1742,14 @@
+ extern NCURSES_EXPORT(char *) _nc_trace_bufcat (int, const char *);
+@@ -1592,12 +1774,14 @@
  extern NCURSES_EXPORT(int) _nc_keypad (SCREEN *, bool);
  extern NCURSES_EXPORT(int) _nc_ospeed (int);
@@ -24121 +25218 @@
  extern NCURSES_EXPORT(void) _nc_freeall (void);
  extern NCURSES_EXPORT(void) _nc_hash_map (void);
-@@ -1661,24 +1813,33 @@
+@@ -1661,24 +1845,33 @@
  
  #define USE_SETBUF_0 0
@@ -24162 +25259 @@
  
  /*
-@@ -1686,10 +1847,11 @@
+@@ -1686,10 +1879,11 @@
   * if the application is running multiple screens under X, it's quite possible
   * they could all have type xterm but have different sizes!  So...
@@ -24176 +25273 @@
  /*
   * Some constants related to SLK's
-@@ -1707,14 +1869,240 @@
+@@ -1707,14 +1901,277 @@
  #define MAX_SKEY(fmt)     (SLK_STDFMT(fmt)? MAX_SKEY_OLD : MAX_SKEY_PC)
  #define MAX_SKEY_LEN(fmt) (SLK_STDFMT(fmt)? MAX_SKEY_LEN_OLD : MAX_SKEY_LEN_PC)
@@ -24208 +25305 @@
 +    sp->jump = outc
 +
++#ifdef USE_TERM_DRIVER
 +struct DriverTCB; /* Terminal Control Block forward declaration */
 +typedef void* TERM_HANDLE;
@@ -24269 +25367 @@
 +} TERM_DRIVER;
 +
-+
 +typedef struct DriverTCB
 +{
@@ -24298 +25395 @@
 +extern NCURSES_EXPORT_VAR(const color_t*) _nc_hls_palette;
 +
++extern NCURSES_EXPORT(int)      _nc_get_driver(TERMINAL_CONTROL_BLOCK*, const char*, int*);
++extern NCURSES_EXPORT(void)     _nc_get_screensize_ex(SCREEN *, TERMINAL *, int *, int *);
++#endif /* USE_TERM_DRIVER */
++
++/*
++ * Entrypoints which are actually provided in the terminal driver, which would
++ * be an sp-name otherwise.
++ */
 +#ifdef USE_TERM_DRIVER
-+extern NCURSES_EXPORT(int)      _nc_tinfo_has_key(SCREEN*, int);
-+extern NCURSES_EXPORT(int)      _nc_tinfo_doupdate(SCREEN *sp);
-+extern NCURSES_EXPORT(int)      _nc_tinfo_mvcur(SCREEN*,int,int,int,int);
-+extern NCURSES_EXPORT(int)      _nc_get_driver(TERMINAL_CONTROL_BLOCK*, const char*, int*);
++#define TINFO_HAS_KEY           _nc_tinfo_has_key
++#define TINFO_DOUPDATE          _nc_tinfo_doupdate
++#define TINFO_MVCUR             _nc_tinfo_mvcur
++extern NCURSES_EXPORT(int)      TINFO_HAS_KEY(SCREEN*, int);
++extern NCURSES_EXPORT(int)      TINFO_DOUPDATE(SCREEN *);
++extern NCURSES_EXPORT(int)      TINFO_MVCUR(SCREEN*, int, int, int, int);
++#else
++#define TINFO_HAS_KEY           NCURSES_SP_NAME(has_key)
++#define TINFO_DOUPDATE          NCURSES_SP_NAME(doupdate)
++#define TINFO_MVCUR             NCURSES_SP_NAME(mvcur)
 +#endif
 +
++/*
++ * Entrypoints using an extra parameter with the terminal driver.
++ */
++#ifdef USE_TERM_DRIVER
++extern NCURSES_EXPORT(void)   _nc_get_screensize(SCREEN *, TERMINAL *, int *, int *);
++extern NCURSES_EXPORT(int)    _nc_setupterm_ex(TERMINAL **, NCURSES_CONST char *, int , int *, bool);
++#define TINFO_GET_SIZE(sp, tp, lp, cp) \
++       _nc_get_screensize(sp, tp, lp, cp)
++#define TINFO_SET_CURTERM(sp, tp) \
++       NCURSES_SP_NAME(set_curterm)(sp, tp)
++#define TINFO_SETUP_TERM(tpp, name, fd, err, reuse) \
++       _nc_setupterm_ex(tpp, name, fd, err, reuse)
++#else /* !USE_TERM_DRIVER */
++extern NCURSES_EXPORT(void)   _nc_get_screensize(SCREEN *, int *, int *);
++#define TINFO_GET_SIZE(sp, tp, lp, cp) \
++       _nc_get_screensize(sp, lp, cp)
++#define TINFO_SET_CURTERM(sp, tp) \
++       set_curterm(tp)
++#define TINFO_SETUP_TERM(tpp, name, fd, err, reuse) \
++       _nc_setupterm(name, fd, err, reuse)
++#endif /* !USE_TERM_DRIVER */
++
++#ifdef USE_TERM_DRIVER
 +#ifdef __MINGW32__
 +#include <nc_mingw.h>
@@ -24310 +25444 @@
 +#endif
 +extern NCURSES_EXPORT_VAR(TERM_DRIVER) _nc_TINFO_DRIVER;
++#endif
 +
 +#ifdef USE_TERM_DRIVER
@@ -24330 +25465 @@
 +
 +#if USE_REENTRANT
-+extern NCURSES_EXPORT(char *)    NCURSES_SP_NAME(_nc_ttytype)(SCREEN*);
 +extern NCURSES_EXPORT(int)       NCURSES_SP_NAME(_nc_TABSIZE)(SCREEN*);
 +extern NCURSES_EXPORT(char *)    NCURSES_SP_NAME(longname)(SCREEN*);
@@ -24343 +25477 @@
 + * part of the API up to now
 + */
-+extern NCURSES_EXPORT(TERMINAL*) NCURSES_SP_NAME(cur_term)(SCREEN *sp);
++extern NCURSES_EXPORT(TERMINAL*) NCURSES_SP_NAME(_nc_get_cur_term) (SCREEN *sp);
 +extern NCURSES_EXPORT(WINDOW *) NCURSES_SP_NAME(_nc_makenew) (SCREEN*, int, int, int, int, int);
 +extern NCURSES_EXPORT(bool)     NCURSES_SP_NAME(_nc_reset_colors)(SCREEN*);
@@ -24421 +25555 @@
 diff -Naur ncurses-5.7.orig/ncurses/llib-lncurses ncurses-5.7/ncurses/llib-lncurses
 --- ncurses-5.7.orig/ncurses/llib-lncurses      2008-10-11 13:57:29.000000000 -0700
-+++ ncurses-5.7/ncurses/llib-lncurses   2009-07-19 15:04:11.000000000 -0700
++++ ncurses-5.7/ncurses/llib-lncurses   2009-09-12 08:51:49.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -26113 +27247 @@
 diff -Naur ncurses-5.7.orig/ncurses/llib-lncursest ncurses-5.7/ncurses/llib-lncursest
 --- ncurses-5.7.orig/ncurses/llib-lncursest     2008-10-11 14:13:13.000000000 -0700
-+++ ncurses-5.7/ncurses/llib-lncursest  2009-07-19 15:04:11.000000000 -0700
++++ ncurses-5.7/ncurses/llib-lncursest  2009-09-12 08:51:49.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -27859 +28993 @@
 diff -Naur ncurses-5.7.orig/ncurses/llib-lncursestw ncurses-5.7/ncurses/llib-lncursestw
 --- ncurses-5.7.orig/ncurses/llib-lncursestw    1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/ncurses/llib-lncursestw 2009-07-19 15:04:11.000000000 -0700
++++ ncurses-5.7/ncurses/llib-lncursestw 2009-09-12 08:51:49.000000000 -0700
 @@ -0,0 +1,5192 @@
 +/****************************************************************************
@@ -33055 +34189 @@
 diff -Naur ncurses-5.7.orig/ncurses/llib-lncursesw ncurses-5.7/ncurses/llib-lncursesw
 --- ncurses-5.7.orig/ncurses/llib-lncursesw     2008-10-11 14:03:02.000000000 -0700
-+++ ncurses-5.7/ncurses/llib-lncursesw  2009-07-19 15:04:11.000000000 -0700
++++ ncurses-5.7/ncurses/llib-lncursesw  2009-09-12 08:51:49.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -34824 +35958 @@
 diff -Naur ncurses-5.7.orig/ncurses/Makefile.in ncurses-5.7/ncurses/Makefile.in
 --- ncurses-5.7.orig/ncurses/Makefile.in        2008-10-18 07:11:54.000000000 -0700
-+++ ncurses-5.7/ncurses/Makefile.in     2009-07-19 15:04:13.000000000 -0700
++++ ncurses-5.7/ncurses/Makefile.in     2009-09-12 08:52:04.000000000 -0700
 @@ -1,6 +1,6 @@
 -# $Id: Makefile.in,v 1.113 2008/10/18 14:11:54 tom Exp $
-+# $Id: Makefile.in,v 1.117 2009/07/04 16:36:11 tom Exp $
++# $Id: Makefile.in,v 1.119 2009/08/10 09:06:37 tom Exp $
  ##############################################################################
 -# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
@@ -34869 +36003 @@
  ################################################################################
  all \
-@@ -204,7 +206,7 @@
+@@ -200,11 +202,11 @@
+        $(BUILD_CC) -o $@ $(BUILD_CCFLAGS) $(tinfo)/make_keys.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
+ 
+ make_hash$(BUILD_EXEEXT) : \
+-               $(tinfo)/comp_hash.c \
++               $(tinfo)/make_hash.c \
                 ../include/hashsize.h
-        $(BUILD_CC) -o $@ $(BUILD_CCFLAGS) -DMAIN_PROGRAM $(tinfo)/comp_hash.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
+-       $(BUILD_CC) -o $@ $(BUILD_CCFLAGS) -DMAIN_PROGRAM $(tinfo)/comp_hash.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
++       $(BUILD_CC) -o $@ $(BUILD_CCFLAGS) $(tinfo)/make_hash.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
  
 -./expanded.c : $(serial)/MKexpanded.sh
-+./expanded.c : curses.priv.h $(serial)/MKexpanded.sh
++./expanded.c : $(srcdir)/curses.priv.h $(serial)/MKexpanded.sh
         sh -e $(serial)/MKexpanded.sh "$(CPP)" $(CPPFLAGS) > $@
  
@@ -34880 +36020 @@
 diff -Naur ncurses-5.7.orig/ncurses/modules ncurses-5.7/ncurses/modules
 --- ncurses-5.7.orig/ncurses/modules    2007-09-08 15:03:34.000000000 -0700
-+++ ncurses-5.7/ncurses/modules 2009-07-19 15:04:15.000000000 -0700
++++ ncurses-5.7/ncurses/modules 2009-09-12 08:51:52.000000000 -0700
 @@ -1,6 +1,6 @@
 -# $Id: modules,v 1.112 2007/09/08 22:03:34 tom Exp $
@@ -34912 +36052 @@
 diff -Naur ncurses-5.7.orig/ncurses/README ncurses-5.7/ncurses/README
 --- ncurses-5.7.orig/ncurses/README     2006-04-22 15:19:37.000000000 -0700
-+++ ncurses-5.7/ncurses/README  2009-07-19 15:04:11.000000000 -0700
++++ ncurses-5.7/ncurses/README  2009-09-12 08:51:49.000000000 -0700
 @@ -1,5 +1,5 @@
  -------------------------------------------------------------------------------
@@ -34950 +36090 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/access.c ncurses-5.7/ncurses/tinfo/access.c
 --- ncurses-5.7.orig/ncurses/tinfo/access.c     2007-11-17 16:57:53.000000000 -0800
-+++ ncurses-5.7/ncurses/tinfo/access.c  2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/access.c  2009-09-12 08:51:28.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -34978 +36118 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/alloc_ttype.c ncurses-5.7/ncurses/tinfo/alloc_ttype.c
 --- ncurses-5.7.orig/ncurses/tinfo/alloc_ttype.c        2008-10-12 09:12:00.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/alloc_ttype.c     2009-07-19 15:03:53.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/alloc_ttype.c     2009-09-12 08:51:30.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -35125 +36265 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/captoinfo.c ncurses-5.7/ncurses/tinfo/captoinfo.c
 --- ncurses-5.7.orig/ncurses/tinfo/captoinfo.c  2008-08-16 12:24:51.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/captoinfo.c       2009-07-19 15:03:48.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/captoinfo.c       2009-09-12 08:51:25.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -35153 +36293 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/comp_hash.c ncurses-5.7/ncurses/tinfo/comp_hash.c
 --- ncurses-5.7.orig/ncurses/tinfo/comp_hash.c  2008-08-16 10:06:53.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/comp_hash.c       2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/comp_hash.c       2009-09-12 08:52:02.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -35161 +36301 @@
   * Permission is hereby granted, free of charge, to any person obtaining a  *
   * copy of this software and associated documentation files (the            *
-@@ -50,7 +50,7 @@
- #define DEBUG(level, params)   /*nothing */
- #endif
- 
+@@ -44,110 +44,36 @@
+ #include <tic.h>
+ #include <hashsize.h>
+ 
+-#ifdef MAIN_PROGRAM
+-#include <ctype.h>
+-#undef  DEBUG
+-#define DEBUG(level, params)   /*nothing */
+-#endif
+-
 -MODULE_ID("$Id: comp_hash.c,v 1.36 2008/08/16 17:06:53 tom Exp $")
-+MODULE_ID("$Id: comp_hash.c,v 1.45 2009/07/18 20:30:21 tom Exp $")
- 
- static int hash_function(const char *);
- 
-@@ -91,8 +91,7 @@
-        hash_table[hashvalue] = i;
-     }
- 
+-
+-static int hash_function(const char *);
+-
+-/*
+- *     _nc_make_hash_table()
+- *
+- *     Takes the entries in table[] and hashes them into hash_table[]
+- *     by name.  There are CAPTABSIZE entries in table[] and HASHTABSIZE
+- *     slots in hash_table[].
+- *
+- */
+-
+-#ifdef MAIN_PROGRAM
+-
+-#undef MODULE_ID
+-#define MODULE_ID(id)          /*nothing */
+-#include <tinfo/doalloc.c>
+-
+-static void
+-_nc_make_hash_table(struct name_table_entry *table,
+-                   short *hash_table)
+-{
+-    short i;
+-    int hashvalue;
+-    int collisions = 0;
+-
+-    for (i = 0; i < HASHTABSIZE; i++) {
+-       hash_table[i] = -1;
+-    }
+-    for (i = 0; i < CAPTABSIZE; i++) {
+-       hashvalue = hash_function(table[i].nte_name);
+-
+-       if (hash_table[hashvalue] >= 0)
+-           collisions++;
+-
+-       if (hash_table[hashvalue] != 0)
+-           table[i].nte_link = hash_table[hashvalue];
+-       hash_table[hashvalue] = i;
+-    }
+-
 -    DEBUG(4, ("Hash table complete: %d collisions out of %d entries",
 -             collisions, CAPTABSIZE));
-+    printf("/* %d collisions out of %d entries */\n", collisions, CAPTABSIZE);
- }
- #endif
- 
-@@ -121,16 +120,24 @@
-     return (int) (sum % HASHTABSIZE);
- }
- 
-+#ifndef MAIN_PROGRAM
-+
-+#define SameName(a,b,termcap) (termcap ? !strncmp(a,b,2) : !strcmp(a,b))
-+#if 0
-+static bool
-+same_name(const char *a, const char *b, bool termcap)
-+{
-+    fprintf(stderr, "compare(%s,%s)\n", a, b);
-+    return SameName(a, b, termcap);
-+}
-+#else
-+#define same_name(a,b,termcap) SameName(a,b,termcap)
-+#endif
-+
+-}
+-#endif
++MODULE_ID("$Id: comp_hash.c,v 1.48 2009/08/08 17:36:21 tom Exp $")
+ 
  /*
+- *     int hash_function(string)
+- *
+- *     Computes the hashing function on the given string.
+- *
+- *     The current hash function is the sum of each consectutive pair
+- *     of characters, taken as two-byte integers, mod HASHTABSIZE.
+- *
++ * Finds the entry for the given string in the hash table if present.
++ * Returns a pointer to the entry in the table or 0 if not found.
+  */
+-
+-static int
+-hash_function(const char *string)
+-{
+-    long sum = 0;
+-
+-    DEBUG(9, ("hashing %s", string));
+-    while (*string) {
+-       sum += (long) (*string + (*(string + 1) << 8));
+-       string++;
+-    }
+-
+-    DEBUG(9, ("sum is %ld", sum));
+-    return (int) (sum % HASHTABSIZE);
+-}
+-
+-/*
 - *     struct name_table_entry *
 - *     find_entry(string)
@@ -35205 +36392 @@
 - *     Returns a pointer to the entry in the table or 0 if not found.
 - *
-+ * Finds the entry for the given string in the hash table if present.
-+ * Returns a pointer to the entry in the table or 0 if not found.
-  */
+- */
 -
 -#ifndef MAIN_PROGRAM
++/* entrypoint used by tack (do not alter) */
  NCURSES_EXPORT(struct name_table_entry const *)
  _nc_find_entry(const char *string,
-               const short *hash_table)
-@@ -142,11 +149,15 @@
-     hashvalue = hash_function(string);
- 
-     if (hash_table[hashvalue] >= 0) {
+-              const short *hash_table)
++              const HashValue * hash_table)
+ {
++    bool termcap = (hash_table != _nc_get_hash_table(FALSE));
++    const HashData *data = _nc_get_hash_info(termcap);
+     int hashvalue;
+     struct name_table_entry const *ptr = 0;
+     struct name_table_entry const *real_table;
+ 
+-    hashvalue = hash_function(string);
++    hashvalue = data->hash_of(string);
++
++    if (data->table_data[hashvalue] >= 0) {
+ 
+-    if (hash_table[hashvalue] >= 0) {
 -       real_table = _nc_get_table(hash_table != _nc_get_hash_table(FALSE));
-+       bool termcap = (hash_table != _nc_get_hash_table(FALSE));
-+
-+       real_table = _nc_get_table(termcap);
-        ptr = real_table + hash_table[hashvalue];
+-       ptr = real_table + hash_table[hashvalue];
 -       while (strcmp(ptr->nte_name, string) != 0) {
 -           if (ptr->nte_link < 0)
 -               return 0;
-+       while (!same_name(ptr->nte_name, string, termcap)) {
+-           ptr = real_table + (ptr->nte_link + hash_table[HASHTABSIZE]);
++       real_table = _nc_get_table(termcap);
++       ptr = real_table + data->table_data[hashvalue];
++       while (!data->compare_names(ptr->nte_name, string)) {
 +           if (ptr->nte_link < 0) {
 +               ptr = 0;
 +               break;
 +           }
-            ptr = real_table + (ptr->nte_link + hash_table[HASHTABSIZE]);
++           ptr = real_table + (ptr->nte_link
++                               + data->table_data[data->table_size]);
         }
      }
-@@ -155,29 +166,36 @@
+ 
+@@ -155,216 +81,34 @@
  }
  
@@ -35258 +36456 @@
  {
 -    struct name_table_entry const *ptr;
-+    struct name_table_entry const *ptr = NULL;
-+    const short *hash_table = _nc_get_hash_table(termcap);
-+    int hashvalue = hash_function(string);
- 
+-
 -    for (ptr = table; ptr < table + CAPTABSIZE; ptr++) {
 -       if (ptr->nte_type == type && strcmp(string, ptr->nte_name) == 0)
 -           return (ptr);
-+    if (hash_table[hashvalue] >= 0) {
+-    }
+-
+-    return ((struct name_table_entry *) NULL);
+-}
+-#endif
+-
+-#ifdef MAIN_PROGRAM
+-/*
+- * This filter reads from standard input a list of tab-delimited columns,
+- * (e.g., from Caps.filtered) computes the hash-value of a specified column and
+- * writes the hashed tables to standard output.
+- *
+- * By compiling the hash table at build time, we're able to make the entire
+- * set of terminfo and termcap tables readonly (and also provide some runtime
+- * performance enhancement).
+- */
+-
+-#define MAX_COLUMNS BUFSIZ     /* this _has_ to be worst-case */
+-
+-static char **
+-parse_columns(char *buffer)
+-{
+-    static char **list;
+-
+-    int col = 0;
+-
+-    if (list == 0 && (list = typeCalloc(char *, MAX_COLUMNS)) == 0)
+-         return (0);
+-
+-    if (*buffer != '#') {
+-       while (*buffer != '\0') {
+-           char *s;
+-           for (s = buffer; (*s != '\0') && !isspace(UChar(*s)); s++)
+-               /*EMPTY */ ;
+-           if (s != buffer) {
+-               char mark = *s;
+-               *s = '\0';
+-               if ((s - buffer) > 1
+-                   && (*buffer == '"')
+-                   && (s[-1] == '"')) {        /* strip the quotes */
+-                   assert(s > buffer + 1);
+-                   s[-1] = '\0';
+-                   buffer++;
+-               }
+-               list[col] = buffer;
+-               col++;
+-               if (mark == '\0')
+-                   break;
+-               while (*++s && isspace(UChar(*s)))
+-                   /*EMPTY */ ;
+-               buffer = s;
+-           } else
++    struct name_table_entry const *ptr = NULL;
++    const HashData *data = _nc_get_hash_info(termcap);
++    int hashvalue = data->hash_of(string);
++
++    if (data->table_data[hashvalue] >= 0) {
 +       const struct name_table_entry *const table = _nc_get_table(termcap);
 +
-+       ptr = table + hash_table[hashvalue];
++       ptr = table + data->table_data[hashvalue];
 +       while (ptr->nte_type != type
-+              || !same_name(ptr->nte_name, string, termcap)) {
++              || !data->compare_names(ptr->nte_name, string)) {
 +           if (ptr->nte_link < 0) {
 +               ptr = 0;
-+               break;
-+           }
-+           ptr = table + (ptr->nte_link + hash_table[HASHTABSIZE]);
-+       }
+                break;
+-       }
+-    }
+-    return col ? list : 0;
+-}
+-
+-int
+-main(int argc, char **argv)
+-{
+-    struct name_table_entry *name_table = typeCalloc(struct
+-                                                    name_table_entry, CAPTABSIZE);
+-    short *hash_table = typeCalloc(short, HASHTABSIZE);
+-    const char *root_name = "";
+-    int column = 0;
+-    int bigstring = 0;
+-    int n;
+-    char buffer[BUFSIZ];
+-
+-    static const char *typenames[] =
+-    {"BOOLEAN", "NUMBER", "STRING"};
+-
+-    short BoolCount = 0;
+-    short NumCount = 0;
+-    short StrCount = 0;
+-
+-    /* The first argument is the column-number (starting with 0).
+-     * The second is the root name of the tables to generate.
+-     */
+-    if (argc <= 3
+-       || (column = atoi(argv[1])) <= 0
+-       || (column >= MAX_COLUMNS)
+-       || *(root_name = argv[2]) == 0
+-       || (bigstring = atoi(argv[3])) < 0
+-       || name_table == 0
+-       || hash_table == 0) {
+-       fprintf(stderr, "usage: make_hash column root_name bigstring\n");
+-       exit(EXIT_FAILURE);
+-    }
+-
+-    /*
+-     * Read the table into our arrays.
+-     */
+-    for (n = 0; (n < CAPTABSIZE) && fgets(buffer, BUFSIZ, stdin);) {
+-       char **list, *nlp = strchr(buffer, '\n');
+-       if (nlp)
+-           *nlp = '\0';
+-       list = parse_columns(buffer);
+-       if (list == 0)          /* blank or comment */
+-           continue;
+-       name_table[n].nte_link = -1;    /* end-of-hash */
+-       name_table[n].nte_name = strdup(list[column]);
+-       if (!strcmp(list[2], "bool")) {
+-           name_table[n].nte_type = BOOLEAN;
+-           name_table[n].nte_index = BoolCount++;
+-       } else if (!strcmp(list[2], "num")) {
+-           name_table[n].nte_type = NUMBER;
+-           name_table[n].nte_index = NumCount++;
+-       } else if (!strcmp(list[2], "str")) {
+-           name_table[n].nte_type = STRING;
+-           name_table[n].nte_index = StrCount++;
+-       } else {
+-           fprintf(stderr, "Unknown type: %s\n", list[2]);
+-           exit(EXIT_FAILURE);
+-       }
+-       n++;
+-    }
+-    _nc_make_hash_table(name_table, hash_table);
+-
+-    /*
+-     * Write the compiled tables to standard output
+-     */
+-    if (bigstring) {
+-       int len = 0;
+-       int nxt;
+-
+-       printf("static const char %s_names_text[] = \\\n", root_name);
+-       for (n = 0; n < CAPTABSIZE; n++) {
+-           nxt = (int) strlen(name_table[n].nte_name) + 5;
+-           if (nxt + len > 72) {
+-               printf("\\\n");
+-               len = 0;
+            }
+-           printf("\"%s\\0\" ", name_table[n].nte_name);
+-           len += nxt;
+-       }
+-       printf(";\n\n");
+-
+-       len = 0;
+-       printf("static name_table_data const %s_names_data[] =\n",
+-              root_name);
+-       printf("{\n");
+-       for (n = 0; n < CAPTABSIZE; n++) {
+-           printf("\t{ %15d,\t%10s,\t%3d, %3d }%c\n",
+-                  len,
+-                  typenames[name_table[n].nte_type],
+-                  name_table[n].nte_index,
+-                  name_table[n].nte_link,
+-                  n < CAPTABSIZE - 1 ? ',' : ' ');
+-           len += (int) strlen(name_table[n].nte_name) + 1;
++           ptr = table + (ptr->nte_link + data->table_data[data->table_size]);
+        }
+-       printf("};\n\n");
+-       printf("static struct name_table_entry *_nc_%s_table = 0;\n\n", root_name);
+-    } else {
+-
+-       printf("static struct name_table_entry %s _nc_%s_table[] =\n",
+-              bigstring ? "" : "const",
+-              root_name);
+-       printf("{\n");
+-       for (n = 0; n < CAPTABSIZE; n++) {
+-           sprintf(buffer, "\"%s\"",
+-                   name_table[n].nte_name);
+-           printf("\t{ %15s,\t%10s,\t%3d, %3d }%c\n",
+-                  buffer,
+-                  typenames[name_table[n].nte_type],
+-                  name_table[n].nte_index,
+-                  name_table[n].nte_link,
+-                  n < CAPTABSIZE - 1 ? ',' : ' ');
+-       }
+-       printf("};\n\n");
+-    }
+-
+-    printf("static const short _nc_%s_hash_table[%d] =\n",
+-          root_name,
+-          HASHTABSIZE + 1);
+-    printf("{\n");
+-    for (n = 0; n < HASHTABSIZE; n++) {
+-       printf("\t%3d,\n", hash_table[n]);
      }
- 
--    return ((struct name_table_entry *) NULL);
+-    printf("\t0\t/* base-of-table */\n");
+-    printf("};\n\n");
+-
+-    printf("#if (BOOLCOUNT!=%d)||(NUMCOUNT!=%d)||(STRCOUNT!=%d)\n",
+-          BoolCount, NumCount, StrCount);
+-    printf("#error\t--> term.h and comp_captab.c disagree about the <--\n");
+-    printf("#error\t--> numbers of booleans, numbers and/or strings <--\n");
+-    printf("#endif\n\n");
+ 
+-    free(hash_table);
+-    return EXIT_SUCCESS;
 +    return ptr;
  }
- #endif
- 
+-#endif
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/comp_parse.c ncurses-5.7/ncurses/tinfo/comp_parse.c
 --- ncurses-5.7.orig/ncurses/tinfo/comp_parse.c 2008-08-16 14:58:16.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/comp_parse.c      2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/comp_parse.c      2009-09-12 08:51:54.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -35327 +36710 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/comp_scan.c ncurses-5.7/ncurses/tinfo/comp_scan.c
 --- ncurses-5.7.orig/ncurses/tinfo/comp_scan.c  2008-08-16 12:22:55.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/comp_scan.c       2009-07-19 15:03:59.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/comp_scan.c       2009-09-12 08:51:37.000000000 -0700
 @@ -51,7 +51,7 @@
  #include <term_entry.h>
@@ -35385 +36768 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/entries.c ncurses-5.7/ncurses/tinfo/entries.c
 --- ncurses-5.7.orig/ncurses/tinfo/entries.c    2008-09-27 06:11:10.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/entries.c 2009-07-19 15:04:15.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/entries.c 2009-09-12 08:51:52.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -35437 +36820 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/hashed_db.c ncurses-5.7/ncurses/tinfo/hashed_db.c
 --- ncurses-5.7.orig/ncurses/tinfo/hashed_db.c  2006-08-19 12:48:38.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/hashed_db.c       2009-07-19 15:02:02.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/hashed_db.c       2009-09-12 08:50:57.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -35543 +36926 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/init_keytry.c ncurses-5.7/ncurses/tinfo/init_keytry.c
 --- ncurses-5.7.orig/ncurses/tinfo/init_keytry.c        2008-05-24 14:44:51.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/init_keytry.c     2009-07-19 15:03:59.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/init_keytry.c     2009-09-12 08:51:37.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -35590 +36973 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_acs.c ncurses-5.7/ncurses/tinfo/lib_acs.c
 --- ncurses-5.7.orig/ncurses/tinfo/lib_acs.c    2008-08-16 12:22:55.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/lib_acs.c 2009-07-19 15:04:06.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/lib_acs.c 2009-09-12 08:51:43.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -35700 +37083 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c ncurses-5.7/ncurses/tinfo/lib_baudrate.c
 --- ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c       2008-06-28 08:19:24.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/lib_baudrate.c    2009-07-19 15:03:59.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/lib_baudrate.c    2009-09-12 08:51:37.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -35787 +37170 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_cur_term.c ncurses-5.7/ncurses/tinfo/lib_cur_term.c
 --- ncurses-5.7.orig/ncurses/tinfo/lib_cur_term.c       2008-08-16 12:22:55.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/lib_cur_term.c    2009-07-19 15:04:04.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/lib_cur_term.c    2009-09-12 08:52:09.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -35795 +37178 @@
   * Permission is hereby granted, free of charge, to any person obtaining a  *
   * copy of this software and associated documentation files (the            *
-@@ -40,12 +40,14 @@
+@@ -40,23 +40,41 @@
  #include <term_entry.h>                /* TTY, cur_term */
  #include <termcap.h>           /* ospeed */
  
 -MODULE_ID("$Id: lib_cur_term.c,v 1.18 2008/08/16 19:22:55 tom Exp $")
-+MODULE_ID("$Id: lib_cur_term.c,v 1.22 2009/05/30 13:55:19 tom Exp $")
++MODULE_ID("$Id: lib_cur_term.c,v 1.26 2009/09/05 18:05:27 tom Exp $")
  
  #undef CUR
@@ -35809 +37192 @@
 +NCURSES_EXPORT_VAR(TERMINAL *) cur_term = 0;
 +#elif BROKEN_LINKER || USE_REENTRANT
++
++NCURSES_EXPORT(TERMINAL *)
++NCURSES_SP_NAME(_nc_get_cur_term) (NCURSES_SP_DCL0)
++{
++    return ((0 != TerminalOf(SP_PARM)) ? TerminalOf(SP_PARM) : CurTerm);
++}
++
++#if NCURSES_SP_FUNCS
++NCURSES_EXPORT(TERMINAL *)
++_nc_get_cur_term(void)
++{
++    return NCURSES_SP_NAME(_nc_get_cur_term) (CURRENT_SCREEN);
++}
++#endif
++
  NCURSES_EXPORT(TERMINAL *)
  NCURSES_PUBLIC_VAR(cur_term) (void)
  {
-@@ -66,7 +68,9 @@
+-    return (SP != 0 && SP->_term != 0) ? SP->_term : _nc_prescreen._cur_term;
++    return NCURSES_SP_NAME(_nc_get_cur_term) (NCURSES_SP_ARG);
+ }
++
+ #else
+ NCURSES_EXPORT_VAR(TERMINAL *) cur_term = 0;
+ #endif
+ 
+ NCURSES_EXPORT(TERMINAL *)
+-set_curterm(TERMINAL * termp)
++NCURSES_SP_NAME(set_curterm) (NCURSES_SP_DCLx TERMINAL * termp)
+ {
+     TERMINAL *oldterm;
+ 
+@@ -64,18 +82,27 @@
+ 
+     _nc_lock_global(curses);
      oldterm = cur_term;
-     if (SP)
-        SP->_term = termp;
+-    if (SP)
+-       SP->_term = termp;
 -#if BROKEN_LINKER || USE_REENTRANT
+-    _nc_prescreen._cur_term = termp;
+-#else
++    if (SP_PARM)
++       SP_PARM->_term = termp;
 +#if BROKEN_LINKER && !USE_REENTRANT
-+    cur_term = termp;
-+#elif BROKEN_LINKER || USE_REENTRANT
-     _nc_prescreen._cur_term = termp;
- #else
      cur_term = termp;
-@@ -84,7 +88,7 @@
++#else
++    CurTerm = termp;
+ #endif
+     if (termp != 0) {
++#ifdef USE_TERM_DRIVER
++       TERMINAL_CONTROL_BLOCK *TCB = (TERMINAL_CONTROL_BLOCK *) termp;
++       ospeed = _nc_ospeed(termp->_baudrate);
++       if (TCB->drv->isTerminfo && termp->type.Strings) {
++           PC = (char) ((pad_char != NULL) ? pad_char[0] : 0);
++       }
++       TCB->csp = SP_PARM;
++#else
+        ospeed = _nc_ospeed(termp->_baudrate);
+        if (termp->type.Strings) {
+            PC = (char) ((pad_char != NULL) ? pad_char[0] : 0);
+        }
++#endif
+     }
+     _nc_unlock_global(curses);
+ 
+@@ -83,23 +110,65 @@
+     return (oldterm);
  }
  
++#if NCURSES_SP_FUNCS
++NCURSES_EXPORT(TERMINAL *)
++set_curterm(TERMINAL * termp)
++{
++    return NCURSES_SP_NAME(set_curterm) (CURRENT_SCREEN, termp);
++}
++#endif
++
  NCURSES_EXPORT(int)
 -del_curterm(TERMINAL * termp)
@@ -35832 +37275 @@
      int rc = ERR;
  
-@@ -94,6 +98,10 @@
+-    T((T_CALLED("del_curterm(%p)"), termp));
++    T((T_CALLED("del_curterm(%p, %p)"), SP_PARM, termp));
+ 
+-    _nc_lock_global(curses);
      if (termp != 0) {
++#ifdef USE_TERM_DRIVER
++       TERMINAL_CONTROL_BLOCK *TCB = (TERMINAL_CONTROL_BLOCK *) termp;
++#endif
++       TERMINAL *cur = (
++#if BROKEN_LINKER && !USE_REENTRANT
++                           cur_term
++#elif BROKEN_LINKER || USE_REENTRANT
++                           NCURSES_SP_NAME(_nc_get_cur_term) (NCURSES_SP_ARG)
++#else
++                           cur_term
++#endif
++       );
++
         _nc_free_termtype(&(termp->type));
++       if (termp == cur)
++           NCURSES_SP_NAME(set_curterm) (NCURSES_SP_ARGx 0);
++
         FreeIfNeeded(termp->_termname);
 +#if USE_HOME_TERMINFO
@@ -35840 +37302 @@
 +           FreeAndNull(_nc_globals.home_terminfo);
 +#endif
++#ifdef USE_TERM_DRIVER
++       if (TCB->drv)
++           TCB->drv->release(TCB);
++#endif
         free(termp);
-        if (termp == cur_term)
-            set_curterm(0);
-@@ -103,3 +111,13 @@
- 
-     returnCode(rc);
- }
+-       if (termp == cur_term)
+-           set_curterm(0);
++
+        rc = OK;
+     }
++    returnCode(rc);
++}
 +
 +#if NCURSES_SP_FUNCS
@@ -35853 +37320 @@
 +{
 +    int rc = ERR;
++
++    _nc_lock_global(curses);
 +    rc = NCURSES_SP_NAME(del_curterm) (CURRENT_SCREEN, termp);
+     _nc_unlock_global(curses);
+ 
+-    returnCode(rc);
 +    return (rc);
-+}
+ }
 +#endif
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_data.c ncurses-5.7/ncurses/tinfo/lib_data.c
 --- ncurses-5.7.orig/ncurses/tinfo/lib_data.c   2008-08-23 15:16:15.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/lib_data.c        2009-07-19 15:04:09.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/lib_data.c        2009-09-12 08:51:47.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -35989 +37461 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_has_cap.c ncurses-5.7/ncurses/tinfo/lib_has_cap.c
 --- ncurses-5.7.orig/ncurses/tinfo/lib_has_cap.c        2003-10-25 12:43:55.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/lib_has_cap.c     2009-07-19 15:03:59.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/lib_has_cap.c     2009-09-12 08:51:37.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -36072 +37544 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_kernel.c ncurses-5.7/ncurses/tinfo/lib_kernel.c
 --- ncurses-5.7.orig/ncurses/tinfo/lib_kernel.c 2004-05-08 10:11:21.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/lib_kernel.c      2009-07-19 15:04:06.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/lib_kernel.c      2009-09-12 08:51:43.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -36227 +37699 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_longname.c ncurses-5.7/ncurses/tinfo/lib_longname.c
 --- ncurses-5.7.orig/ncurses/tinfo/lib_longname.c       2000-12-09 18:55:07.000000000 -0800
-+++ ncurses-5.7/ncurses/tinfo/lib_longname.c    2009-07-19 15:03:59.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/lib_longname.c    2009-09-12 08:51:37.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -36300 +37772 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_napms.c ncurses-5.7/ncurses/tinfo/lib_napms.c
 --- ncurses-5.7.orig/ncurses/tinfo/lib_napms.c  2008-05-03 14:34:13.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/lib_napms.c       2009-07-19 15:04:06.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/lib_napms.c       2009-09-12 08:51:43.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -36354 +37826 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_options.c ncurses-5.7/ncurses/tinfo/lib_options.c
 --- ncurses-5.7.orig/ncurses/tinfo/lib_options.c        2008-08-16 14:20:48.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/lib_options.c     2009-07-19 15:04:13.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/lib_options.c     2009-09-12 08:52:05.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -36370 +37842 @@
  
  /*
-@@ -43,14 +44,20 @@
- 
- #include <term.h>
- 
+@@ -41,23 +42,28 @@
+ 
+ #include <curses.priv.h>
+ 
+-#include <term.h>
+-
 -MODULE_ID("$Id: lib_options.c,v 1.58 2008/08/16 21:20:48 Werner.Fink Exp $")
 +#ifndef CUR
 +#define CUR SP_TERMTYPE
 +#endif
-+
-+MODULE_ID("$Id: lib_options.c,v 1.65 2009/07/04 18:14:31 tom Exp $")
  
 -static int _nc_curs_set(SCREEN *, int);
- static int _nc_meta(SCREEN *, bool);
+-static int _nc_meta(SCREEN *, bool);
++MODULE_ID("$Id: lib_options.c,v 1.70 2009/08/16 14:16:38 tom Exp $")
  
  NCURSES_EXPORT(int)
  idlok(WINDOW *win, bool flag)
  {
-+#if NCURSES_SP_FUNCS
-+    SCREEN *sp = CURRENT_SCREEN;
-+#endif
++    int res = ERR;
      T((T_CALLED("idlok(%p,%d)"), win, flag));
  
      if (win) {
-@@ -63,6 +70,9 @@
+-       _nc_idlok = win->_idlok = (flag && (has_il() || change_scroll_region));
+-       returnCode(OK);
+-    } else
+-       returnCode(ERR);
++       SCREEN *sp = _nc_screen_of(win);
++       if (sp && IsTermInfo(sp)) {
++           sp->_nc_sp_idlok =
++               win->_idlok = (flag && (NCURSES_SP_NAME(has_il) (NCURSES_SP_ARG)
++                                       || change_scroll_region));
++           res = OK;
++       }
++    }
++    returnCode(res);
+ }
+ 
  NCURSES_EXPORT(void)
- idcok(WINDOW *win, bool flag)
+@@ -65,25 +71,34 @@
  {
-+#if NCURSES_SP_FUNCS
-+    SCREEN *sp = CURRENT_SCREEN;
-+#endif
      T((T_CALLED("idcok(%p,%d)"), win, flag));
  
-     if (win)
-@@ -72,18 +82,26 @@
+-    if (win)
+-       _nc_idcok = win->_idcok = (flag && has_ic());
+-
++    if (win) {
++       SCREEN *sp = _nc_screen_of(win);
++       sp->_nc_sp_idcok = win->_idcok = (flag && NCURSES_SP_NAME(has_ic) (NCURSES_SP_ARG));
++    }
+     returnVoid;
  }
  
@@ -36410 +37898 @@
 +NCURSES_SP_NAME(halfdelay) (NCURSES_SP_DCLx int t)
  {
-     T((T_CALLED("halfdelay(%d)"), t));
+-    T((T_CALLED("halfdelay(%d)"), t));
++    T((T_CALLED("halfdelay(%p,%d)"), SP_PARM, t));
  
 -    if (t < 1 || t > 255 || SP == 0)
-+    if (t < 1 || t > 255 || SP_PARM == 0)
++    if (t < 1 || t > 255 || !IsValidTIScreen(SP_PARM))
         returnCode(ERR);
  
-     cbreak();
+-    cbreak();
 -    SP->_cbreak = t + 1;
++    NCURSES_SP_NAME(cbreak) (NCURSES_SP_ARG);
 +    SP_PARM->_cbreak = t + 1;
      returnCode(OK);
@@ -36433 +37923 @@
  nodelay(WINDOW *win, bool flag)
  {
-@@ -148,27 +166,64 @@
+@@ -129,7 +144,7 @@
+ 
+     if (win) {
+        win->_use_keypad = flag;
+-       returnCode(_nc_keypad(SP, flag));
++       returnCode(_nc_keypad(_nc_screen_of(win), flag));
+     } else
+        returnCode(ERR);
+ }
+@@ -137,38 +152,106 @@
+ NCURSES_EXPORT(int)
+ meta(WINDOW *win GCC_UNUSED, bool flag)
+ {
+-    int result;
++    int result = ERR;
++    SCREEN *sp = (win == 0) ? CURRENT_SCREEN : _nc_screen_of(win);
+ 
+     /* Ok, we stay relaxed and don't signal an error if win is NULL */
+     T((T_CALLED("meta(%p,%d)"), win, flag));
+-    result = _nc_meta(SP, flag);
++
++    /* Ok, we stay relaxed and don't signal an error if win is NULL */
++
++    if (sp != 0) {
++       sp->_use_meta = flag;
++#ifdef USE_TERM_DRIVER
++       if (IsTermInfo(sp)) {
++           if (flag) {
++               NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx "meta_on", meta_on);
++           } else {
++               NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx "meta_off", meta_off);
++           }
++       }
++#else
++       if (flag) {
++           NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx "meta_on", meta_on);
++       } else {
++           NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx "meta_off", meta_off);
++       }
++#endif
++       result = OK;
++    }
+     returnCode(result);
+ }
+ 
  /* curs_set() moved here to narrow the kernel interface */
  
@@ -36441 +37975 @@
  {
 -    int result;
-+    int result = ERR;
-+
++    int code = ERR;
 +    T((T_CALLED("curs_set(%p,%d)"), SP_PARM, vis));
+ 
+-    T((T_CALLED("curs_set(%d)"), vis));
+-    result = _nc_curs_set(SP, vis);
+-    returnCode(result);
 +    if (SP_PARM != 0 && vis >= 0 && vis <= 2) {
 +       int cursor = SP_PARM->_cursor;
- 
--    T((T_CALLED("curs_set(%d)"), vis));
--    result = _nc_curs_set(SP, vis);
++       bool bBuiltIn = !IsTermInfo(SP_PARM);
 +       if (vis == cursor) {
-+           result = cursor;
++           code = cursor;
 +       } else {
-+           switch (vis) {
-+           case 2:
-+               result = _nc_putp_flush("cursor_visible", cursor_visible);
-+               break;
-+           case 1:
-+               result = _nc_putp_flush("cursor_normal", cursor_normal);
-+               break;
-+           case 0:
-+               result = _nc_putp_flush("cursor_invisible", cursor_invisible);
-+               break;
-+           }
-+           if (result != ERR)
-+               result = (cursor == -1 ? 1 : cursor);
++           if (!bBuiltIn) {
++               switch (vis) {
++               case 2:
++                   code = NCURSES_SP_NAME(_nc_putp_flush) (NCURSES_SP_ARGx
++                                                           "cursor_visible",
++                                                           cursor_visible);
++                   break;
++               case 1:
++                   code = NCURSES_SP_NAME(_nc_putp_flush) (NCURSES_SP_ARGx
++                                                           "cursor_normal",
++                                                           cursor_normal);
++                   break;
++               case 0:
++                   code = NCURSES_SP_NAME(_nc_putp_flush) (NCURSES_SP_ARGx
++                                                           "cursor_invisible",
++                                                           cursor_invisible);
++                   break;
++               }
++           } else
++               code = ERR;
++           if (code != ERR)
++               code = (cursor == -1 ? 1 : cursor);
 +           SP_PARM->_cursor = vis;
 +       }
 +    }
-     returnCode(result);
++    returnCode(code);
  }
  
@@ -36475 +38019 @@
 -typeahead(int fd)
 +curs_set(int vis)
-+{
+ {
+-    T((T_CALLED("typeahead(%d)"), fd));
+-    if (SP != 0) {
+-       SP->_checkfd = fd;
 +    return (NCURSES_SP_NAME(curs_set) (CURRENT_SCREEN, vis));
 +}
@@ -36482 +38029 @@
 +NCURSES_EXPORT(int)
 +NCURSES_SP_NAME(typeahead) (NCURSES_SP_DCLx int fd)
- {
-     T((T_CALLED("typeahead(%d)"), fd));
--    if (SP != 0) {
--       SP->_checkfd = fd;
-+    if (SP_PARM != 0) {
++{
++    T((T_CALLED("typeahead(%p, %d)"), SP_PARM, fd));
++    if (IsValidTIScreen(SP_PARM)) {
 +       SP_PARM->_checkfd = fd;
         returnCode(OK);
@@ -36505 +38050 @@
  **      has_key()
  **
-@@ -190,11 +245,19 @@
+@@ -189,42 +272,49 @@
+                || has_key_internal(keycode, tp->sibling));
  }
  
- NCURSES_EXPORT(int)
++#ifdef USE_TERM_DRIVER
++NCURSES_EXPORT(int)
++TINFO_HAS_KEY(SCREEN *sp, int keycode)
++{
++    return IsValidTIScreen(sp) ?
++       has_key_internal(keycode, sp->_keytry) : 0;
++}
++#else
++NCURSES_EXPORT(int)
 +NCURSES_SP_NAME(has_key) (NCURSES_SP_DCLx int keycode)
 +{
@@ -36516 +38070 @@
 +
 +#if NCURSES_SP_FUNCS
-+NCURSES_EXPORT(int)
+ NCURSES_EXPORT(int)
  has_key(int keycode)
  {
@@ -36524 +38078 @@
  }
 +#endif
++#endif
  #endif /* NCURSES_EXT_FUNCS */
  
- /*
-@@ -202,29 +265,26 @@
-  * than cur_term.
-  */
- #undef CUR
+-/*
+- * Internal entrypoints use SCREEN* parameter to obtain capabilities rather
+- * than cur_term.
+- */
+-#undef CUR
 -#define CUR (sp->_term)->type.
-+#define CUR SP_TERMTYPE
- 
+-
 -static int
 -_nc_putp(const char *name GCC_UNUSED, const char *value)
@@ -36545 +38099 @@
 -       TPUTS_TRACE(name);
 -       rc = putp(value);
-+    int rc = _nc_putp(name, value);
++    int rc = NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx name, value);
 +    if (rc != ERR) {
 +       _nc_flush();
@@ -36553 +38107 @@
  
 -static int
-+#if NCURSES_SP_FUNCS
++#if 0 && NCURSES_SP_FUNCS
 +NCURSES_EXPORT(int)
  _nc_putp_flush(const char *name, const char *value)
@@ -36568 +38122 @@
  /* Turn the keypad on/off
   *
-@@ -245,12 +305,12 @@
+@@ -245,12 +335,12 @@
          * has wgetch() reading in more than one thread.  putp() and below
          * may use SP explicitly.
@@ -36583 +38137 @@
             rc = _nc_keypad(sp, flag);
             _nc_set_screen(save_sp);
-@@ -276,45 +336,14 @@
+@@ -258,10 +348,19 @@
+        } else
+ #endif
+        {
++#ifdef USE_TERM_DRIVER
++           rc = CallDriver_1(sp, kpad, flag);
++           if (rc == OK)
++               sp->_keypad_on = flag;
++#else
+            if (flag) {
+-               (void) _nc_putp_flush("keypad_xmit", keypad_xmit);
++               (void) NCURSES_SP_NAME(_nc_putp_flush) (NCURSES_SP_ARGx
++                                                       "keypad_xmit",
++                                                       keypad_xmit);
+            } else if (!flag && keypad_local) {
+-               (void) _nc_putp_flush("keypad_local", keypad_local);
++               (void) NCURSES_SP_NAME(_nc_putp_flush) (NCURSES_SP_ARGx
++                                                       "keypad_local",
++                                                       keypad_local);
+            }
+ 
+            if (flag && !sp->_tried) {
+@@ -270,58 +369,8 @@
+            }
+            sp->_keypad_on = flag;
+            rc = OK;
++#endif
+        }
+     }
+     return (rc);
  }
- 
- static int
+-
+-static int
 -_nc_curs_set(SCREEN *sp, int vis)
 -{
@@ -36618 +38201 @@
 -
 -static int
- _nc_meta(SCREEN *sp, bool flag)
- {
-     int result = ERR;
- 
-     /* Ok, we stay relaxed and don't signal an error if win is NULL */
- 
+-_nc_meta(SCREEN *sp, bool flag)
+-{
+-    int result = ERR;
+-
+-    /* Ok, we stay relaxed and don't signal an error if win is NULL */
+-
 -    if (SP != 0) {
 -       SP->_use_meta = flag;
-+    if (sp != 0) {
-+       sp->_use_meta = flag;
- 
-        if (flag) {
-            _nc_putp("meta_on", meta_on);
+-
+-       if (flag) {
+-           _nc_putp("meta_on", meta_on);
+-       } else {
+-           _nc_putp("meta_off", meta_off);
+-       }
+-       result = OK;
+-    }
+-    return result;
+-}
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_print.c ncurses-5.7/ncurses/tinfo/lib_print.c
 --- ncurses-5.7.orig/ncurses/tinfo/lib_print.c  2006-11-25 16:26:34.000000000 -0800
-+++ ncurses-5.7/ncurses/tinfo/lib_print.c       2009-07-19 15:04:06.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/lib_print.c       2009-09-12 08:51:43.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -36702 +38290 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_raw.c ncurses-5.7/ncurses/tinfo/lib_raw.c
 --- ncurses-5.7.orig/ncurses/tinfo/lib_raw.c    2007-09-29 14:50:22.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/lib_raw.c 2009-07-19 15:02:20.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/lib_raw.c 2009-09-12 08:51:59.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
 - * Copyright (c) 1998-2002,2007 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -36720 +38308 @@
  
  /*
-@@ -49,7 +50,7 @@
+@@ -47,9 +48,8 @@
+  */
+ 
  #include <curses.priv.h>
- #include <term.h>              /* cur_term */
+-#include <term.h>              /* cur_term */
  
 -MODULE_ID("$Id: lib_raw.c,v 1.14 2007/09/29 21:50:22 tom Exp $")
-+MODULE_ID("$Id: lib_raw.c,v 1.15 2009/02/15 00:49:02 tom Exp $")
++MODULE_ID("$Id: lib_raw.c,v 1.17 2009/08/01 23:11:02 tom Exp $")
  
  #if SVR4_TERMIO && !defined(_POSIX_SOURCE)
  #define _POSIX_SOURCE
-@@ -61,7 +62,7 @@
+@@ -61,7 +61,7 @@
  
  #ifdef __EMX__
@@ -36738 +38328 @@
  #define _nc_setmode(mode)      /* nothing */
  #endif
-@@ -77,13 +78,13 @@
+@@ -77,19 +77,19 @@
  #endif /* TRACE */
  
@@ -36746 +38336 @@
  {
      int result = ERR;
- 
-     T((T_CALLED("raw()")));
- 
++    TERMINAL *termp;
+ 
+-    T((T_CALLED("raw()")));
+-
 -    if (SP != 0 && cur_term != 0) {
-+    if (SP_PARM != 0 && cur_term != 0) {
++    T((T_CALLED("raw(%p)"), SP_PARM));
++    if ((termp = TerminalOf(SP_PARM)) != 0) {
         TTY buf;
  
         BEFORE("raw");
-@@ -99,8 +100,8 @@
+        _nc_setmode(O_BINARY);
+ 
+-       buf = cur_term->Nttyb;
++       buf = termp->Nttyb;
+ #ifdef TERMIOS
+        buf.c_lflag &= ~(ICANON | ISIG | IEXTEN);
+        buf.c_iflag &= ~(COOKED_INPUT);
+@@ -98,30 +98,39 @@
+ #else
         buf.sg_flags |= RAW;
  #endif
-        if ((result = _nc_set_tty_mode(&buf)) == OK) {
+-       if ((result = _nc_set_tty_mode(&buf)) == OK) {
 -           SP->_raw = TRUE;
 -           SP->_cbreak = 1;
+-           cur_term->Nttyb = buf;
++       result = NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf);
++       if (result == OK) {
 +           SP_PARM->_raw = TRUE;
 +           SP_PARM->_cbreak = 1;
-            cur_term->Nttyb = buf;
++           termp->Nttyb = buf;
         }
         AFTER("raw");
-@@ -108,14 +109,22 @@
+     }
      returnCode(result);
  }
@@ -36773 +38376 @@
 -cbreak(void)
 +raw(void)
-+{
+ {
+-    int result = ERR;
 +    return NCURSES_SP_NAME(raw) (CURRENT_SCREEN);
 +}
 +#endif
-+
+ 
+-    T((T_CALLED("cbreak()")));
 +NCURSES_EXPORT(int)
 +NCURSES_SP_NAME(cbreak) (NCURSES_SP_DCL0)
- {
-     int result = ERR;
- 
-     T((T_CALLED("cbreak()")));
++{
++    int result = ERR;
++    TERMINAL *termp;
  
 -    if (SP != 0 && cur_term != 0) {
-+    if (SP_PARM != 0 && cur_term != 0) {
++    T((T_CALLED("cbreak(%p)"), SP_PARM));
++    if ((termp = TerminalOf(SP_PARM)) != 0) {
         TTY buf;
  
         BEFORE("cbreak");
-@@ -132,7 +141,7 @@
+        _nc_setmode(O_BINARY);
+ 
+-       buf = cur_term->Nttyb;
++       buf = termp->Nttyb;
+ #ifdef TERMIOS
+        buf.c_lflag &= ~ICANON;
+        buf.c_iflag &= ~ICRNL;
+@@ -131,134 +140,172 @@
+ #else
         buf.sg_flags |= CBREAK;
  #endif
-        if ((result = _nc_set_tty_mode(&buf)) == OK) {
+-       if ((result = _nc_set_tty_mode(&buf)) == OK) {
 -           SP->_cbreak = 1;
+-           cur_term->Nttyb = buf;
++       result = NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf);
++       if (result == OK) {
 +           SP_PARM->_cbreak = 1;
-            cur_term->Nttyb = buf;
++           termp->Nttyb = buf;
         }
         AFTER("cbreak");
-@@ -140,12 +149,20 @@
+     }
      returnCode(result);
  }
@@ -36820 +38436 @@
  {
      int result = ERR;
- 
-@@ -169,14 +186,22 @@
++    TERMINAL *termp;
+ 
+-    T((T_CALLED("qiflush()")));
+-
+-    if (cur_term != 0) {
++    T((T_CALLED("qiflush(%p)"), SP_PARM));
++    if ((termp = TerminalOf(SP_PARM)) != 0) {
+        TTY buf;
+ 
+        BEFORE("qiflush");
+-       buf = cur_term->Nttyb;
++       buf = termp->Nttyb;
+ #ifdef TERMIOS
+        buf.c_lflag &= ~(NOFLSH);
+-       result = _nc_set_tty_mode(&buf);
++       result = NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf);
+ #else
+        /* FIXME */
+ #endif
+        if (result == OK)
+-           cur_term->Nttyb = buf;
++           termp->Nttyb = buf;
+        AFTER("qiflush");
+     }
      returnVoid;
  }
@@ -36838 +38476 @@
  {
      int result = ERR;
- 
-     T((T_CALLED("noraw()")));
- 
++    TERMINAL *termp;
+ 
+-    T((T_CALLED("noraw()")));
+-
 -    if (SP != 0 && cur_term != 0) {
-+    if (SP_PARM != 0 && cur_term != 0) {
++    T((T_CALLED("noraw(%p)"), SP_PARM));
++    if ((termp = TerminalOf(SP_PARM)) != 0) {
         TTY buf;
  
         BEFORE("noraw");
-@@ -191,8 +216,8 @@
+        _nc_setmode(O_TEXT);
+ 
+-       buf = cur_term->Nttyb;
++       buf = termp->Nttyb;
+ #ifdef TERMIOS
+        buf.c_lflag |= ISIG | ICANON |
+-           (cur_term->Ottyb.c_lflag & IEXTEN);
++           (termp->Ottyb.c_lflag & IEXTEN);
+        buf.c_iflag |= COOKED_INPUT;
+ #else
         buf.sg_flags &= ~(RAW | CBREAK);
  #endif
-        if ((result = _nc_set_tty_mode(&buf)) == OK) {
+-       if ((result = _nc_set_tty_mode(&buf)) == OK) {
 -           SP->_raw = FALSE;
 -           SP->_cbreak = 0;
+-           cur_term->Nttyb = buf;
++       result = NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf);
++       if (result == OK) {
 +           SP_PARM->_raw = FALSE;
 +           SP_PARM->_cbreak = 0;
-            cur_term->Nttyb = buf;
++           termp->Nttyb = buf;
         }
         AFTER("noraw");
-@@ -200,14 +225,22 @@
+     }
      returnCode(result);
  }
@@ -36865 +38517 @@
 -nocbreak(void)
 +noraw(void)
-+{
+ {
+-    int result = ERR;
 +    return NCURSES_SP_NAME(noraw) (CURRENT_SCREEN);
 +}
 +#endif
-+
+ 
+-    T((T_CALLED("nocbreak()")));
 +NCURSES_EXPORT(int)
 +NCURSES_SP_NAME(nocbreak) (NCURSES_SP_DCL0)
- {
-     int result = ERR;
- 
-     T((T_CALLED("nocbreak()")));
++{
++    int result = ERR;
++    TERMINAL *termp;
  
 -    if (SP != 0 && cur_term != 0) {
-+    if (SP_PARM != 0 && cur_term != 0) {
++    T((T_CALLED("nocbreak(%p)"), SP_PARM));
++    if ((termp = TerminalOf(SP_PARM)) != 0) {
         TTY buf;
  
         BEFORE("nocbreak");
-@@ -221,7 +254,7 @@
+        _nc_setmode(O_TEXT);
+ 
+-       buf = cur_term->Nttyb;
++       buf = termp->Nttyb;
+ #ifdef TERMIOS
+        buf.c_lflag |= ICANON;
+        buf.c_iflag |= ICRNL;
+ #else
         buf.sg_flags &= ~CBREAK;
  #endif
-        if ((result = _nc_set_tty_mode(&buf)) == OK) {
+-       if ((result = _nc_set_tty_mode(&buf)) == OK) {
 -           SP->_cbreak = 0;
+-           cur_term->Nttyb = buf;
++       result = NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf);
++       if (result == OK) {
 +           SP_PARM->_cbreak = 0;
-            cur_term->Nttyb = buf;
++           termp->Nttyb = buf;
         }
         AFTER("nocbreak");
-@@ -229,12 +262,20 @@
+     }
      returnCode(result);
  }
  
+-/*
+- * Note:
+- * this implementation may be wrong.  See the comment under intrflush().
+- */
 +#if NCURSES_SP_FUNCS
 +NCURSES_EXPORT(int)
@@ -36903 +38571 @@
 +#endif
 +
- /*
-  * Note:
-  * this implementation may be wrong.  See the comment under intrflush().
-  */
  NCURSES_EXPORT(void)
 -noqiflush(void)
@@ -36912 +38576 @@
  {
      int result = ERR;
- 
-@@ -259,6 +300,14 @@
++    TERMINAL *termp;
+ 
+-    T((T_CALLED("noqiflush()")));
+-
+-    if (cur_term != 0) {
++    T((T_CALLED("noqiflush(%p)"), SP_PARM));
++    if ((termp = TerminalOf(SP_PARM)) != 0) {
+        TTY buf;
+ 
+        BEFORE("noqiflush");
+-       buf = cur_term->Nttyb;
++       buf = termp->Nttyb;
+ #ifdef TERMIOS
+        buf.c_lflag |= NOFLSH;
+-       result = _nc_set_tty_mode(&buf);
++       result = NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf);
+ #else
+        /* FIXME */
+ #endif
+-       if (result == OK) {
+-           cur_term->Nttyb = buf;
+-       }
++       if (result == OK)
++           termp->Nttyb = buf;
+        AFTER("noqiflush");
+     }
      returnVoid;
  }
@@ -36928 +38616 @@
   * This call does the same thing as the qiflush()/noqiflush() pair.  We know
   * for certain that SVr3 intrflush() tweaks the NOFLSH bit; on the other hand,
-@@ -267,7 +316,7 @@
+@@ -267,30 +314,41 @@
   * curs_inopts(3x) is too exact to be coincidence.
   */
@@ -36936 +38624 @@
  {
      int result = ERR;
- 
-@@ -294,3 +343,11 @@
++    TERMINAL *termp;
+ 
+-    T((T_CALLED("intrflush(%d)"), flag));
++    T((T_CALLED("intrflush(%p,%d)"), SP_PARM, flag));
++    if (SP_PARM == 0)
++       returnCode(ERR);
+ 
+-    if (cur_term != 0) {
++    if ((termp = TerminalOf(SP_PARM)) != 0) {
+        TTY buf;
+ 
+        BEFORE("intrflush");
+-       buf = cur_term->Nttyb;
++       buf = termp->Nttyb;
+ #ifdef TERMIOS
+        if (flag)
+            buf.c_lflag &= ~(NOFLSH);
+        else
+            buf.c_lflag |= (NOFLSH);
+-       result = _nc_set_tty_mode(&buf);
++       result = NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf);
+ #else
+        /* FIXME */
+ #endif
+        if (result == OK) {
+-           cur_term->Nttyb = buf;
++           termp->Nttyb = buf;
+        }
+        AFTER("intrflush");
      }
      returnCode(result);
@@ -36951 +38666 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_setup.c ncurses-5.7/ncurses/tinfo/lib_setup.c
 --- ncurses-5.7.orig/ncurses/tinfo/lib_setup.c  2008-08-03 15:42:33.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/lib_setup.c       2009-07-19 15:04:06.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/lib_setup.c       2009-09-12 08:52:09.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -36967 +38682 @@
  
  /*
-@@ -53,7 +54,7 @@
- 
- #include <term.h>              /* lines, columns, cur_term */
- 
+@@ -51,9 +52,7 @@
+ #include <locale.h>
+ #endif
+ 
+-#include <term.h>              /* lines, columns, cur_term */
+-
 -MODULE_ID("$Id: lib_setup.c,v 1.111 2008/08/03 22:42:33 tom Exp $")
-+MODULE_ID("$Id: lib_setup.c,v 1.117 2009/06/06 17:56:31 tom Exp $")
++MODULE_ID("$Id: lib_setup.c,v 1.119 2009/09/05 20:10:02 tom Exp $")
  
  /****************************************************************************
   *
-@@ -116,54 +117,68 @@
-     return cur_term ? cur_term->type.term_names : empty;
+@@ -109,61 +108,96 @@
+  * Wrap global variables in this module.
+  */
+ #if USE_REENTRANT
++
+ NCURSES_EXPORT(char *)
+ NCURSES_PUBLIC_VAR(ttytype) (void)
+ {
+     static char empty[] = "";
+-    return cur_term ? cur_term->type.term_names : empty;
++    char *result = empty;
++
++#if NCURSES_SP_FUNCS
++    if (CURRENT_SCREEN) {
++       TERMINAL *termp = TerminalOf(CURRENT_SCREEN);
++       if (termp != 0) {
++           result = termp->type.term_names;
++       }
++    }
++#else
++    if (cur_term != 0) {
++       result = cur_term->type.term_names;
++    }
++#endif
++    return result;
  }
++
  NCURSES_EXPORT(int *)
 -_nc_ptr_Lines(void)
@@ -36986 +38727 @@
 +    return ptrLines(sp);
  }
++
  NCURSES_EXPORT(int)
  NCURSES_PUBLIC_VAR(LINES) (void)
@@ -36992 +38734 @@
 +    return *_nc_ptr_Lines(CURRENT_SCREEN);
  }
++
  NCURSES_EXPORT(int *)
 -_nc_ptr_Cols(void)
@@ -36999 +38742 @@
 +    return ptrCols(sp);
  }
++
  NCURSES_EXPORT(int)
  NCURSES_PUBLIC_VAR(COLS) (void)
@@ -37005 +38749 @@
 +    return *_nc_ptr_Cols(CURRENT_SCREEN);
 +}
++
 +NCURSES_EXPORT(int *)
 +_nc_ptr_Tabsize(SCREEN *sp)
@@ -37010 +38755 @@
 +    return ptrTabsize(sp);
  }
++
  NCURSES_EXPORT(int)
  NCURSES_PUBLIC_VAR(TABSIZE) (void)
@@ -37056 +38802 @@
  #if USE_SIGWINCH
  /*
-@@ -188,13 +203,25 @@
+@@ -188,17 +222,56 @@
  #endif
  
  NCURSES_EXPORT(void)
--use_env(bool f)
 +NCURSES_SP_NAME(use_env) (NCURSES_SP_DCLx bool f)
- {
-     T((T_CALLED("use_env()")));
--    _nc_prescreen.use_env = f;
++{
++    T((T_CALLED("use_env(%p,%d)"), SP_PARM, (int) f));
++#if NCURSES_SP_FUNCS
 +    if (IsPreScreen(SP_PARM)) {
 +       SP_PARM->_use_env = f;
-+    } else {
-+       _nc_prescreen.use_env = f;
 +    }
++#else
++    _nc_prescreen.use_env = f;
++#endif
++    returnVoid;
++}
++
++#if NCURSES_SP_FUNCS
++NCURSES_EXPORT(void)
+ use_env(bool f)
+ {
+-    T((T_CALLED("use_env()")));
++    T((T_CALLED("use_env(%d)"), (int) f));
+     _nc_prescreen.use_env = f;
      returnVoid;
  }
- 
-+#if NCURSES_SP_FUNCS
-+NCURSES_EXPORT(void)
-+use_env(bool f)
-+{
-+    NCURSES_SP_NAME(use_env) (CURRENT_SCREEN, f);
-+}
 +#endif
-+
+ 
  NCURSES_EXPORT(void)
- _nc_get_screensize(SCREEN *sp, int *linep, int *colp)
+-_nc_get_screensize(SCREEN *sp, int *linep, int *colp)
++_nc_get_screensize(SCREEN *sp,
++#ifdef USE_TERM_DRIVER
++                  TERMINAL * termp,
++#endif
++                  int *linep, int *colp)
  /* Obtain lines/columns values from the environment and/or terminfo entry */
-@@ -320,7 +347,7 @@
+ {
++#ifdef USE_TERM_DRIVER
++    TERMINAL_CONTROL_BLOCK *TCB;
++    int my_tabsize;
++
++    assert(termp != 0 && linep != 0 && colp != 0);
++    TCB = (TERMINAL_CONTROL_BLOCK *) termp;
++
++    my_tabsize = TCB->info.tabsize;
++    TCB->drv->size(TCB, linep, colp);
++
++#if USE_REENTRANT
++    if (sp != 0) {
++       sp->_TABSIZE = my_tabsize;
++    }
++#else
++    TABSIZE = my_tabsize;
++#endif
++    T(("TABSIZE = %d", my_tabsize));
++#else /* !USE_TERM_DRIVER */
+     TERMINAL *termp = cur_term;
+     int my_tabsize;
+ 
+@@ -298,19 +371,31 @@
+     TABSIZE = my_tabsize;
+ #endif
+     T(("TABSIZE = %d", TABSIZE));
++#endif /* USE_TERM_DRIVER */
+ }
+ 
+ #if USE_SIZECHANGE
+ NCURSES_EXPORT(void)
+ _nc_update_screensize(SCREEN *sp)
+ {
++    int new_lines;
++    int new_cols;
++
++#ifdef USE_TERM_DRIVER
++    int old_lines;
++    int old_cols;
++
++    assert(sp != 0);
++
++    CallDriver_2(sp, getsize, &old_lines, &old_cols);
++
++#else
+     TERMINAL *termp = cur_term;
+     int old_lines = lines;
+-    int new_lines;
+     int old_cols = columns;
+-    int new_cols;
++#endif
+ 
+-    _nc_get_screensize(sp, &new_lines, &new_cols);
++    TINFO_GET_SIZE(sp, sp->_term, &new_lines, &new_cols);
+ 
+     /*
+      * See is_term_resized() and resizeterm().
+@@ -320,7 +405,7 @@
      if (sp != 0
         && sp->_resize != 0) {
@@ -37093 +38905 @@
      }
  }
-@@ -604,7 +631,7 @@
+@@ -348,6 +433,7 @@
+                                            exit(EXIT_FAILURE);\
+                                        }
+ 
++#ifndef USE_TERM_DRIVER
+ #if USE_DATABASE || USE_TERMCAP
+ /*
+  * Return 1 if entry found, 0 if not found, -1 if database not accessible,
+@@ -407,6 +493,7 @@
+        }
+     }
+ }
++#endif /* !USE_TERM_DRIVER */
+ 
+ /*
+  * Find the locale which is in effect.
+@@ -486,18 +573,37 @@
+     return 0;
+ }
+ 
+-/*
+- * This entrypoint is called from tgetent() to allow a special case of reusing
+- * the same TERMINAL data (see comment).
+- */
+ NCURSES_EXPORT(int)
+-_nc_setupterm(NCURSES_CONST char *tname, int Filedes, int *errret, bool reuse)
++TINFO_SETUP_TERM(TERMINAL ** tp,
++                NCURSES_CONST char *tname,
++                int Filedes,
++                int *errret,
++                bool reuse)
+ {
+-    TERMINAL *termp;
++#ifdef USE_TERM_DRIVER
++    TERMINAL_CONTROL_BLOCK *TCB = 0;
++#else
+     int status;
++#endif
++    TERMINAL *termp;
++    SCREEN *sp = 0;
++    int code = ERR;
+ 
+     START_TRACE();
++
++#ifdef USE_TERM_DRIVER
++    T((T_CALLED("_nc_setupterm_ex(%p,%s,%d,%p)"),
++       tp, _nc_visbuf(tname), Filedes, errret));
++
++    if (tp == 0) {
++       ret_error0(TGETENT_ERR,
++                  "Invalid parameter, internal error.\n");
++    } else
++       termp = *tp;
++#else
++    termp = cur_term;
+     T((T_CALLED("setupterm(%s,%d,%p)"), _nc_visbuf(tname), Filedes, errret));
++#endif
+ 
+     if (tname == 0) {
+        tname = getenv("TERM");
+@@ -538,20 +644,34 @@
+      * properly with this feature).
+      */
+     if (reuse
+-       && (termp = cur_term) != 0
++       && (termp != 0)
+        && termp->Filedes == Filedes
+        && termp->_termname != 0
+        && !strcmp(termp->_termname, tname)
+        && _nc_name_match(termp->type.term_names, tname, "|")) {
+        T(("reusing existing terminal information and mode-settings"));
++       code = OK;
+     } else {
+-
++#ifdef USE_TERM_DRIVER
++       termp = (TERMINAL *) typeCalloc(TERMINAL_CONTROL_BLOCK, 1);
++#else
+        termp = typeCalloc(TERMINAL, 1);
+-
++#endif
+        if (termp == 0) {
+            ret_error0(TGETENT_ERR,
+                       "Not enough memory to create terminal structure.\n");
+        }
++#ifdef USE_TERM_DRIVER
++       TCB = (TERMINAL_CONTROL_BLOCK *) termp;
++       code = _nc_get_driver(TCB, tname, errret);
++       if (code == OK) {
++           termp->Filedes = Filedes;
++           termp->_termname = strdup(tname);
++       } else {
++           ret_error0(TGETENT_ERR,
++                      "Could not find any driver to handle this terminal.\n");
++       }
++#else
+ #if USE_DATABASE || USE_TERMCAP
+        status = grab_entry(tname, &termp->type);
+ #else
+@@ -599,25 +719,57 @@
+            def_prog_mode();
+            baudrate();
+        }
++       code = OK;
++#endif
+     }
+ 
++#ifdef USE_TERM_DRIVER
++    *tp = termp;
++    NCURSES_SP_NAME(set_curterm) (sp, termp);
++    TCB->drv->init(TCB);
++#else
++    sp = SP;
++#endif
++
      /*
       * We should always check the screensize, just in case.
       */
 -    _nc_get_screensize(SP, ptrLines(), ptrCols());
-+    _nc_get_screensize(SP, ptrLines(SP), ptrCols(SP));
++    TINFO_GET_SIZE(sp, termp, ptrLines(sp), ptrCols(sp));
  
      if (errret)
         *errret = TGETENT_YES;
+ 
++#ifndef USE_TERM_DRIVER
+     if (generic_type) {
+        ret_error(TGETENT_NO, "'%s': I need something more specific.\n", tname);
+     }
+     if (hard_copy) {
+        ret_error(TGETENT_YES, "'%s': I can't handle hardcopy terminals.\n", tname);
+     }
+-    returnCode(OK);
++#endif
++    returnCode(code);
+ }
+ 
++#ifdef USE_TERM_DRIVER
++/*
++ * This entrypoint is called from tgetent() to allow a special case of reusing
++ * the same TERMINAL data (see comment).
++ */
++NCURSES_EXPORT(int)
++_nc_setupterm(NCURSES_CONST char *tname,
++             int Filedes,
++             int *errret,
++             bool reuse)
++{
++    int res;
++    TERMINAL *termp;
++    res = TINFO_SETUP_TERM(&termp, tname, Filedes, errret, reuse);
++    if (ERR != res)
++       NCURSES_SP_NAME(set_curterm) (CURRENT_SCREEN_PRE, termp);
++    return res;
++}
++#endif
++
+ /*
+  *     setupterm(termname, Filedes, errret)
+  *
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_termcap.c ncurses-5.7/ncurses/tinfo/lib_termcap.c
 --- ncurses-5.7.orig/ncurses/tinfo/lib_termcap.c        2008-08-16 12:22:55.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/lib_termcap.c     2009-07-19 15:04:15.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/lib_termcap.c     2009-09-12 08:52:09.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -37129 +39090 @@
 +#endif
 +
-+MODULE_ID("$Id: lib_termcap.c,v 1.69 2009/07/11 18:14:21 tom Exp $")
++MODULE_ID("$Id: lib_termcap.c,v 1.70 2009/08/30 17:16:00 tom Exp $")
  
  NCURSES_EXPORT_VAR(char *) UP = 0;
  NCURSES_EXPORT_VAR(char *) BC = 0;
-@@ -76,16 +81,28 @@
+@@ -76,16 +81,26 @@
   ***************************************************************************/
  
@@ -37151 +39112 @@
      T((T_CALLED("tgetent()")));
  
+-    _nc_setupterm((NCURSES_CONST char *) name, STDOUT_FILENO, &errcode, TRUE);
++    TINFO_SETUP_TERM(&termp, (NCURSES_CONST char *) name,
++                    STDOUT_FILENO, &errcode, TRUE);
++
 +#ifdef USE_TERM_DRIVER
-+    _nc_setupterm_ex(&termp, (NCURSES_CONST char *) name,
-+                    STDOUT_FILENO, &errcode, TRUE);
-+
 +    if (termp == 0 ||
 +       !((TERMINAL_CONTROL_BLOCK *) termp)->drv->isTerminfo)
 +       return (errcode);
-+#else
-     _nc_setupterm((NCURSES_CONST char *) name, STDOUT_FILENO, &errcode, TRUE);
 +#endif
  
      /*
       * In general we cannot tell if the fixed sgr0 is still used by the
-@@ -109,9 +126,9 @@
+@@ -109,9 +124,9 @@
             /*
              * Also free the terminfo data that we loaded (much bigger leak).
@@ -37176 +39136 @@
                     if (LAST_TRM == trm)
                         LAST_TRM = 0;
-@@ -131,7 +148,7 @@
+@@ -131,7 +146,7 @@
         }
         CacheInx = best;
@@ -37185 +39145 @@
  
      PC = 0;
-@@ -153,7 +170,7 @@
+@@ -153,7 +168,7 @@
         if (backspace_if_not_bs != NULL)
             BC = backspace_if_not_bs;
@@ -37194 +39154 @@
                 if (FIX_SGR0 != exit_attribute_mode) {
                     free(FIX_SGR0);
-@@ -164,8 +181,8 @@
+@@ -164,8 +179,8 @@
         LAST_BUF = bufp;
         LAST_USE = TRUE;
@@ -37205 +39165 @@
  /* LINT_PREPRO
  #if 0*/
-@@ -177,6 +194,25 @@
+@@ -177,6 +192,25 @@
      returnCode(errcode);
  }
@@ -37231 +39191 @@
   *
   * tgetflag(str)
-@@ -187,23 +223,47 @@
+@@ -187,24 +221,48 @@
   ***************************************************************************/
  
@@ -37278 +39238 @@
 -    returnCode(0);             /* Solaris does this */
 +    returnCode(result);
-+}
-+
+ }
+ 
 +#if NCURSES_SP_FUNCS
 +NCURSES_EXPORT(int)
@@ -37285 +39245 @@
 +{
 +    return NCURSES_SP_NAME(tgetflag) (CURRENT_SCREEN, id);
- }
++}
 +#endif
- 
++
  /***************************************************************************
   *
-@@ -215,25 +275,48 @@
+  * tgetnum(str)
+@@ -215,25 +273,48 @@
   ***************************************************************************/
  
@@ -37351 +39312 @@
   *
   * tgetstr(str, area)
-@@ -244,40 +327,62 @@
+@@ -244,40 +325,62 @@
   ***************************************************************************/
  
@@ -37439 +39400 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_termname.c ncurses-5.7/ncurses/tinfo/lib_termname.c
 --- ncurses-5.7.orig/ncurses/tinfo/lib_termname.c       2003-12-27 10:23:01.000000000 -0800
-+++ ncurses-5.7/ncurses/tinfo/lib_termname.c    2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/lib_termname.c    2009-09-12 08:51:17.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -37484 +39445 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_ti.c ncurses-5.7/ncurses/tinfo/lib_ti.c
 --- ncurses-5.7.orig/ncurses/tinfo/lib_ti.c     2003-05-24 14:10:28.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/lib_ti.c  2009-07-19 15:04:15.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/lib_ti.c  2009-09-12 08:51:57.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -37500 +39461 @@
  
  #include <curses.priv.h>
-@@ -36,68 +37,150 @@
+@@ -36,68 +37,152 @@
  #include <term_entry.h>
  #include <tic.h>
  
 -MODULE_ID("$Id: lib_ti.c,v 1.23 2003/05/24 21:10:28 tom Exp $")
-+MODULE_ID("$Id: lib_ti.c,v 1.26 2009/07/11 18:14:21 tom Exp $")
++MODULE_ID("$Id: lib_ti.c,v 1.27 2009/07/28 22:03:36 tom Exp $")
 +
 +#if 0
@@ -37570 +39531 @@
 -tigetnum(NCURSES_CONST char *str)
 +tigetflag(NCURSES_CONST char *str)
-+{
+ {
+-    unsigned i;
 +    return NCURSES_SP_NAME(tigetflag) (CURRENT_SCREEN, str);
 +}
 +#endif
-+
+ 
+-    T((T_CALLED("tigetnum(%s)"), str));
 +NCURSES_EXPORT(int)
 +NCURSES_SP_NAME(tigetnum) (NCURSES_SP_DCLx NCURSES_CONST char *str)
- {
--    unsigned i;
++{
 +    int i, j;
 +    int result = CANCELLED_NUMERIC;    /* Solaris returns a -1 on error */
- 
--    T((T_CALLED("tigetnum(%s)"), str));
-+    T((T_CALLED("tigetnum(%p, %s)"), SP_PARM, str));
  
 -    if (cur_term != 0) {
@@ -37593 +39552 @@
 -                   returnCode(ABSENT_NUMERIC);
 -               returnCode(tp->Numbers[i]);
++    T((T_CALLED("tigetnum(%p, %s)"), SP_PARM, str));
++
 +    if (HasTInfoTerminal(SP_PARM)) {
 +       TERMTYPE *tp = &(TerminalOf(SP_PARM)->type);
@@ -37613 +39574 @@
         }
 +#endif
-+       if (j >= 0 && VALID_NUMERIC(tp->Numbers[j]))
-+           result = tp->Numbers[j];
-+       else
-+           result = ABSENT_NUMERIC;
++       if (j >= 0) {
++           if (VALID_NUMERIC(tp->Numbers[j]))
++               result = tp->Numbers[j];
++           else
++               result = ABSENT_NUMERIC;
++       }
      }
  
@@ -37688 +39651 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_tparm.c ncurses-5.7/ncurses/tinfo/lib_tparm.c
 --- ncurses-5.7.orig/ncurses/tinfo/lib_tparm.c  2008-08-16 12:22:55.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/lib_tparm.c       2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/lib_tparm.c       2009-09-12 08:51:17.000000000 -0700
 @@ -40,10 +40,9 @@
  #include <curses.priv.h>
@@ -37703 +39666 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_tputs.c ncurses-5.7/ncurses/tinfo/lib_tputs.c
 --- ncurses-5.7.orig/ncurses/tinfo/lib_tputs.c  2008-06-28 06:12:15.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/lib_tputs.c       2009-07-19 15:04:07.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/lib_tputs.c       2009-09-12 08:51:45.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -37984 +39947 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_ttyflags.c ncurses-5.7/ncurses/tinfo/lib_ttyflags.c
 --- ncurses-5.7.orig/ncurses/tinfo/lib_ttyflags.c       2008-08-03 15:10:44.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/lib_ttyflags.c    2009-07-19 15:04:06.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/lib_ttyflags.c    2009-09-12 08:51:43.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -38323 +40286 @@
  }
 +#endif
+diff -Naur ncurses-5.7.orig/ncurses/tinfo/make_hash.c ncurses-5.7/ncurses/tinfo/make_hash.c
+--- ncurses-5.7.orig/ncurses/tinfo/make_hash.c  1969-12-31 16:00:00.000000000 -0800
++++ ncurses-5.7/ncurses/tinfo/make_hash.c       2009-09-12 08:52:02.000000000 -0700
+@@ -0,0 +1,294 @@
++/****************************************************************************
++ * Copyright (c) 1998-2008,2009 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"), to deal in the Software without restriction, including      *
++ * without limitation the rights to use, copy, modify, merge, publish,      *
++ * distribute, distribute with modifications, sublicense, and/or sell       *
++ * copies of the Software, and to permit persons to whom the Software is    *
++ * furnished to do so, subject to the following conditions:                 *
++ *                                                                          *
++ * The above copyright notice and this permission notice shall be included  *
++ * in all copies or substantial portions of the Software.                   *
++ *                                                                          *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
++ *                                                                          *
++ * Except as contained in this notice, the name(s) of the above copyright   *
++ * holders shall not be used in advertising or otherwise to promote the     *
++ * sale, use or other dealings in this Software without prior written       *
++ * authorization.                                                           *
++ ****************************************************************************/
++
++/****************************************************************************
++ *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
++ *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
++ *     and: Thomas E. Dickey                        1996-on                 *
++ ****************************************************************************/
++
++/*
++ *     make_hash.c --- build-time program for constructing comp_captab.c
++ *
++ */
++
++#include <curses.priv.h>
++
++#include <tic.h>
++#include <hashsize.h>
++
++#include <ctype.h>
++
++MODULE_ID("$Id: make_hash.c,v 1.2 2009/08/08 17:42:41 tom Exp $")
++
++/*
++ *     _nc_make_hash_table()
++ *
++ *     Takes the entries in table[] and hashes them into hash_table[]
++ *     by name.  There are CAPTABSIZE entries in table[] and HASHTABSIZE
++ *     slots in hash_table[].
++ *
++ */
++
++#undef MODULE_ID
++#define MODULE_ID(id)          /*nothing */
++#include <tinfo/doalloc.c>
++
++/*
++ *     int hash_function(string)
++ *
++ *     Computes the hashing function on the given string.
++ *
++ *     The current hash function is the sum of each consectutive pair
++ *     of characters, taken as two-byte integers, mod HASHTABSIZE.
++ *
++ */
++
++static int
++hash_function(const char *string)
++{
++    long sum = 0;
++
++    while (*string) {
++       sum += (long) (*string + (*(string + 1) << 8));
++       string++;
++    }
++
++    return (int) (sum % HASHTABSIZE);
++}
++
++static void
++_nc_make_hash_table(struct name_table_entry *table,
++                   HashValue * hash_table)
++{
++    short i;
++    int hashvalue;
++    int collisions = 0;
++
++    for (i = 0; i < HASHTABSIZE; i++) {
++       hash_table[i] = -1;
++    }
++    for (i = 0; i < CAPTABSIZE; i++) {
++       hashvalue = hash_function(table[i].nte_name);
++
++       if (hash_table[hashvalue] >= 0)
++           collisions++;
++
++       if (hash_table[hashvalue] != 0)
++           table[i].nte_link = hash_table[hashvalue];
++       hash_table[hashvalue] = i;
++    }
++
++    printf("/* %d collisions out of %d entries */\n", collisions, CAPTABSIZE);
++}
++
++/*
++ * This filter reads from standard input a list of tab-delimited columns,
++ * (e.g., from Caps.filtered) computes the hash-value of a specified column and
++ * writes the hashed tables to standard output.
++ *
++ * By compiling the hash table at build time, we're able to make the entire
++ * set of terminfo and termcap tables readonly (and also provide some runtime
++ * performance enhancement).
++ */
++
++#define MAX_COLUMNS BUFSIZ     /* this _has_ to be worst-case */
++
++static char **
++parse_columns(char *buffer)
++{
++    static char **list;
++
++    int col = 0;
++
++    if (list == 0 && (list = typeCalloc(char *, MAX_COLUMNS)) == 0)
++         return (0);
++
++    if (*buffer != '#') {
++       while (*buffer != '\0') {
++           char *s;
++           for (s = buffer; (*s != '\0') && !isspace(UChar(*s)); s++)
++               /*EMPTY */ ;
++           if (s != buffer) {
++               char mark = *s;
++               *s = '\0';
++               if ((s - buffer) > 1
++                   && (*buffer == '"')
++                   && (s[-1] == '"')) {        /* strip the quotes */
++                   assert(s > buffer + 1);
++                   s[-1] = '\0';
++                   buffer++;
++               }
++               list[col] = buffer;
++               col++;
++               if (mark == '\0')
++                   break;
++               while (*++s && isspace(UChar(*s)))
++                   /*EMPTY */ ;
++               buffer = s;
++           } else
++               break;
++       }
++    }
++    return col ? list : 0;
++}
++
++int
++main(int argc, char **argv)
++{
++    struct name_table_entry *name_table = typeCalloc(struct
++                                                    name_table_entry, CAPTABSIZE);
++    HashValue *hash_table = typeCalloc(HashValue, HASHTABSIZE);
++    const char *root_name = "";
++    int column = 0;
++    int bigstring = 0;
++    int n;
++    char buffer[BUFSIZ];
++
++    static const char *typenames[] =
++    {"BOOLEAN", "NUMBER", "STRING"};
++
++    short BoolCount = 0;
++    short NumCount = 0;
++    short StrCount = 0;
++
++    /* The first argument is the column-number (starting with 0).
++     * The second is the root name of the tables to generate.
++     */
++    if (argc <= 3
++       || (column = atoi(argv[1])) <= 0
++       || (column >= MAX_COLUMNS)
++       || *(root_name = argv[2]) == 0
++       || (bigstring = atoi(argv[3])) < 0
++       || name_table == 0
++       || hash_table == 0) {
++       fprintf(stderr, "usage: make_hash column root_name bigstring\n");
++       exit(EXIT_FAILURE);
++    }
++
++    /*
++     * Read the table into our arrays.
++     */
++    for (n = 0; (n < CAPTABSIZE) && fgets(buffer, BUFSIZ, stdin);) {
++       char **list, *nlp = strchr(buffer, '\n');
++       if (nlp)
++           *nlp = '\0';
++       list = parse_columns(buffer);
++       if (list == 0)          /* blank or comment */
++           continue;
++       name_table[n].nte_link = -1;    /* end-of-hash */
++       name_table[n].nte_name = strdup(list[column]);
++       if (!strcmp(list[2], "bool")) {
++           name_table[n].nte_type = BOOLEAN;
++           name_table[n].nte_index = BoolCount++;
++       } else if (!strcmp(list[2], "num")) {
++           name_table[n].nte_type = NUMBER;
++           name_table[n].nte_index = NumCount++;
++       } else if (!strcmp(list[2], "str")) {
++           name_table[n].nte_type = STRING;
++           name_table[n].nte_index = StrCount++;
++       } else {
++           fprintf(stderr, "Unknown type: %s\n", list[2]);
++           exit(EXIT_FAILURE);
++       }
++       n++;
++    }
++    _nc_make_hash_table(name_table, hash_table);
++
++    /*
++     * Write the compiled tables to standard output
++     */
++    if (bigstring) {
++       int len = 0;
++       int nxt;
++
++       printf("static const char %s_names_text[] = \\\n", root_name);
++       for (n = 0; n < CAPTABSIZE; n++) {
++           nxt = (int) strlen(name_table[n].nte_name) + 5;
++           if (nxt + len > 72) {
++               printf("\\\n");
++               len = 0;
++           }
++           printf("\"%s\\0\" ", name_table[n].nte_name);
++           len += nxt;
++       }
++       printf(";\n\n");
++
++       len = 0;
++       printf("static name_table_data const %s_names_data[] =\n",
++              root_name);
++       printf("{\n");
++       for (n = 0; n < CAPTABSIZE; n++) {
++           printf("\t{ %15d,\t%10s,\t%3d, %3d }%c\n",
++                  len,
++                  typenames[name_table[n].nte_type],
++                  name_table[n].nte_index,
++                  name_table[n].nte_link,
++                  n < CAPTABSIZE - 1 ? ',' : ' ');
++           len += (int) strlen(name_table[n].nte_name) + 1;
++       }
++       printf("};\n\n");
++       printf("static struct name_table_entry *_nc_%s_table = 0;\n\n", root_name);
++    } else {
++
++       printf("static struct name_table_entry %s _nc_%s_table[] =\n",
++              bigstring ? "" : "const",
++              root_name);
++       printf("{\n");
++       for (n = 0; n < CAPTABSIZE; n++) {
++           sprintf(buffer, "\"%s\"",
++                   name_table[n].nte_name);
++           printf("\t{ %15s,\t%10s,\t%3d, %3d }%c\n",
++                  buffer,
++                  typenames[name_table[n].nte_type],
++                  name_table[n].nte_index,
++                  name_table[n].nte_link,
++                  n < CAPTABSIZE - 1 ? ',' : ' ');
++       }
++       printf("};\n\n");
++    }
++
++    printf("static const HashValue _nc_%s_hash_table[%d] =\n",
++          root_name,
++          HASHTABSIZE + 1);
++    printf("{\n");
++    for (n = 0; n < HASHTABSIZE; n++) {
++       printf("\t%3d,\n", hash_table[n]);
++    }
++    printf("\t0\t/* base-of-table */\n");
++    printf("};\n\n");
++
++    printf("#if (BOOLCOUNT!=%d)||(NUMCOUNT!=%d)||(STRCOUNT!=%d)\n",
++          BoolCount, NumCount, StrCount);
++    printf("#error\t--> term.h and comp_captab.c disagree about the <--\n");
++    printf("#error\t--> numbers of booleans, numbers and/or strings <--\n");
++    printf("#endif\n\n");
++
++    free(hash_table);
++    return EXIT_SUCCESS;
++}
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/make_keys.c ncurses-5.7/ncurses/tinfo/make_keys.c
 --- ncurses-5.7.orig/ncurses/tinfo/make_keys.c  2008-08-03 14:57:22.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/make_keys.c       2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/make_keys.c       2009-09-12 08:51:17.000000000 -0700
 @@ -39,16 +39,16 @@
  #define USE_TERMLIB 1
@@ -38368 +40629 @@
             fprintf(ofp, "\t{ %4d, %-*.*s },\t/* %s */\n",
                     code,
+diff -Naur ncurses-5.7.orig/ncurses/tinfo/MKcaptab.sh ncurses-5.7/ncurses/tinfo/MKcaptab.sh
+--- ncurses-5.7.orig/ncurses/tinfo/MKcaptab.sh  2007-08-12 06:13:51.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/MKcaptab.sh       2009-09-12 08:52:02.000000000 -0700
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ ##############################################################################
+-# Copyright (c) 2007 Free Software Foundation, Inc.                          #
++# Copyright (c) 2007,2009 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"), #
+@@ -26,12 +26,19 @@
+ # use or other dealings in this Software without prior written               #
+ # authorization.                                                             #
+ ##############################################################################
+-# $Id: MKcaptab.sh,v 1.8 2007/08/12 13:13:51 tom Exp $
++# $Id: MKcaptab.sh,v 1.10 2009/08/08 17:19:25 tom Exp $
+ AWK=${1-awk}
+ OPT1=${2-0}
+ OPT2=${3-tinfo/MKcaptab.awk}
+ DATA=${4-../include/Caps}
+ 
++cat <<EOF
++/*
++ * generated by $0
++ */
++
++EOF
++
+ cat <<'EOF'
+ /*
+  *     comp_captab.c -- The names of the capabilities indexed via a hash
+@@ -58,7 +65,7 @@
+ static void
+ next_string(const char *strings, unsigned *offset)
+ {
+-       *offset += strlen(strings + *offset) + 1;
++    *offset += strlen(strings + *offset) + 1;
+ }
+ 
+ static const struct name_table_entry *
+@@ -66,21 +73,21 @@
+                const name_table_data *source,
+                const char *strings)
+ {
+-       if (*actual == 0) {
+-               *actual = typeCalloc(struct name_table_entry, CAPTABSIZE);
+-               if (*actual != 0) {
+-                       unsigned n;
+-                       unsigned len = 0;
+-                       for (n = 0; n < CAPTABSIZE; ++n) {
+-                               (*actual)[n].nte_name = strings + len;
+-                               (*actual)[n].nte_type = source[n].nte_type;
+-                               (*actual)[n].nte_index = source[n].nte_index;
+-                               (*actual)[n].nte_link = source[n].nte_link;
+-                               next_string(strings, &len);
+-                       }
+-               }
++    if (*actual == 0) {
++       *actual = typeCalloc(struct name_table_entry, CAPTABSIZE);
++       if (*actual != 0) {
++           unsigned n;
++           unsigned len = 0;
++           for (n = 0; n < CAPTABSIZE; ++n) {
++               (*actual)[n].nte_name = strings + len;
++               (*actual)[n].nte_type = source[n].nte_type;
++               (*actual)[n].nte_index = source[n].nte_index;
++               (*actual)[n].nte_link = source[n].nte_link;
++               next_string(strings, &len);
++           }
+        }
+-       return *actual;
++    }
++    return *actual;
+ }
+ 
+ #define add_alias(field) \\
+@@ -94,18 +101,18 @@
+                const char *strings,
+                unsigned tablesize)
+ {
+-       if (*actual == 0) {
+-               *actual = typeCalloc(struct alias, tablesize + 1);
+-               if (*actual != 0) {
+-                       unsigned n;
+-                       for (n = 0; n < tablesize; ++n) {
+-                               add_alias(from);
+-                               add_alias(to);
+-                               add_alias(source);
+-                       }
+-               }
++    if (*actual == 0) {
++       *actual = typeCalloc(struct alias, tablesize + 1);
++       if (*actual != 0) {
++           unsigned n;
++           for (n = 0; n < tablesize; ++n) {
++               add_alias(from);
++               add_alias(to);
++               add_alias(source);
++           }
+        }
+-       return *actual;
++    }
++    return *actual;
+ }
+ 
+ #define build_names(root) _nc_build_names(&_nc_##root##_table, \\
+@@ -122,27 +129,65 @@
+ 
+ NCURSES_EXPORT(const struct name_table_entry *) _nc_get_table (bool termcap)
+ {
+-       return termcap ? build_names(cap) : build_names(info) ;
++    return termcap ? build_names(cap) : build_names(info) ;
+ }
+ 
+-NCURSES_EXPORT(const short *) _nc_get_hash_table (bool termcap)
++/* entrypoint used by tack (do not alter) */
++NCURSES_EXPORT(const HashValue *) _nc_get_hash_table (bool termcap)
+ {
+-       return termcap ? _nc_cap_hash_table: _nc_info_hash_table ;
++    return termcap ? _nc_cap_hash_table: _nc_info_hash_table ;
+ }
+ 
+ NCURSES_EXPORT(const struct alias *) _nc_get_alias_table (bool termcap)
+ {
+-       return termcap ? build_alias(cap) : build_alias(info) ;
++    return termcap ? build_alias(cap) : build_alias(info) ;
++}
++
++static HashValue
++hash_function(const char *string)
++{
++    long sum = 0;
++
++    DEBUG(9, ("hashing %s", string));
++    while (*string) {
++       sum += (long) (*string + (*(string + 1) << 8));
++       string++;
++    }
++
++    DEBUG(9, ("sum is %ld", sum));
++    return (HashValue) (sum % HASHTABSIZE);
++}
++
++static int
++compare_cap_names(const char *a, const char *b)
++{
++    return !strncmp(a, b, 2);
++}
++
++static int
++compare_info_names(const char *a, const char *b)
++{
++    return !strcmp(a, b);
++}
++
++static const HashData hash_data[2] = {
++    { HASHTABSIZE, _nc_info_hash_table, hash_function, compare_info_names },
++    { HASHTABSIZE, _nc_cap_hash_table, hash_function, compare_cap_names }
++};
++
++NCURSES_EXPORT(const HashData *) _nc_get_hash_info (bool termcap)
++{
++    return &hash_data[(termcap != FALSE)];
+ }
+ 
+ #if NO_LEAKS
+ NCURSES_EXPORT(void) _nc_comp_captab_leaks(void)
+ {
+ #if $OPT1
+-       FreeIfNeeded(_nc_cap_table);
+-       FreeIfNeeded(_nc_info_table);
+-       FreeIfNeeded(_nc_capalias_table);
+-       FreeIfNeeded(_nc_infoalias_table);
++    FreeIfNeeded(_nc_cap_table);
++    FreeIfNeeded(_nc_info_table);
++    FreeIfNeeded(_nc_capalias_table);
++    FreeIfNeeded(_nc_infoalias_table);
+ #endif
+ }
+ #endif /* NO_LEAKS */
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/MKcodes.awk ncurses-5.7/ncurses/tinfo/MKcodes.awk
 --- ncurses-5.7.orig/ncurses/tinfo/MKcodes.awk  2008-06-28 16:13:25.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/MKcodes.awk       2009-07-19 15:04:03.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/MKcodes.awk       2009-09-12 08:51:40.000000000 -0700
 @@ -1,5 +1,5 @@
  ##############################################################################
@@ -38432 +40874 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/MKfallback.sh ncurses-5.7/ncurses/tinfo/MKfallback.sh
 --- ncurses-5.7.orig/ncurses/tinfo/MKfallback.sh        2006-07-15 09:54:20.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/MKfallback.sh     2009-07-19 15:03:53.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/MKfallback.sh     2009-09-12 08:51:30.000000000 -0700
 @@ -1,6 +1,6 @@
  #!/bin/sh
@@ -38460 +40902 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/MKnames.awk ncurses-5.7/ncurses/tinfo/MKnames.awk
 --- ncurses-5.7.orig/ncurses/tinfo/MKnames.awk  2008-10-11 14:07:56.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/MKnames.awk       2009-07-19 15:03:45.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/MKnames.awk       2009-09-12 08:51:23.000000000 -0700
 @@ -1,5 +1,5 @@
  ##############################################################################
@@ -38531 +40973 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/name_match.c ncurses-5.7/ncurses/tinfo/name_match.c
 --- ncurses-5.7.orig/ncurses/tinfo/name_match.c 2008-08-03 12:49:33.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/name_match.c      2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/name_match.c      2009-09-12 08:51:17.000000000 -0700
 @@ -31,10 +31,9 @@
   ****************************************************************************/
@@ -38546 +40988 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/parse_entry.c ncurses-5.7/ncurses/tinfo/parse_entry.c
 --- ncurses-5.7.orig/ncurses/tinfo/parse_entry.c        2008-08-16 14:52:03.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/parse_entry.c     2009-07-19 15:04:15.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/parse_entry.c     2009-09-12 08:51:52.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -38669 +41111 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/setbuf.c ncurses-5.7/ncurses/tinfo/setbuf.c
 --- ncurses-5.7.orig/ncurses/tinfo/setbuf.c     2007-05-12 12:04:02.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/setbuf.c  2009-07-19 15:03:59.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/setbuf.c  2009-09-12 08:51:56.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -38691 +41133 @@
  
 -MODULE_ID("$Id: setbuf.c,v 1.13 2007/05/12 19:04:02 tom Exp $")
-+MODULE_ID("$Id: setbuf.c,v 1.14 2009/05/09 23:09:00 tom Exp $")
++MODULE_ID("$Id: setbuf.c,v 1.15 2009/05/23 22:13:44 tom Exp $")
  
  /*
   * If the output file descriptor is connected to a tty (the typical case) it
-@@ -98,11 +100,11 @@
+@@ -98,11 +100,20 @@
   * buffer.  So we disable this by default (there may yet be a workaround).
   */
@@ -38702 +41144 @@
 +NCURSES_SP_NAME(_nc_set_buffer) (NCURSES_SP_DCLx FILE *ofp, bool buffered)
  {
++    int Cols;
++    int Lines;
++
++    if (0 == SP_PARM)
++       return;
++
++    Cols = *(ptrCols(SP_PARM));
++    Lines = *(ptrLines(SP_PARM));
++
      /* optional optimization hack -- do before any output to ofp */
  #if HAVE_SETVBUF || HAVE_SETBUFFER
@@ -38709 +41160 @@
         char *buf_ptr;
  
-@@ -115,10 +117,10 @@
+@@ -114,11 +125,11 @@
+        setmode(ofp, O_BINARY);
  #endif
         if (buffered != 0) {
-            buf_len = min(LINES * (COLS + 6), 2800);
+-           buf_len = min(LINES * (COLS + 6), 2800);
 -           if ((buf_ptr = SP->_setbuf) == 0) {
++           buf_len = min(Lines * (Cols + 6), 2800);
 +           if ((buf_ptr = SP_PARM->_setbuf) == 0) {
                 if ((buf_ptr = typeMalloc(char, buf_len)) == NULL)
@@ -38722 +41175 @@
             }
  #if !USE_SETBUF_0
-@@ -144,7 +146,15 @@
+@@ -144,7 +155,15 @@
         (void) setbuffer(ofp, buf_ptr, (int) buf_len);
  #endif
@@ -38736 +41189 @@
 +_nc_set_buffer(FILE *ofp, bool buffered)
 +{
-+    return NCURSES_SP_NAME(_nc_set_buffer) (CURRENT_SCREEN, ofp, buffered);
++    NCURSES_SP_NAME(_nc_set_buffer) (CURRENT_SCREEN, ofp, buffered);
 +}
 +#endif
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/tinfo_driver.c ncurses-5.7/ncurses/tinfo/tinfo_driver.c
 --- ncurses-5.7.orig/ncurses/tinfo/tinfo_driver.c       1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/ncurses/tinfo/tinfo_driver.c    2009-07-19 15:04:11.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/tinfo_driver.c    2009-09-12 08:52:05.000000000 -0700
 @@ -0,0 +1,1389 @@
 +/****************************************************************************
@@ -38787 +41240 @@
 +#endif
 +
-+MODULE_ID("$Id: tinfo_driver.c,v 1.1 2009/05/23 22:40:30 juergen Exp $")
++MODULE_ID("$Id: tinfo_driver.c,v 1.2 2009/08/16 14:17:08 tom Exp $")
 +
 +/*
@@ -38918 +41371 @@
 +{
 +    AssertTCB();
-+    return _nc_tinfo_doupdate(TCB->csp);
++    return TINFO_DOUPDATE(TCB->csp);
 +}
 +
@@ -39690 +42143 @@
 +    SCREEN *sp = TCB->csp;
 +    AssertTCB();
-+    return _nc_tinfo_mvcur(sp, yold, xold, ynew, xnew);
++    return TINFO_MVCUR(sp, yold, xold, ynew, xnew);
 +}
 +
@@ -40128 +42581 @@
 +    AssertTCB();
 +    if (TCB->csp)
-+       res = _nc_tinfo_has_key(TCB->csp, key) == 0 ? FALSE : TRUE;
++       res = TINFO_HAS_KEY(TCB->csp, key) == 0 ? FALSE : TRUE;
 +
 +    return res;
@@ -40134 +42587 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/use_screen.c ncurses-5.7/ncurses/tinfo/use_screen.c
 --- ncurses-5.7.orig/ncurses/tinfo/use_screen.c 2008-06-07 12:16:56.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/use_screen.c      2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/use_screen.c      2009-09-12 08:51:17.000000000 -0700
 @@ -32,7 +32,7 @@
  
@@ -40155 +42608 @@
 diff -Naur ncurses-5.7.orig/ncurses/tinfo/write_entry.c ncurses-5.7/ncurses/tinfo/write_entry.c
 --- ncurses-5.7.orig/ncurses/tinfo/write_entry.c        2008-08-03 12:24:00.000000000 -0700
-+++ ncurses-5.7/ncurses/tinfo/write_entry.c     2009-07-19 15:03:53.000000000 -0700
++++ ncurses-5.7/ncurses/tinfo/write_entry.c     2009-09-12 08:51:30.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -40294 +42747 @@
 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_traceatr.c ncurses-5.7/ncurses/trace/lib_traceatr.c
 --- ncurses-5.7.orig/ncurses/trace/lib_traceatr.c       2008-08-03 09:24:53.000000000 -0700
-+++ ncurses-5.7/ncurses/trace/lib_traceatr.c    2009-07-19 15:03:59.000000000 -0700
++++ ncurses-5.7/ncurses/trace/lib_traceatr.c    2009-09-12 08:51:37.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -40388 +42841 @@
 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracebits.c ncurses-5.7/ncurses/trace/lib_tracebits.c
 --- ncurses-5.7.orig/ncurses/trace/lib_tracebits.c      2008-08-03 09:09:26.000000000 -0700
-+++ ncurses-5.7/ncurses/trace/lib_tracebits.c   2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/trace/lib_tracebits.c   2009-09-12 08:51:17.000000000 -0700
 @@ -33,9 +33,8 @@
   ****************************************************************************/
@@ -40402 +42855 @@
 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_trace.c ncurses-5.7/ncurses/trace/lib_trace.c
 --- ncurses-5.7.orig/ncurses/trace/lib_trace.c  2008-08-23 11:04:29.000000000 -0700
-+++ ncurses-5.7/ncurses/trace/lib_trace.c       2009-07-19 15:02:23.000000000 -0700
++++ ncurses-5.7/ncurses/trace/lib_trace.c       2009-09-12 08:51:19.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -40462 +42915 @@
 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracechr.c ncurses-5.7/ncurses/trace/lib_tracechr.c
 --- ncurses-5.7.orig/ncurses/trace/lib_tracechr.c       2008-08-03 08:39:29.000000000 -0700
-+++ ncurses-5.7/ncurses/trace/lib_tracechr.c    2009-07-19 15:03:53.000000000 -0700
++++ ncurses-5.7/ncurses/trace/lib_tracechr.c    2009-09-12 08:51:30.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -40508 +42961 @@
 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracedmp.c ncurses-5.7/ncurses/trace/lib_tracedmp.c
 --- ncurses-5.7.orig/ncurses/trace/lib_tracedmp.c       2008-08-16 12:30:56.000000000 -0700
-+++ ncurses-5.7/ncurses/trace/lib_tracedmp.c    2009-07-19 15:03:53.000000000 -0700
++++ ncurses-5.7/ncurses/trace/lib_tracedmp.c    2009-09-12 08:51:30.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -40563 +43016 @@
 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracemse.c ncurses-5.7/ncurses/trace/lib_tracemse.c
 --- ncurses-5.7.orig/ncurses/trace/lib_tracemse.c       2008-08-03 08:39:29.000000000 -0700
-+++ ncurses-5.7/ncurses/trace/lib_tracemse.c    2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/trace/lib_tracemse.c    2009-09-12 08:51:17.000000000 -0700
 @@ -38,7 +38,7 @@
  
@@ -40584 +43037 @@
 diff -Naur ncurses-5.7.orig/ncurses/trace/trace_tries.c ncurses-5.7/ncurses/trace/trace_tries.c
 --- ncurses-5.7.orig/ncurses/trace/trace_tries.c        2008-08-03 08:43:30.000000000 -0700
-+++ ncurses-5.7/ncurses/trace/trace_tries.c     2009-07-19 15:03:48.000000000 -0700
++++ ncurses-5.7/ncurses/trace/trace_tries.c     2009-09-12 08:51:25.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -40612 +43065 @@
 diff -Naur ncurses-5.7.orig/ncurses/trace/varargs.c ncurses-5.7/ncurses/trace/varargs.c
 --- ncurses-5.7.orig/ncurses/trace/varargs.c    2008-08-03 08:42:49.000000000 -0700
-+++ ncurses-5.7/ncurses/trace/varargs.c 2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/trace/varargs.c 2009-09-12 08:51:17.000000000 -0700
 @@ -34,7 +34,7 @@
  
@@ -40633 +43086 @@
 diff -Naur ncurses-5.7.orig/ncurses/trace/visbuf.c ncurses-5.7/ncurses/trace/visbuf.c
 --- ncurses-5.7.orig/ncurses/trace/visbuf.c     2008-08-04 16:07:39.000000000 -0700
-+++ ncurses-5.7/ncurses/trace/visbuf.c  2009-07-19 15:04:15.000000000 -0700
++++ ncurses-5.7/ncurses/trace/visbuf.c  2009-09-12 08:51:52.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -40693 +43146 @@
 diff -Naur ncurses-5.7.orig/ncurses/tty/hardscroll.c ncurses-5.7/ncurses/tty/hardscroll.c
 --- ncurses-5.7.orig/ncurses/tty/hardscroll.c   2008-08-03 16:49:30.000000000 -0700
-+++ ncurses-5.7/ncurses/tty/hardscroll.c        2009-07-19 15:03:53.000000000 -0700
++++ ncurses-5.7/ncurses/tty/hardscroll.c        2009-09-12 08:51:30.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -40912 +43365 @@
 diff -Naur ncurses-5.7.orig/ncurses/tty/hashmap.c ncurses-5.7/ncurses/tty/hashmap.c
 --- ncurses-5.7.orig/ncurses/tty/hashmap.c      2007-10-13 11:47:25.000000000 -0700
-+++ ncurses-5.7/ncurses/tty/hashmap.c   2009-07-19 15:03:59.000000000 -0700
++++ ncurses-5.7/ncurses/tty/hashmap.c   2009-09-12 08:51:37.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -41377 +43830 @@
 diff -Naur ncurses-5.7.orig/ncurses/tty/lib_mvcur.c ncurses-5.7/ncurses/tty/lib_mvcur.c
 --- ncurses-5.7.orig/ncurses/tty/lib_mvcur.c    2008-08-16 12:30:58.000000000 -0700
-+++ ncurses-5.7/ncurses/tty/lib_mvcur.c 2009-07-19 15:03:59.000000000 -0700
++++ ncurses-5.7/ncurses/tty/lib_mvcur.c 2009-09-12 08:52:09.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -41404 +43857 @@
  
  /****************************************************************************
-@@ -152,13 +153,16 @@
+@@ -152,13 +153,21 @@
   */
  
@@ -41416 +43869 @@
 +#endif
 +
-+MODULE_ID("$Id: lib_mvcur.c,v 1.120 2009/05/10 00:52:29 tom Exp $")
++MODULE_ID("$Id: lib_mvcur.c,v 1.121 2009/08/30 16:52:00 tom Exp $")
++
++#define WANT_CHAR(sp, y, x) (sp)->_newscr->_line[y].text[x]    /* desired state */
  
 -#define WANT_CHAR(y, x)        SP->_newscr->_line[y].text[x]   /* desired state */
 -#define BAUDRATE       cur_term->_baudrate     /* bits per second */
-+#define WANT_CHAR(sp, y, x) (sp)->_newscr->_line[y].text[x]    /* desired state */
++#if NCURSES_SP_FUNCS
++#define BAUDRATE(sp)   sp->_term->_baudrate    /* bits per second */
++#else
 +#define BAUDRATE(sp)   cur_term->_baudrate     /* bits per second */
++#endif
  
  #if defined(MAIN) || defined(NCURSES_TEST)
  #include <sys/time.h>
-@@ -169,7 +173,7 @@
+@@ -169,7 +178,7 @@
  
  #define OPT_SIZE 512
@@ -41434 +43892 @@
  /****************************************************************************
   *
-@@ -179,34 +183,34 @@
+@@ -179,34 +188,34 @@
  
  #ifdef TRACE
@@ -41478 +43936 @@
  {
      if (cap == 0)
-@@ -230,45 +234,56 @@
+@@ -230,45 +239,59 @@
                 }
  
@@ -41536 +43994 @@
  /* what to do at initialization time and after each shellout */
  {
++    if (SP_PARM && !IsTermInfo(SP_PARM))
++       return;
++
      /* initialize screen for cursor access */
      if (enter_ca_mode) {
@@ -41546 +44007 @@
  
      /*
-@@ -280,53 +295,63 @@
+@@ -280,53 +303,63 @@
       * they know the screen size.  This is useful when you're running
       * a vt100 emulation through xterm.
@@ -41640 +44101 @@
  
      /*
-@@ -335,7 +360,7 @@
+@@ -335,7 +368,7 @@
       * can treat it like absolute screen addressing.  This seems to be true
       * for all cursor_mem_address terminal types in the terminfo database.
@@ -41649 +44110 @@
      /*
       * Parametrized local-motion strings.  This static cost computation
-@@ -361,40 +386,43 @@
+@@ -361,40 +394,43 @@
       * All these averages depend on the assumption that all parameter values
       * are equally probable.
@@ -41717 +44178 @@
      /*
       * If save_cursor is used within enter_ca_mode, we should not use it for
-@@ -411,30 +439,40 @@
+@@ -411,30 +447,42 @@
      }
  
@@ -41727 +44188 @@
       * called by doupdate's return-from-shellout code.
       */
+-    _nc_mvcur_resume();
 +    NCURSES_SP_NAME(_nc_mvcur_resume) (NCURSES_SP_ARG);
-+}
-+
+ }
+ 
 +#if NCURSES_SP_FUNCS
-+NCURSES_EXPORT(void)
+ NCURSES_EXPORT(void)
+-_nc_mvcur_wrap(void)
 +_nc_mvcur_init(void)
 +{
 +    NCURSES_SP_NAME(_nc_mvcur_init) (CURRENT_SCREEN);
-     _nc_mvcur_resume();
- }
++}
 +#endif
- 
- NCURSES_EXPORT(void)
--_nc_mvcur_wrap(void)
++
++NCURSES_EXPORT(void)
 +NCURSES_SP_NAME(_nc_mvcur_wrap) (NCURSES_SP_DCL0)
  /* wrap up cursor-addressing mode */
@@ -41746 +44207 @@
      /* leave cursor at screen bottom */
 -    mvcur(-1, -1, screen_lines - 1, 0);
-+    mvcur(-1, -1, screen_lines(CURRENT_SCREEN) - 1, 0);
++    TINFO_MVCUR(NCURSES_SP_ARGx -1, -1, screen_lines(SP_PARM) - 1, 0);
++
++    if (SP_PARM && !IsTermInfo(SP_PARM))
++       return;
  
      /* set cursor to normal mode */
@@ -41768 +44232 @@
      /*
       * Reset terminal's tab counter.  There's a long-time bug that
-@@ -444,8 +482,16 @@
+@@ -444,9 +492,17 @@
       * escape sequences that reset things as column positions.
       * Utter a \r to reset this invisibly.
@@ -41774 +44238 @@
 -    _nc_outch('\r');
 +    NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_ARGx '\r');
-+}
-+
+ }
+ 
 +#if NCURSES_SP_FUNCS
 +NCURSES_EXPORT(void)
@@ -41781 +44245 @@
 +{
 +    NCURSES_SP_NAME(_nc_mvcur_wrap) (CURRENT_SCREEN);
- }
++}
 +#endif
- 
++
  /****************************************************************************
   *
-@@ -486,8 +532,13 @@
+  * Optimized cursor movement
+@@ -486,8 +542,13 @@
  #define LASTTAB(fr)    ((fr > 0) ? ((fr - 1) / init_tabs) * init_tabs : -1)
  
@@ -41802 +44267 @@
  {
      string_desc save;
-@@ -500,38 +551,38 @@
+@@ -500,38 +561,38 @@
  
         if (row_address != 0
@@ -41851 +44316 @@
         }
  
-@@ -550,17 +601,17 @@
+@@ -550,17 +611,17 @@
         if (column_address
             && _nc_safe_strcat(_nc_str_copy(target, &save),
@@ -41872 +44337 @@
  
             if (cursor_right) {
-@@ -575,7 +626,7 @@
+@@ -575,7 +636,7 @@
  
                     for (fr = from_x; (nxt = NEXTTAB(fr)) <= to_x; fr = nxt) {
@@ -41881 +44346 @@
                             break;
                     }
-@@ -599,7 +650,7 @@
+@@ -599,7 +660,7 @@
                     && n < (int) check.s_size
                     && vcost == 0
@@ -41890 +44355 @@
                         ovw = FALSE;
                 }
-@@ -616,8 +667,8 @@
+@@ -616,8 +677,8 @@
                     int i;
  
@@ -41901 +44366 @@
                             || !Charable(ch)
  #endif
-@@ -631,13 +682,13 @@
+@@ -631,13 +692,13 @@
                     int i;
  
@@ -41918 +44383 @@
                 }
  
-@@ -650,10 +701,10 @@
+@@ -650,10 +711,10 @@
             n = from_x - to_x;
  
@@ -41931 +44396 @@
  
             if (cursor_left) {
-@@ -667,7 +718,8 @@
+@@ -667,7 +728,8 @@
  
                     for (fr = from_x; (nxt = LASTTAB(fr)) >= to_x; fr = nxt) {
@@ -41941 +44406 @@
                             break;
                     }
-@@ -676,7 +728,9 @@
+@@ -676,7 +738,9 @@
                 }
  #endif /* USE_HARD_TABS */
@@ -41952 +44417 @@
                 if (lhcost < hcost
                     && _nc_safe_strcat(_nc_str_copy(target, &save), str)) {
-@@ -705,7 +759,7 @@
+@@ -705,7 +769,7 @@
   */
  
@@ -41961 +44426 @@
  {
      string_desc result;
-@@ -723,9 +777,9 @@
+@@ -723,9 +787,9 @@
  #define InitResult _nc_str_init(&result, buffer, sizeof(buffer))
  
@@ -41973 +44438 @@
  #if defined(TRACE) || defined(NCURSES_TEST)
         if (!(_nc_optimize_enable & OPTIMIZE_MVCUR))
-@@ -740,7 +794,7 @@
+@@ -740,7 +804,7 @@
          * (like, say, local-movement \n getting mapped to some obscure
          * character because A_ALTCHARSET is on).
@@ -41982 +44447 @@
             if (!profiling) {
                 (void) fputs("nonlocal\n", stderr);
-@@ -754,8 +808,10 @@
+@@ -754,8 +818,10 @@
  #ifndef NO_OPTIMIZE
      /* tactic #1: use local movement */
@@ -41995 +44460 @@
         tactic = 1;
         usecost = newcost;
-@@ -763,42 +819,51 @@
+@@ -763,42 +829,51 @@
  
      /* tactic #2: use carriage-return + local movement */
@@ -42063 +44528 @@
  
      /*
-@@ -808,26 +873,39 @@
+@@ -808,26 +883,39 @@
         InitResult;
      switch (tactic) {
@@ -42109 +44574 @@
      }
  #endif /* !NO_OPTIMIZE */
-@@ -845,17 +923,19 @@
+@@ -845,25 +933,26 @@
  
      if (usecost != INFINITY) {
@@ -42125 +44590 @@
  }
  
--NCURSES_EXPORT(int)
+ NCURSES_EXPORT(int)
 -mvcur(int yold, int xold, int ynew, int xnew)
++TINFO_MVCUR(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew)
  /* optimized cursor move from (yold, xold) to (ynew, xnew) */
-+NCURSES_EXPORT(int)
-+NCURSES_SP_NAME(mvcur) (NCURSES_SP_DCLx
-+                       int yold, int xold, int ynew, int xnew)
  {
      NCURSES_CH_T oldattr;
      int code;
-@@ -863,7 +943,7 @@
-     TR(TRACE_CALLS | TRACE_MOVE, (T_CALLED("mvcur(%d,%d,%d,%d)"),
-                                  yold, xold, ynew, xnew));
+ 
+-    TR(TRACE_CALLS | TRACE_MOVE, (T_CALLED("mvcur(%d,%d,%d,%d)"),
+-                                 yold, xold, ynew, xnew));
++    TR(TRACE_CALLS | TRACE_MOVE, (T_CALLED("_nc_tinfo_mvcur(%p,%d,%d,%d,%d)"),
++                                 SP_PARM, yold, xold, ynew, xnew));
  
 -    if (SP == 0) {
@@ -42143 +44608 @@
      } else if (yold == ynew && xold == xnew) {
         code = OK;
-@@ -874,9 +954,9 @@
+@@ -874,9 +963,9 @@
          * column position implied by wraparound or the lack thereof and
          * rolling up the screen to get ynew on the screen.
@@ -42156 +44621 @@
  
         /*
-@@ -884,38 +964,40 @@
+@@ -884,38 +973,40 @@
          * character set -- these have a strong tendency to screw up the CR &
          * LF used for local character motions!
@@ -42210 +44675 @@
                     }
                 }
-@@ -929,27 +1011,35 @@
+@@ -929,27 +1020,35 @@
             }
         }
@@ -42242 +44707 @@
  }
  
-+#if NCURSES_SP_FUNCS
++#if NCURSES_SP_FUNCS && !defined(USE_TERM_DRIVER)
 +NCURSES_EXPORT(int)
 +mvcur(int yold, int xold, int ynew, int xnew)
@@ -42253 +44718 @@
  NCURSES_EXPORT_VAR(int) _nc_optimize_enable = OPTIMIZE_ALL;
  #endif
-@@ -1212,25 +1302,25 @@
+@@ -1212,25 +1311,25 @@
                            speeds[i], overhead, totalest);
             }
@@ -42298 +44763 @@
 diff -Naur ncurses-5.7.orig/ncurses/tty/lib_tstp.c ncurses-5.7/ncurses/tty/lib_tstp.c
 --- ncurses-5.7.orig/ncurses/tty/lib_tstp.c     2008-05-03 09:24:56.000000000 -0700
-+++ ncurses-5.7/ncurses/tty/lib_tstp.c  2009-07-19 15:03:59.000000000 -0700
++++ ncurses-5.7/ncurses/tty/lib_tstp.c  2009-09-12 08:51:37.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -42440 +44905 @@
 diff -Naur ncurses-5.7.orig/ncurses/tty/lib_twait.c ncurses-5.7/ncurses/tty/lib_twait.c
 --- ncurses-5.7.orig/ncurses/tty/lib_twait.c    2008-08-30 13:08:19.000000000 -0700
-+++ ncurses-5.7/ncurses/tty/lib_twait.c 2009-07-19 15:03:53.000000000 -0700
++++ ncurses-5.7/ncurses/tty/lib_twait.c 2009-09-12 08:51:30.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -42647 +45112 @@
 diff -Naur ncurses-5.7.orig/ncurses/tty/lib_vidattr.c ncurses-5.7/ncurses/tty/lib_vidattr.c
 --- ncurses-5.7.orig/ncurses/tty/lib_vidattr.c  2007-06-30 14:58:04.000000000 -0700
-+++ ncurses-5.7/ncurses/tty/lib_vidattr.c       2009-07-19 15:04:09.000000000 -0700
++++ ncurses-5.7/ncurses/tty/lib_vidattr.c       2009-09-12 08:52:04.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -42676 +45141 @@
 +#endif
 +
-+MODULE_ID("$Id: lib_vidattr.c,v 1.57 2009/05/23 20:46:28 tom Exp $")
++MODULE_ID("$Id: lib_vidattr.c,v 1.58 2009/08/15 22:12:01 tom Exp $")
  
 -#define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc)
@@ -42810 +45275 @@
         }
  
-@@ -282,27 +297,53 @@
+@@ -282,28 +297,53 @@
      if (reverse)
         newmode |= A_REVERSE;
@@ -42861 +45326 @@
      chtype attrs = A_NORMAL;
  
+-    T((T_CALLED("termattrs()")));
 +    T((T_CALLED("termattrs(%p)"), SP_PARM));
 +#ifdef USE_TERM_DRIVER
@@ -42867 +45333 @@
 +#else
 +
-     T((T_CALLED("termattrs()")));
      if (enter_alt_charset_mode)
         attrs |= A_ALTCHARSET;
-@@ -331,8 +372,17 @@
+ 
+@@ -331,8 +371,17 @@
      if (enter_underline_mode)
         attrs |= A_UNDERLINE;
@@ -42892 +45358 @@
 diff -Naur ncurses-5.7.orig/ncurses/tty/MKexpanded.sh ncurses-5.7/ncurses/tty/MKexpanded.sh
 --- ncurses-5.7.orig/ncurses/tty/MKexpanded.sh  2005-01-01 17:06:40.000000000 -0800
-+++ ncurses-5.7/ncurses/tty/MKexpanded.sh       2009-07-19 15:04:13.000000000 -0700
++++ ncurses-5.7/ncurses/tty/MKexpanded.sh       2009-09-12 08:51:50.000000000 -0700
 @@ -1,6 +1,6 @@
  #! /bin/sh
@@ -42999 +45465 @@
 diff -Naur ncurses-5.7.orig/ncurses/tty/tty_update.c ncurses-5.7/ncurses/tty/tty_update.c
 --- ncurses-5.7.orig/ncurses/tty/tty_update.c   2008-08-30 13:08:19.000000000 -0700
-+++ ncurses-5.7/ncurses/tty/tty_update.c        2009-07-19 15:04:11.000000000 -0700
++++ ncurses-5.7/ncurses/tty/tty_update.c        2009-09-12 08:52:05.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -43015 +45481 @@
  
  /*-----------------------------------------------------------------
-@@ -38,12 +39,17 @@
+@@ -38,12 +39,16 @@
   *
   *     The routine doupdate() and its dependents.
@@ -43024 +45490 @@
   *-----------------------------------------------------------------*/
  
-+#define NEED_NCURSES_CH_T 1
  #include <curses.priv.h>
  
@@ -43034 +45499 @@
  #undef __BEOS__
  #endif
-@@ -76,9 +82,8 @@
+@@ -76,9 +81,8 @@
  #endif
  
@@ -43041 +45506 @@
  
 -MODULE_ID("$Id: tty_update.c,v 1.246 2008/08/30 20:08:19 tom Exp $")
-+MODULE_ID("$Id: tty_update.c,v 1.258 2009/06/27 19:16:17 tom Exp $")
++MODULE_ID("$Id: tty_update.c,v 1.258.1.2 2009/08/16 14:20:30 tom Exp tom $")
  
  /*
   * This define controls the line-breakout optimization.  Every once in a
-@@ -91,7 +96,7 @@
+@@ -91,7 +95,7 @@
   */
  #define CHECK_INTERVAL 5
@@ -43054 +45519 @@
  static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
  static NCURSES_CH_T normal = NewChar(BLANK_TEXT);
-@@ -103,13 +108,23 @@
+@@ -103,13 +107,23 @@
   */
  /* #define POSITION_DEBUG */
@@ -43079 +45544 @@
  #ifdef POSITION_DEBUG
  /****************************************************************************
-@@ -119,7 +134,7 @@
+@@ -119,7 +133,7 @@
   ****************************************************************************/
  
@@ -43088 +45553 @@
  {
      char buf[20];
-@@ -129,10 +144,10 @@
+@@ -129,10 +143,10 @@
      if (!_nc_tracing || (expected_y < 0 && expected_x < 0))
         return;
@@ -43102 +45567 @@
      do {
         int ask = sizeof(buf) - 1 - (s - buf);
-@@ -152,8 +167,12 @@
+@@ -152,8 +166,12 @@
         if (expected_y < 0)
             expected_y = y - 1;
@@ -43117 +45582 @@
                     y - 1, x - 1, expected_y, expected_x, legend);
         } else {
-@@ -162,7 +181,7 @@
+@@ -162,7 +180,7 @@
      }
  }
@@ -43126 +45591 @@
  
  /****************************************************************************
-@@ -172,19 +191,20 @@
+@@ -172,19 +190,22 @@
   ****************************************************************************/
  
@@ -43143 +45608 @@
 -    mvcur(SP->_cursrow, SP->_curscol, row, col);
 -    position_check(SP->_cursrow, SP->_curscol, "GoTo2");
-+    NCURSES_SP_NAME(mvcur) (NCURSES_SP_ARGx SP_PARM->_cursrow,
-+                           SP_PARM->_curscol, row, col);
++    TINFO_MVCUR(NCURSES_SP_ARGx
++               SP_PARM->_cursrow,
++               SP_PARM->_curscol,
++               row, col);
 +    position_check(SP_PARM, SP_PARM->_cursrow, SP_PARM->_curscol, "GoTo2");
  }
@@ -43154 +45621 @@
      int chlen = 1;
      NCURSES_CH_T my_ch;
-@@ -194,7 +214,7 @@
+@@ -194,7 +215,7 @@
  
      TR(TRACE_CHARPUT, ("PutAttrChar(%s) at (%d, %d)",
@@ -43163 +45630 @@
      /*
       * If this is not a valid character, there is nothing more to do.
-@@ -224,12 +244,12 @@
+@@ -224,12 +245,12 @@
          */
         if (is8bits(CharOf(CHDEREF(ch)))
@@ -43180 +45647 @@
             ;
         } else {
-@@ -241,7 +261,7 @@
+@@ -241,7 +262,7 @@
  #endif
  
@@ -43189 +45656 @@
         my_ch = CHDEREF(ch);    /* work around const param */
  #if USE_WIDEC_SUPPORT
-@@ -251,8 +271,8 @@
+@@ -251,8 +272,8 @@
          * character, and uses the wide-character mapping when we expect the
          * normal one to be broken (by mis-design ;-).
@@ -43200 +45667 @@
             my_ch = _nc_wacs[CharOf(my_ch)];
         }
-@@ -265,9 +285,9 @@
+@@ -265,9 +286,9 @@
          */
         if (AttrOf(attr) & A_ALTCHARSET) {
@@ -43212 +45679 @@
                 if (temp == 0)
                     temp = ' ';
-@@ -282,28 +302,28 @@
+@@ -282,28 +303,28 @@
         ch = CHREF(tilde);
      }
@@ -43248 +45715 @@
  {
      bool have_pending = FALSE;
-@@ -313,13 +333,13 @@
+@@ -313,13 +334,13 @@
       * have the refreshing slow down drastically (or stop) if there's an
       * unread character available.
@@ -43265 +45732 @@
         if (poll(fds, 1, 0) > 0) {
             have_pending = TRUE;
-@@ -347,43 +367,52 @@
+@@ -347,43 +368,52 @@
             ktimeout.tv_usec = 0;
  
@@ -43333 +45800 @@
  }
  
-@@ -391,7 +420,7 @@
+@@ -391,7 +421,7 @@
   * Wrap the cursor position, i.e., advance to the beginning of the next line.
   */
@@ -43342 +45809 @@
      if (eat_newline_glitch) {
         /*
-@@ -407,40 +436,45 @@
+@@ -407,40 +437,45 @@
          * it's safe to just tell the code that the cursor is in hyperspace and
          * let the next mvcur() call straighten things out.
@@ -43406 +45873 @@
  
  /*
-@@ -450,19 +484,19 @@
+@@ -450,19 +485,19 @@
   * or can be output by clearing (A_COLOR in case of bce-terminal) are excluded.
   */
@@ -43431 +45898 @@
                 return FALSE;
         }
-@@ -488,7 +522,7 @@
+@@ -488,7 +523,7 @@
   * This code is optimized using ech and rep.
   */
@@ -43440 +45907 @@
      int i;
  
-@@ -500,13 +534,13 @@
+@@ -500,13 +535,13 @@
             NCURSES_CH_T ntext0;
  
@@ -43456 +45923 @@
             }
             runcount = 2;
-@@ -523,10 +557,11 @@
+@@ -523,10 +558,11 @@
              * which it would be marginally advantageous.
              */
@@ -43472 +45939 @@
                 /*
                  * If this is the last part of the given interval,
-@@ -534,27 +569,34 @@
+@@ -534,27 +570,34 @@
                  * last update on the line.
                  */
@@ -43516 +45983 @@
             ntext += runcount;
             num -= runcount;
-@@ -563,7 +605,7 @@
+@@ -563,7 +606,7 @@
      }
  
@@ -43525 +45992 @@
  }
  
-@@ -576,39 +618,40 @@
+@@ -576,39 +619,40 @@
   * Returns: same as EmitRange
   */
@@ -43575 +46042 @@
  
  /* leave unbracketed here so 'indent' works */
-@@ -618,7 +661,7 @@
+@@ -618,7 +662,7 @@
                 if_USE_SCROLL_HINTS(win->_line[row].oldindex = row)
  
  NCURSES_EXPORT(int)
 -doupdate(void)
-+NCURSES_SP_NAME(doupdate) (NCURSES_SP_DCL0)
++TINFO_DOUPDATE(NCURSES_SP_DCL0)
  {
      int i;
      int nonempty;
-@@ -626,30 +669,49 @@
+@@ -626,30 +670,49 @@
      struct tms before, after;
  #endif /* USE_TRACE_TIMES */
@@ -43643 +46110 @@
          * This is a transparent extension:  XSI does not address it,
          * and applications need not know that ncurses can do it.
-@@ -658,20 +720,20 @@
+@@ -658,20 +721,20 @@
          * (this can happen in an xterm, for example), and resize the
          * ncurses data structures accordingly.
@@ -43671 +46138 @@
  #if USE_TRACE_TIMES
      /* zero the metering machinery */
-@@ -695,11 +757,11 @@
+@@ -695,11 +758,11 @@
         int j, k;
         attr_t rattr = A_NORMAL;
@@ -43687 +46154 @@
  
                 /* is an attribute turned on here? */
-@@ -717,8 +779,8 @@
+@@ -717,8 +780,8 @@
                  * there's enough room to set the attribute before the first
                  * non-blank in the run.
@@ -43698 +46165 @@
                     continue;
                 }
-@@ -727,14 +789,14 @@
+@@ -727,14 +790,14 @@
                 for (k = 1; k <= magic_cookie_glitch; k++) {
                     if (j - k < 0
@@ -43715 +46182 @@
                                           : ":unsafe")));
                         break;
-@@ -745,10 +807,11 @@
+@@ -745,10 +808,11 @@
                     int m, n = j;
  
@@ -43731 +46198 @@
                                 TR(TRACE_ATTRS,
                                    ("Range attributed with %s ends at (%d, %d)",
-@@ -764,7 +827,8 @@
+@@ -764,7 +828,8 @@
                   foundit:;
  
@@ -43741 +46208 @@
                         /*
                          * If there are safely-attributed blanks at the end of
-@@ -773,15 +837,15 @@
+@@ -773,15 +838,15 @@
                          */
                         while (n >= 0
@@ -43760 +46227 @@
                                 TR(TRACE_ATTRS,
                                    ("No room at end in %d,%d%s%s",
-@@ -789,7 +853,7 @@
+@@ -789,7 +854,7 @@
                                     (ISBLANK(lastline[n + k])
                                      ? ""
@@ -43769 +46236 @@
                                      : ":unsafe")));
                                 break;
-@@ -806,12 +870,12 @@
+@@ -806,12 +871,12 @@
                         _traceattr(turnon), i, j));
  
@@ -43786 +46253 @@
                         q = 0;
                     }
-@@ -837,7 +901,7 @@
+@@ -837,7 +902,7 @@
         /* show altered highlights after magic-cookie check */
         if (USE_TRACEF(TRACE_UPDATE)) {
@@ -43795 +46262 @@
         }
  #endif /* TRACE */
-@@ -845,23 +909,23 @@
+@@ -845,23 +910,23 @@
  #endif /* USE_XMC_SUPPORT */
  
@@ -43828 +46295 @@
         TR(TRACE_UPDATE, ("Transforming lines, nonempty %d", nonempty));
         for (i = 0; i < nonempty; i++) {
-@@ -869,7 +933,7 @@
+@@ -869,7 +934,7 @@
              * Here is our line-breakout optimization.
              */
@@ -43837 +46304 @@
                 changedlines = 0;
             }
-@@ -880,35 +944,35 @@
+@@ -880,35 +945,35 @@
              * is normally set by _nc_scroll_window in the
              * vertical-movement optimization code,
@@ -43888 +46355 @@
  
    cleanup:
-@@ -921,10 +985,10 @@
+@@ -921,10 +986,10 @@
  #if USE_XMC_SUPPORT
      if (magic_cookie_glitch != 0)
@@ -43902 +46369 @@
  #if USE_TRACE_TIMES
      (void) times(&after);
-@@ -940,6 +1004,14 @@
+@@ -940,6 +1005,14 @@
      returnCode(OK);
  }
  
-+#if NCURSES_SP_FUNCS
++#if NCURSES_SP_FUNCS && !defined(USE_TERM_DRIVER)
 +NCURSES_EXPORT(int)
 +doupdate(void)
 +{
-+    return NCURSES_SP_NAME(doupdate) (CURRENT_SCREEN);
++    return TINFO_DOUPDATE(CURRENT_SCREEN);
 +}
 +#endif
@@ -43917 +46384 @@
   *     ClrBlank(win)
   *
-@@ -951,14 +1023,14 @@
+@@ -951,14 +1024,14 @@
   *     in the wbkgd() call.  Assume 'stdscr' for this case.
   */
@@ -43935 +46402 @@
  }
  
-@@ -970,23 +1042,24 @@
+@@ -970,23 +1043,24 @@
  */
  
@@ -43971 +46438 @@
  }
  
-@@ -997,15 +1070,16 @@
+@@ -997,15 +1071,16 @@
  */
  
@@ -43993 +46460 @@
                 if (!CharEq(*cp, blank)) {
                     *cp = blank;
-@@ -1018,14 +1092,14 @@
+@@ -1018,14 +1093,14 @@
      }
  
@@ -44013 +46480 @@
      }
  }
-@@ -1037,23 +1111,29 @@
+@@ -1037,23 +1112,29 @@
  */
  
@@ -44055 +46522 @@
  }
  
-@@ -1065,26 +1145,26 @@
+@@ -1065,26 +1146,26 @@
   *     screen, checking if each is blank, and one or more are changed.
   */
@@ -44088 +46555 @@
             if (!ok)
                 top = row;
-@@ -1092,11 +1172,11 @@
+@@ -1092,11 +1173,11 @@
  
         /* don't use clr_eos for just one line if clr_eol available */
@@ -44105 +46572 @@
         }
      }
-@@ -1105,15 +1185,15 @@
+@@ -1105,15 +1186,15 @@
  
  #if USE_XMC_SUPPORT
@@ -44127 +46594 @@
  
  /*
-@@ -1135,19 +1215,19 @@
+@@ -1135,19 +1216,19 @@
  */
  
@@ -44153 +46620 @@
      /*
       * If we have colors, there is the possibility of having two color pairs
-@@ -1155,19 +1235,20 @@
+@@ -1155,19 +1236,20 @@
       * for this case, and update the old line with the new line's colors when
       * they are equivalent.
@@ -44179 +46646 @@
                     }
                 }
-@@ -1177,7 +1258,7 @@
+@@ -1177,7 +1259,7 @@
  
      if (ceol_standout_glitch && clr_eol) {
@@ -44188 +46655 @@
                 attrchanged = TRUE;
                 break;
-@@ -1189,9 +1270,13 @@
+@@ -1189,9 +1271,13 @@
      firstChar = 0;
  
@@ -44205 +46672 @@
  
         /*
-@@ -1206,8 +1291,8 @@
+@@ -1206,8 +1292,8 @@
          * following operation.
          */
@@ -44216 +46683 @@
  
             /* check for turn-on:
-@@ -1216,26 +1301,30 @@
+@@ -1216,26 +1302,30 @@
              */
             if (ISBLANK(newLine[n])
@@ -44255 +46722 @@
             }
  
-@@ -1246,38 +1335,42 @@
+@@ -1246,38 +1336,42 @@
  
         /* it may be cheap to clear leading whitespace with clr_bol */
@@ -44311 +46778 @@
  
                     while (firstChar < nFirstChar)
-@@ -1286,29 +1379,34 @@
+@@ -1286,29 +1380,34 @@
             }
         } else {
@@ -44353 +46820 @@
                        newLine + firstChar,
                        (nLastChar - firstChar + 1) * sizeof(NCURSES_CH_T));
-@@ -1318,32 +1416,44 @@
+@@ -1318,32 +1417,44 @@
         }
  
@@ -44411 +46878 @@
         } else {
             int nLastNonblank = nLastChar;
-@@ -1364,8 +1474,13 @@
+@@ -1364,8 +1475,13 @@
  
             n = min(oLastChar, nLastChar);
@@ -44427 +46894 @@
  
             if (oLastChar < nLastChar) {
-@@ -1376,21 +1491,26 @@
+@@ -1376,21 +1492,26 @@
                     --oLastChar;
                 }
@@ -44464 +46931 @@
                     /*
                      * The delete-char sequence will
-@@ -1400,18 +1520,18 @@
+@@ -1400,18 +1521,18 @@
                      * setting the video attributes from
                      * the last character on the row.
@@ -44487 +46954 @@
      return;
  }
-@@ -1424,7 +1544,7 @@
+@@ -1424,7 +1545,7 @@
  */
  
@@ -44496 +46963 @@
      int i, j;
      bool fast_clear = (clear_screen || clr_eos || clr_eol);
-@@ -1432,9 +1552,13 @@
+@@ -1432,9 +1553,13 @@
      TR(TRACE_UPDATE, ("ClearScreen() called"));
  
@@ -44513 +46980 @@
             fast_clear = FALSE;
         }
-@@ -1443,42 +1567,46 @@
+@@ -1443,42 +1568,46 @@
  
      if (fast_clear) {
@@ -44586 +47053 @@
  
      TR(TRACE_UPDATE, ("screen cleared"));
-@@ -1492,49 +1620,52 @@
+@@ -1492,49 +1621,52 @@
  */
  
@@ -44651 +47118 @@
  
  /*
-@@ -1545,22 +1676,25 @@
+@@ -1545,22 +1677,25 @@
  */
  
@@ -44684 +47151 @@
      }
  }
-@@ -1599,54 +1733,66 @@
+@@ -1599,54 +1734,66 @@
  
  /* Try to scroll up assuming given csr (miny, maxy). Returns ERR on failure */
@@ -44774 +47241 @@
      }
  #endif
-@@ -1656,55 +1802,66 @@
+@@ -1656,55 +1803,66 @@
  /* Try to scroll down assuming given csr (miny, maxy). Returns ERR on failure */
  /* n > 0 */
@@ -44864 +47331 @@
      }
  #endif
-@@ -1714,40 +1871,46 @@
+@@ -1714,40 +1872,46 @@
  /* scroll by using delete_line at del and insert_line at ins */
  /* n > 0 */
@@ -44922 +47389 @@
      }
  
-@@ -1763,15 +1926,24 @@
+@@ -1763,15 +1927,24 @@
   * save/restore cursor capabilities if the terminal has them.
   */
@@ -44950 +47417 @@
  #if USE_XMC_SUPPORT
      /*
-@@ -1787,34 +1959,36 @@
+@@ -1787,34 +1960,36 @@
          * Explicitly clear if stuff pushed off top of region might
          * be saved by the terminal.
@@ -44998 +47465 @@
         /*
          * Clear the newly shifted-in text.
-@@ -1823,44 +1997,49 @@
+@@ -1823,44 +1998,49 @@
             && (non_dest_scroll_region || (memory_below && bot == maxy))) {
             static const NCURSES_CH_T blank2 = NewChar(BLANK_TEXT);
@@ -45063 +47530 @@
         /*
          * Clear the newly shifted-in text.
-@@ -1869,8 +2048,8 @@
+@@ -1869,8 +2049,8 @@
             && (non_dest_scroll_region || (memory_above && top == 0))) {
             static const NCURSES_CH_T blank2 = NewChar(BLANK_TEXT);
@@ -45074 +47541 @@
         }
      }
-@@ -1878,99 +2057,159 @@
+@@ -1878,99 +2058,159 @@
      if (res == ERR)
         return (ERR);
@@ -45213 +47680 @@
  
 -       mvcur(SP->_cursrow, SP->_curscol, screen_lines - 1, 0);
-+       NCURSES_SP_NAME(mvcur) (NCURSES_SP_ARGx
-+                               SP_PARM->_cursrow,
-+                               SP_PARM->_curscol,
-+                               screen_lines(SP_PARM) - 1,
-+                               0);
++       TINFO_MVCUR(NCURSES_SP_ARGx
++                   SP_PARM->_cursrow,
++                   SP_PARM->_curscol,
++                   screen_lines(SP_PARM) - 1,
++                   0);
  
 -       ClrToEOL(blank, TRUE);
@@ -45278 +47745 @@
 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_add_wch.c ncurses-5.7/ncurses/widechar/lib_add_wch.c
 --- ncurses-5.7.orig/ncurses/widechar/lib_add_wch.c     2006-12-02 13:19:17.000000000 -0800
-+++ ncurses-5.7/ncurses/widechar/lib_add_wch.c  2009-07-19 15:04:13.000000000 -0700
++++ ncurses-5.7/ncurses/widechar/lib_add_wch.c  2009-09-12 08:51:56.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -45286 +47753 @@
   * Permission is hereby granted, free of charge, to any person obtaining a  *
   * copy of this software and associated documentation files (the            *
-@@ -35,39 +35,389 @@
+@@ -35,39 +35,392 @@
  
  #include <curses.priv.h>
@@ -45297 +47764 @@
 -NCURSES_EXPORT(int)
 -wadd_wch(WINDOW *win, const cchar_t *wch)
-+MODULE_ID("$Id: lib_add_wch.c,v 1.7 2009/07/04 21:59:25 tom Exp $")
++MODULE_ID("$Id: lib_add_wch.c,v 1.8 2009/07/25 14:38:01 tom Exp $")
 +
 +/* clone/adapt lib_addch.c */
@@ -45585 +48052 @@
 +    wchar_t *s;
 +    int tabsize = 8;
++#if USE_REENTRANT
++    SCREEN *sp = _nc_screen_of(win);
++#endif
 +
 +    /*
@@ -45605 +48075 @@
 +    case '\t':
 +#if USE_REENTRANT
-+       tabsize = sp->_TABSIZE;
++       tabsize = *ptrTabsize(sp);
 +#else
 +       tabsize = TABSIZE;
@@ -45700 +48170 @@
  
      TR(TRACE_VIRTPUT | TRACE_CCALLS, (T_RETURN("%d"), code));
-@@ -77,37 +427,18 @@
+@@ -77,37 +430,18 @@
  NCURSES_EXPORT(int)
  wecho_wchar(WINDOW *win, const cchar_t *wch)
@@ -45748 +48218 @@
 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_cchar.c ncurses-5.7/ncurses/widechar/lib_cchar.c
 --- ncurses-5.7.orig/ncurses/widechar/lib_cchar.c       2007-05-12 12:03:06.000000000 -0700
-+++ ncurses-5.7/ncurses/widechar/lib_cchar.c    2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/ncurses/widechar/lib_cchar.c    2009-09-12 08:51:54.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -45791 +48261 @@
 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_get_wch.c ncurses-5.7/ncurses/widechar/lib_get_wch.c
 --- ncurses-5.7.orig/ncurses/widechar/lib_get_wch.c     2008-08-16 12:22:55.000000000 -0700
-+++ ncurses-5.7/ncurses/widechar/lib_get_wch.c  2009-07-19 15:03:53.000000000 -0700
++++ ncurses-5.7/ncurses/widechar/lib_get_wch.c  2009-09-12 08:51:30.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -45834 +48304 @@
 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_get_wstr.c ncurses-5.7/ncurses/widechar/lib_get_wstr.c
 --- ncurses-5.7.orig/ncurses/widechar/lib_get_wstr.c    2008-08-16 12:25:33.000000000 -0700
-+++ ncurses-5.7/ncurses/widechar/lib_get_wstr.c 2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/widechar/lib_get_wstr.c 2009-09-12 08:51:17.000000000 -0700
 @@ -38,9 +38,8 @@
  */
@@ -45848 +48318 @@
 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_ins_wch.c ncurses-5.7/ncurses/widechar/lib_ins_wch.c
 --- ncurses-5.7.orig/ncurses/widechar/lib_ins_wch.c     2005-12-03 12:24:19.000000000 -0800
-+++ ncurses-5.7/ncurses/widechar/lib_ins_wch.c  2009-07-19 15:04:04.000000000 -0700
++++ ncurses-5.7/ncurses/widechar/lib_ins_wch.c  2009-09-12 08:51:42.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -45885 +48355 @@
 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_unget_wch.c ncurses-5.7/ncurses/widechar/lib_unget_wch.c
 --- ncurses-5.7.orig/ncurses/widechar/lib_unget_wch.c   2008-06-07 07:50:37.000000000 -0700
-+++ ncurses-5.7/ncurses/widechar/lib_unget_wch.c        2009-07-19 15:03:53.000000000 -0700
++++ ncurses-5.7/ncurses/widechar/lib_unget_wch.c        2009-09-12 08:51:30.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -45942 +48412 @@
 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_vid_attr.c ncurses-5.7/ncurses/widechar/lib_vid_attr.c
 --- ncurses-5.7.orig/ncurses/widechar/lib_vid_attr.c    2007-06-30 15:03:02.000000000 -0700
-+++ ncurses-5.7/ncurses/widechar/lib_vid_attr.c 2009-07-19 15:04:00.000000000 -0700
++++ ncurses-5.7/ncurses/widechar/lib_vid_attr.c 2009-09-12 08:51:37.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -46174 +48644 @@
 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_wacs.c ncurses-5.7/ncurses/widechar/lib_wacs.c
 --- ncurses-5.7.orig/ncurses/widechar/lib_wacs.c        2006-12-17 07:16:17.000000000 -0800
-+++ ncurses-5.7/ncurses/widechar/lib_wacs.c     2009-07-19 15:02:22.000000000 -0700
++++ ncurses-5.7/ncurses/widechar/lib_wacs.c     2009-09-12 08:51:17.000000000 -0700
 @@ -31,9 +31,8 @@
   ****************************************************************************/
@@ -46188 +48658 @@
 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_wunctrl.c ncurses-5.7/ncurses/widechar/lib_wunctrl.c
 --- ncurses-5.7.orig/ncurses/widechar/lib_wunctrl.c     2007-06-12 13:22:32.000000000 -0700
-+++ ncurses-5.7/ncurses/widechar/lib_wunctrl.c  2009-07-19 15:03:53.000000000 -0700
++++ ncurses-5.7/ncurses/widechar/lib_wunctrl.c  2009-09-12 08:51:30.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -46237 +48707 @@
 diff -Naur ncurses-5.7.orig/ncurses/win32con/gettimeofday.c ncurses-5.7/ncurses/win32con/gettimeofday.c
 --- ncurses-5.7.orig/ncurses/win32con/gettimeofday.c    1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/ncurses/win32con/gettimeofday.c 2009-07-19 15:04:11.000000000 -0700
++++ ncurses-5.7/ncurses/win32con/gettimeofday.c 2009-09-12 08:51:49.000000000 -0700
 @@ -0,0 +1,51 @@
 +/****************************************************************************
@@ -46292 +48762 @@
 diff -Naur ncurses-5.7.orig/ncurses/win32con/win_driver.c ncurses-5.7/ncurses/win32con/win_driver.c
 --- ncurses-5.7.orig/ncurses/win32con/win_driver.c      1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/ncurses/win32con/win_driver.c   2009-07-19 15:04:11.000000000 -0700
++++ ncurses-5.7/ncurses/win32con/win_driver.c   2009-09-12 08:51:49.000000000 -0700
 @@ -0,0 +1,1085 @@
 +/****************************************************************************
@@ -47381 +49851 @@
 diff -Naur ncurses-5.7.orig/NEWS ncurses-5.7/NEWS
 --- ncurses-5.7.orig/NEWS       2008-11-01 17:56:22.000000000 -0700
-+++ ncurses-5.7/NEWS    2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/NEWS    2009-09-12 08:52:10.000000000 -0700
 @@ -1,5 +1,5 @@
  -------------------------------------------------------------------------------
@@ -47394 +49864 @@
  -------------------------------------------------------------------------------
 --- $Id: NEWS,v 1.1320 2008/11/02 00:56:22 tom Exp $
-+-- $Id: NEWS,v 1.1409 2009/07/19 00:09:05 tom Exp $
++-- $Id: NEWS,v 1.1430 2009/09/06 16:03:13 tom Exp $
  -------------------------------------------------------------------------------
  
  This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,6 +45,300 @@
+@@ -45,6 +45,362 @@
  Changes through 1.9.9e did not credit all contributions;
  it is not possible to add this information.
  
++20090906
++       + fix typo s/is_timeout/is_notimeout/ which made "man is_notimeout" not
++         work.
++       + add null-pointer checks to other opaque-functions.
++       + add is_pad() and is_subwin() functions for opaque access to WINDOW
++         (discussion with Mark Dickinson).
++       + correct merge to lib_newterm.c, which broke when sp-funcs was
++         enabled.
++
++20090905
++       + build-fix for building outside source-tree (report by Sven Joachim).
++       + fix Debian lintian warning for man/tabs.1 by making section number
++         agree with file-suffix (report by Sven Joachim).
++       + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete).
++
++20090829
++       + workaround for bug in g++ 4.1-4.4 warnings for wattrset() macro on
++         amd64 (Debian #542031).
++       + fix typo in curs_mouse.3x (Debian #429198).
++
++20090822
++       + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete).
++
++20090815
++       + correct use of terminfo capabilities for initializing soft-keys,
++         broken in 20090509 merging.
++       + modify wgetch() to ensure it checks SIGWINCH when it gets an error
++         in non-blocking mode (patch by Clemens Ladisch).
++       + use PATH_SEPARATOR symbol when substituting into run_tic.sh, to
++         help with builds on non-Unix platforms such as OS/2 EMX.
++       + modify scripting for misc/run_tic.sh to test configure script's
++         $cross_compiling variable directly rather than comparing host/build
++         compiler names (prompted by comment in GenToo #249363).
++       + fix configure script option --with-database, which was coded as an
++         enable-type switch.
++       + build-fixes for --srcdir (report by Frederic L W Meunier).
++
++20090808
++       + separate _nc_find_entry() and _nc_find_type_entry() from
++         implementation details of hash function.
++
++20090803
++       + add tabs.1 to man/man_db.renames
++       + modify lib_addch.c to compensate for removal of wide-character test
++         from unctrl() in 20090704 (Debian #539735).
++
++20090801
++       + improve discussion in INSTALL for use of system's tic/infocmp for
++         cross-compiling and building fallbacks.
++       + modify test/demo_termcap.c to correspond better to options in
++         test/demo_terminfo.c
++       + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete).
++       + fix logic for 'V' in test/ncurses.c tests f/F.
++
++20090728
++       + correct logic in tigetnum(), which caused tput program to treat all
++         string capabilities as numeric (report by Rajeev V Pillai,
++         cf: 20090711).
++
++20090725
++       + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete).
++
 +20090718
 +       + fix a null-pointer check in _nc_format_slks() in lib_slk.c, from
@@ -47701 +50233 @@
 diff -Naur ncurses-5.7.orig/panel/Makefile.in ncurses-5.7/panel/Makefile.in
 --- ncurses-5.7.orig/panel/Makefile.in  2007-04-28 07:56:11.000000000 -0700
-+++ ncurses-5.7/panel/Makefile.in       2009-07-19 15:03:48.000000000 -0700
++++ ncurses-5.7/panel/Makefile.in       2009-09-12 08:51:25.000000000 -0700
 @@ -1,6 +1,6 @@
 -# $Id: Makefile.in,v 1.52 2007/04/28 14:56:11 tom Exp $
@@ -47730 +50262 @@
 diff -Naur ncurses-5.7.orig/panel/p_above.c ncurses-5.7/panel/p_above.c
 --- ncurses-5.7.orig/panel/p_above.c    2005-02-19 08:44:57.000000000 -0800
-+++ ncurses-5.7/panel/p_above.c 2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/panel/p_above.c 2009-09-12 08:51:28.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -47802 +50334 @@
 diff -Naur ncurses-5.7.orig/panel/panel.c ncurses-5.7/panel/panel.c
 --- ncurses-5.7.orig/panel/panel.c      2005-02-19 10:04:31.000000000 -0800
-+++ ncurses-5.7/panel/panel.c   2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/panel/panel.c   2009-09-12 08:51:28.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -47837 +50369 @@
 diff -Naur ncurses-5.7.orig/panel/panel.h ncurses-5.7/panel/panel.h
 --- ncurses-5.7.orig/panel/panel.h      2006-05-27 12:49:40.000000000 -0700
-+++ ncurses-5.7/panel/panel.h   2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/panel/panel.h   2009-09-12 08:51:28.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -47873 +50405 @@
 diff -Naur ncurses-5.7.orig/panel/panel.priv.h ncurses-5.7/panel/panel.priv.h
 --- ncurses-5.7.orig/panel/panel.priv.h 2008-09-27 15:36:11.000000000 -0700
-+++ ncurses-5.7/panel/panel.priv.h      2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/panel/panel.priv.h      2009-09-12 08:51:28.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -47986 +50518 @@
 diff -Naur ncurses-5.7.orig/panel/p_below.c ncurses-5.7/panel/p_below.c
 --- ncurses-5.7.orig/panel/p_below.c    2005-02-19 08:45:10.000000000 -0800
-+++ ncurses-5.7/panel/p_below.c 2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/panel/p_below.c 2009-09-12 08:51:28.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -48059 +50591 @@
 diff -Naur ncurses-5.7.orig/panel/p_bottom.c ncurses-5.7/panel/p_bottom.c
 --- ncurses-5.7.orig/panel/p_bottom.c   2005-02-19 08:38:16.000000000 -0800
-+++ ncurses-5.7/panel/p_bottom.c        2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/panel/p_bottom.c        2009-09-12 08:51:28.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -48094 +50626 @@
 diff -Naur ncurses-5.7.orig/panel/p_delete.c ncurses-5.7/panel/p_delete.c
 --- ncurses-5.7.orig/panel/p_delete.c   2005-02-19 08:38:45.000000000 -0800
-+++ ncurses-5.7/panel/p_delete.c        2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/panel/p_delete.c        2009-09-12 08:51:28.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -48135 +50667 @@
 diff -Naur ncurses-5.7.orig/panel/p_hidden.c ncurses-5.7/panel/p_hidden.c
 --- ncurses-5.7.orig/panel/p_hidden.c   2005-02-19 08:39:17.000000000 -0800
-+++ ncurses-5.7/panel/p_hidden.c        2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/panel/p_hidden.c        2009-09-12 08:51:28.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -48176 +50708 @@
 diff -Naur ncurses-5.7.orig/panel/p_hide.c ncurses-5.7/panel/p_hide.c
 --- ncurses-5.7.orig/panel/p_hide.c     2005-02-19 08:39:41.000000000 -0800
-+++ ncurses-5.7/panel/p_hide.c  2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/panel/p_hide.c  2009-09-12 08:51:28.000000000 -0700
 @@ -36,23 +36,27 @@
   */
@@ -48215 +50747 @@
 diff -Naur ncurses-5.7.orig/panel/p_move.c ncurses-5.7/panel/p_move.c
 --- ncurses-5.7.orig/panel/p_move.c     2005-02-19 08:46:49.000000000 -0800
-+++ ncurses-5.7/panel/p_move.c  2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/panel/p_move.c  2009-09-12 08:51:28.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -48267 +50799 @@
 diff -Naur ncurses-5.7.orig/panel/p_new.c ncurses-5.7/panel/p_new.c
 --- ncurses-5.7.orig/panel/p_new.c      2008-08-04 11:25:48.000000000 -0700
-+++ ncurses-5.7/panel/p_new.c   2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/panel/p_new.c   2009-09-12 08:51:28.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -48335 +50867 @@
 diff -Naur ncurses-5.7.orig/panel/p_replace.c ncurses-5.7/panel/p_replace.c
 --- ncurses-5.7.orig/panel/p_replace.c  2005-02-19 08:41:31.000000000 -0800
-+++ ncurses-5.7/panel/p_replace.c       2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/panel/p_replace.c       2009-09-12 08:51:28.000000000 -0700
 @@ -36,23 +36,25 @@
   */
@@ -48375 +50907 @@
 diff -Naur ncurses-5.7.orig/panel/p_show.c ncurses-5.7/panel/p_show.c
 --- ncurses-5.7.orig/panel/p_show.c     2005-02-19 08:42:02.000000000 -0800
-+++ ncurses-5.7/panel/p_show.c  2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/panel/p_show.c  2009-09-12 08:51:28.000000000 -0700
 @@ -36,34 +36,37 @@
   */
@@ -48432 +50964 @@
 diff -Naur ncurses-5.7.orig/panel/p_update.c ncurses-5.7/panel/p_update.c
 --- ncurses-5.7.orig/panel/p_update.c   2005-02-19 08:49:47.000000000 -0800
-+++ ncurses-5.7/panel/p_update.c        2009-07-19 15:03:51.000000000 -0700
++++ ncurses-5.7/panel/p_update.c        2009-09-12 08:51:28.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -48506 +51038 @@
 diff -Naur ncurses-5.7.orig/progs/Makefile.in ncurses-5.7/progs/Makefile.in
 --- ncurses-5.7.orig/progs/Makefile.in  2008-09-07 06:58:55.000000000 -0700
-+++ ncurses-5.7/progs/Makefile.in       2009-07-19 15:03:48.000000000 -0700
++++ ncurses-5.7/progs/Makefile.in       2009-09-12 08:51:25.000000000 -0700
 @@ -1,6 +1,6 @@
 -# $Id: Makefile.in,v 1.79 2008/09/07 13:58:55 tom Exp $
@@ -48617 +51149 @@
 diff -Naur ncurses-5.7.orig/progs/modules ncurses-5.7/progs/modules
 --- ncurses-5.7.orig/progs/modules      2006-12-23 16:53:21.000000000 -0800
-+++ ncurses-5.7/progs/modules   2009-07-19 15:03:43.000000000 -0700
++++ ncurses-5.7/progs/modules   2009-09-12 08:51:21.000000000 -0700
 @@ -1,7 +1,7 @@
 -# $Id: modules,v 1.13 2006/12/24 00:53:21 tom Exp $
@@ -48640 +51172 @@
 diff -Naur ncurses-5.7.orig/progs/tabs.c ncurses-5.7/progs/tabs.c
 --- ncurses-5.7.orig/progs/tabs.c       1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/progs/tabs.c    2009-07-19 15:01:57.000000000 -0700
++++ ncurses-5.7/progs/tabs.c    2009-09-12 08:50:52.000000000 -0700
 @@ -0,0 +1,506 @@
 +/****************************************************************************
@@ -49150 +51682 @@
 diff -Naur ncurses-5.7.orig/progs/tic.c ncurses-5.7/progs/tic.c
 --- ncurses-5.7.orig/progs/tic.c        2008-09-13 09:59:24.000000000 -0700
-+++ ncurses-5.7/progs/tic.c     2009-07-19 15:03:43.000000000 -0700
++++ ncurses-5.7/progs/tic.c     2009-09-12 08:51:21.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -49183 +51715 @@
 diff -Naur ncurses-5.7.orig/progs/tput.c ncurses-5.7/progs/tput.c
 --- ncurses-5.7.orig/progs/tput.c       2008-07-13 04:05:12.000000000 -0700
-+++ ncurses-5.7/progs/tput.c    2009-07-19 15:03:43.000000000 -0700
++++ ncurses-5.7/progs/tput.c    2009-09-12 08:51:21.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -49213 +51745 @@
 diff -Naur ncurses-5.7.orig/progs/transform.c ncurses-5.7/progs/transform.c
 --- ncurses-5.7.orig/progs/transform.c  1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/progs/transform.c       2009-07-19 15:03:43.000000000 -0700
++++ ncurses-5.7/progs/transform.c       2009-09-12 08:51:21.000000000 -0700
 @@ -0,0 +1,79 @@
 +/****************************************************************************
@@ -49296 +51828 @@
 diff -Naur ncurses-5.7.orig/progs/tset.c ncurses-5.7/progs/tset.c
 --- ncurses-5.7.orig/progs/tset.c       2008-10-11 12:26:19.000000000 -0700
-+++ ncurses-5.7/progs/tset.c    2009-07-19 15:03:43.000000000 -0700
++++ ncurses-5.7/progs/tset.c    2009-09-12 08:51:21.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -49324 +51856 @@
 diff -Naur ncurses-5.7.orig/README.MinGW ncurses-5.7/README.MinGW
 --- ncurses-5.7.orig/README.MinGW       1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/README.MinGW    2009-07-19 15:04:11.000000000 -0700
++++ ncurses-5.7/README.MinGW    2009-09-12 08:51:49.000000000 -0700
 @@ -0,0 +1,79 @@
 +-------------------------------------------------------------------------------
@@ -49407 +51939 @@
 diff -Naur ncurses-5.7.orig/test/aclocal.m4 ncurses-5.7/test/aclocal.m4
 --- ncurses-5.7.orig/test/aclocal.m4    2008-02-09 10:22:17.000000000 -0800
-+++ ncurses-5.7/test/aclocal.m4 2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/test/aclocal.m4 2009-09-12 08:51:54.000000000 -0700
 @@ -1,5 +1,5 @@
  dnl***************************************************************************
@@ -50311 +52843 @@
 +#endif
 +])
+diff -Naur ncurses-5.7.orig/test/blue.c ncurses-5.7/test/blue.c
+--- ncurses-5.7.orig/test/blue.c        2008-08-03 11:20:27.000000000 -0700
++++ ncurses-5.7/test/blue.c     2009-09-12 08:52:07.000000000 -0700
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2008,2009 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            *
+@@ -40,7 +40,7 @@
+  * results, use the ncurses(3) library.  On non-Intel machines, SVr4 curses is
+  * just as good.
+  *
+- * $Id: blue.c,v 1.30 2008/08/03 18:20:27 tom Exp $
++ * $Id: blue.c,v 1.31 2009/08/29 19:02:25 tom Exp $
+  */
+ 
+ #include <test.priv.h>
+@@ -353,9 +353,9 @@
+     }
+ 
+     move(PROMPTROW, 0);
+-    standout();
++    (void) standout();
+     (void) printw("Finished deal %d - type any character to continue...", deal_number);
+-    standend();
++    (void) standend();
+     (void) getch();
+ }
+ 
+@@ -386,7 +386,7 @@
+ {
+     clear();
+     (void) printw("You finished the game in %d deals. This is ", deal);
+-    standout();
++    (void) standout();
+     if (deal < 2)
+        (void) addstr("excellent");
+     else if (deal < 4)
+@@ -395,7 +395,7 @@
+        (void) addstr("average");
+     else
+        (void) addstr("poor");
+-    standend();
++    (void) standend();
+     (void) addstr(".         ");
+     refresh();
+ }
+diff -Naur ncurses-5.7.orig/test/bs.c ncurses-5.7/test/bs.c
+--- ncurses-5.7.orig/test/bs.c  2008-08-03 11:30:28.000000000 -0700
++++ ncurses-5.7/test/bs.c       2009-09-12 08:52:07.000000000 -0700
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2008,2009 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            *
+@@ -34,7 +34,7 @@
+  * v2.0 featuring strict ANSI/POSIX conformance, November 1993.
+  * v2.1 with ncurses mouse support, September 1995
+  *
+- * $Id: bs.c,v 1.47 2008/08/03 18:30:28 tom Exp $
++ * $Id: bs.c,v 1.48 2009/08/29 19:02:25 tom Exp $
+  */
+ 
+ #include <test.priv.h>
+@@ -374,7 +374,7 @@
+        for (j = 0; j < BWIDTH; j++)
+            (void) addstr(" . ");
+ #ifdef A_COLOR
+-       attrset(0);
++       (void) attrset(0);
+ #endif /* A_COLOR */
+        (void) addch(' ');
+        (void) addch((chtype) (i + 'A'));
+@@ -392,7 +392,7 @@
+        for (j = 0; j < BWIDTH; j++)
+            (void) addstr(" . ");
+ #ifdef A_COLOR
+-       attrset(0);
++       (void) attrset(0);
+ #endif /* A_COLOR */
+        (void) addch(' ');
+        (void) addch((chtype) (i + 'A'));
+@@ -773,7 +773,7 @@
+ #endif /* A_COLOR */
+                                    (void) addch(MARK_MISS);
+ #ifdef A_COLOR
+-                                   attrset(0);
++                                   (void) attrset(0);
+ #endif /* A_COLOR */
+                                } else {
+                                    pgoto(y1, x1);
+@@ -799,7 +799,7 @@
+ #endif /* A_COLOR */
+                        (void) addch(SHOWHIT);
+ #ifdef A_COLOR
+-                       attrset(0);
++                       (void) attrset(0);
+ #endif /* A_COLOR */
+                    }
+                }
+@@ -841,7 +841,7 @@
+ #endif /* A_COLOR */
+     (void) addch((chtype) hits[PLAYER][curx][cury]);
+ #ifdef A_COLOR
+-    attrset(0);
++    (void) attrset(0);
+ #endif /* A_COLOR */
+ 
+     prompt(1, "You %s.", hit ? "scored a hit" : "missed");
+@@ -971,7 +971,7 @@
+ #endif /* A_COLOR */
+     (void) addch((chtype) (hit ? SHOWHIT : SHOWSPLASH));
+ #ifdef A_COLOR
+-    attrset(0);
++    (void) attrset(0);
+ #endif /* A_COLOR */
+ 
+     return hit ? (sunk ? S_SUNK : S_HIT) : S_MISS;
 diff -Naur ncurses-5.7.orig/test/chgat.c ncurses-5.7/test/chgat.c
 --- ncurses-5.7.orig/test/chgat.c       2008-02-09 15:19:13.000000000 -0800
-+++ ncurses-5.7/test/chgat.c    2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/test/chgat.c    2009-09-12 08:51:54.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -50350 +53004 @@
 diff -Naur ncurses-5.7.orig/test/clip_printw.c ncurses-5.7/test/clip_printw.c
 --- ncurses-5.7.orig/test/clip_printw.c 1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/test/clip_printw.c      2009-07-19 15:04:17.000000000 -0700
-@@ -0,0 +1,377 @@
++++ ncurses-5.7/test/clip_printw.c      2009-09-12 08:52:07.000000000 -0700
+@@ -0,0 +1,378 @@
 +/****************************************************************************
 + * Copyright (c) 2008,2009 Free Software Foundation, Inc.                   *
@@ -50380 +53034 @@
 + ****************************************************************************/
 +/*
-+ * $Id: clip_printw.c,v 1.3 2009/07/17 09:28:52 tom Exp $
++ * $Id: clip_printw.c,v 1.4 2009/08/29 19:00:44 tom Exp $
 + *
 + * demonstrate how to use printw without wrapping.
@@ -50681 +53335 @@
 +       switch (st.ch) {
 +       case '.':               /* change from current position */
-+           wattrset(win, st.attr | COLOR_PAIR(st.pair));
++           (void) wattrset(win, st.attr | COLOR_PAIR(st.pair));
 +           if (st.count > 0) {
 +               need = st.count + 1;
@@ -50721 +53375 @@
 +    ExitProgram(EXIT_SUCCESS);
 +}
++
 +#else
 +int
@@ -50731 +53386 @@
 diff -Naur ncurses-5.7.orig/test/configure ncurses-5.7/test/configure
 --- ncurses-5.7.orig/test/configure     2008-09-06 15:11:48.000000000 -0700
-+++ ncurses-5.7/test/configure  2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/test/configure  2009-09-12 08:51:54.000000000 -0700
 @@ -194,6 +194,7 @@
    --with-Xaw3d            link with Xaw 3d library
@@ -59248 +61903 @@
 diff -Naur ncurses-5.7.orig/test/configure.in ncurses-5.7/test/configure.in
 --- ncurses-5.7.orig/test/configure.in  2008-09-06 15:10:23.000000000 -0700
-+++ ncurses-5.7/test/configure.in       2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/test/configure.in       2009-09-12 08:51:54.000000000 -0700
 @@ -1,5 +1,5 @@
  dnl***************************************************************************
@@ -59327 +61982 @@
 diff -Naur ncurses-5.7.orig/test/demo_forms.c ncurses-5.7/test/demo_forms.c
 --- ncurses-5.7.orig/test/demo_forms.c  2008-10-18 13:38:20.000000000 -0700
-+++ ncurses-5.7/test/demo_forms.c       2009-07-19 15:04:04.000000000 -0700
++++ ncurses-5.7/test/demo_forms.c       2009-09-12 08:52:07.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -59340 +61995 @@
  /*
 - * $Id: demo_forms.c,v 1.30 2008/10/18 20:38:20 tom Exp $
-+ * $Id: demo_forms.c,v 1.32 2009/05/30 16:52:42 tom Exp $
++ * $Id: demo_forms.c,v 1.33 2009/08/29 18:47:26 tom Exp $
   *
   * Demonstrate a variety of functions from the form library.
@@ -59367 +62022 @@
             set_field_buffer(f, 0, t_value);
      }
+@@ -300,13 +307,13 @@
+        }
+ 
+        waddch(win, ' ');
+-       wattrset(win, field_fore(field));
++       (void) wattrset(win, field_fore(field));
+        waddstr(win, "fore");
+        wattroff(win, field_fore(field));
+ 
+        waddch(win, '/');
+ 
+-       wattrset(win, field_back(field));
++       (void) wattrset(win, field_back(field));
+        waddstr(win, "back");
+        wattroff(win, field_back(field));
+ 
+@@ -317,7 +324,7 @@
+        for (nbuf = 0; nbuf <= 2; ++nbuf) {
+            if ((buffer = field_buffer(field, nbuf)) != 0) {
+                wprintw(win, "buffer %d:", nbuf);
+-               wattrset(win, A_REVERSE);
++               (void) wattrset(win, A_REVERSE);
+                waddstr(win, buffer);
+                wattroff(win, A_REVERSE);
+                waddstr(win, "\n");
 @@ -444,8 +451,11 @@
  
@@ -59380 +62060 @@
      nl();
  
+diff -Naur ncurses-5.7.orig/test/demo_termcap.c ncurses-5.7/test/demo_termcap.c
+--- ncurses-5.7.orig/test/demo_termcap.c        2008-02-09 10:08:36.000000000 -0800
++++ ncurses-5.7/test/demo_termcap.c     2009-09-12 08:51:59.000000000 -0700
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2005-2007,2008 Free Software Foundation, Inc.              *
++ * Copyright (c) 2005-2008,2009 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            *
+@@ -29,7 +29,7 @@
+ /*
+  * Author: Thomas E. Dickey
+  *
+- * $Id: demo_termcap.c,v 1.7 2008/02/09 18:08:36 tom Exp $
++ * $Id: demo_termcap.c,v 1.11 2009/08/02 00:02:53 tom Exp $
+  *
+  * A simple demo of the termcap interface.
+  */
+@@ -38,10 +38,25 @@
+ 
+ #if HAVE_TGETENT
+ 
++#if defined(HAVE_CURSES_DATA_BOOLNAMES) || defined(DECL_CURSES_DATA_BOOLNAMES)
++#define USE_CODE_LISTS 1
++#else
++#define USE_CODE_LISTS 0
++#endif
++
++#define FCOLS 8
++#define FNAME(type) "%s %-*s = ", #type, FCOLS
++
++#if USE_CODE_LISTS
++static bool b_opt = FALSE;
++static bool n_opt = FALSE;
++static bool s_opt = FALSE;
++#endif
++
+ #define isCapName(c) (isgraph(c) && strchr("^#=:\\", c) == 0)
+ 
+ static void
+-dumpit(char *cap)
++dumpit(NCURSES_CONST char *cap)
+ {
+     /*
+      * One of the limitations of the termcap interface is that the library
+@@ -59,7 +74,7 @@
+         * Note that the strings returned are mostly terminfo format, since
+         * ncurses does not convert except for a handful of special cases.
+         */
+-       printf("str %s = ", cap);
++       printf(FNAME(str), cap);
+        while (*str != 0) {
+            int ch = UChar(*str++);
+            switch (ch) {
+@@ -108,15 +123,17 @@
+        }
+        printf("\n");
+     } else if ((num = tgetnum(cap)) >= 0) {
+-       printf("num %s = %d\n", cap, num);
++       printf(FNAME(num), cap);
++       printf(" %d\n", num);
+     } else if ((num = tgetflag(cap)) > 0) {
+-       printf("flg %s\n", cap);
++       printf(FNAME(flg), cap);
++       printf("%s\n", "true");
+     }
+     fflush(stdout);
+ }
+ 
+ static void
+-demo_termcap(char *name)
++brute_force(const char *name)
+ {
+     char buffer[1024];
+ 
+@@ -140,23 +157,142 @@
+     }
+ }
+ 
++#if USE_CODE_LISTS
++static void
++demo_terminfo(NCURSES_CONST char *name)
++{
++    unsigned n;
++    NCURSES_CONST char *cap;
++
++    printf("Terminal type \"%s\"\n", name);
++    setupterm(name, 1, (int *) 0);
++
++    if (b_opt) {
++       for (n = 0;; ++n) {
++           cap = boolcodes[n];
++           if (cap == 0)
++               break;
++           dumpit(cap);
++       }
++    }
++
++    if (n_opt) {
++       for (n = 0;; ++n) {
++           cap = numcodes[n];
++           if (cap == 0)
++               break;
++           dumpit(cap);
++       }
++    }
++
++    if (s_opt) {
++       for (n = 0;; ++n) {
++           cap = strcodes[n];
++           if (cap == 0)
++               break;
++           dumpit(cap);
++       }
++    }
++}
++
++static void
++usage(void)
++{
++    static const char *msg[] =
++    {
++       "Usage: demo_terminfo [options] [terminal]",
++       "",
++       "If no options are given, print all (boolean, numeric, string)",
++       "capabilities for the given terminal, using short names.",
++       "",
++       "Options:",
++       " -a       try all names, print capabilities found",
++       " -b       print boolean-capabilities",
++       " -n       print numeric-capabilities",
++       " -r COUNT repeat for given count",
++       " -s       print string-capabilities",
++    };
++    unsigned n;
++    for (n = 0; n < SIZEOF(msg); ++n) {
++       fprintf(stderr, "%s\n", msg[n]);
++    }
++    ExitProgram(EXIT_FAILURE);
++}
++#endif
++
+ int
+ main(int argc, char *argv[])
+ {
+     int n;
+     char *name;
++    bool a_opt = FALSE;
+ 
+-    if (argc > 1) {
+-       for (n = 1; n < argc; ++n) {
+-           demo_termcap(argv[n]);
+-       }
+-    } else if ((name = getenv("TERM")) != 0) {
+-       demo_termcap(name);
+-    } else {
+-       static char dumb[] = "dumb";
+-       demo_termcap(dumb);
++#if USE_CODE_LISTS
++    int repeat;
++    int r_opt = 1;
++
++    while ((n = getopt(argc, argv, "abnr:s")) != -1) {
++       switch (n) {
++       case 'a':
++           a_opt = TRUE;
++           break;
++       case 'b':
++           b_opt = TRUE;
++           break;
++       case 'n':
++           n_opt = TRUE;
++           break;
++       case 'r':
++           if ((r_opt = atoi(optarg)) <= 0)
++               usage();
++           break;
++       case 's':
++           s_opt = TRUE;
++           break;
++       default:
++           usage();
++           break;
++       }
+     }
+ 
++    if (!(b_opt || n_opt || s_opt)) {
++       b_opt = TRUE;
++       n_opt = TRUE;
++       s_opt = TRUE;
++    }
++#else
++    a_opt = TRUE;
++#endif
++
++    if (a_opt) {
++       if (optind < argc) {
++           for (n = optind; n < argc; ++n) {
++               brute_force(argv[n]);
++           }
++       } else if ((name = getenv("TERM")) != 0) {
++           brute_force(name);
++       } else {
++           static char dumb[] = "dumb";
++           brute_force(dumb);
++       }
++    }
++#if USE_CODE_LISTS
++    else {
++       for (repeat = 0; repeat < r_opt; ++repeat) {
++           if (optind < argc) {
++               for (n = optind; n < argc; ++n) {
++                   demo_terminfo(argv[n]);
++               }
++           } else if ((name = getenv("TERM")) != 0) {
++               demo_terminfo(name);
++           } else {
++               static char dumb[] = "dumb";
++               demo_terminfo(dumb);
++           }
++       }
++    }
++#endif
++
+     ExitProgram(EXIT_SUCCESS);
+ }
+ 
 diff -Naur ncurses-5.7.orig/test/demo_terminfo.c ncurses-5.7/test/demo_terminfo.c
 --- ncurses-5.7.orig/test/demo_terminfo.c       1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/test/demo_terminfo.c    2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/test/demo_terminfo.c    2009-09-12 08:51:54.000000000 -0700
 @@ -0,0 +1,304 @@
 +/****************************************************************************
@@ -59690 +62598 @@
 diff -Naur ncurses-5.7.orig/test/ditto.c ncurses-5.7/test/ditto.c
 --- ncurses-5.7.orig/test/ditto.c       2008-08-04 06:21:41.000000000 -0700
-+++ ncurses-5.7/test/ditto.c    2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/test/ditto.c    2009-09-12 08:51:54.000000000 -0700
 @@ -29,7 +29,7 @@
  /*
@@ -59785 +62693 @@
 diff -Naur ncurses-5.7.orig/test/edit_field.c ncurses-5.7/test/edit_field.c
 --- ncurses-5.7.orig/test/edit_field.c  2008-10-18 13:40:20.000000000 -0700
-+++ ncurses-5.7/test/edit_field.c       2009-07-19 15:02:04.000000000 -0700
++++ ncurses-5.7/test/edit_field.c       2009-09-12 08:50:59.000000000 -0700
 @@ -26,7 +26,7 @@
   * authorization.                                                           *
@@ -59808 +62716 @@
 diff -Naur ncurses-5.7.orig/test/edit_field.h ncurses-5.7/test/edit_field.h
 --- ncurses-5.7.orig/test/edit_field.h  2006-06-03 09:38:57.000000000 -0700
-+++ ncurses-5.7/test/edit_field.h       2009-07-19 15:02:04.000000000 -0700
++++ ncurses-5.7/test/edit_field.h       2009-09-12 08:50:59.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -59838 +62746 @@
 diff -Naur ncurses-5.7.orig/test/filter.c ncurses-5.7/test/filter.c
 --- ncurses-5.7.orig/test/filter.c      2006-12-09 08:53:47.000000000 -0800
-+++ ncurses-5.7/test/filter.c   2009-07-19 15:02:00.000000000 -0700
++++ ncurses-5.7/test/filter.c   2009-09-12 08:50:55.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -59908 +62816 @@
      keypad(stdscr, TRUE);
  
+diff -Naur ncurses-5.7.orig/test/firework.c ncurses-5.7/test/firework.c
+--- ncurses-5.7.orig/test/firework.c    2006-05-20 08:36:08.000000000 -0700
++++ ncurses-5.7/test/firework.c 2009-09-12 08:52:07.000000000 -0700
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2006,2009 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: firework.c,v 1.24 2006/05/20 15:36:08 tom Exp $
++ * $Id: firework.c,v 1.25 2009/08/29 19:02:25 tom Exp $
+  */
+ #include <test.priv.h>
+ 
+@@ -94,14 +94,14 @@
+     showit();
+ 
+     init_pair(1, get_colour(&bold), my_bg);
+-    attrset(COLOR_PAIR(1) | bold);
++    (void) attrset(COLOR_PAIR(1) | bold);
+     mvprintw(row - 1, col - 1, " - ");
+     mvprintw(row + 0, col - 1, "-+-");
+     mvprintw(row + 1, col - 1, " - ");
+     showit();
+ 
+     init_pair(1, get_colour(&bold), my_bg);
+-    attrset(COLOR_PAIR(1) | bold);
++    (void) attrset(COLOR_PAIR(1) | bold);
+     mvprintw(row - 2, col - 2, " --- ");
+     mvprintw(row - 1, col - 2, "-+++-");
+     mvprintw(row + 0, col - 2, "-+#+-");
+@@ -110,7 +110,7 @@
+     showit();
+ 
+     init_pair(1, get_colour(&bold), my_bg);
+-    attrset(COLOR_PAIR(1) | bold);
++    (void) attrset(COLOR_PAIR(1) | bold);
+     mvprintw(row - 2, col - 2, " +++ ");
+     mvprintw(row - 1, col - 2, "++#++");
+     mvprintw(row + 0, col - 2, "+# #+");
+@@ -119,7 +119,7 @@
+     showit();
+ 
+     init_pair(1, get_colour(&bold), my_bg);
+-    attrset(COLOR_PAIR(1) | bold);
++    (void) attrset(COLOR_PAIR(1) | bold);
+     mvprintw(row - 2, col - 2, "  #  ");
+     mvprintw(row - 1, col - 2, "## ##");
+     mvprintw(row + 0, col - 2, "#   #");
+@@ -128,7 +128,7 @@
+     showit();
+ 
+     init_pair(1, get_colour(&bold), my_bg);
+-    attrset(COLOR_PAIR(1) | bold);
++    (void) attrset(COLOR_PAIR(1) | bold);
+     mvprintw(row - 2, col - 2, " # # ");
+     mvprintw(row - 1, col - 2, "#   #");
+     mvprintw(row + 0, col - 2, "     ");
+@@ -173,7 +173,7 @@
+            direction = (start > end) ? -1 : 1;
+            diff = abs(start - end);
+        } while (diff < 2 || diff >= LINES - 2);
+-       attrset(A_NORMAL);
++       (void) attrset(A_NORMAL);
+        for (row = 0; row < diff; row++) {
+            mvprintw(LINES - row, start + (row * direction),
+                     (direction < 0) ? "\\" : "/");
 diff -Naur ncurses-5.7.orig/test/firstlast.c ncurses-5.7/test/firstlast.c
 --- ncurses-5.7.orig/test/firstlast.c   2006-04-01 11:03:18.000000000 -0800
-+++ ncurses-5.7/test/firstlast.c        2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/test/firstlast.c        2009-09-12 08:51:54.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -59948 +62928 @@
      }
  }
+diff -Naur ncurses-5.7.orig/test/gdc.c ncurses-5.7/test/gdc.c
+--- ncurses-5.7.orig/test/gdc.c 2008-08-03 16:58:42.000000000 -0700
++++ ncurses-5.7/test/gdc.c      2009-09-12 08:52:07.000000000 -0700
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2008,2009 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            *
+@@ -33,7 +33,7 @@
+  * modified 10-18-89 for curses (jrl)
+  * 10-18-89 added signal handling
+  *
+- * $Id: gdc.c,v 1.31 2008/08/03 23:58:42 tom Exp $
++ * $Id: gdc.c,v 1.32 2009/08/29 19:02:25 tom Exp $
+  */
+ 
+ #include <test.priv.h>
+@@ -78,7 +78,7 @@
+     int n;
+ 
+     if (hascolor)
+-       attrset(COLOR_PAIR(PAIR_FRAMES));
++       (void) attrset(COLOR_PAIR(PAIR_FRAMES));
+ 
+     mvaddch(YBASE - 1, XBASE - 1, ACS_ULCORNER);
+     hline(ACS_HLINE, XLENGTH);
+@@ -102,7 +102,7 @@
+     vline(ACS_VLINE, YDEPTH);
+ 
+     if (hascolor)
+-       attrset(COLOR_PAIR(PAIR_OTHERS));
++       (void) attrset(COLOR_PAIR(PAIR_OTHERS));
+ }
+ 
+ static void
+@@ -220,7 +220,7 @@
+        init_pair(PAIR_DIGITS, COLOR_BLACK, COLOR_RED);
+        init_pair(PAIR_OTHERS, COLOR_RED, bg);
+        init_pair(PAIR_FRAMES, COLOR_WHITE, bg);
+-       attrset(COLOR_PAIR(PAIR_OTHERS));
++       (void) attrset(COLOR_PAIR(PAIR_OTHERS));
+     }
+ 
+   restart:
+@@ -335,7 +335,7 @@
+            goto restart;
+        case ERR:
+            if (sigtermed) {
+-               standend();
++               (void) standend();
+                endwin();
+                fprintf(stderr, "gdc terminated by signal %d\n", sigtermed);
+                ExitProgram(EXIT_FAILURE);
+@@ -345,7 +345,7 @@
+            continue;
+        }
+     } while (--count);
+-    standend();
++    (void) standend();
+     endwin();
+     ExitProgram(EXIT_SUCCESS);
+ }
+diff -Naur ncurses-5.7.orig/test/hanoi.c ncurses-5.7/test/hanoi.c
+--- ncurses-5.7.orig/test/hanoi.c       2008-08-04 03:57:59.000000000 -0700
++++ ncurses-5.7/test/hanoi.c    2009-09-12 08:52:07.000000000 -0700
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2008,2009 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            *
+@@ -41,7 +41,7 @@
+  *
+  *     Date: 05.Nov.90
+  *
+- * $Id: hanoi.c,v 1.27 2008/08/04 10:57:59 tom Exp $
++ * $Id: hanoi.c,v 1.28 2009/08/29 19:02:25 tom Exp $
+  */
+ 
+ #include <test.priv.h>
+@@ -229,7 +229,7 @@
+     mvaddstr(1, 24, "T O W E R S   O F   H A N O I");
+     mvaddstr(3, 34, "SJR 1990");
+     mvprintw(19, 5, "Moves : %d", NMoves);
+-    attrset(A_REVERSE);
++    (void) attrset(A_REVERSE);
+     mvaddstr(BASELINE, 8,
+             "                                                               ");
+ 
+@@ -241,7 +241,7 @@
+     mvaddch(BASELINE, LEFTPEG, '1');
+     mvaddch(BASELINE, MIDPEG, '2');
+     mvaddch(BASELINE, RIGHTPEG, '3');
+-    attrset(A_NORMAL);
++    (void) attrset(A_NORMAL);
+ 
+     /* Draw tiles */
+     for (peg = 0; peg < NPEGS; peg++) {
+@@ -251,16 +251,16 @@
+                memset(TileBuf, ' ', len);
+                TileBuf[len] = '\0';
+                if (has_colors())
+-                   attrset(COLOR_PAIR(LENTOIND(len)));
++                   (void) attrset(COLOR_PAIR(LENTOIND(len)));
+                else
+-                   attrset(A_REVERSE);
++                   (void) attrset(A_REVERSE);
+                mvaddstr(BASELINE - (SlotNo + 1),
+                         (int) (PegPos[peg] - len / 2),
+                         TileBuf);
+            }
+        }
+     }
+-    attrset(A_NORMAL);
++    (void) attrset(A_NORMAL);
+     refresh();
+ }
+ 
 diff -Naur ncurses-5.7.orig/test/insdelln.c ncurses-5.7/test/insdelln.c
 --- ncurses-5.7.orig/test/insdelln.c    1969-12-31 16:00:00.000000000 -0800
-+++ ncurses-5.7/test/insdelln.c 2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/test/insdelln.c 2009-09-12 08:52:07.000000000 -0700
 @@ -0,0 +1,387 @@
 +/****************************************************************************
@@ -59980 +63081 @@
 + ****************************************************************************/
 +/*
-+ * $Id: insdelln.c,v 1.2 2009/07/15 23:21:04 tom Exp $
++ * $Id: insdelln.c,v 1.3 2009/08/29 18:47:26 tom Exp $
 + *
 + * test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln
@@ -60254 +63355 @@
 +
 +    do {
-+       wattrset(win, st.attr | COLOR_PAIR(st.pair));
++       (void) wattrset(win, st.attr | COLOR_PAIR(st.pair));
 +       switch (st.ch) {
 +       case 'i':
@@ -60295 +63396 @@
 +
 +    do {
-+       attrset(st.attr | COLOR_PAIR(st.pair));
++       (void) attrset(st.attr | COLOR_PAIR(st.pair));
 +       switch (st.ch) {
 +       case 'i':
@@ -60341 +63442 @@
 diff -Naur ncurses-5.7.orig/test/modules ncurses-5.7/test/modules
 --- ncurses-5.7.orig/test/modules       2007-08-18 10:57:08.000000000 -0700
-+++ ncurses-5.7/test/modules    2009-07-19 15:04:15.000000000 -0700
++++ ncurses-5.7/test/modules    2009-09-12 08:51:52.000000000 -0700
 @@ -1,6 +1,6 @@
 -# $Id: modules,v 1.36 2007/08/18 17:57:08 tom Exp $
@@ -60377 +63478 @@
 diff -Naur ncurses-5.7.orig/test/ncurses.c ncurses-5.7/test/ncurses.c
 --- ncurses-5.7.orig/test/ncurses.c     2008-09-27 07:34:58.000000000 -0700
-+++ ncurses-5.7/test/ncurses.c  2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/test/ncurses.c  2009-09-12 08:52:07.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -60390 +63491 @@
  
 -$Id: ncurses.c,v 1.329 2008/09/27 14:34:58 tom Exp $
-+$Id: ncurses.c,v 1.342 2009/07/18 11:48:42 tom Exp $
++$Id: ncurses.c,v 1.345 2009/08/29 20:24:57 tom Exp $
  
  ***************************************************************************/
  
+@@ -232,7 +232,7 @@
+ 
+     echo();
+     getyx(win, y0, x0);
+-    wattrset(win, A_REVERSE);
++    (void) wattrset(win, A_REVERSE);
+ 
+     x = (int) strlen(buffer);
+     while (!done) {
 @@ -318,6 +318,7 @@
      *target = 0;
@@ -60410 +63520 @@
  static int
  wGet_wchar(WINDOW *win, wint_t *result)
+@@ -363,7 +365,7 @@
+ 
+     echo();
+     getyx(win, y0, x0);
+-    wattrset(win, A_REVERSE);
++    (void) wattrset(win, A_REVERSE);
+ 
+     x = (int) wcslen(buffer);
+     while (!done) {
 @@ -483,7 +485,11 @@
         addstr("Shelling out...");
@@ -60454 +63573 @@
      static const char *help[] =
      {
+@@ -610,12 +629,12 @@
+        int flg = ((strstr(help[n], "toggle") != 0)
+                   && (flags[UChar(*help[n])] != FALSE));
+        if (flg)
+-           standout();
++           (void) standout();
+        mvprintw(row, col, "%s", help[n]);
+        if (col == 0)
+            clrtoeol();
+        if (flg)
+-           standend();
++           (void) standend();
+     }
+     wrefresh(stdscr);
+     wmove(win, y, x);
 @@ -657,7 +676,7 @@
  {
@@ -60577 +63711 @@
  #endif
  
+@@ -1331,7 +1358,7 @@
+            addch(ch | attr);
+        }
+     } else {
+-       attrset(attr);
++       (void) attrset(attr);
+        addstr(attr_test_string);
+        attroff(attr);
+     }
 @@ -1840,6 +1867,8 @@
             width = 4;
@@ -60658 +63801 @@
                 init_pair(pair, fg, bg);
                 attron((attr_t) COLOR_PAIR(pair));
-@@ -1960,6 +2002,8 @@
+@@ -1960,16 +2002,18 @@
                     attron((attr_t) A_ALTCHARSET);
                 if (opt_bold)
@@ -60667 +63810 @@
                 if (opt_nums) {
                     sprintf(numbered, "{%02X}", i);
-@@ -1968,8 +2012,8 @@
+                    hello = numbered;
+                }
                 printw("%-*.*s", width, width, hello);
-                attrset(A_NORMAL);
+-               attrset(A_NORMAL);
++               (void) attrset(A_NORMAL);
  
 -               if ((i % per_row) == 0 && (i % COLORS) == 0) {
@@ -60793 +63938 @@
             done = TRUE;
             continue;
+@@ -2324,9 +2395,9 @@
+                     (i == current ? '>' : ' '),
+                     (i < (int) SIZEOF(the_color_names)
+                      ? the_color_names[i] : numeric));
+-           attrset(COLOR_PAIR(i));
++           (void) attrset(COLOR_PAIR(i));
+            addstr("        ");
+-           attrset(A_NORMAL);
++           (void) attrset(A_NORMAL);
+ 
+            color_content((short) i, &red, &green, &blue);
+            addstr("   R = ");
+@@ -2334,20 +2405,20 @@
+                attron(A_STANDOUT);
+            printw("%04d", red);
+            if (current == i && field == 0)
+-               attrset(A_NORMAL);
++               (void) attrset(A_NORMAL);
+            addstr(", G = ");
+            if (current == i && field == 1)
+                attron(A_STANDOUT);
+            printw("%04d", green);
+            if (current == i && field == 1)
+-               attrset(A_NORMAL);
++               (void) attrset(A_NORMAL);
+            addstr(", B = ");
+            if (current == i && field == 2)
+                attron(A_STANDOUT);
+            printw("%04d", blue);
+            if (current == i && field == 2)
+-               attrset(A_NORMAL);
+-           attrset(A_NORMAL);
++               (void) attrset(A_NORMAL);
++           (void) attrset(A_NORMAL);
+            printw(" ( %3d %3d %3d )",
+                   scaled_rgb(red),
+                   scaled_rgb(green),
 @@ -2802,6 +2873,7 @@
  } attrs_to_cycle[] = {
@@ -60801 +63983 @@
      { A_UNDERLINE,     "underline" },
  };
+@@ -2818,7 +2890,7 @@
+            *at_code = 0;
+        break;
+     case 'V':
+-       if (*at_code == 1)
++       if (*at_code == 0)
+            *at_code = SIZEOF(attrs_to_cycle) - 1;
+        else
+            *at_code -= 1;
 @@ -2902,7 +2974,7 @@
         do {
@@ -60959 +64150 @@
  
  }
+@@ -4954,7 +5037,7 @@
+        wbkgd(subWin, COLOR_PAIR(2) | ' ');
+     }
+ #endif
+-    wattrset(subWin, A_BOLD);
++    (void) wattrset(subWin, A_BOLD);
+     box(subWin, ACS_VLINE, ACS_HLINE);
+     mvwaddstr(subWin, 2, 1, "This is a subwindow");
+     wrefresh(win);
+@@ -5774,18 +5857,18 @@
+ 
+     switch (flavor) {
+     case 0:
+-       wattrset(win, A_NORMAL);
++       (void) wattrset(win, A_NORMAL);
+        break;
+     case 1:
+-       wattrset(win, A_BOLD);
++       (void) wattrset(win, A_BOLD);
+        break;
+     case 2:
+        init_pair(cpair, COLOR_BLUE, COLOR_WHITE);
+-       wattrset(win, COLOR_PAIR(cpair) | A_NORMAL);
++       (void) wattrset(win, COLOR_PAIR(cpair) | A_NORMAL);
+        break;
+     case 3:
+        init_pair(cpair, COLOR_WHITE, COLOR_BLUE);
+-       wattrset(win, COLOR_PAIR(cpair) | A_BOLD);
++       (void) wattrset(win, COLOR_PAIR(cpair) | A_BOLD);
+        break;
+     }
+ }
 @@ -5804,7 +5887,7 @@
         break;
@@ -60968 +64191 @@
      case 3:
         wbkgdset(win, ' ' | A_NORMAL);
+@@ -5890,7 +5973,7 @@
+            break;
+        }
+        overlap_helpitem(state, item, msg);
+-       wattrset(stdscr, A_NORMAL);
++       (void) wattrset(stdscr, A_NORMAL);
+        wbkgdset(stdscr, ' ' | A_NORMAL);
+     }
+     move(LINES - 1, 0);
+@@ -5915,7 +5998,7 @@
+ {
+     overlap_test_1_attr(a, flavor, col);
+     fillwin(a, fill);
+-    wattrset(a, A_NORMAL);
++    (void) wattrset(a, A_NORMAL);
+ }
+ 
+ static void
+@@ -6497,7 +6580,7 @@
+            min_colors = -1;
+        }
+ #if NCURSES_VERSION_PATCH >= 20000708
+-       else if (assumed_colors)
++       if (assumed_colors)
+            assume_default_colors(default_fg, default_bg);
+ #endif
+ #endif
+diff -Naur ncurses-5.7.orig/test/newdemo.c ncurses-5.7/test/newdemo.c
+--- ncurses-5.7.orig/test/newdemo.c     2008-08-03 13:19:38.000000000 -0700
++++ ncurses-5.7/test/newdemo.c  2009-09-12 08:52:07.000000000 -0700
+@@ -2,7 +2,7 @@
+  *  newdemo.c  -       A demo program using PDCurses. The program illustrate
+  *                     the use of colours for text output.
+  *
+- * $Id: newdemo.c,v 1.31 2008/08/03 20:19:38 tom Exp $
++ * $Id: newdemo.c,v 1.32 2009/08/29 18:47:26 tom Exp $
+  */
+ 
+ #include <test.priv.h>
+@@ -84,7 +84,7 @@
+        if (pair > COLOR_PAIRS)
+            pair = COLOR_PAIRS;
+        init_pair(pair, foreground, background);
+-       wattrset(win, COLOR_PAIR(pair));
++       (void) wattrset(win, COLOR_PAIR(pair));
+     }
+ }
+ 
+@@ -96,7 +96,7 @@
+            pair = COLOR_PAIRS;
+        attrs |= COLOR_PAIR(pair);
+     }
+-    wattrset(win, attrs);
++    (void) wattrset(win, attrs);
+     return attrs;
+ }
+ 
 diff -Naur ncurses-5.7.orig/test/programs ncurses-5.7/test/programs
 --- ncurses-5.7.orig/test/programs      2008-08-16 14:47:39.000000000 -0700
-+++ ncurses-5.7/test/programs   2009-07-19 15:04:15.000000000 -0700
++++ ncurses-5.7/test/programs   2009-09-12 08:51:52.000000000 -0700
 @@ -1,6 +1,6 @@
 -# $Id: programs,v 1.14 2008/08/16 21:47:39 tom Exp $
@@ -61006 +64286 @@
 diff -Naur ncurses-5.7.orig/test/railroad.c ncurses-5.7/test/railroad.c
 --- ncurses-5.7.orig/test/railroad.c    2008-02-09 10:08:43.000000000 -0800
-+++ ncurses-5.7/test/railroad.c 2009-07-19 15:02:23.000000000 -0700
++++ ncurses-5.7/test/railroad.c 2009-09-12 08:51:19.000000000 -0700
 @@ -29,7 +29,7 @@
  /*
@@ -61051 +64331 @@
  }
  
+diff -Naur ncurses-5.7.orig/test/rain.c ncurses-5.7/test/rain.c
+--- ncurses-5.7.orig/test/rain.c        2008-05-24 16:34:34.000000000 -0700
++++ ncurses-5.7/test/rain.c     2009-09-12 08:52:07.000000000 -0700
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2008,2009 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: rain.c,v 1.34 2008/05/24 23:34:34 tom Exp $
++ * $Id: rain.c,v 1.35 2009/08/29 19:02:25 tom Exp $
+  */
+ #include <test.priv.h>
+ 
+@@ -105,7 +105,7 @@
+        chtype color = COLOR_PAIR(z);
+        if (z)
+            color |= A_BOLD;
+-       attrset(color);
++       (void) attrset(color);
+     }
+     return j;
+ }
 diff -Naur ncurses-5.7.orig/test/README ncurses-5.7/test/README
 --- ncurses-5.7.orig/test/README        2008-10-18 14:02:45.000000000 -0700
-+++ ncurses-5.7/test/README     2009-07-19 15:04:15.000000000 -0700
++++ ncurses-5.7/test/README     2009-09-12 08:51:52.000000000 -0700
 @@ -25,7 +25,7 @@
  -- sale, use or other dealings in this Software without prior written        --
@@ -61393 +64701 @@
  wscanw                         test: testcurs
  wscrl                          test: ncurses testcurs
+diff -Naur ncurses-5.7.orig/test/tclock.c ncurses-5.7/test/tclock.c
+--- ncurses-5.7.orig/test/tclock.c      2005-04-16 09:39:27.000000000 -0700
++++ ncurses-5.7/test/tclock.c   2009-09-12 08:52:07.000000000 -0700
+@@ -1,4 +1,4 @@
+-/* $Id: tclock.c,v 1.25 2005/04/16 16:39:27 tom Exp $ */
++/* $Id: tclock.c,v 1.26 2009/08/29 18:47:26 tom Exp $ */
+ 
+ #include <test.priv.h>
+ 
+@@ -67,7 +67,7 @@
+     int d;
+ 
+     if (has_colors())
+-       attrset(COLOR_PAIR(pair));
++       (void) attrset(COLOR_PAIR(pair));
+ 
+     dx = x2 - from_x;
+     dy = y2 - from_y;
+@@ -209,17 +209,17 @@
+ 
+        dline(3, cx, cy, cx + mdx, cy - mdy, '#');
+ 
+-       attrset(A_REVERSE);
++       (void) attrset(A_REVERSE);
+        dline(2, cx, cy, cx + hdx, cy - hdy, '.');
+        attroff(A_REVERSE);
+ 
+        if (has_colors())
+-           attrset(COLOR_PAIR(1));
++           (void) attrset(COLOR_PAIR(1));
+ 
+        dline(1, cx, cy, cx + sdx, cy - sdy, 'O');
+ 
+        if (has_colors())
+-           attrset(COLOR_PAIR(0));
++           (void) attrset(COLOR_PAIR(0));
+ 
+        text = ctime(&tim);
+        mvprintw(2, 0, "%.*s", (int) (strlen(text) - 1), text);
+diff -Naur ncurses-5.7.orig/test/testaddch.c ncurses-5.7/test/testaddch.c
+--- ncurses-5.7.orig/test/testaddch.c   2006-04-01 11:08:03.000000000 -0800
++++ ncurses-5.7/test/testaddch.c        2009-09-12 08:52:07.000000000 -0700
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
++ * Copyright (c) 1998-2006,2009 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            *
+@@ -29,7 +29,7 @@
+  * This is an example written by Alexander V. Lukyanov <lav@yars.free.net>,
+  * to demonstrate an inconsistency between ncurses and SVr4 curses.
+  *
+- * $Id: testaddch.c,v 1.6 2006/04/01 19:08:03 tom Exp $
++ * $Id: testaddch.c,v 1.7 2009/08/29 19:02:25 tom Exp $
+  */
+ #include <test.priv.h>
+ 
+@@ -66,7 +66,7 @@
+        attr = (i & 4) ? COLOR_PAIR(4) : 0;
+ 
+        bkgdset(back);
+-       attrset(set);
++       (void) attrset(set);
+ 
+        attr_addstr("Test string with spaces ->   <-\n", attr);
+     }
+@@ -77,7 +77,7 @@
+        attr = (i & 4) ? COLOR_PAIR(4) : 0;
+ 
+        bkgdset(back);
+-       attrset(set);
++       (void) attrset(set);
+ 
+        attr_addstr("Test string with spaces ->   <-\n", attr);
+     }
 diff -Naur ncurses-5.7.orig/test/test_arrays.c ncurses-5.7/test/test_arrays.c
 --- ncurses-5.7.orig/test/test_arrays.c 2008-02-09 10:09:43.000000000 -0800
-+++ ncurses-5.7/test/test_arrays.c      2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/test/test_arrays.c      2009-09-12 08:51:54.000000000 -0700
 @@ -26,7 +26,7 @@
   * authorization.                                                           *
@@ -61414 +64798 @@
  #define DUMP(name) dump_array(#name, name)
  
+diff -Naur ncurses-5.7.orig/test/testcurs.c ncurses-5.7/test/testcurs.c
+--- ncurses-5.7.orig/test/testcurs.c    2008-08-03 10:58:09.000000000 -0700
++++ ncurses-5.7/test/testcurs.c 2009-09-12 08:52:07.000000000 -0700
+@@ -7,7 +7,7 @@
+  *  wrs(5/28/93) -- modified to be consistent (perform identically) with either
+  *                  PDCurses or under Unix System V, R4
+  *
+- * $Id: testcurs.c,v 1.39 2008/08/03 17:58:09 tom Exp $
++ * $Id: testcurs.c,v 1.40 2009/08/29 18:47:26 tom Exp $
+  */
+ 
+ #include <test.priv.h>
+@@ -682,7 +682,7 @@
+     if ((pad = newpad(50, 100)) != 0) {
+        wattron(pad, A_REVERSE);
+        mvwaddstr(pad, 5, 2, "This is a new pad");
+-       wattrset(pad, A_NORMAL);
++       (void) wattrset(pad, A_NORMAL);
+        mvwaddstr(pad, 8, 0,
+                  "The end of this line should be truncated here:except  now");
+        mvwaddstr(pad, 11, 1, "This line should not appear.It will now");
+@@ -720,7 +720,7 @@
+ 
+     assert((new_option >= 0) && (new_option < MAX_OPTIONS));
+ 
+-    attrset(A_NORMAL);
++    (void) attrset(A_NORMAL);
+     mvaddstr(3, 20, "PDCurses Test Program");
+ 
+     for (i = 0; i < (int) MAX_OPTIONS; i++)
+@@ -729,9 +729,9 @@
+     if ((old_option >= 0) && (old_option < MAX_OPTIONS))
+        mvaddstr(5 + old_option, 25, command[old_option].text);
+ 
+-    attrset(A_REVERSE);
++    (void) attrset(A_REVERSE);
+     mvaddstr(5 + new_option, 25, command[new_option].text);
+-    attrset(A_NORMAL);
++    (void) attrset(A_NORMAL);
+     mvaddstr(13, 3,
+             "Use Up and Down Arrows to select - Enter to run - Q to quit");
+     refresh();
+diff -Naur ncurses-5.7.orig/test/test_getstr.c ncurses-5.7/test/test_getstr.c
+--- ncurses-5.7.orig/test/test_getstr.c 2008-02-09 10:09:35.000000000 -0800
++++ ncurses-5.7/test/test_getstr.c      2009-09-12 08:52:07.000000000 -0700
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2007,2008 Free Software Foundation, Inc.                   *
++ * Copyright (c) 2007-2008,2009 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: test_getstr.c,v 1.8 2008/02/09 18:09:35 tom Exp $
++ * $Id: test_getstr.c,v 1.9 2009/08/29 19:02:25 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -271,7 +271,7 @@
+            *buffer = '\0';
+            rc = ERR;
+            echo();
+-           wattrset(txtwin, A_REVERSE);
++           (void) wattrset(txtwin, A_REVERSE);
+            switch (flavor) {
+            case eGetStr:
+                if (txtwin != stdscr) {
+@@ -309,7 +309,7 @@
+                break;
+            }
+            noecho();
+-           wattrset(txtwin, A_NORMAL);
++           (void) wattrset(txtwin, A_NORMAL);
+            wprintw(strwin, "%d:%s", rc, buffer);
+            wnoutrefresh(strwin);
+            break;
+diff -Naur ncurses-5.7.orig/test/test_get_wstr.c ncurses-5.7/test/test_get_wstr.c
+--- ncurses-5.7.orig/test/test_get_wstr.c       2007-08-11 10:01:43.000000000 -0700
++++ ncurses-5.7/test/test_get_wstr.c    2009-09-12 08:52:07.000000000 -0700
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2007 Free Software Foundation, Inc.                        *
++ * Copyright (c) 2007,2009 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: test_get_wstr.c,v 1.5 2007/08/11 17:01:43 tom Exp $
++ * $Id: test_get_wstr.c,v 1.6 2009/08/29 19:02:25 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -269,7 +269,7 @@
+            *buffer = '\0';
+            rc = ERR;
+            echo();
+-           wattrset(txtwin, A_REVERSE);
++           (void) wattrset(txtwin, A_REVERSE);
+            switch (flavor) {
+            case eGetStr:
+                if (txtwin != stdscr) {
+@@ -307,9 +307,9 @@
+                break;
+            }
+            noecho();
+-           wattrset(txtwin, A_NORMAL);
++           (void) wattrset(txtwin, A_NORMAL);
+            wprintw(strwin, "%d", rc);
+-           waddwstr(strwin, (wchar_t *) buffer);
++           (void) waddwstr(strwin, (wchar_t *) buffer);
+            wnoutrefresh(strwin);
+            break;
+        default:
+diff -Naur ncurses-5.7.orig/test/test_opaque.c ncurses-5.7/test/test_opaque.c
+--- ncurses-5.7.orig/test/test_opaque.c 2008-07-05 16:18:40.000000000 -0700
++++ ncurses-5.7/test/test_opaque.c      2009-09-12 08:52:07.000000000 -0700
+@@ -1,5 +1,5 @@
+ /****************************************************************************
+- * Copyright (c) 2007,2008 Free Software Foundation, Inc.                   *
++ * Copyright (c) 2007-2008,2009 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: test_opaque.c,v 1.7 2008/07/05 23:18:40 tom Exp $
++ * $Id: test_opaque.c,v 1.8 2009/08/29 19:02:25 tom Exp $
+  *
+  * Author: Thomas E Dickey
+  *
+@@ -185,10 +185,10 @@
+ {
+     to_keyword(stswin, cell);
+     if (active == cell)
+-       wstandout(stswin);
++       (void) wstandout(stswin);
+     wprintw(stswin, "%s:", name);
+     if (active == cell)
+-       wstandend(stswin);
++       (void) wstandend(stswin);
+ }
+ /* *INDENT-OFF* */
+ static struct {
 diff -Naur ncurses-5.7.orig/test/test.priv.h ncurses-5.7/test/test.priv.h
 --- ncurses-5.7.orig/test/test.priv.h   2008-10-04 14:53:41.000000000 -0700
-+++ ncurses-5.7/test/test.priv.h        2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/test/test.priv.h        2009-09-12 08:51:54.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -61577 +65112 @@
 diff -Naur ncurses-5.7.orig/test/view.c ncurses-5.7/test/view.c
 --- ncurses-5.7.orig/test/view.c        2008-09-06 15:10:50.000000000 -0700
-+++ ncurses-5.7/test/view.c     2009-07-19 15:04:17.000000000 -0700
++++ ncurses-5.7/test/view.c     2009-09-12 08:51:54.000000000 -0700
 @@ -1,5 +1,5 @@
  /****************************************************************************
@@ -61638 +65173 @@
 diff -Naur ncurses-5.7.orig/test/worm.c ncurses-5.7/test/worm.c
 --- ncurses-5.7.orig/test/worm.c        2008-10-04 14:54:09.000000000 -0700
-+++ ncurses-5.7/test/worm.c     2009-07-19 15:03:58.000000000 -0700
++++ ncurses-5.7/test/worm.c     2009-09-12 08:51:35.000000000 -0700
 @@ -61,7 +61,7 @@
    traces will be dumped.  The program stops and waits for one character of
@@ -61675 +65210 @@
      }
  #endif
+diff -Naur ncurses-5.7.orig/test/xmas.c ncurses-5.7/test/xmas.c
+--- ncurses-5.7.orig/test/xmas.c        2008-08-03 04:08:59.000000000 -0700
++++ ncurses-5.7/test/xmas.c     2009-09-12 08:52:07.000000000 -0700
+@@ -92,7 +92,7 @@
+ /******************************************************************************/
+ 
+ /*
+- * $Id: xmas.c,v 1.24 2008/08/03 11:08:59 tom Exp $
++ * $Id: xmas.c,v 1.25 2009/08/29 18:47:26 tom Exp $
+  */
+ #include <test.priv.h>
+ 
+@@ -170,7 +170,7 @@
+ unset_color(WINDOW *win)
+ {
+     if (has_colors())
+-       wattrset(win, COLOR_PAIR(0));
++       (void) wattrset(win, COLOR_PAIR(0));
+ }
+ 
+ static void
+@@ -533,9 +533,9 @@
+        mvwaddch(treescrn4, 12, 23, ' ');
+ 
+        /*star */
+-       wstandout(treescrn4);
++       (void) wstandout(treescrn4);
+        mvwaddch(treescrn4, 0, 12, '*');
+-       wstandend(treescrn4);
++       (void) wstandend(treescrn4);
+ 
+        /*strng1 */
+        mvwaddch(treescrn4, 3, 13, ' ');
+@@ -597,9 +597,9 @@
+        mvwaddch(treescrn6, 11, 23, ' ');
+ 
+        /*star */
+-       wstandout(treescrn6);
++       (void) wstandout(treescrn6);
+        mvwaddch(treescrn6, 0, 12, '*');
+-       wstandend(treescrn6);
++       (void) wstandend(treescrn6);
+ 
+        /*strng1 */
+ 
+@@ -816,11 +816,11 @@
+ static int
+ star(void)
+ {
+-    wattrset(treescrn2, A_BOLD | A_BLINK);
++    (void) wattrset(treescrn2, A_BOLD | A_BLINK);
+     set_color(treescrn2, COLOR_YELLOW);
+ 
+     mvwaddch(treescrn2, 0, 12, (chtype) '*');
+-    wstandend(treescrn2);
++    (void) wstandend(treescrn2);
+ 
+     unset_color(treescrn2);
+     wrefresh(treescrn2);
+@@ -831,7 +831,7 @@
+ static int
+ strng1(void)
+ {
+-    wattrset(treescrn2, A_BOLD | A_BLINK);
++    (void) wattrset(treescrn2, A_BOLD | A_BLINK);
+     set_color(treescrn2, COLOR_WHITE);
+ 
+     mvwaddch(treescrn2, 3, 13, (chtype) '\'');
+@@ -849,7 +849,7 @@
+ static int
+ strng2(void)
+ {
+-    wattrset(treescrn2, A_BOLD | A_BLINK);
++    (void) wattrset(treescrn2, A_BOLD | A_BLINK);
+     set_color(treescrn2, COLOR_WHITE);
+ 
+     mvwaddch(treescrn2, 5, 14, (chtype) '\'');
+@@ -870,7 +870,7 @@
+ static int
+ strng3(void)
+ {
+-    wattrset(treescrn2, A_BOLD | A_BLINK);
++    (void) wattrset(treescrn2, A_BOLD | A_BLINK);
+     set_color(treescrn2, COLOR_WHITE);
+ 
+     mvwaddch(treescrn2, 7, 16, (chtype) '\'');
+@@ -893,7 +893,7 @@
+ static int
+ strng4(void)
+ {
+-    wattrset(treescrn2, A_BOLD | A_BLINK);
++    (void) wattrset(treescrn2, A_BOLD | A_BLINK);
+     set_color(treescrn2, COLOR_WHITE);
+ 
+     mvwaddch(treescrn2, 9, 17, (chtype) '\'');
+@@ -921,7 +921,7 @@
+ static int
+ strng5(void)
+ {
+-    wattrset(treescrn2, A_BOLD | A_BLINK);
++    (void) wattrset(treescrn2, A_BOLD | A_BLINK);
+     set_color(treescrn2, COLOR_WHITE);
+ 
+     mvwaddch(treescrn2, 11, 19, (chtype) '\'');
 diff -Naur ncurses-5.7.orig/TO-DO ncurses-5.7/TO-DO
 --- ncurses-5.7.orig/TO-DO      2008-10-11 12:22:27.000000000 -0700
-+++ ncurses-5.7/TO-DO   2009-07-19 15:01:59.000000000 -0700
++++ ncurses-5.7/TO-DO   2009-09-12 08:50:54.000000000 -0700
 @@ -25,7 +25,7 @@
  -- sale, use or other dealings in this Software without prior written        --