- Timestamp:
- Feb 22, 2009, 9:42:30 PM (15 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- 54f612f
- Parents:
- 61a4c69
- File:
-
- 1 moved
-
patches/ncurses-5.7-branch_update-9.patch (moved) (moved from patches/ncurses-5.7-branch_update-8.patch) (153 diffs)
Legend:
- Unmodified
- Added
- Removed
-
patches/ncurses-5.7-branch_update-9.patch
r61a4c69 r2a64e8b 1 1 Submitted By: Jim Gifford (jim at cross-lfs dot org) 2 Date: 02- 15-20092 Date: 02-22-2009 3 3 Initial Package Version: 5.7 4 4 Origin: Upstream 5 5 Upstream Status: Applied 6 6 Description: This is a branch update for NCurses-5.7, and should be 7 rechecked periodically. This patch covers up to 5.7-200902 14.7 rechecked periodically. This patch covers up to 5.7-20090221. 8 8 9 9 diff -Naur ncurses-5.7.orig/aclocal.m4 ncurses-5.7/aclocal.m4 10 10 --- ncurses-5.7.orig/aclocal.m4 2008-10-25 15:15:32.000000000 -0700 11 +++ ncurses-5.7/aclocal.m4 2009-02- 15 23:21:19.692164827-080011 +++ ncurses-5.7/aclocal.m4 2009-02-22 21:40:16.166419890 -0800 12 12 @@ -1,5 +1,5 @@ 13 13 dnl*************************************************************************** … … 886 886 diff -Naur ncurses-5.7.orig/Ada95/gen/adacurses-config.in ncurses-5.7/Ada95/gen/adacurses-config.in 887 887 --- ncurses-5.7.orig/Ada95/gen/adacurses-config.in 2007-04-07 14:06:50.000000000 -0700 888 +++ ncurses-5.7/Ada95/gen/adacurses-config.in 2009-02- 15 23:21:14.347823438-0800888 +++ ncurses-5.7/Ada95/gen/adacurses-config.in 2009-02-22 21:40:06.801819807 -0800 889 889 @@ -1,18 +1,47 @@ 890 890 #! /bin/sh … … 960 960 diff -Naur ncurses-5.7.orig/Ada95/gen/Makefile.in ncurses-5.7/Ada95/gen/Makefile.in 961 961 --- ncurses-5.7.orig/Ada95/gen/Makefile.in 2008-10-04 15:58:31.000000000 -0700 962 +++ ncurses-5.7/Ada95/gen/Makefile.in 2009-02- 15 23:21:14.347823438-0800962 +++ ncurses-5.7/Ada95/gen/Makefile.in 2009-02-22 21:40:06.801819807 -0800 963 963 @@ -1,5 +1,5 @@ 964 964 ############################################################################## … … 1016 1016 diff -Naur ncurses-5.7.orig/Ada95/samples/Makefile.in ncurses-5.7/Ada95/samples/Makefile.in 1017 1017 --- ncurses-5.7.orig/Ada95/samples/Makefile.in 2006-12-17 08:45:02.000000000 -0800 1018 +++ ncurses-5.7/Ada95/samples/Makefile.in 2009-02- 15 23:21:14.347823438-08001018 +++ ncurses-5.7/Ada95/samples/Makefile.in 2009-02-22 21:40:06.805818410 -0800 1019 1019 @@ -1,5 +1,5 @@ 1020 1020 ############################################################################## … … 1055 1055 diff -Naur ncurses-5.7.orig/Ada95/src/Makefile.in ncurses-5.7/Ada95/src/Makefile.in 1056 1056 --- ncurses-5.7.orig/Ada95/src/Makefile.in 2007-09-15 11:22:24.000000000 -0700 1057 +++ ncurses-5.7/Ada95/src/Makefile.in 2009-02- 15 23:21:14.347823438-08001057 +++ ncurses-5.7/Ada95/src/Makefile.in 2009-02-22 21:40:06.805818410 -0800 1058 1058 @@ -1,5 +1,5 @@ 1059 1059 ############################################################################## … … 1147 1147 diff -Naur ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb 1148 1148 --- ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb 2008-07-26 11:51:11.000000000 -0700 1149 +++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb 2009-02- 15 23:21:00.210918563-08001149 +++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb 2009-02-22 21:39:52.800922475 -0800 1150 1150 @@ -35,8 +35,8 @@ 1151 1151 ------------------------------------------------------------------------------ … … 1170 1170 diff -Naur ncurses-5.7.orig/c++/cursesw.cc ncurses-5.7/c++/cursesw.cc 1171 1171 --- ncurses-5.7.orig/c++/cursesw.cc 2007-12-15 15:01:57.000000000 -0800 1172 +++ ncurses-5.7/c++/cursesw.cc 2009-02- 15 23:21:00.214919122-08001172 +++ ncurses-5.7/c++/cursesw.cc 2009-02-22 21:39:52.804923033 -0800 1173 1173 @@ -1,6 +1,6 @@ 1174 1174 // * this is for making emacs happy: -*-Mode: C++;-*- … … 1207 1207 diff -Naur ncurses-5.7.orig/c++/Makefile.in ncurses-5.7/c++/Makefile.in 1208 1208 --- ncurses-5.7.orig/c++/Makefile.in 2007-04-28 08:29:12.000000000 -0700 1209 +++ ncurses-5.7/c++/Makefile.in 2009-02- 15 23:21:09.899537365-08001209 +++ ncurses-5.7/c++/Makefile.in 2009-02-22 21:40:02.885566699 -0800 1210 1210 @@ -1,6 +1,6 @@ 1211 1211 -# $Id: Makefile.in,v 1.84 2007/04/28 15:29:12 tom Exp $ … … 1241 1241 diff -Naur ncurses-5.7.orig/config.guess ncurses-5.7/config.guess 1242 1242 --- ncurses-5.7.orig/config.guess 2008-08-30 13:25:07.000000000 -0700 1243 +++ ncurses-5.7/config.guess 2009-02- 15 23:21:09.899537365-08001243 +++ ncurses-5.7/config.guess 2009-02-22 21:40:02.885566699 -0800 1244 1244 @@ -4,7 +4,7 @@ 1245 1245 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 … … 1311 1311 diff -Naur ncurses-5.7.orig/config.sub ncurses-5.7/config.sub 1312 1312 --- ncurses-5.7.orig/config.sub 2008-08-30 13:25:02.000000000 -0700 1313 +++ ncurses-5.7/config.sub 2009-02- 15 23:21:09.903537644-08001313 +++ ncurses-5.7/config.sub 2009-02-22 21:40:02.885566699 -0800 1314 1314 @@ -4,7 +4,7 @@ 1315 1315 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 … … 1395 1395 diff -Naur ncurses-5.7.orig/configure ncurses-5.7/configure 1396 1396 --- ncurses-5.7.orig/configure 2008-10-25 17:04:38.000000000 -0700 1397 +++ ncurses-5.7/configure 2009-02- 15 23:21:24.616480793 -08001397 +++ ncurses-5.7/configure 2009-02-22 21:40:17.902529403 -0800 1398 1398 @@ -1,7 +1,7 @@ 1399 1399 #! /bin/sh … … 13282 13282 diff -Naur ncurses-5.7.orig/configure.in ncurses-5.7/configure.in 13283 13283 --- ncurses-5.7.orig/configure.in 2008-10-18 07:53:32.000000000 -0700 13284 +++ ncurses-5.7/configure.in 2009-02- 15 23:21:24.616480793 -080013284 +++ ncurses-5.7/configure.in 2009-02-22 21:40:17.902529403 -0800 13285 13285 @@ -1,5 +1,5 @@ 13286 13286 dnl*************************************************************************** … … 13550 13550 diff -Naur ncurses-5.7.orig/dist.mk ncurses-5.7/dist.mk 13551 13551 --- ncurses-5.7.orig/dist.mk 2008-11-01 17:58:38.000000000 -0700 13552 +++ ncurses-5.7/dist.mk 2009-02- 15 23:21:24.616480793-080013552 +++ ncurses-5.7/dist.mk 2009-02-22 21:40:19.474632211 -0800 13553 13553 @@ -25,7 +25,7 @@ 13554 13554 # use or other dealings in this Software without prior written # … … 13556 13556 ############################################################################## 13557 13557 -# $Id: dist.mk,v 1.671 2008/11/02 00:58:38 tom Exp $ 13558 +# $Id: dist.mk,v 1.68 6 2009/02/14 21:09:27tom Exp $13558 +# $Id: dist.mk,v 1.687 2009/02/21 21:20:20 tom Exp $ 13559 13559 # Makefile for creating ncurses distributions. 13560 13560 # … … 13565 13565 NCURSES_MINOR = 7 13566 13566 -NCURSES_PATCH = 20081102 13567 +NCURSES_PATCH = 200902 1413567 +NCURSES_PATCH = 20090221 13568 13568 13569 13569 # We don't append the patch to the version, since this only applies to releases … … 13571 13571 diff -Naur ncurses-5.7.orig/form/frm_driver.c ncurses-5.7/form/frm_driver.c 13572 13572 --- ncurses-5.7.orig/form/frm_driver.c 2008-10-18 09:25:00.000000000 -0700 13573 +++ ncurses-5.7/form/frm_driver.c 2009-02- 15 23:21:03.083101270-080013573 +++ ncurses-5.7/form/frm_driver.c 2009-02-22 21:39:55.861116636 -0800 13574 13574 @@ -32,7 +32,7 @@ 13575 13575 … … 13591 13591 diff -Naur ncurses-5.7.orig/form/Makefile.in ncurses-5.7/form/Makefile.in 13592 13592 --- ncurses-5.7.orig/form/Makefile.in 2007-04-28 07:56:11.000000000 -0700 13593 +++ ncurses-5.7/form/Makefile.in 2009-02- 15 23:21:09.919538762-080013593 +++ ncurses-5.7/form/Makefile.in 2009-02-22 21:40:02.905568096 -0800 13594 13594 @@ -1,6 +1,6 @@ 13595 13595 -# $Id: Makefile.in,v 1.47 2007/04/28 14:56:11 tom Exp $ … … 13610 13610 LD = @LD@ 13611 13611 LN_S = @LN_S@ 13612 diff -Naur ncurses-5.7.orig/include/capdefaults.c ncurses-5.7/include/capdefaults.c 13613 --- ncurses-5.7.orig/include/capdefaults.c 2008-08-04 05:33:42.000000000 -0700 13614 +++ ncurses-5.7/include/capdefaults.c 2009-02-22 21:40:19.474632211 -0800 13615 @@ -32,7 +32,7 @@ 13616 * and: Thomas E. Dickey 1996-on * 13617 ****************************************************************************/ 13618 13619 -/* $Id: capdefaults.c,v 1.13 2008/08/04 12:33:42 tom Exp $ */ 13620 +/* $Id: capdefaults.c,v 1.14 2008/11/16 00:19:59 juergen Exp $ */ 13621 13622 /* 13623 * Compute obsolete capabilities. The reason this is an include file is 13624 @@ -44,11 +44,11 @@ 13625 * postprocess_termcap(). 13626 */ 13627 { 13628 - char *sp; 13629 + char *strp; 13630 short capval; 13631 13632 #define EXTRACT_DELAY(str) \ 13633 - (short) (sp = strchr(str, '*'), sp ? atoi(sp+1) : 0) 13634 + (short) (strp = strchr(str, '*'), strp ? atoi(strp+1) : 0) 13635 13636 /* current (4.4BSD) capabilities marked obsolete */ 13637 if (VALID_STRING(carriage_return) 13612 13638 diff -Naur ncurses-5.7.orig/include/curses.h.in ncurses-5.7/include/curses.h.in 13613 13639 --- ncurses-5.7.orig/include/curses.h.in 2008-08-30 13:11:29.000000000 -0700 13614 +++ ncurses-5.7/include/curses.h.in 2009-02- 15 23:21:24.620481072-080013640 +++ ncurses-5.7/include/curses.h.in 2009-02-22 21:40:19.474632211 -0800 13615 13641 @@ -1,5 +1,5 @@ 13616 13642 /**************************************************************************** … … 13625 13651 13626 13652 -/* $Id: curses.h.in,v 1.187 2008/08/30 20:11:29 tom Exp $ */ 13627 +/* $Id: curses.h.in,v 1.19 3 2009/02/15 00:04:23tom Exp $ */13653 +/* $Id: curses.h.in,v 1.194 2009/02/21 22:44:41 tom Exp $ */ 13628 13654 13629 13655 #ifndef __NCURSES_H … … 13695 13721 extern NCURSES_EXPORT(int) standend (void); /* generated */ 13696 13722 extern NCURSES_EXPORT(int) start_color (void); /* implemented */ 13697 @@ -856,23 +857,11 7@@13723 @@ -856,23 +857,119 @@ 13698 13724 * These extensions provide access to information stored in the WINDOW even 13699 13725 * when NCURSES_OPAQUE is set: … … 13783 13809 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(reset_shell_mode) (SCREEN*); /* implemented */ 13784 13810 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(ripoffline) (SCREEN*, int, int (*)(WINDOW *, int)); /* implemented */ 13811 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_init) (SCREEN*, const char *); /* implemented */ 13812 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_restore) (SCREEN*, const char *); /* implemented */ 13785 13813 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(scr_set) (SCREEN*, const char *); /* implemented */ 13786 13814 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(slk_attroff) (SCREEN*, const chtype); /* implemented */ … … 13825 13853 13826 13854 #define NCURSES_ATTR_SHIFT 8 13827 @@ -1173,7 +12 68,7 @@13855 @@ -1173,7 +1270,7 @@ 13828 13856 * It gives the ESC expire time in milliseconds. 13829 13857 * b. ttytype is needed for backward compatibility … … 13836 13864 diff -Naur ncurses-5.7.orig/include/curses.tail ncurses-5.7/include/curses.tail 13837 13865 --- ncurses-5.7.orig/include/curses.tail 2008-07-05 13:20:38.000000000 -0700 13838 +++ ncurses-5.7/include/curses.tail 2009-02- 15 23:21:00.214919122-080013866 +++ ncurses-5.7/include/curses.tail 2009-02-22 21:39:52.804923033 -0800 13839 13867 @@ -1,4 +1,4 @@ 13840 13868 -/* $Id: curses.tail,v 1.16 2008/07/05 20:20:38 tom Exp $ */ … … 13853 13881 diff -Naur ncurses-5.7.orig/include/curses.wide ncurses-5.7/include/curses.wide 13854 13882 --- ncurses-5.7.orig/include/curses.wide 2007-03-10 09:52:23.000000000 -0800 13855 +++ ncurses-5.7/include/curses.wide 2009-02- 15 23:21:01.799020254 -080013883 +++ ncurses-5.7/include/curses.wide 2009-02-22 21:39:54.289015784 -0800 13856 13884 @@ -1,9 +1,11 @@ 13857 13885 -/* $Id: curses.wide,v 1.34 2007/03/10 17:52:23 tom Exp $ */ … … 13869 13897 diff -Naur ncurses-5.7.orig/INSTALL ncurses-5.7/INSTALL 13870 13898 --- ncurses-5.7.orig/INSTALL 2008-11-02 13:13:51.000000000 -0800 13871 +++ ncurses-5.7/INSTALL 2009-02- 15 23:21:09.895537365-080013899 +++ ncurses-5.7/INSTALL 2009-02-22 21:40:02.877566978 -0800 13872 13900 @@ -1,5 +1,5 @@ 13873 13901 ------------------------------------------------------------------------------- … … 13920 13948 diff -Naur ncurses-5.7.orig/man/curs_color.3x ncurses-5.7/man/curs_color.3x 13921 13949 --- ncurses-5.7.orig/man/curs_color.3x 2005-12-17 16:00:37.000000000 -0800 13922 +++ ncurses-5.7/man/curs_color.3x 2009-02- 15 23:21:17.376018158-080013950 +++ ncurses-5.7/man/curs_color.3x 2009-02-22 21:40:14.670322949 -0800 13923 13951 @@ -1,5 +1,5 @@ 13924 13952 .\"*************************************************************************** … … 13951 13979 diff -Naur ncurses-5.7.orig/man/curs_mouse.3x ncurses-5.7/man/curs_mouse.3x 13952 13980 --- ncurses-5.7.orig/man/curs_mouse.3x 2006-12-30 15:43:34.000000000 -0800 13953 +++ ncurses-5.7/man/curs_mouse.3x 2009-02- 15 23:21:00.214919122-080013981 +++ ncurses-5.7/man/curs_mouse.3x 2009-02-22 21:39:52.804923033 -0800 13954 13982 @@ -1,6 +1,6 @@ 13955 13983 '\" t … … 13997 14025 diff -Naur ncurses-5.7.orig/man/keybound.3x ncurses-5.7/man/keybound.3x 13998 14026 --- ncurses-5.7.orig/man/keybound.3x 2006-02-25 13:47:06.000000000 -0800 13999 +++ ncurses-5.7/man/keybound.3x 2009-02- 15 23:21:04.663202123-080014027 +++ ncurses-5.7/man/keybound.3x 2009-02-22 21:39:57.593227825 -0800 14000 14028 @@ -1,5 +1,5 @@ 14001 14029 .\"*************************************************************************** … … 14018 14046 diff -Naur ncurses-5.7.orig/man/tabs.1 ncurses-5.7/man/tabs.1 14019 14047 --- ncurses-5.7.orig/man/tabs.1 1969-12-31 16:00:00.000000000 -0800 14020 +++ ncurses-5.7/man/tabs.1 2009-02- 15 23:20:58.758823578 -080014048 +++ ncurses-5.7/man/tabs.1 2009-02-22 21:39:51.140814638 -0800 14021 14049 @@ -0,0 +1,143 @@ 14022 14050 +.\"*************************************************************************** … … 14165 14193 diff -Naur ncurses-5.7.orig/man/tset.1 ncurses-5.7/man/tset.1 14166 14194 --- ncurses-5.7.orig/man/tset.1 2006-12-24 07:00:30.000000000 -0800 14167 +++ ncurses-5.7/man/tset.1 2009-02- 15 23:20:58.758823578 -080014195 +++ ncurses-5.7/man/tset.1 2009-02-22 21:39:51.140814638 -0800 14168 14196 @@ -1,5 +1,5 @@ 14169 14197 .\"*************************************************************************** … … 14186 14214 diff -Naur ncurses-5.7.orig/MANIFEST ncurses-5.7/MANIFEST 14187 14215 --- ncurses-5.7.orig/MANIFEST 2008-10-25 16:47:24.000000000 -0700 14188 +++ ncurses-5.7/MANIFEST 2009-02- 15 23:21:09.895537365-080014216 +++ ncurses-5.7/MANIFEST 2009-02-22 21:40:02.877566978 -0800 14189 14217 @@ -640,6 +640,7 @@ 14190 14218 ./man/ncurses.3x … … 14229 14257 diff -Naur ncurses-5.7.orig/menu/Makefile.in ncurses-5.7/menu/Makefile.in 14230 14258 --- ncurses-5.7.orig/menu/Makefile.in 2007-04-28 07:56:11.000000000 -0700 14231 +++ ncurses-5.7/menu/Makefile.in 2009-02- 15 23:21:09.919538762-080014259 +++ ncurses-5.7/menu/Makefile.in 2009-02-22 21:40:02.905568096 -0800 14232 14260 @@ -1,6 +1,6 @@ 14233 14261 -# $Id: Makefile.in,v 1.48 2007/04/28 14:56:11 tom Exp $ … … 14250 14278 diff -Naur ncurses-5.7.orig/misc/gen-pkgconfig.in ncurses-5.7/misc/gen-pkgconfig.in 14251 14279 --- ncurses-5.7.orig/misc/gen-pkgconfig.in 1969-12-31 16:00:00.000000000 -0800 14252 +++ ncurses-5.7/misc/gen-pkgconfig.in 2009-02- 15 23:21:17.376018158-080014280 +++ ncurses-5.7/misc/gen-pkgconfig.in 2009-02-22 21:40:14.670322949 -0800 14253 14281 @@ -0,0 +1,119 @@ 14254 14282 +#!@SHELL@ … … 14373 14401 diff -Naur ncurses-5.7.orig/misc/Makefile.in ncurses-5.7/misc/Makefile.in 14374 14402 --- ncurses-5.7.orig/misc/Makefile.in 2007-03-31 08:54:17.000000000 -0700 14375 +++ ncurses-5.7/misc/Makefile.in 2009-02- 15 23:21:19.700165665-080014403 +++ ncurses-5.7/misc/Makefile.in 2009-02-22 21:40:16.170420449 -0800 14376 14404 @@ -1,6 +1,6 @@ 14377 14405 -# $Id: Makefile.in,v 1.43 2007/03/31 15:54:17 tom Exp $ … … 14456 14484 diff -Naur ncurses-5.7.orig/misc/ncurses-config.in ncurses-5.7/misc/ncurses-config.in 14457 14485 --- ncurses-5.7.orig/misc/ncurses-config.in 2007-03-17 13:02:19.000000000 -0700 14458 +++ ncurses-5.7/misc/ncurses-config.in 2009-02- 15 23:21:17.376018158-080014486 +++ ncurses-5.7/misc/ncurses-config.in 2009-02-22 21:40:14.670322949 -0800 14459 14487 @@ -1,7 +1,7 @@ 14460 14488 #!@SHELL@ … … 14583 14611 diff -Naur ncurses-5.7.orig/misc/terminfo.src ncurses-5.7/misc/terminfo.src 14584 14612 --- ncurses-5.7.orig/misc/terminfo.src 2008-10-12 16:03:54.000000000 -0700 14585 +++ ncurses-5.7/misc/terminfo.src 2009-02- 15 23:21:14.363823718-080014613 +++ ncurses-5.7/misc/terminfo.src 2009-02-22 21:40:06.821818969 -0800 14586 14614 @@ -6,8 +6,8 @@ 14587 14615 # Report bugs and new terminal descriptions to … … 14749 14777 diff -Naur ncurses-5.7.orig/mk-1st.awk ncurses-5.7/mk-1st.awk 14750 14778 --- ncurses-5.7.orig/mk-1st.awk 2007-03-24 15:10:55.000000000 -0700 14751 +++ ncurses-5.7/mk-1st.awk 2009-02- 15 23:21:11.279628160-080014779 +++ ncurses-5.7/mk-1st.awk 2009-02-22 21:40:04.169651068 -0800 14752 14780 @@ -1,6 +1,6 @@ 14753 14781 -# $Id: mk-1st.awk,v 1.78 2007/03/24 22:10:55 tom Exp $ … … 14779 14807 diff -Naur ncurses-5.7.orig/ncurses/base/define_key.c ncurses-5.7/ncurses/base/define_key.c 14780 14808 --- ncurses-5.7.orig/ncurses/base/define_key.c 2006-12-30 15:23:31.000000000 -0800 14781 +++ ncurses-5.7/ncurses/base/define_key.c 2009-02- 15 23:21:24.620481072-080014809 +++ ncurses-5.7/ncurses/base/define_key.c 2009-02-22 21:40:17.906529403 -0800 14782 14810 @@ -1,5 +1,5 @@ 14783 14811 /**************************************************************************** … … 14848 14876 diff -Naur ncurses-5.7.orig/ncurses/base/keybound.c ncurses-5.7/ncurses/base/keybound.c 14849 14877 --- ncurses-5.7.orig/ncurses/base/keybound.c 2006-06-17 11:19:24.000000000 -0700 14850 +++ ncurses-5.7/ncurses/base/keybound.c 2009-02- 15 23:21:24.620481072-080014878 +++ ncurses-5.7/ncurses/base/keybound.c 2009-02-22 21:40:19.478632211 -0800 14851 14879 @@ -1,5 +1,5 @@ 14852 14880 /**************************************************************************** … … 14868 14896 14869 14897 -MODULE_ID("$Id: keybound.c,v 1.7 2006/06/17 18:19:24 tom Exp $") 14870 +MODULE_ID("$Id: keybound.c,v 1. 8 2009/02/15 00:31:10tom Exp $")14898 +MODULE_ID("$Id: keybound.c,v 1.9 2009/02/21 16:32:34 tom Exp $") 14871 14899 14872 14900 /* … … 14880 14908 char *result = 0; 14881 14909 14882 14910 - T((T_CALLED("keybound(%d,%d)"), code, count)); 14883 14911 - if (SP != 0 && code >= 0) { 14884 14912 - result = _nc_expand_try(SP->_keytry, (unsigned) code, &count, 0); 14913 + T((T_CALLED("keybound(%p, %d,%d)"), SP_PARM, code, count)); 14885 14914 + if (SP_PARM != 0 && code >= 0) { 14886 14915 + result = _nc_expand_try(SP_PARM->_keytry, (unsigned) code, &count, 0); … … 14898 14927 diff -Naur ncurses-5.7.orig/ncurses/base/key_defined.c ncurses-5.7/ncurses/base/key_defined.c 14899 14928 --- ncurses-5.7.orig/ncurses/base/key_defined.c 2006-12-30 15:22:55.000000000 -0800 14900 +++ ncurses-5.7/ncurses/base/key_defined.c 2009-02- 15 23:21:24.620481072-080014929 +++ ncurses-5.7/ncurses/base/key_defined.c 2009-02-22 21:40:19.478632211 -0800 14901 14930 @@ -1,5 +1,5 @@ 14902 14931 /**************************************************************************** … … 14906 14935 * Permission is hereby granted, free of charge, to any person obtaining a * 14907 14936 * copy of this software and associated documentation files (the * 14908 @@ -27,12 +27,13 @@ 14909 ****************************************************************************/ 14910 14911 /**************************************************************************** 14912 - * Author: Thomas E. Dickey, 2003 * 14913 + * Author: Thomas E. Dickey 2003 * 14914 + * and: Juergen Pfeifer 2009 * 14915 ****************************************************************************/ 14937 @@ -32,7 +32,7 @@ 14916 14938 14917 14939 #include <curses.priv.h> 14918 14940 14919 14941 -MODULE_ID("$Id: key_defined.c,v 1.6 2006/12/30 23:22:55 tom Exp $") 14920 +MODULE_ID("$Id: key_defined.c,v 1. 7 2009/02/15 00:30:00tom Exp $")14942 +MODULE_ID("$Id: key_defined.c,v 1.8 2009/02/21 16:24:26 tom Exp $") 14921 14943 14922 14944 static int 14923 14945 find_definition(TRIES * tree, const char *str) 14924 @@ -65,14 +6 6,22 @@14946 @@ -65,14 +65,22 @@ 14925 14947 * Otherwise, return the keycode's value (neither OK/ERR). 14926 14948 */ … … 14931 14953 int code = ERR; 14932 14954 14933 14955 - T((T_CALLED("key_defined(%s)"), _nc_visbuf(str))); 14934 14956 - if (SP != 0 && str != 0) { 14935 14957 - code = find_definition(SP->_keytry, str); 14958 + T((T_CALLED("key_defined(%p, %s)"), SP_PARM, _nc_visbuf(str))); 14936 14959 + if (SP_PARM != 0 && str != 0) { 14937 14960 + code = find_definition(SP_PARM->_keytry, str); … … 14950 14973 diff -Naur ncurses-5.7.orig/ncurses/base/keyok.c ncurses-5.7/ncurses/base/keyok.c 14951 14974 --- ncurses-5.7.orig/ncurses/base/keyok.c 2006-12-30 08:22:33.000000000 -0800 14952 +++ ncurses-5.7/ncurses/base/keyok.c 2009-02- 15 23:21:24.620481072-080014975 +++ ncurses-5.7/ncurses/base/keyok.c 2009-02-22 21:40:17.906529403 -0800 14953 14976 @@ -1,5 +1,5 @@ 14954 14977 /**************************************************************************** … … 15022 15045 diff -Naur ncurses-5.7.orig/ncurses/base/legacy_coding.c ncurses-5.7/ncurses/base/legacy_coding.c 15023 15046 --- ncurses-5.7.orig/ncurses/base/legacy_coding.c 2005-12-17 15:38:17.000000000 -0800 15024 +++ ncurses-5.7/ncurses/base/legacy_coding.c 2009-02- 15 23:21:24.620481072-080015047 +++ ncurses-5.7/ncurses/base/legacy_coding.c 2009-02-22 21:40:19.478632211 -0800 15025 15048 @@ -1,5 +1,5 @@ 15026 15049 /**************************************************************************** … … 15042 15065 15043 15066 -MODULE_ID("$Id: legacy_coding.c,v 1.2 2005/12/17 23:38:17 tom Exp $") 15044 +MODULE_ID("$Id: legacy_coding.c,v 1. 3 2009/02/14 21:46:14tom Exp $")15067 +MODULE_ID("$Id: legacy_coding.c,v 1.4 2009/02/21 16:16:38 tom Exp $") 15045 15068 15046 15069 NCURSES_EXPORT(int) … … 15050 15073 int result = ERR; 15051 15074 15052 15075 - T((T_CALLED("use_legacy_coding(%d)"), level)); 15053 15076 - if (level >= 0 && level <= 2 && SP != 0) { 15054 15077 - result = SP->_legacy_coding; 15055 15078 - SP->_legacy_coding = level; 15079 + T((T_CALLED("use_legacy_coding(%p,%d)"), SP_PARM, level)); 15056 15080 + if (level >= 0 && level <= 2 && SP_PARM != 0) { 15057 15081 + result = SP_PARM->_legacy_coding; … … 15070 15094 diff -Naur ncurses-5.7.orig/ncurses/base/lib_addch.c ncurses-5.7/ncurses/base/lib_addch.c 15071 15095 --- ncurses-5.7.orig/ncurses/base/lib_addch.c 2008-08-16 12:20:04.000000000 -0700 15072 +++ ncurses-5.7/ncurses/base/lib_addch.c 2009-02- 15 23:21:15.875920379-080015096 +++ ncurses-5.7/ncurses/base/lib_addch.c 2009-02-22 21:40:13.074219583 -0800 15073 15097 @@ -1,5 +1,5 @@ 15074 15098 /**************************************************************************** … … 15127 15151 diff -Naur ncurses-5.7.orig/ncurses/base/lib_beep.c ncurses-5.7/ncurses/base/lib_beep.c 15128 15152 --- ncurses-5.7.orig/ncurses/base/lib_beep.c 2005-04-09 08:20:04.000000000 -0700 15129 +++ ncurses-5.7/ncurses/base/lib_beep.c 2009-02- 15 23:21:24.620481072-080015153 +++ ncurses-5.7/ncurses/base/lib_beep.c 2009-02-22 21:40:17.906529403 -0800 15130 15154 @@ -1,5 +1,5 @@ 15131 15155 /**************************************************************************** … … 15175 15199 diff -Naur ncurses-5.7.orig/ncurses/base/lib_color.c ncurses-5.7/ncurses/base/lib_color.c 15176 15200 --- ncurses-5.7.orig/ncurses/base/lib_color.c 2007-04-07 10:07:28.000000000 -0700 15177 +++ ncurses-5.7/ncurses/base/lib_color.c 2009-02- 15 23:21:24.620481072-080015201 +++ ncurses-5.7/ncurses/base/lib_color.c 2009-02-22 21:40:17.906529403 -0800 15178 15202 @@ -1,5 +1,5 @@ 15179 15203 /**************************************************************************** … … 15588 15612 diff -Naur ncurses-5.7.orig/ncurses/base/lib_colorset.c ncurses-5.7/ncurses/base/lib_colorset.c 15589 15613 --- ncurses-5.7.orig/ncurses/base/lib_colorset.c 2005-01-29 13:40:51.000000000 -0800 15590 +++ ncurses-5.7/ncurses/base/lib_colorset.c 2009-02- 15 23:21:17.376018158-080015614 +++ ncurses-5.7/ncurses/base/lib_colorset.c 2009-02-22 21:40:14.670322949 -0800 15591 15615 @@ -1,5 +1,5 @@ 15592 15616 /**************************************************************************** … … 15636 15660 diff -Naur ncurses-5.7.orig/ncurses/base/lib_dft_fgbg.c ncurses-5.7/ncurses/base/lib_dft_fgbg.c 15637 15661 --- ncurses-5.7.orig/ncurses/base/lib_dft_fgbg.c 2005-11-26 12:03:38.000000000 -0800 15638 +++ ncurses-5.7/ncurses/base/lib_dft_fgbg.c 2009-02- 15 23:21:24.620481072-080015662 +++ ncurses-5.7/ncurses/base/lib_dft_fgbg.c 2009-02-22 21:40:17.906529403 -0800 15639 15663 @@ -1,5 +1,5 @@ 15640 15664 /**************************************************************************** … … 15724 15748 diff -Naur ncurses-5.7.orig/ncurses/base/lib_echo.c ncurses-5.7/ncurses/base/lib_echo.c 15725 15749 --- ncurses-5.7.orig/ncurses/base/lib_echo.c 2000-12-09 18:43:27.000000000 -0800 15726 +++ ncurses-5.7/ncurses/base/lib_echo.c 2009-02-15 23:21:24.620481072 -0800 15750 +++ ncurses-5.7/ncurses/base/lib_echo.c 2009-02-22 21:40:19.478632211 -0800 15751 @@ -1,5 +1,5 @@ 15752 /**************************************************************************** 15753 - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * 15754 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 15755 * * 15756 * Permission is hereby granted, free of charge, to any person obtaining a * 15757 * copy of this software and associated documentation files (the * 15758 @@ -29,6 +29,8 @@ 15759 /**************************************************************************** 15760 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 15761 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 15762 + * and: Thomas E. Dickey 1996-on * 15763 + * and: Juergen Pfeifer 2009 * 15764 ****************************************************************************/ 15765 15766 /* 15767 @@ -42,20 +44,40 @@ 15768 15769 #include <curses.priv.h> 15770 15771 -MODULE_ID("$Id: lib_echo.c,v 1.5 2000/12/10 02:43:27 tom Exp $") 15772 +MODULE_ID("$Id: lib_echo.c,v 1.7 2009/02/21 20:20:40 tom Exp $") 15773 15774 NCURSES_EXPORT(int) 15775 +NCURSES_SP_NAME(echo) (NCURSES_SP_DCL0) 15776 +{ 15777 + T((T_CALLED("echo(%p)"), SP_PARM)); 15778 + if (0 == SP_PARM) 15779 + returnCode(ERR); 15780 + SP_PARM->_echo = TRUE; 15781 + returnCode(OK); 15782 +} 15783 + 15784 +#if NCURSES_SP_FUNCS 15785 +NCURSES_EXPORT(int) 15786 echo(void) 15787 { 15788 - T((T_CALLED("echo()"))); 15789 - SP->_echo = TRUE; 15790 + return NCURSES_SP_NAME(echo) (CURRENT_SCREEN); 15791 +} 15792 +#endif 15793 + 15794 +NCURSES_EXPORT(int) 15795 +NCURSES_SP_NAME(noecho) (NCURSES_SP_DCL0) 15796 +{ 15797 + T((T_CALLED("noecho(%p)"), SP_PARM)); 15798 + if (0 == SP_PARM) 15799 + returnCode(ERR); 15800 + SP_PARM->_echo = FALSE; 15801 returnCode(OK); 15802 } 15803 15804 +#if NCURSES_SP_FUNCS 15805 NCURSES_EXPORT(int) 15806 noecho(void) 15807 { 15808 - T((T_CALLED("noecho()"))); 15809 - SP->_echo = FALSE; 15810 - returnCode(OK); 15811 + return NCURSES_SP_NAME(noecho) (CURRENT_SCREEN); 15812 } 15813 +#endif 15814 diff -Naur ncurses-5.7.orig/ncurses/base/lib_endwin.c ncurses-5.7/ncurses/base/lib_endwin.c 15815 --- ncurses-5.7.orig/ncurses/base/lib_endwin.c 2000-12-09 18:43:27.000000000 -0800 15816 +++ ncurses-5.7/ncurses/base/lib_endwin.c 2009-02-22 21:40:17.910529962 -0800 15727 15817 @@ -1,5 +1,5 @@ 15728 15818 /**************************************************************************** … … 15741 15831 15742 15832 /* 15743 @@ -42,20 +44,36 @@ 15744 15833 @@ -41,16 +43,16 @@ 15745 15834 #include <curses.priv.h> 15746 15747 -MODULE_ID("$Id: lib_echo.c,v 1.5 2000/12/10 02:43:27 tom Exp $") 15748 +MODULE_ID("$Id: lib_echo.c,v 1.6 2009/02/15 00:34:19 tom Exp $") 15835 #include <term.h> 15836 15837 -MODULE_ID("$Id: lib_endwin.c,v 1.19 2000/12/10 02:43:27 tom Exp $") 15838 +MODULE_ID("$Id: lib_endwin.c,v 1.20 2009/02/15 00:35:00 tom Exp $") 15749 15839 15750 15840 NCURSES_EXPORT(int) 15751 -e cho(void)15752 +NCURSES_SP_NAME(e cho) (NCURSES_SP_DCL0)15841 -endwin(void) 15842 +NCURSES_SP_NAME(endwin) (NCURSES_SP_DCL0) 15753 15843 { 15754 T((T_CALLED("echo()"))); 15755 - SP->_echo = TRUE; 15756 + SP_PARM->_echo = TRUE; 15757 returnCode(OK); 15758 } 15759 15844 T((T_CALLED("endwin()"))); 15845 15846 - if (SP) { 15847 - SP->_endwin = TRUE; 15848 - SP->_mouse_wrap(SP); 15849 + if (SP_PARM) { 15850 + SP_PARM->_endwin = TRUE; 15851 + SP_PARM->_mouse_wrap(SP_PARM); 15852 _nc_screen_wrap(); 15853 _nc_mvcur_wrap(); /* wrap up cursor addressing */ 15854 returnCode(reset_shell_mode()); 15855 @@ -58,3 +60,11 @@ 15856 15857 returnCode(ERR); 15858 } 15859 + 15760 15860 +#if NCURSES_SP_FUNCS 15761 NCURSES_EXPORT(int) 15762 -noecho(void) 15763 +echo(void) 15861 +NCURSES_EXPORT(int) 15862 +endwin(void) 15764 15863 +{ 15765 + return NCURSES_SP_NAME(e cho) (CURRENT_SCREEN);15864 + return NCURSES_SP_NAME(endwin) (CURRENT_SCREEN); 15766 15865 +} 15767 15866 +#endif 15768 + 15769 +NCURSES_EXPORT(int) 15770 +NCURSES_SP_NAME(noecho) (NCURSES_SP_DCL0) 15771 { 15772 T((T_CALLED("noecho()"))); 15773 - SP->_echo = FALSE; 15774 + SP_PARM->_echo = FALSE; 15775 returnCode(OK); 15776 } 15777 + 15778 +#if NCURSES_SP_FUNCS 15779 +NCURSES_EXPORT(int) 15780 +noecho(void) 15781 +{ 15782 + return NCURSES_SP_NAME(noecho) (CURRENT_SCREEN); 15783 +} 15784 +#endif 15785 diff -Naur ncurses-5.7.orig/ncurses/base/lib_endwin.c ncurses-5.7/ncurses/base/lib_endwin.c 15786 --- ncurses-5.7.orig/ncurses/base/lib_endwin.c 2000-12-09 18:43:27.000000000 -0800 15787 +++ ncurses-5.7/ncurses/base/lib_endwin.c 2009-02-15 23:21:24.620481072 -0800 15867 diff -Naur ncurses-5.7.orig/ncurses/base/lib_flash.c ncurses-5.7/ncurses/base/lib_flash.c 15868 --- ncurses-5.7.orig/ncurses/base/lib_flash.c 2000-12-09 18:43:27.000000000 -0800 15869 +++ ncurses-5.7/ncurses/base/lib_flash.c 2009-02-22 21:40:17.910529962 -0800 15788 15870 @@ -1,5 +1,5 @@ 15789 15871 /**************************************************************************** … … 15802 15884 15803 15885 /* 15804 @@ -41,16 +43,16 @@15805 #include <curses.priv.h>15806 #include <term.h>15807 15808 -MODULE_ID("$Id: lib_endwin.c,v 1.19 2000/12/10 02:43:27 tom Exp $")15809 +MODULE_ID("$Id: lib_endwin.c,v 1.20 2009/02/15 00:35:00 tom Exp $")15810 15811 NCURSES_EXPORT(int)15812 -endwin(void)15813 +NCURSES_SP_NAME(endwin) (NCURSES_SP_DCL0)15814 {15815 T((T_CALLED("endwin()")));15816 15817 - if (SP) {15818 - SP->_endwin = TRUE;15819 - SP->_mouse_wrap(SP);15820 + if (SP_PARM) {15821 + SP_PARM->_endwin = TRUE;15822 + SP_PARM->_mouse_wrap(SP_PARM);15823 _nc_screen_wrap();15824 _nc_mvcur_wrap(); /* wrap up cursor addressing */15825 returnCode(reset_shell_mode());15826 @@ -58,3 +60,11 @@15827 15828 returnCode(ERR);15829 }15830 +15831 +#if NCURSES_SP_FUNCS15832 +NCURSES_EXPORT(int)15833 +endwin(void)15834 +{15835 + return NCURSES_SP_NAME(endwin) (CURRENT_SCREEN);15836 +}15837 +#endif15838 diff -Naur ncurses-5.7.orig/ncurses/base/lib_flash.c ncurses-5.7/ncurses/base/lib_flash.c15839 --- ncurses-5.7.orig/ncurses/base/lib_flash.c 2000-12-09 18:43:27.000000000 -080015840 +++ ncurses-5.7/ncurses/base/lib_flash.c 2009-02-15 23:21:24.624480793 -080015841 @@ -1,5 +1,5 @@15842 /****************************************************************************15843 - * Copyright (c) 1998,2000 Free Software Foundation, Inc. *15844 + * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc. *15845 * *15846 * Permission is hereby granted, free of charge, to any person obtaining a *15847 * copy of this software and associated documentation files (the *15848 @@ -29,6 +29,8 @@15849 /****************************************************************************15850 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 *15851 * and: Eric S. Raymond <esr@snark.thyrsus.com> *15852 + * and: Thomas E. Dickey 1996-on *15853 + * and: Juergen Pfeifer 2009 *15854 ****************************************************************************/15855 15856 /*15857 15886 @@ -41,7 +43,7 @@ 15858 15887 #include <curses.priv.h> … … 15887 15916 diff -Naur ncurses-5.7.orig/ncurses/base/lib_freeall.c ncurses-5.7/ncurses/base/lib_freeall.c 15888 15917 --- ncurses-5.7.orig/ncurses/base/lib_freeall.c 2008-09-27 06:09:57.000000000 -0700 15889 +++ ncurses-5.7/ncurses/base/lib_freeall.c 2009-02- 15 23:21:03.083101270-080015918 +++ ncurses-5.7/ncurses/base/lib_freeall.c 2009-02-22 21:39:55.861116636 -0800 15890 15919 @@ -40,7 +40,7 @@ 15891 15920 extern int malloc_errfd; /* FIXME */ … … 15908 15937 diff -Naur ncurses-5.7.orig/ncurses/base/lib_getch.c ncurses-5.7/ncurses/base/lib_getch.c 15909 15938 --- ncurses-5.7.orig/ncurses/base/lib_getch.c 2008-09-20 12:46:13.000000000 -0700 15910 +++ ncurses-5.7/ncurses/base/lib_getch.c 2009-02- 15 23:21:24.624480793-080015939 +++ ncurses-5.7/ncurses/base/lib_getch.c 2009-02-22 21:40:17.910529962 -0800 15911 15940 @@ -1,5 +1,5 @@ 15912 15941 /**************************************************************************** … … 15977 16006 diff -Naur ncurses-5.7.orig/ncurses/base/lib_isendwin.c ncurses-5.7/ncurses/base/lib_isendwin.c 15978 16007 --- ncurses-5.7.orig/ncurses/base/lib_isendwin.c 2000-12-09 18:43:27.000000000 -0800 15979 +++ ncurses-5.7/ncurses/base/lib_isendwin.c 2009-02- 15 23:21:24.624480793-080016008 +++ ncurses-5.7/ncurses/base/lib_isendwin.c 2009-02-22 21:40:17.910529962 -0800 15980 16009 @@ -1,5 +1,5 @@ 15981 16010 /**************************************************************************** … … 16021 16050 diff -Naur ncurses-5.7.orig/ncurses/base/lib_mouse.c ncurses-5.7/ncurses/base/lib_mouse.c 16022 16051 --- ncurses-5.7.orig/ncurses/base/lib_mouse.c 2008-10-18 14:48:55.000000000 -0700 16023 +++ ncurses-5.7/ncurses/base/lib_mouse.c 2009-02- 15 23:21:03.083101270-080016052 +++ ncurses-5.7/ncurses/base/lib_mouse.c 2009-02-22 21:39:55.861116636 -0800 16024 16053 @@ -79,7 +79,7 @@ 16025 16054 … … 16080 16109 diff -Naur ncurses-5.7.orig/ncurses/base/lib_newterm.c ncurses-5.7/ncurses/base/lib_newterm.c 16081 16110 --- ncurses-5.7.orig/ncurses/base/lib_newterm.c 2008-08-16 14:20:48.000000000 -0700 16082 +++ ncurses-5.7/ncurses/base/lib_newterm.c 2009-02- 15 23:21:24.624480793-080016111 +++ ncurses-5.7/ncurses/base/lib_newterm.c 2009-02-22 21:40:17.910529962 -0800 16083 16112 @@ -1,5 +1,5 @@ 16084 16113 /**************************************************************************** … … 16191 16220 diff -Naur ncurses-5.7.orig/ncurses/base/lib_newwin.c ncurses-5.7/ncurses/base/lib_newwin.c 16192 16221 --- ncurses-5.7.orig/ncurses/base/lib_newwin.c 2008-06-07 06:58:09.000000000 -0700 16193 +++ ncurses-5.7/ncurses/base/lib_newwin.c 2009-02- 15 23:21:24.624480793-080016222 +++ ncurses-5.7/ncurses/base/lib_newwin.c 2009-02-22 21:40:17.910529962 -0800 16194 16223 @@ -1,5 +1,5 @@ 16195 16224 /**************************************************************************** … … 16253 16282 diff -Naur ncurses-5.7.orig/ncurses/base/lib_nl.c ncurses-5.7/ncurses/base/lib_nl.c 16254 16283 --- ncurses-5.7.orig/ncurses/base/lib_nl.c 2000-12-09 18:43:27.000000000 -0800 16255 +++ ncurses-5.7/ncurses/base/lib_nl.c 2009-02- 15 23:21:24.624480793-080016284 +++ ncurses-5.7/ncurses/base/lib_nl.c 2009-02-22 21:40:19.478632211 -0800 16256 16285 @@ -1,5 +1,5 @@ 16257 16286 /**************************************************************************** 16258 16287 - * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. * 16259 + * Copyright (c) 1998-200 0,2009 Free Software Foundation, Inc. *16288 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 16260 16289 * * 16261 16290 * Permission is hereby granted, free of charge, to any person obtaining a * … … 16270 16299 16271 16300 /* 16272 @@ -42, 18 +44,18@@16301 @@ -42,38 +44,52 @@ 16273 16302 16274 16303 #include <curses.priv.h> 16275 16304 16276 16305 -MODULE_ID("$Id: lib_nl.c,v 1.8 2000/12/10 02:43:27 tom Exp $") 16277 +MODULE_ID("$Id: lib_nl.c,v 1. 9 2009/02/15 00:38:22tom Exp $")16306 +MODULE_ID("$Id: lib_nl.c,v 1.10 2009/02/21 20:58:21 tom Exp $") 16278 16307 16279 16308 #ifdef __EMX__ … … 16285 16314 +NCURSES_SP_NAME(nl) (NCURSES_SP_DCL0) 16286 16315 { 16287 16288 16316 - T((T_CALLED("nl()"))); 16317 - 16289 16318 - SP->_nl = TRUE; 16319 - 16320 + T((T_CALLED("nl(%p)"), SP_PARM)); 16321 + if (0 == SP_PARM) 16322 + returnCode(ERR); 16290 16323 + SP_PARM->_nl = TRUE; 16291 16292 16324 #ifdef __EMX__ 16293 16325 _nc_flush(); 16294 @@ -63,12 +65,20 @@ 16326 _fsetmode(NC_OUTPUT, "t"); 16327 #endif 16328 - 16295 16329 returnCode(OK); 16296 16330 } … … 16300 16334 -nonl(void) 16301 16335 +nl(void) 16302 +{ 16336 { 16337 - T((T_CALLED("nonl()"))); 16338 - 16339 - SP->_nl = FALSE; 16303 16340 + return NCURSES_SP_NAME(nl) (CURRENT_SCREEN); 16304 16341 +} 16305 16342 +#endif 16306 + 16343 16307 16344 +NCURSES_EXPORT(int) 16308 16345 +NCURSES_SP_NAME(nonl) (NCURSES_SP_DCL0) 16309 16310 T((T_CALLED("nonl()")));16311 16312 - SP->_nl = FALSE;16346 +{ 16347 + T((T_CALLED("nonl(%p)"), SP_PARM)); 16348 + if (0 == SP_PARM) 16349 + returnCode(ERR); 16313 16350 + SP_PARM->_nl = FALSE; 16314 16315 16351 #ifdef __EMX__ 16316 16352 _nc_flush(); 16317 @@ -77,3 +87,11 @@ 16318 16353 _fsetmode(NC_OUTPUT, "b"); 16354 #endif 16355 - 16319 16356 returnCode(OK); 16320 16357 } … … 16329 16366 diff -Naur ncurses-5.7.orig/ncurses/base/lib_pad.c ncurses-5.7/ncurses/base/lib_pad.c 16330 16367 --- ncurses-5.7.orig/ncurses/base/lib_pad.c 2006-10-14 13:47:13.000000000 -0700 16331 +++ ncurses-5.7/ncurses/base/lib_pad.c 2009-02- 15 23:21:24.624480793-080016368 +++ ncurses-5.7/ncurses/base/lib_pad.c 2009-02-22 21:40:17.910529962 -0800 16332 16369 @@ -1,5 +1,5 @@ 16333 16370 /**************************************************************************** … … 16376 16413 diff -Naur ncurses-5.7.orig/ncurses/base/lib_screen.c ncurses-5.7/ncurses/base/lib_screen.c 16377 16414 --- ncurses-5.7.orig/ncurses/base/lib_screen.c 2008-08-16 12:05:37.000000000 -0700 16378 +++ ncurses-5.7/ncurses/base/lib_screen.c 2009-02- 15 23:21:24.624480793-080016415 +++ ncurses-5.7/ncurses/base/lib_screen.c 2009-02-22 21:40:17.910529962 -0800 16379 16416 @@ -1,5 +1,5 @@ 16380 16417 /**************************************************************************** … … 16494 16531 diff -Naur ncurses-5.7.orig/ncurses/base/lib_set_term.c ncurses-5.7/ncurses/base/lib_set_term.c 16495 16532 --- ncurses-5.7.orig/ncurses/base/lib_set_term.c 2008-08-04 11:11:12.000000000 -0700 16496 +++ ncurses-5.7/ncurses/base/lib_set_term.c 2009-02- 15 23:21:24.624480793-080016533 +++ ncurses-5.7/ncurses/base/lib_set_term.c 2009-02-22 21:40:17.910529962 -0800 16497 16534 @@ -1,5 +1,5 @@ 16498 16535 /**************************************************************************** … … 16544 16581 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatrof.c ncurses-5.7/ncurses/base/lib_slkatrof.c 16545 16582 --- ncurses-5.7.orig/ncurses/base/lib_slkatrof.c 2005-01-08 15:01:32.000000000 -0800 16546 +++ ncurses-5.7/ncurses/base/lib_slkatrof.c 2009-02- 15 23:21:24.624480793-080016583 +++ ncurses-5.7/ncurses/base/lib_slkatrof.c 2009-02-22 21:40:19.478632211 -0800 16547 16584 @@ -1,5 +1,5 @@ 16548 16585 /**************************************************************************** … … 16557 16594 16558 16595 -MODULE_ID("$Id: lib_slkatrof.c,v 1.8 2005/01/08 23:01:32 tom Exp $") 16559 +MODULE_ID("$Id: lib_slkatrof.c,v 1. 9 2009/02/15 00:33:48 tom Exp $")16596 +MODULE_ID("$Id: lib_slkatrof.c,v 1.10 2009/02/21 17:35:28 tom Exp $") 16560 16597 16561 16598 NCURSES_EXPORT(int) … … 16563 16600 +NCURSES_SP_NAME(slk_attroff) (NCURSES_SP_DCLx const chtype attr) 16564 16601 { 16565 T((T_CALLED("slk_attroff(%s)"), _traceattr(attr))); 16602 - T((T_CALLED("slk_attroff(%s)"), _traceattr(attr))); 16603 + T((T_CALLED("slk_attroff(%p,%s)"), SP_PARM, _traceattr(attr))); 16566 16604 16567 16605 - if (SP != 0 && SP->_slk != 0) { … … 16591 16629 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatron.c ncurses-5.7/ncurses/base/lib_slkatron.c 16592 16630 --- ncurses-5.7.orig/ncurses/base/lib_slkatron.c 2005-01-08 15:02:01.000000000 -0800 16593 +++ ncurses-5.7/ncurses/base/lib_slkatron.c 2009-02- 15 23:21:24.624480793-080016631 +++ ncurses-5.7/ncurses/base/lib_slkatron.c 2009-02-22 21:40:19.478632211 -0800 16594 16632 @@ -1,5 +1,5 @@ 16595 16633 /**************************************************************************** … … 16604 16642 16605 16643 -MODULE_ID("$Id: lib_slkatron.c,v 1.8 2005/01/08 23:02:01 tom Exp $") 16606 +MODULE_ID("$Id: lib_slkatron.c,v 1. 9 2009/02/15 00:33:48tom Exp $")16644 +MODULE_ID("$Id: lib_slkatron.c,v 1.10 2009/02/21 18:16:04 tom Exp $") 16607 16645 16608 16646 NCURSES_EXPORT(int) … … 16610 16648 +NCURSES_SP_NAME(slk_attron) (NCURSES_SP_DCLx const chtype attr) 16611 16649 { 16612 T((T_CALLED("slk_attron(%s)"), _traceattr(attr))); 16650 - T((T_CALLED("slk_attron(%s)"), _traceattr(attr))); 16651 + T((T_CALLED("slk_attron(%p,%s)"), SP_PARM, _traceattr(attr))); 16613 16652 16614 16653 - if (SP != 0 && SP->_slk != 0) { … … 16638 16677 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c ncurses-5.7/ncurses/base/lib_slkatr_set.c 16639 16678 --- ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c 2005-01-28 13:11:53.000000000 -0800 16640 +++ ncurses-5.7/ncurses/base/lib_slkatr_set.c 2009-02- 15 23:21:24.624480793-080016679 +++ ncurses-5.7/ncurses/base/lib_slkatr_set.c 2009-02-22 21:40:19.478632211 -0800 16641 16680 @@ -1,5 +1,5 @@ 16642 16681 /**************************************************************************** … … 16660 16699 16661 16700 -MODULE_ID("$Id: lib_slkatr_set.c,v 1.10 2005/01/28 21:11:53 tom Exp $") 16662 +MODULE_ID("$Id: lib_slkatr_set.c,v 1.1 2 2009/02/15 00:33:48tom Exp $")16701 +MODULE_ID("$Id: lib_slkatr_set.c,v 1.13 2009/02/21 17:20:17 tom Exp $") 16663 16702 16664 16703 NCURSES_EXPORT(int) … … 16669 16708 + void *opts) 16670 16709 { 16710 - T((T_CALLED("slk_attr_set(%s,%d)"), _traceattr(attr), color_pair_number)); 16671 16711 + int code = ERR; 16672 16712 + 16673 T((T_CALLED("slk_attr_set(%s,%d)"), _traceattr(attr), color_pair_number));16713 + T((T_CALLED("slk_attr_set(%p,%s,%d)"), SP_PARM, _traceattr(attr), color_pair_number)); 16674 16714 16675 16715 - if (SP != 0 && SP->_slk != 0 && !opts && … … 16708 16748 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatrset.c ncurses-5.7/ncurses/base/lib_slkatrset.c 16709 16749 --- ncurses-5.7.orig/ncurses/base/lib_slkatrset.c 2005-01-08 13:46:47.000000000 -0800 16710 +++ ncurses-5.7/ncurses/base/lib_slkatrset.c 2009-02- 15 23:21:24.628481072-080016750 +++ ncurses-5.7/ncurses/base/lib_slkatrset.c 2009-02-22 21:40:19.478632211 -0800 16711 16751 @@ -1,5 +1,5 @@ 16712 16752 /**************************************************************************** … … 16721 16761 16722 16762 -MODULE_ID("$Id: lib_slkatrset.c,v 1.7 2005/01/08 21:46:47 tom Exp $") 16723 +MODULE_ID("$Id: lib_slkatrset.c,v 1. 8 2009/02/15 00:33:48tom Exp $")16763 +MODULE_ID("$Id: lib_slkatrset.c,v 1.9 2009/02/21 17:49:07 tom Exp $") 16724 16764 16725 16765 NCURSES_EXPORT(int) … … 16727 16767 +NCURSES_SP_NAME(slk_attrset) (NCURSES_SP_DCLx const chtype attr) 16728 16768 { 16729 T((T_CALLED("slk_attrset(%s)"), _traceattr(attr))); 16769 - T((T_CALLED("slk_attrset(%s)"), _traceattr(attr))); 16770 + T((T_CALLED("slk_attrset(%p,%s)"), SP_PARM, _traceattr(attr))); 16730 16771 16731 16772 - if (SP != 0 && SP->_slk != 0) { … … 16747 16788 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkattr.c ncurses-5.7/ncurses/base/lib_slkattr.c 16748 16789 --- ncurses-5.7.orig/ncurses/base/lib_slkattr.c 2005-01-08 13:44:28.000000000 -0800 16749 +++ ncurses-5.7/ncurses/base/lib_slkattr.c 2009-02- 15 23:21:24.628481072-080016790 +++ ncurses-5.7/ncurses/base/lib_slkattr.c 2009-02-22 21:40:19.478632211 -0800 16750 16791 @@ -1,5 +1,5 @@ 16751 16792 /**************************************************************************** … … 16760 16801 16761 16802 -MODULE_ID("$Id: lib_slkattr.c,v 1.6 2005/01/08 21:44:28 tom Exp $") 16762 +MODULE_ID("$Id: lib_slkattr.c,v 1. 7 2009/02/15 00:33:48tom Exp $")16803 +MODULE_ID("$Id: lib_slkattr.c,v 1.8 2009/02/21 17:48:14 tom Exp $") 16763 16804 16764 16805 NCURSES_EXPORT(attr_t) … … 16766 16807 +NCURSES_SP_NAME(slk_attr) (NCURSES_SP_DCL0) 16767 16808 { 16768 T((T_CALLED("slk_attr()"))); 16809 - T((T_CALLED("slk_attr()"))); 16810 + T((T_CALLED("slk_attr(%p)"), SP_PARM)); 16769 16811 16770 16812 - if (SP != 0 && SP->_slk != 0) { … … 16790 16832 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slk.c ncurses-5.7/ncurses/base/lib_slk.c 16791 16833 --- ncurses-5.7.orig/ncurses/base/lib_slk.c 2008-09-27 07:07:33.000000000 -0700 16792 +++ ncurses-5.7/ncurses/base/lib_slk.c 2009-02- 15 23:21:24.624480793-080016834 +++ ncurses-5.7/ncurses/base/lib_slk.c 2009-02-22 21:40:17.910529962 -0800 16793 16835 @@ -1,5 +1,5 @@ 16794 16836 /**************************************************************************** … … 16836 16878 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkclear.c ncurses-5.7/ncurses/base/lib_slkclear.c 16837 16879 --- ncurses-5.7.orig/ncurses/base/lib_slkclear.c 2007-12-29 09:51:47.000000000 -0800 16838 +++ ncurses-5.7/ncurses/base/lib_slkclear.c 2009-02- 15 23:21:24.628481072-080016880 +++ ncurses-5.7/ncurses/base/lib_slkclear.c 2009-02-22 21:40:19.478632211 -0800 16839 16881 @@ -1,5 +1,5 @@ 16840 16882 /**************************************************************************** … … 16849 16891 16850 16892 -MODULE_ID("$Id: lib_slkclear.c,v 1.10 2007/12/29 17:51:47 tom Exp $") 16851 +MODULE_ID("$Id: lib_slkclear.c,v 1.1 1 2009/02/15 00:33:48tom Exp $")16893 +MODULE_ID("$Id: lib_slkclear.c,v 1.12 2009/02/21 17:47:14 tom Exp $") 16852 16894 16853 16895 NCURSES_EXPORT(int) … … 16857 16899 int rc = ERR; 16858 16900 16859 T((T_CALLED("slk_clear()"))); 16901 - T((T_CALLED("slk_clear()"))); 16902 + T((T_CALLED("slk_clear(%p)"), SP_PARM)); 16860 16903 16861 16904 - if (SP != NULL && SP->_slk != NULL) { 16862 16905 - SP->_slk->hidden = TRUE; 16863 + if (SP_PARM != NULL && SP_PARM->_slk != NULL) {16906 + if (SP_PARM != 0 && SP_PARM->_slk != 0) { 16864 16907 + SP_PARM->_slk->hidden = TRUE; 16865 16908 /* For simulated SLK's it looks much more natural to … … 16868 16911 - WINDOW_ATTRS(SP->_slk->win) = WINDOW_ATTRS(stdscr); 16869 16912 - if (SP->_slk->win == stdscr) { 16870 + SP_PARM->_slk->win->_nc_bkgd = stdscr->_nc_bkgd;16871 + WINDOW_ATTRS(SP_PARM->_slk->win) = WINDOW_ATTRS( stdscr);16872 + if (SP_PARM->_slk->win == stdscr) {16913 + SP_PARM->_slk->win->_nc_bkgd = SP_PARM->_stdscr->_nc_bkgd; 16914 + WINDOW_ATTRS(SP_PARM->_slk->win) = WINDOW_ATTRS(SP_PARM->_stdscr); 16915 + if (SP_PARM->_slk->win == SP_PARM->_stdscr) { 16873 16916 rc = OK; 16874 16917 } else { … … 16891 16934 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkcolor.c ncurses-5.7/ncurses/base/lib_slkcolor.c 16892 16935 --- ncurses-5.7.orig/ncurses/base/lib_slkcolor.c 2005-01-28 13:11:53.000000000 -0800 16893 +++ ncurses-5.7/ncurses/base/lib_slkcolor.c 2009-02- 15 23:21:24.628481072-080016936 +++ ncurses-5.7/ncurses/base/lib_slkcolor.c 2009-02-22 21:40:19.478632211 -0800 16894 16937 @@ -1,5 +1,5 @@ 16895 16938 /**************************************************************************** … … 16899 16942 * Permission is hereby granted, free of charge, to any person obtaining a * 16900 16943 * copy of this software and associated documentation files (the * 16901 @@ -28,7 +28,7 @@ 16944 @@ -27,8 +27,8 @@ 16945 ****************************************************************************/ 16902 16946 16903 16947 /**************************************************************************** 16904 16948 - * Author: Juergen Pfeifer, 1998 * 16905 16949 - * and: Thomas E. Dickey 2005 * 16950 + * Author: Juergen Pfeifer, 1998,2009 * 16906 16951 + * and: Thomas E. Dickey 2005-on * 16907 16952 ****************************************************************************/ … … 16913 16958 16914 16959 -MODULE_ID("$Id: lib_slkcolor.c,v 1.12 2005/01/28 21:11:53 tom Exp $") 16915 +MODULE_ID("$Id: lib_slkcolor.c,v 1.1 4 2009/02/15 00:33:48tom Exp $")16960 +MODULE_ID("$Id: lib_slkcolor.c,v 1.15 2009/02/21 16:59:50 tom Exp $") 16916 16961 16917 16962 NCURSES_EXPORT(int) … … 16919 16964 +NCURSES_SP_NAME(slk_color) (NCURSES_SP_DCLx short color_pair_number) 16920 16965 { 16966 - T((T_CALLED("slk_color(%d)"), color_pair_number)); 16921 16967 + int code = ERR; 16922 16968 + 16923 T((T_CALLED("slk_color(%d)"), color_pair_number)); 16924 16925 - if (SP != 0 && SP->_slk != 0 && 16926 - color_pair_number >= 0 && color_pair_number < COLOR_PAIRS) { 16927 - TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(SP->_slk->attr)))); 16928 - SetPair(SP->_slk->attr, color_pair_number); 16929 - TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr)))); 16930 - returnCode(OK); 16931 - } else 16932 - returnCode(ERR); 16969 + T((T_CALLED("slk_color(%p,%d)"), SP_PARM, color_pair_number)); 16970 + 16933 16971 + if (SP_PARM != 0 16934 16972 + && SP_PARM->_slk != 0 … … 16942 16980 + returnCode(code); 16943 16981 +} 16944 + 16982 16983 - if (SP != 0 && SP->_slk != 0 && 16984 - color_pair_number >= 0 && color_pair_number < COLOR_PAIRS) { 16985 - TR(TRACE_ATTRS, ("... current is %s", _tracech_t(CHREF(SP->_slk->attr)))); 16986 - SetPair(SP->_slk->attr, color_pair_number); 16987 - TR(TRACE_ATTRS, ("new attribute is %s", _tracech_t(CHREF(SP->_slk->attr)))); 16988 - returnCode(OK); 16989 - } else 16990 - returnCode(ERR); 16945 16991 +#if NCURSES_SP_FUNCS 16946 16992 +NCURSES_EXPORT(int) … … 16952 16998 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkinit.c ncurses-5.7/ncurses/base/lib_slkinit.c 16953 16999 --- ncurses-5.7.orig/ncurses/base/lib_slkinit.c 2008-01-12 12:23:39.000000000 -0800 16954 +++ ncurses-5.7/ncurses/base/lib_slkinit.c 2009-02- 15 23:21:24.628481072 -080017000 +++ ncurses-5.7/ncurses/base/lib_slkinit.c 2009-02-22 21:40:17.914529962 -0800 16955 17001 @@ -1,5 +1,5 @@ 16956 17002 /**************************************************************************** … … 16995 17041 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slklab.c ncurses-5.7/ncurses/base/lib_slklab.c 16996 17042 --- ncurses-5.7.orig/ncurses/base/lib_slklab.c 2003-03-29 14:53:48.000000000 -0800 16997 +++ ncurses-5.7/ncurses/base/lib_slklab.c 2009-02- 15 23:21:24.628481072-080017043 +++ ncurses-5.7/ncurses/base/lib_slklab.c 2009-02-22 21:40:19.478632211 -0800 16998 17044 @@ -1,5 +1,5 @@ 16999 17045 /**************************************************************************** … … 17007 17053 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 17008 17054 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 17009 + * and: Thomas E. Dickey 1996-on*17010 + * and: Juergen Pfeifer 2009*17055 + * and: Juergen Pfeifer, 1998,2009 * 17056 + * and: Thomas E. Dickey 1998-on * 17011 17057 ****************************************************************************/ 17012 17058 … … 17017 17063 17018 17064 -MODULE_ID("$Id: lib_slklab.c,v 1.7 2003/03/29 22:53:48 tom Exp $") 17019 +MODULE_ID("$Id: lib_slklab.c,v 1. 8 2009/02/15 00:42:53tom Exp $")17065 +MODULE_ID("$Id: lib_slklab.c,v 1.9 2009/02/21 18:48:42 tom Exp $") 17020 17066 17021 17067 NCURSES_EXPORT(char *) … … 17023 17069 +NCURSES_SP_NAME(slk_label) (NCURSES_SP_DCLx int n) 17024 17070 { 17025 T((T_CALLED("slk_label(%d)"), n)); 17071 - T((T_CALLED("slk_label(%d)"), n)); 17072 + T((T_CALLED("slk_label(%p,%d)"), SP_PARM, n)); 17026 17073 17027 17074 - if (SP == NULL || SP->_slk == NULL || n < 1 || n > SP->_slk->labcnt) 17028 + if (SP_PARM == NULL || SP_PARM->_slk == NULL|| n < 1 || n > SP_PARM->_slk->labcnt)17075 + if (SP_PARM == 0 || SP_PARM->_slk == 0 || n < 1 || n > SP_PARM->_slk->labcnt) 17029 17076 returnPtr(0); 17030 17077 - returnPtr(SP->_slk->ent[n - 1].ent_text); … … 17041 17088 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkrefr.c ncurses-5.7/ncurses/base/lib_slkrefr.c 17042 17089 --- ncurses-5.7.orig/ncurses/base/lib_slkrefr.c 2008-09-27 07:07:53.000000000 -0700 17043 +++ ncurses-5.7/ncurses/base/lib_slkrefr.c 2009-02- 15 23:21:24.628481072 -080017090 +++ ncurses-5.7/ncurses/base/lib_slkrefr.c 2009-02-22 21:40:17.914529962 -0800 17044 17091 @@ -1,5 +1,5 @@ 17045 17092 /**************************************************************************** … … 17119 17166 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkset.c ncurses-5.7/ncurses/base/lib_slkset.c 17120 17167 --- ncurses-5.7.orig/ncurses/base/lib_slkset.c 2007-10-13 13:08:46.000000000 -0700 17121 +++ ncurses-5.7/ncurses/base/lib_slkset.c 2009-02- 15 23:21:24.628481072-080017168 +++ ncurses-5.7/ncurses/base/lib_slkset.c 2009-02-22 21:40:19.478632211 -0800 17122 17169 @@ -1,5 +1,5 @@ 17123 17170 /**************************************************************************** … … 17132 17179 17133 17180 -MODULE_ID("$Id: lib_slkset.c,v 1.17 2007/10/13 20:08:46 tom Exp $") 17134 +MODULE_ID("$Id: lib_slkset.c,v 1.1 8 2009/02/15 00:33:48tom Exp $")17181 +MODULE_ID("$Id: lib_slkset.c,v 1.19 2009/02/21 17:34:06 tom Exp $") 17135 17182 17136 17183 NCURSES_EXPORT(int) … … 17140 17187 SLK *slk; 17141 17188 int offset; 17142 @@ -59,8 +59,8 @@ 17143 17144 T((T_CALLED("slk_set(%d, \"%s\", %d)"), i, str, format)); 17189 @@ -57,20 +57,20 @@ 17190 const char *str = astr; 17191 const char *p; 17192 17193 - T((T_CALLED("slk_set(%d, \"%s\", %d)"), i, str, format)); 17194 + T((T_CALLED("slk_set(%p, %d, \"%s\", %d)"), SP_PARM, i, str, format)); 17145 17195 17146 17196 - if (SP == 0 … … 17151 17201 || i > slk->labcnt 17152 17202 || format < 0 17153 @@ -70,7 +70,7 @@ 17203 || format > 2) 17204 returnCode(ERR); 17205 - if (str == NULL) 17206 + if (str == 0) 17154 17207 str = ""; 17155 17208 --i; /* Adjust numbering of labels */ … … 17174 17227 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slktouch.c ncurses-5.7/ncurses/base/lib_slktouch.c 17175 17228 --- ncurses-5.7.orig/ncurses/base/lib_slktouch.c 2000-12-09 18:43:27.000000000 -0800 17176 +++ ncurses-5.7/ncurses/base/lib_slktouch.c 2009-02- 15 23:21:24.628481072-080017229 +++ ncurses-5.7/ncurses/base/lib_slktouch.c 2009-02-22 21:40:19.478632211 -0800 17177 17230 @@ -1,5 +1,5 @@ 17178 17231 /**************************************************************************** … … 17198 17251 17199 17252 -MODULE_ID("$Id: lib_slktouch.c,v 1.5 2000/12/10 02:43:27 tom Exp $") 17200 +MODULE_ID("$Id: lib_slktouch.c,v 1. 6 2009/02/15 00:44:36tom Exp $")17253 +MODULE_ID("$Id: lib_slktouch.c,v 1.7 2009/02/21 17:42:59 tom Exp $") 17201 17254 17202 17255 NCURSES_EXPORT(int) … … 17204 17257 +NCURSES_SP_NAME(slk_touch) (NCURSES_SP_DCL0) 17205 17258 { 17206 T((T_CALLED("slk_touch()"))); 17259 - T((T_CALLED("slk_touch()"))); 17260 + T((T_CALLED("slk_touch(%p)"), SP_PARM)); 17207 17261 17208 17262 - if (SP == NULL || SP->_slk == NULL) 17209 + if (SP_PARM == NULL || SP_PARM->_slk == NULL)17263 + if (SP_PARM == 0 || SP_PARM->_slk == 0) 17210 17264 returnCode(ERR); 17211 17265 - SP->_slk->dirty = TRUE; … … 17224 17278 diff -Naur ncurses-5.7.orig/ncurses/base/lib_ungetch.c ncurses-5.7/ncurses/base/lib_ungetch.c 17225 17279 --- ncurses-5.7.orig/ncurses/base/lib_ungetch.c 2008-05-31 09:44:54.000000000 -0700 17226 +++ ncurses-5.7/ncurses/base/lib_ungetch.c 2009-02- 15 23:21:24.628481072 -080017280 +++ ncurses-5.7/ncurses/base/lib_ungetch.c 2009-02-22 21:40:17.914529962 -0800 17227 17281 @@ -1,5 +1,5 @@ 17228 17282 /**************************************************************************** … … 17268 17322 } 17269 17323 +#endif 17324 diff -Naur ncurses-5.7.orig/ncurses/base/lib_winch.c ncurses-5.7/ncurses/base/lib_winch.c 17325 --- ncurses-5.7.orig/ncurses/base/lib_winch.c 2001-06-02 16:42:08.000000000 -0700 17326 +++ ncurses-5.7/ncurses/base/lib_winch.c 2009-02-22 21:40:19.478632211 -0800 17327 @@ -39,16 +39,16 @@ 17328 17329 #include <curses.priv.h> 17330 17331 -MODULE_ID("$Id: lib_winch.c,v 1.5 2001/06/02 23:42:08 skimo Exp $") 17332 +MODULE_ID("$Id: lib_winch.c,v 1.6 2008/11/16 00:19:59 juergen Exp $") 17333 17334 NCURSES_EXPORT(chtype) 17335 winch(WINDOW *win) 17336 { 17337 T((T_CALLED("winch(%p)"), win)); 17338 if (win != 0) { 17339 - returnChar(CharOf(win->_line[win->_cury].text[win->_curx]) | 17340 - AttrOf(win->_line[win->_cury].text[win->_curx])); 17341 + returnChtype(CharOf(win->_line[win->_cury].text[win->_curx]) | 17342 + AttrOf(win->_line[win->_cury].text[win->_curx])); 17343 } else { 17344 - returnChar(0); 17345 + returnChtype(0); 17346 } 17347 } 17270 17348 diff -Naur ncurses-5.7.orig/ncurses/base/MKkeyname.awk ncurses-5.7/ncurses/base/MKkeyname.awk 17271 17349 --- ncurses-5.7.orig/ncurses/base/MKkeyname.awk 2008-07-12 11:40:00.000000000 -0700 17272 +++ ncurses-5.7/ncurses/base/MKkeyname.awk 2009-02- 15 23:21:24.620481072-080017350 +++ ncurses-5.7/ncurses/base/MKkeyname.awk 2009-02-22 21:40:17.906529403 -0800 17273 17351 @@ -1,6 +1,6 @@ 17274 17352 -# $Id: MKkeyname.awk,v 1.40 2008/07/12 18:40:00 tom Exp $ … … 17303 17381 print "void _nc_keyname_leaks(void)" 17304 17382 print "{" 17383 diff -Naur ncurses-5.7.orig/ncurses/base/MKlib_gen.sh ncurses-5.7/ncurses/base/MKlib_gen.sh 17384 --- ncurses-5.7.orig/ncurses/base/MKlib_gen.sh 2008-08-30 12:20:50.000000000 -0700 17385 +++ ncurses-5.7/ncurses/base/MKlib_gen.sh 2009-02-22 21:40:19.478632211 -0800 17386 @@ -2,7 +2,7 @@ 17387 # 17388 # MKlib_gen.sh -- generate sources from curses.h macro definitions 17389 # 17390 -# ($Id: MKlib_gen.sh,v 1.34 2008/08/30 19:20:50 tom Exp $) 17391 +# ($Id: MKlib_gen.sh,v 1.35 2008/11/16 00:19:59 juergen Exp $) 17392 # 17393 ############################################################################## 17394 # Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. # 17395 @@ -199,7 +199,7 @@ 17396 } 17397 second = first + 1; 17398 if ( $first == "chtype" ) { 17399 - returnType = "Char"; 17400 + returnType = "Chtype"; 17401 } else if ( $first == "SCREEN" ) { 17402 returnType = "SP"; 17403 } else if ( $first == "WINDOW" ) { 17404 diff -Naur ncurses-5.7.orig/ncurses/base/tries.c ncurses-5.7/ncurses/base/tries.c 17405 --- ncurses-5.7.orig/ncurses/base/tries.c 2008-08-16 12:22:55.000000000 -0700 17406 +++ ncurses-5.7/ncurses/base/tries.c 2009-02-22 21:40:19.478632211 -0800 17407 @@ -39,7 +39,7 @@ 17408 17409 #include <curses.priv.h> 17410 17411 -MODULE_ID("$Id: tries.c,v 1.27 2008/08/16 19:22:55 tom Exp $") 17412 +MODULE_ID("$Id: tries.c,v 1.28 2008/11/16 00:19:59 juergen Exp $") 17413 17414 /* 17415 * Expand a keycode into the string that it corresponds to, returning null if 17416 @@ -72,7 +72,9 @@ 17417 *((unsigned char *) (result + len)) = 128; 17418 #ifdef TRACE 17419 if (len == 0 && USE_TRACEF(TRACE_MAXIMUM)) { 17420 - _tracef("expand_key %s %s", _nc_tracechar(SP, code), _nc_visbuf(result)); 17421 + _tracef("expand_key %s %s", 17422 + _nc_tracechar(CURRENT_SCREEN, code), 17423 + _nc_visbuf(result)); 17424 _nc_unlock_global(tracef); 17425 } 17426 #endif 17305 17427 diff -Naur ncurses-5.7.orig/ncurses/curses.priv.h ncurses-5.7/ncurses/curses.priv.h 17306 17428 --- ncurses-5.7.orig/ncurses/curses.priv.h 2008-10-04 14:37:45.000000000 -0700 17307 +++ ncurses-5.7/ncurses/curses.priv.h 2009-02- 15 23:21:24.628481072-080017429 +++ ncurses-5.7/ncurses/curses.priv.h 2009-02-22 21:40:19.478632211 -0800 17308 17430 @@ -1,5 +1,5 @@ 17309 17431 /**************************************************************************** … … 17318 17440 /* 17319 17441 - * $Id: curses.priv.h,v 1.394 2008/10/04 21:37:45 tom Exp $ 17320 + * $Id: curses.priv.h,v 1. 399 2009/02/15 01:05:47tom Exp $17442 + * $Id: curses.priv.h,v 1.402 2009/02/21 22:54:34 tom Exp $ 17321 17443 * 17322 17444 * curses.priv.h … … 17370 17492 #include <term_entry.h> 17371 17493 #include <nc_tparm.h> 17494 @@ -289,7 +319,7 @@ 17495 #if NCURSES_NO_PADDING 17496 #define GetNoPadding(sp) ((sp) ? (sp)->_no_padding : _nc_prescreen._no_padding) 17497 #define SetNoPadding(sp) _nc_set_no_padding(sp) 17498 -extern NCURSES_EXPORT(void) _nc_set_no_padding(SCREEN *); 17499 +extern NCURSES_EXPORT(void) _nc_set_no_padding(SCREEN *); 17500 #else 17501 #define GetNoPadding(sp) FALSE 17502 #define SetNoPadding(sp) /*nothing*/ 17372 17503 @@ -404,6 +434,8 @@ 17373 17504 #define C_SHIFT 9 /* we need more bits than there are colors */ … … 17379 17510 17380 17511 #define COLOR_DEFAULT C_MASK 17512 @@ -464,13 +496,13 @@ 17513 } slk_ent; 17514 17515 typedef struct _SLK { 17516 - char dirty; /* all labels have changed */ 17517 - char hidden; /* soft labels are hidden */ 17518 - WINDOW *win; 17519 + bool dirty; /* all labels have changed */ 17520 + bool hidden; /* soft labels are hidden */ 17521 + WINDOW *win; 17522 slk_ent *ent; 17523 - short maxlab; /* number of available labels */ 17524 - short labcnt; /* number of allocated labels */ 17525 - short maxlen; /* length of labels */ 17526 + short maxlab; /* number of available labels */ 17527 + short labcnt; /* number of allocated labels */ 17528 + short maxlen; /* length of labels */ 17529 NCURSES_CH_T attr; /* soft label attribute */ 17530 } SLK; 17531 17381 17532 @@ -703,6 +735,8 @@ 17382 17533 char *_setbuf; /* buffered I/O for output */ 17383 17534 bool _filtered; /* filter() was called */ 17384 17535 bool _buffered; /* setvbuf uses _setbuf data */ 17385 + bool _prescreen; /* is in prescreen phase*/17386 + bool _use_env;/* LINES & COLS from environment? */17536 + bool _prescreen; /* is in prescreen phase */ 17537 + bool _use_env; /* LINES & COLS from environment? */ 17387 17538 int _checkfd; /* filedesc for typeahead check */ 17388 17539 TERMINAL *_term; /* terminal type information */ … … 17402 17553 chtype _ok_attributes; /* valid attributes for terminal */ 17403 17554 chtype _xmc_suppress; /* attributes to suppress if xmc */ 17555 @@ -1263,7 +1299,7 @@ 17556 #define returnBool(code) TRACE_RETURN(code,bool) 17557 #define returnCPtr(code) TRACE_RETURN(code,cptr) 17558 #define returnCVoidPtr(code) TRACE_RETURN(code,cvoid_ptr) 17559 -#define returnChar(code) TRACE_RETURN(code,chtype) 17560 +#define returnChtype(code) TRACE_RETURN(code,chtype) 17561 #define returnCode(code) TRACE_RETURN(code,int) 17562 #define returnPtr(code) TRACE_RETURN(code,ptr) 17563 #define returnSP(code) TRACE_RETURN(code,sp) 17564 @@ -1322,7 +1358,7 @@ 17565 #define returnBool(code) return code 17566 #define returnCPtr(code) return code 17567 #define returnCVoidPtr(code) return code 17568 -#define returnChar(code) return code 17569 +#define returnChtype(code) return code 17570 #define returnCode(code) return code 17571 #define returnPtr(code) return code 17572 #define returnSP(code) return code 17404 17573 @@ -1519,7 +1555,7 @@ 17405 17574 extern NCURSES_EXPORT(void) _nc_screen_wrap (void); … … 17420 17589 * We don't want to use the lines or columns capabilities internally, because 17421 17590 * if the application is running multiple screens under X, it's quite possible 17591 @@ -1715,6 +1753,66 @@ 17592 #define MSG_NO_MEMORY "Out of memory" 17593 #define MSG_NO_INPUTS "Premature EOF" 17594 17595 +/* timed_wait flag definitions */ 17596 +#define TW_NONE 0 17597 +#define TW_INPUT 1 17598 +#define TW_MOUSE 2 17599 +#define TW_ANY (TW_INPUT | TW_MOUSE) 17600 +#define TW_EVENT 4 17601 + 17602 +/* 17603 + * Exported entrypoints beyond the published API 17604 + */ 17605 +extern NCURSES_EXPORT(WINDOW *) _nc_curscr_of(SCREEN*); 17606 +extern NCURSES_EXPORT(WINDOW *) _nc_newscr_of(SCREEN*); 17607 +extern NCURSES_EXPORT(WINDOW *) _nc_stdscr_of(SCREEN*); 17608 +extern NCURSES_EXPORT(int) _nc_outc_wrapper(SCREEN*,int); 17609 + 17610 +extern NCURSES_EXPORT(TERMINAL*) NCURSES_SP_NAME(_nc_set_curterm)(SCREEN*,TERMINAL*); 17611 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_del_curterm)(SCREEN*,TERMINAL*); 17612 + 17613 +#if NCURSES_EXT_FUNCS 17614 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_set_tabsize)(SCREEN*, int); 17615 +#endif 17616 + 17617 +extern NCURSES_EXPORT(chtype) NCURSES_SP_NAME(_nc_acs_char)(SCREEN*,int); 17618 + 17619 +/* 17620 + * We put the safe versions of various calls here as they are not published 17621 + * part of the API up to now 17622 + */ 17623 +extern NCURSES_EXPORT(SCREEN*) _nc_SP(void); 17624 + 17625 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_vidputs)(SCREEN*,chtype,int(*) (SCREEN*, int)); 17626 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_vidattr)(SCREEN *, chtype); 17627 + 17628 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_scr_restore)(SCREEN*, const char*); 17629 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_scr_init)(SCREEN*,const char*); 17630 + 17631 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_restartterm)(SCREEN*,NCURSES_CONST char*,int,int*); 17632 +extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(_nc_is_term_resized)(SCREEN*,int,int); 17633 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_resize_term)(SCREEN*,int,int); 17634 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_resizeterm)(SCREEN*,int,int); 17635 + 17636 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tgetent)(SCREEN*,char*,const char *); 17637 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tputs)(SCREEN*,const char*,int,int(*)(SCREEN*, int)); 17638 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_savetty)(SCREEN*); 17639 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_resetty)(SCREEN*); 17640 + 17641 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_mcprint)(SCREEN*,char*, int); 17642 +extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(_nc_tgetstr)(SCREEN*,NCURSES_CONST char*,char**); 17643 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tgetflag)(SCREEN*,NCURSES_CONST char*); 17644 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tgetnum)(SCREEN*,NCURSES_CONST char*); 17645 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tigetflag)(SCREEN*,NCURSES_CONST char*); 17646 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tigetnum)(SCREEN*,NCURSES_CONST char*); 17647 +extern NCURSES_EXPORT(char *) NCURSES_SP_NAME(_nc_tigetstr)(SCREEN*, NCURSES_CONST char*); 17648 +extern NCURSES_EXPORT(void) _nc_cookie_init(SCREEN *sp); 17649 +extern NCURSES_EXPORT(int) _nc_tinfo_doupdate(SCREEN *sp); 17650 +extern NCURSES_EXPORT(int) _nc_tinfo_mcprint(SCREEN*,char*,int); 17651 +#if USE_WIDEC_SUPPORT 17652 +extern NCURSES_EXPORT(wchar_t *) NCURSES_SP_NAME(_nc_wunctrl)(SCREEN*, cchar_t *); 17653 +#endif 17654 + 17655 #ifdef __cplusplus 17656 } 17657 #endif 17422 17658 diff -Naur ncurses-5.7.orig/ncurses/Makefile.in ncurses-5.7/ncurses/Makefile.in 17423 17659 --- ncurses-5.7.orig/ncurses/Makefile.in 2008-10-18 07:11:54.000000000 -0700 17424 +++ ncurses-5.7/ncurses/Makefile.in 2009-02- 15 23:21:09.919538762-080017660 +++ ncurses-5.7/ncurses/Makefile.in 2009-02-22 21:40:02.905568096 -0800 17425 17661 @@ -1,6 +1,6 @@ 17426 17662 -# $Id: Makefile.in,v 1.113 2008/10/18 14:11:54 tom Exp $ … … 17443 17679 diff -Naur ncurses-5.7.orig/ncurses/tinfo/entries.c ncurses-5.7/ncurses/tinfo/entries.c 17444 17680 --- ncurses-5.7.orig/ncurses/tinfo/entries.c 2008-09-27 06:11:10.000000000 -0700 17445 +++ ncurses-5.7/ncurses/tinfo/entries.c 2009-02- 15 23:21:03.083101270-080017681 +++ ncurses-5.7/ncurses/tinfo/entries.c 2009-02-22 21:39:55.861116636 -0800 17446 17682 @@ -37,7 +37,7 @@ 17447 17683 #include <tic.h> … … 17465 17701 diff -Naur ncurses-5.7.orig/ncurses/tinfo/hashed_db.c ncurses-5.7/ncurses/tinfo/hashed_db.c 17466 17702 --- ncurses-5.7.orig/ncurses/tinfo/hashed_db.c 2006-08-19 12:48:38.000000000 -0700 17467 +++ ncurses-5.7/ncurses/tinfo/hashed_db.c 2009-02- 15 23:21:04.663202123-080017703 +++ ncurses-5.7/ncurses/tinfo/hashed_db.c 2009-02-22 21:39:57.593227825 -0800 17468 17704 @@ -1,5 +1,5 @@ 17469 17705 /**************************************************************************** … … 17571 17807 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c ncurses-5.7/ncurses/tinfo/lib_baudrate.c 17572 17808 --- ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c 2008-06-28 08:19:24.000000000 -0700 17573 +++ ncurses-5.7/ncurses/tinfo/lib_baudrate.c 2009-02- 15 23:21:24.628481072-080017809 +++ ncurses-5.7/ncurses/tinfo/lib_baudrate.c 2009-02-22 21:40:17.918530520 -0800 17574 17810 @@ -1,5 +1,5 @@ 17575 17811 /**************************************************************************** … … 17620 17856 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_has_cap.c ncurses-5.7/ncurses/tinfo/lib_has_cap.c 17621 17857 --- ncurses-5.7.orig/ncurses/tinfo/lib_has_cap.c 2003-10-25 12:43:55.000000000 -0700 17622 +++ ncurses-5.7/ncurses/tinfo/lib_has_cap.c 2009-02- 15 23:21:24.632481631-080017858 +++ ncurses-5.7/ncurses/tinfo/lib_has_cap.c 2009-02-22 21:40:17.918530520 -0800 17623 17859 @@ -1,5 +1,5 @@ 17624 17860 /**************************************************************************** … … 17680 17916 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_kernel.c ncurses-5.7/ncurses/tinfo/lib_kernel.c 17681 17917 --- ncurses-5.7.orig/ncurses/tinfo/lib_kernel.c 2004-05-08 10:11:21.000000000 -0700 17682 +++ ncurses-5.7/ncurses/tinfo/lib_kernel.c 2009-02- 15 23:21:24.632481631-080017918 +++ ncurses-5.7/ncurses/tinfo/lib_kernel.c 2009-02-22 21:40:17.918530520 -0800 17683 17919 @@ -1,5 +1,5 @@ 17684 17920 /**************************************************************************** … … 17791 18027 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_longname.c ncurses-5.7/ncurses/tinfo/lib_longname.c 17792 18028 --- ncurses-5.7.orig/ncurses/tinfo/lib_longname.c 2000-12-09 18:55:07.000000000 -0800 17793 +++ ncurses-5.7/ncurses/tinfo/lib_longname.c 2009-02- 15 23:21:24.632481631-080018029 +++ ncurses-5.7/ncurses/tinfo/lib_longname.c 2009-02-22 21:40:17.918530520 -0800 17794 18030 @@ -1,5 +1,5 @@ 17795 18031 /**************************************************************************** … … 17835 18071 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_napms.c ncurses-5.7/ncurses/tinfo/lib_napms.c 17836 18072 --- ncurses-5.7.orig/ncurses/tinfo/lib_napms.c 2008-05-03 14:34:13.000000000 -0700 17837 +++ ncurses-5.7/ncurses/tinfo/lib_napms.c 2009-02- 15 23:21:24.632481631-080018073 +++ ncurses-5.7/ncurses/tinfo/lib_napms.c 2009-02-22 21:40:17.918530520 -0800 17838 18074 @@ -1,5 +1,5 @@ 17839 18075 /**************************************************************************** … … 17879 18115 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_options.c ncurses-5.7/ncurses/tinfo/lib_options.c 17880 18116 --- ncurses-5.7.orig/ncurses/tinfo/lib_options.c 2008-08-16 14:20:48.000000000 -0700 17881 +++ ncurses-5.7/ncurses/tinfo/lib_options.c 2009-02- 15 23:21:24.632481631-080018117 +++ ncurses-5.7/ncurses/tinfo/lib_options.c 2009-02-22 21:40:17.918530520 -0800 17882 18118 @@ -1,5 +1,5 @@ 17883 18119 /**************************************************************************** … … 17965 18201 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_raw.c ncurses-5.7/ncurses/tinfo/lib_raw.c 17966 18202 --- ncurses-5.7.orig/ncurses/tinfo/lib_raw.c 2007-09-29 14:50:22.000000000 -0700 17967 +++ ncurses-5.7/ncurses/tinfo/lib_raw.c 2009-02- 15 23:21:24.632481631-080018203 +++ ncurses-5.7/ncurses/tinfo/lib_raw.c 2009-02-22 21:40:17.918530520 -0800 17968 18204 @@ -1,5 +1,5 @@ 17969 18205 /**************************************************************************** … … 18214 18450 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_setup.c ncurses-5.7/ncurses/tinfo/lib_setup.c 18215 18451 --- ncurses-5.7.orig/ncurses/tinfo/lib_setup.c 2008-08-03 15:42:33.000000000 -0700 18216 +++ ncurses-5.7/ncurses/tinfo/lib_setup.c 2009-02- 15 23:21:24.632481631-080018452 +++ ncurses-5.7/ncurses/tinfo/lib_setup.c 2009-02-22 21:40:17.918530520 -0800 18217 18453 @@ -1,5 +1,5 @@ 18218 18454 /**************************************************************************** … … 18303 18539 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_termname.c ncurses-5.7/ncurses/tinfo/lib_termname.c 18304 18540 --- ncurses-5.7.orig/ncurses/tinfo/lib_termname.c 2003-12-27 10:23:01.000000000 -0800 18305 +++ ncurses-5.7/ncurses/tinfo/lib_termname.c 2009-02- 15 23:21:24.632481631 -080018541 +++ ncurses-5.7/ncurses/tinfo/lib_termname.c 2009-02-22 21:40:19.482631931 -0800 18306 18542 @@ -1,5 +1,5 @@ 18307 18543 /**************************************************************************** … … 18316 18552 18317 18553 -MODULE_ID("$Id: lib_termname.c,v 1.8 2003/12/27 18:23:01 tom Exp $") 18318 +MODULE_ID("$Id: lib_termname.c,v 1.1 0 2009/02/15 01:07:06tom Exp $")18554 +MODULE_ID("$Id: lib_termname.c,v 1.11 2009/02/21 16:37:12 tom Exp $") 18319 18555 18320 18556 NCURSES_EXPORT(char *) … … 18324 18560 char *name = 0; 18325 18561 18326 T((T_CALLED("termname()"))); 18562 - T((T_CALLED("termname()"))); 18563 + T((T_CALLED("termname(%p)"), SP_PARM)); 18327 18564 18328 18565 +#if NCURSES_SP_FUNCS … … 18345 18582 +} 18346 18583 +#endif 18584 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_tparm.c ncurses-5.7/ncurses/tinfo/lib_tparm.c 18585 --- ncurses-5.7.orig/ncurses/tinfo/lib_tparm.c 2008-08-16 12:22:55.000000000 -0700 18586 +++ ncurses-5.7/ncurses/tinfo/lib_tparm.c 2009-02-22 21:40:19.482631931 -0800 18587 @@ -40,10 +40,9 @@ 18588 #include <curses.priv.h> 18589 18590 #include <ctype.h> 18591 -#include <term.h> 18592 #include <tic.h> 18593 18594 -MODULE_ID("$Id: lib_tparm.c,v 1.76 2008/08/16 19:22:55 tom Exp $") 18595 +MODULE_ID("$Id: lib_tparm.c,v 1.77 2008/11/16 00:19:59 juergen Exp $") 18596 18597 /* 18598 * char * 18347 18599 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_tputs.c ncurses-5.7/ncurses/tinfo/lib_tputs.c 18348 18600 --- ncurses-5.7.orig/ncurses/tinfo/lib_tputs.c 2008-06-28 06:12:15.000000000 -0700 18349 +++ ncurses-5.7/ncurses/tinfo/lib_tputs.c 2009-02- 15 23:21:24.632481631-080018601 +++ ncurses-5.7/ncurses/tinfo/lib_tputs.c 2009-02-22 21:40:17.918530520 -0800 18350 18602 @@ -1,5 +1,5 @@ 18351 18603 /**************************************************************************** … … 18398 18650 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_ttyflags.c ncurses-5.7/ncurses/tinfo/lib_ttyflags.c 18399 18651 --- ncurses-5.7.orig/ncurses/tinfo/lib_ttyflags.c 2008-08-03 15:10:44.000000000 -0700 18400 +++ ncurses-5.7/ncurses/tinfo/lib_ttyflags.c 2009-02- 15 23:21:24.632481631-080018652 +++ ncurses-5.7/ncurses/tinfo/lib_ttyflags.c 2009-02-22 21:40:17.918530520 -0800 18401 18653 @@ -1,5 +1,5 @@ 18402 18654 /**************************************************************************** … … 18512 18764 saved_tty(void) 18513 18765 { 18766 diff -Naur ncurses-5.7.orig/ncurses/tinfo/make_keys.c ncurses-5.7/ncurses/tinfo/make_keys.c 18767 --- ncurses-5.7.orig/ncurses/tinfo/make_keys.c 2008-08-03 14:57:22.000000000 -0700 18768 +++ ncurses-5.7/ncurses/tinfo/make_keys.c 2009-02-22 21:40:19.482631931 -0800 18769 @@ -39,16 +39,16 @@ 18770 #define USE_TERMLIB 1 18771 #include <curses.priv.h> 18772 18773 -MODULE_ID("$Id: make_keys.c,v 1.14 2008/08/03 21:57:22 tom Exp $") 18774 +MODULE_ID("$Id: make_keys.c,v 1.15 2008/11/16 00:19:59 juergen Exp $") 18775 18776 #include <names.c> 18777 18778 #define UNKNOWN (SIZEOF(strnames) + SIZEOF(strfnames)) 18779 18780 -static size_t 18781 +static unsigned 18782 lookup(const char *name) 18783 { 18784 - size_t n; 18785 + unsigned n; 18786 bool found = FALSE; 18787 for (n = 0; strnames[n] != 0; n++) { 18788 if (!strcmp(name, strnames[n])) { 18789 @@ -73,7 +73,7 @@ 18790 char buffer[BUFSIZ]; 18791 char from[256]; 18792 char to[256]; 18793 - int maxlen = 16; 18794 + unsigned maxlen = 16; 18795 int scanned; 18796 18797 while (fgets(buffer, sizeof(buffer), ifp) != 0) { 18798 @@ -85,10 +85,10 @@ 18799 18800 scanned = sscanf(buffer, "%255s %255s", to, from); 18801 if (scanned == 2) { 18802 - int code = lookup(from); 18803 + unsigned code = lookup(from); 18804 if (code == UNKNOWN) 18805 continue; 18806 - if ((int) strlen(from) > maxlen) 18807 + if (strlen(from) > maxlen) 18808 maxlen = strlen(from); 18809 fprintf(ofp, "\t{ %4d, %-*.*s },\t/* %s */\n", 18810 code, 18811 diff -Naur ncurses-5.7.orig/ncurses/tinfo/MKnames.awk ncurses-5.7/ncurses/tinfo/MKnames.awk 18812 --- ncurses-5.7.orig/ncurses/tinfo/MKnames.awk 2008-10-11 14:07:56.000000000 -0700 18813 +++ ncurses-5.7/ncurses/tinfo/MKnames.awk 2009-02-22 21:40:19.482631931 -0800 18814 @@ -25,7 +25,7 @@ 18815 # use or other dealings in this Software without prior written # 18816 # authorization. # 18817 ############################################################################## 18818 -# $Id: MKnames.awk,v 1.20 2008/10/11 21:07:56 tom Exp $ 18819 +# $Id: MKnames.awk,v 1.21 2008/11/16 00:19:59 juergen Exp $ 18820 function large_item(value) { 18821 result = sprintf("%d,", offset); 18822 offset = offset + length(value) + 1; 18823 @@ -107,8 +107,6 @@ 18824 print "" 18825 print "#if BROKEN_LINKER || USE_REENTRANT" 18826 print "" 18827 - print "#include <term.h>" 18828 - print "" 18829 if (bigstrings) { 18830 printf "static const char _nc_name_blob[] = \n" 18831 printf "%s;\n", bigstr; 18832 diff -Naur ncurses-5.7.orig/ncurses/tinfo/name_match.c ncurses-5.7/ncurses/tinfo/name_match.c 18833 --- ncurses-5.7.orig/ncurses/tinfo/name_match.c 2008-08-03 12:49:33.000000000 -0700 18834 +++ ncurses-5.7/ncurses/tinfo/name_match.c 2009-02-22 21:40:19.482631931 -0800 18835 @@ -31,10 +31,9 @@ 18836 ****************************************************************************/ 18837 18838 #include <curses.priv.h> 18839 -#include <term.h> 18840 #include <tic.h> 18841 18842 -MODULE_ID("$Id: name_match.c,v 1.17 2008/08/03 19:49:33 tom Exp $") 18843 +MODULE_ID("$Id: name_match.c,v 1.18 2008/11/16 00:19:59 juergen Exp $") 18844 18845 /* 18846 * _nc_first_name(char *names) 18847 diff -Naur ncurses-5.7.orig/ncurses/tinfo/use_screen.c ncurses-5.7/ncurses/tinfo/use_screen.c 18848 --- ncurses-5.7.orig/ncurses/tinfo/use_screen.c 2008-06-07 12:16:56.000000000 -0700 18849 +++ ncurses-5.7/ncurses/tinfo/use_screen.c 2009-02-22 21:40:19.482631931 -0800 18850 @@ -32,7 +32,7 @@ 18851 18852 #include <curses.priv.h> 18853 18854 -MODULE_ID("$Id: use_screen.c,v 1.6 2008/06/07 19:16:56 tom Exp $") 18855 +MODULE_ID("$Id: use_screen.c,v 1.7 2008/11/16 00:19:59 juergen Exp $") 18856 18857 NCURSES_EXPORT(int) 18858 use_screen(SCREEN *screen, NCURSES_SCREEN_CB func, void *data) 18859 @@ -47,7 +47,7 @@ 18860 * recurred through this point, return an error if so. 18861 */ 18862 _nc_lock_global(curses); 18863 - save_SP = SP; 18864 + save_SP = CURRENT_SCREEN; 18865 set_term(screen); 18866 18867 code = func(screen, data); 18868 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracebits.c ncurses-5.7/ncurses/trace/lib_tracebits.c 18869 --- ncurses-5.7.orig/ncurses/trace/lib_tracebits.c 2008-08-03 09:09:26.000000000 -0700 18870 +++ ncurses-5.7/ncurses/trace/lib_tracebits.c 2009-02-22 21:40:19.482631931 -0800 18871 @@ -33,9 +33,8 @@ 18872 ****************************************************************************/ 18873 18874 #include <curses.priv.h> 18875 -#include <term.h> /* cur_term */ 18876 18877 -MODULE_ID("$Id: lib_tracebits.c,v 1.17 2008/08/03 16:09:26 tom Exp $") 18878 +MODULE_ID("$Id: lib_tracebits.c,v 1.18 2008/11/16 00:19:59 juergen Exp $") 18879 18880 #if SVR4_TERMIO && !defined(_POSIX_SOURCE) 18881 #define _POSIX_SOURCE 18882 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracemse.c ncurses-5.7/ncurses/trace/lib_tracemse.c 18883 --- ncurses-5.7.orig/ncurses/trace/lib_tracemse.c 2008-08-03 08:39:29.000000000 -0700 18884 +++ ncurses-5.7/ncurses/trace/lib_tracemse.c 2009-02-22 21:40:19.482631931 -0800 18885 @@ -38,7 +38,7 @@ 18886 18887 #include <curses.priv.h> 18888 18889 -MODULE_ID("$Id: lib_tracemse.c,v 1.15 2008/08/03 15:39:29 tom Exp $") 18890 +MODULE_ID("$Id: lib_tracemse.c,v 1.16 2008/11/16 00:19:59 juergen Exp $") 18891 18892 #ifdef TRACE 18893 18894 @@ -117,7 +117,7 @@ 18895 NCURSES_EXPORT(char *) 18896 _tracemouse(MEVENT const *ep) 18897 { 18898 - return _nc_tracemouse(SP, ep); 18899 + return _nc_tracemouse(CURRENT_SCREEN, ep); 18900 } 18901 18902 #else /* !TRACE */ 18903 diff -Naur ncurses-5.7.orig/ncurses/trace/varargs.c ncurses-5.7/ncurses/trace/varargs.c 18904 --- ncurses-5.7.orig/ncurses/trace/varargs.c 2008-08-03 08:42:49.000000000 -0700 18905 +++ ncurses-5.7/ncurses/trace/varargs.c 2009-02-22 21:40:19.482631931 -0800 18906 @@ -34,7 +34,7 @@ 18907 18908 #include <ctype.h> 18909 18910 -MODULE_ID("$Id: varargs.c,v 1.7 2008/08/03 15:42:49 tom Exp $") 18911 +MODULE_ID("$Id: varargs.c,v 1.8 2008/11/16 00:19:59 juergen Exp $") 18912 18913 #ifdef TRACE 18914 18915 @@ -44,7 +44,7 @@ 18916 atUnknown = 0, atInteger, atFloat, atPoint, atString 18917 } ARGTYPE; 18918 18919 -#define VA_INT(type) ival = va_arg(ap, type) 18920 +#define VA_INT(type) ival = (int) va_arg(ap, type) 18921 #define VA_FLT(type) fval = va_arg(ap, type) 18922 #define VA_PTR(type) pval = (char *)va_arg(ap, type) 18923 #define VA_STR(type) sval = va_arg(ap, type) 18514 18924 diff -Naur ncurses-5.7.orig/ncurses/tty/lib_mvcur.c ncurses-5.7/ncurses/tty/lib_mvcur.c 18515 18925 --- ncurses-5.7.orig/ncurses/tty/lib_mvcur.c 2008-08-16 12:30:58.000000000 -0700 18516 +++ ncurses-5.7/ncurses/tty/lib_mvcur.c 2009-02- 15 23:21:24.632481631-080018926 +++ ncurses-5.7/ncurses/tty/lib_mvcur.c 2009-02-22 21:40:17.922530520 -0800 18517 18927 @@ -1,5 +1,5 @@ 18518 18928 /**************************************************************************** … … 18605 19015 diff -Naur ncurses-5.7.orig/ncurses/tty/lib_vidattr.c ncurses-5.7/ncurses/tty/lib_vidattr.c 18606 19016 --- ncurses-5.7.orig/ncurses/tty/lib_vidattr.c 2007-06-30 14:58:04.000000000 -0700 18607 +++ ncurses-5.7/ncurses/tty/lib_vidattr.c 2009-02- 15 23:21:24.636481910-080019017 +++ ncurses-5.7/ncurses/tty/lib_vidattr.c 2009-02-22 21:40:19.482631931 -0800 18608 19018 @@ -1,5 +1,5 @@ 18609 19019 /**************************************************************************** … … 18628 19038 18629 19039 -MODULE_ID("$Id: lib_vidattr.c,v 1.49 2007/06/30 21:58:04 tom Exp $") 18630 +MODULE_ID("$Id: lib_vidattr.c,v 1.5 0 2009/02/15 00:51:03tom Exp $")19040 +MODULE_ID("$Id: lib_vidattr.c,v 1.51 2009/02/21 21:43:40 tom Exp $") 18631 19041 18632 19042 #define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc) … … 18649 19059 attrs |= A_COLOR; 18650 19060 18651 returnChar(attrs); 19061 - returnChar(attrs); 19062 + returnChtype(attrs); 18652 19063 } 18653 19064 + … … 18661 19072 diff -Naur ncurses-5.7.orig/ncurses/tty/tty_update.c ncurses-5.7/ncurses/tty/tty_update.c 18662 19073 --- ncurses-5.7.orig/ncurses/tty/tty_update.c 2008-08-30 13:08:19.000000000 -0700 18663 +++ ncurses-5.7/ncurses/tty/tty_update.c 2009-02- 15 23:21:24.636481910 -080019074 +++ ncurses-5.7/ncurses/tty/tty_update.c 2009-02-22 21:40:17.922530520 -0800 18664 19075 @@ -1,5 +1,5 @@ 18665 19076 /**************************************************************************** … … 18806 19217 SetPair(oldLine[n], GetPair(newLine[n])); 18807 19218 } 19219 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_cchar.c ncurses-5.7/ncurses/widechar/lib_cchar.c 19220 --- ncurses-5.7.orig/ncurses/widechar/lib_cchar.c 2007-05-12 12:03:06.000000000 -0700 19221 +++ ncurses-5.7/ncurses/widechar/lib_cchar.c 2009-02-22 21:40:19.482631931 -0800 19222 @@ -1,5 +1,5 @@ 19223 /**************************************************************************** 19224 - * Copyright (c) 2001-2005,2007 Free Software Foundation, Inc. * 19225 + * Copyright (c) 2001-2007,2008 Free Software Foundation, Inc. * 19226 * * 19227 * Permission is hereby granted, free of charge, to any person obtaining a * 19228 * copy of this software and associated documentation files (the * 19229 @@ -35,7 +35,7 @@ 19230 19231 #include <curses.priv.h> 19232 19233 -MODULE_ID("$Id: lib_cchar.c,v 1.12 2007/05/12 19:03:06 tom Exp $") 19234 +MODULE_ID("$Id: lib_cchar.c,v 1.13 2008/11/16 00:19:59 juergen Exp $") 19235 19236 /* 19237 * The SuSv2 description leaves some room for interpretation. We'll assume wch 19238 @@ -50,8 +50,8 @@ 19239 short color_pair, 19240 const void *opts) 19241 { 19242 - int i; 19243 - int len; 19244 + unsigned i; 19245 + unsigned len; 19246 int code = OK; 19247 19248 TR(TRACE_CCALLS, (T_CALLED("setcchar(%p,%s,%lu,%d,%p)"), 19249 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_get_wstr.c ncurses-5.7/ncurses/widechar/lib_get_wstr.c 19250 --- ncurses-5.7.orig/ncurses/widechar/lib_get_wstr.c 2008-08-16 12:25:33.000000000 -0700 19251 +++ ncurses-5.7/ncurses/widechar/lib_get_wstr.c 2009-02-22 21:40:19.482631931 -0800 19252 @@ -38,9 +38,8 @@ 19253 */ 19254 19255 #include <curses.priv.h> 19256 -#include <term.h> 19257 19258 -MODULE_ID("$Id: lib_get_wstr.c,v 1.10 2008/08/16 19:25:33 tom Exp $") 19259 +MODULE_ID("$Id: lib_get_wstr.c,v 1.11 2008/11/16 00:19:59 juergen Exp $") 19260 19261 static int 19262 wadd_wint(WINDOW *win, wint_t *src) 19263 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_wacs.c ncurses-5.7/ncurses/widechar/lib_wacs.c 19264 --- ncurses-5.7.orig/ncurses/widechar/lib_wacs.c 2006-12-17 07:16:17.000000000 -0800 19265 +++ ncurses-5.7/ncurses/widechar/lib_wacs.c 2009-02-22 21:40:19.482631931 -0800 19266 @@ -31,9 +31,8 @@ 19267 ****************************************************************************/ 19268 19269 #include <curses.priv.h> 19270 -#include <term.h> 19271 19272 -MODULE_ID("$Id: lib_wacs.c,v 1.7 2006/12/17 15:16:17 tom Exp $") 19273 +MODULE_ID("$Id: lib_wacs.c,v 1.8 2008/11/16 00:19:59 juergen Exp $") 19274 19275 NCURSES_EXPORT_VAR(cchar_t) * _nc_wacs = 0; 19276 18808 19277 diff -Naur ncurses-5.7.orig/NEWS ncurses-5.7/NEWS 18809 19278 --- ncurses-5.7.orig/NEWS 2008-11-01 17:56:22.000000000 -0700 18810 +++ ncurses-5.7/NEWS 2009-02- 15 23:21:24.600479396-080019279 +++ ncurses-5.7/NEWS 2009-02-22 21:40:19.474632211 -0800 18811 19280 @@ -1,5 +1,5 @@ 18812 19281 ------------------------------------------------------------------------------- … … 18821 19290 ------------------------------------------------------------------------------- 18822 19291 --- $Id: NEWS,v 1.1320 2008/11/02 00:56:22 tom Exp $ 18823 +-- $Id: NEWS,v 1.136 4 2009/02/15 00:20:00 tom Exp $19292 +-- $Id: NEWS,v 1.1365 2009/02/22 02:05:30 tom Exp $ 18824 19293 ------------------------------------------------------------------------------- 18825 19294 18826 19295 This is a log of changes that ncurses has gone through since Zeyd started 18827 @@ -45,6 +45,15 0@@19296 @@ -45,6 +45,153 @@ 18828 19297 Changes through 1.9.9e did not credit all contributions; 18829 19298 it is not possible to add this information. 18830 19299 19300 +20090221 19301 + + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete). 19302 + 18831 19303 +20090214 18832 19304 + + add configure script --enable-sp-funcs to enable the new set of … … 18978 19450 diff -Naur ncurses-5.7.orig/panel/Makefile.in ncurses-5.7/panel/Makefile.in 18979 19451 --- ncurses-5.7.orig/panel/Makefile.in 2007-04-28 07:56:11.000000000 -0700 18980 +++ ncurses-5.7/panel/Makefile.in 2009-02- 15 23:21:09.919538762-080019452 +++ ncurses-5.7/panel/Makefile.in 2009-02-22 21:40:02.905568096 -0800 18981 19453 @@ -1,6 +1,6 @@ 18982 19454 -# $Id: Makefile.in,v 1.52 2007/04/28 14:56:11 tom Exp $ … … 18999 19471 diff -Naur ncurses-5.7.orig/progs/Makefile.in ncurses-5.7/progs/Makefile.in 19000 19472 --- ncurses-5.7.orig/progs/Makefile.in 2008-09-07 06:58:55.000000000 -0700 19001 +++ ncurses-5.7/progs/Makefile.in 2009-02- 15 23:20:58.766824137-080019473 +++ ncurses-5.7/progs/Makefile.in 2009-02-22 21:39:51.152816873 -0800 19002 19474 @@ -1,6 +1,6 @@ 19003 19475 -# $Id: Makefile.in,v 1.79 2008/09/07 13:58:55 tom Exp $ … … 19065 19537 diff -Naur ncurses-5.7.orig/progs/modules ncurses-5.7/progs/modules 19066 19538 --- ncurses-5.7.orig/progs/modules 2006-12-23 16:53:21.000000000 -0800 19067 +++ ncurses-5.7/progs/modules 2009-02- 15 23:20:58.766824137-080019539 +++ ncurses-5.7/progs/modules 2009-02-22 21:39:51.152816873 -0800 19068 19540 @@ -1,7 +1,7 @@ 19069 19541 -# $Id: modules,v 1.13 2006/12/24 00:53:21 tom Exp $ … … 19086 19558 diff -Naur ncurses-5.7.orig/progs/tabs.c ncurses-5.7/progs/tabs.c 19087 19559 --- ncurses-5.7.orig/progs/tabs.c 1969-12-31 16:00:00.000000000 -0800 19088 +++ ncurses-5.7/progs/tabs.c 2009-02- 15 23:21:00.214919122-080019560 +++ ncurses-5.7/progs/tabs.c 2009-02-22 21:39:52.804923033 -0800 19089 19561 @@ -0,0 +1,506 @@ 19090 19562 +/**************************************************************************** … … 19596 20068 diff -Naur ncurses-5.7.orig/test/clip_printw.c ncurses-5.7/test/clip_printw.c 19597 20069 --- ncurses-5.7.orig/test/clip_printw.c 1969-12-31 16:00:00.000000000 -0800 19598 +++ ncurses-5.7/test/clip_printw.c 2009-02- 15 23:21:06.503320016-080020070 +++ ncurses-5.7/test/clip_printw.c 2009-02-22 21:39:59.253333985 -0800 19599 20071 @@ -0,0 +1,360 @@ 19600 20072 +/**************************************************************************** … … 19960 20432 diff -Naur ncurses-5.7.orig/test/demo_forms.c ncurses-5.7/test/demo_forms.c 19961 20433 --- ncurses-5.7.orig/test/demo_forms.c 2008-10-18 13:38:20.000000000 -0700 19962 +++ ncurses-5.7/test/demo_forms.c 2009-02- 15 23:21:06.503320016-080020434 +++ ncurses-5.7/test/demo_forms.c 2009-02-22 21:39:59.253333985 -0800 19963 20435 @@ -26,7 +26,7 @@ 19964 20436 * authorization. * … … 19995 20467 diff -Naur ncurses-5.7.orig/test/edit_field.c ncurses-5.7/test/edit_field.c 19996 20468 --- ncurses-5.7.orig/test/edit_field.c 2008-10-18 13:40:20.000000000 -0700 19997 +++ ncurses-5.7/test/edit_field.c 2009-02- 15 23:21:06.503320016-080020469 +++ ncurses-5.7/test/edit_field.c 2009-02-22 21:39:59.253333985 -0800 19998 20470 @@ -26,7 +26,7 @@ 19999 20471 * authorization. * … … 20018 20490 diff -Naur ncurses-5.7.orig/test/edit_field.h ncurses-5.7/test/edit_field.h 20019 20491 --- ncurses-5.7.orig/test/edit_field.h 2006-06-03 09:38:57.000000000 -0700 20020 +++ ncurses-5.7/test/edit_field.h 2009-02- 15 23:21:06.507320016-080020492 +++ ncurses-5.7/test/edit_field.h 2009-02-22 21:39:59.253333985 -0800 20021 20493 @@ -1,5 +1,5 @@ 20022 20494 /**************************************************************************** … … 20048 20520 diff -Naur ncurses-5.7.orig/test/filter.c ncurses-5.7/test/filter.c 20049 20521 --- ncurses-5.7.orig/test/filter.c 2006-12-09 08:53:47.000000000 -0800 20050 +++ ncurses-5.7/test/filter.c 2009-02- 15 23:21:03.083101270-080020522 +++ ncurses-5.7/test/filter.c 2009-02-22 21:39:55.861116636 -0800 20051 20523 @@ -1,5 +1,5 @@ 20052 20524 /**************************************************************************** … … 20120 20592 diff -Naur ncurses-5.7.orig/test/insdelln.c ncurses-5.7/test/insdelln.c 20121 20593 --- ncurses-5.7.orig/test/insdelln.c 1969-12-31 16:00:00.000000000 -0800 20122 +++ ncurses-5.7/test/insdelln.c 2009-02- 15 23:21:06.507320016-080020594 +++ ncurses-5.7/test/insdelln.c 2009-02-22 21:39:59.253333985 -0800 20123 20595 @@ -0,0 +1,380 @@ 20124 20596 +/**************************************************************************** … … 20504 20976 diff -Naur ncurses-5.7.orig/test/modules ncurses-5.7/test/modules 20505 20977 --- ncurses-5.7.orig/test/modules 2007-08-18 10:57:08.000000000 -0700 20506 +++ ncurses-5.7/test/modules 2009-02- 15 23:21:06.507320016-080020978 +++ ncurses-5.7/test/modules 2009-02-22 21:39:59.253333985 -0800 20507 20979 @@ -1,4 +1,4 @@ 20508 20980 -# $Id: modules,v 1.36 2007/08/18 17:57:08 tom Exp $ … … 20529 21001 diff -Naur ncurses-5.7.orig/test/ncurses.c ncurses-5.7/test/ncurses.c 20530 21002 --- ncurses-5.7.orig/test/ncurses.c 2008-09-27 07:34:58.000000000 -0700 20531 +++ ncurses-5.7/test/ncurses.c 2009-02- 15 23:21:17.380017041 -080021003 +++ ncurses-5.7/test/ncurses.c 2009-02-22 21:40:14.674322391 -0800 20532 21004 @@ -40,7 +40,7 @@ 20533 21005 Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993 … … 21021 21493 diff -Naur ncurses-5.7.orig/test/programs ncurses-5.7/test/programs 21022 21494 --- ncurses-5.7.orig/test/programs 2008-08-16 14:47:39.000000000 -0700 21023 +++ ncurses-5.7/test/programs 2009-02- 15 23:21:06.507320016-080021495 +++ ncurses-5.7/test/programs 2009-02-22 21:39:59.257334543 -0800 21024 21496 @@ -1,4 +1,4 @@ 21025 21497 -# $Id: programs,v 1.14 2008/08/16 21:47:39 tom Exp $ … … 21046 21518 diff -Naur ncurses-5.7.orig/test/README ncurses-5.7/test/README 21047 21519 --- ncurses-5.7.orig/test/README 2008-10-18 14:02:45.000000000 -0700 21048 +++ ncurses-5.7/test/README 2009-02- 15 23:21:06.503320016-080021520 +++ ncurses-5.7/test/README 2009-02-22 21:39:59.253333985 -0800 21049 21521 @@ -25,7 +25,7 @@ 21050 21522 -- sale, use or other dealings in this Software without prior written -- … … 21342 21814 diff -Naur ncurses-5.7.orig/test/test.priv.h ncurses-5.7/test/test.priv.h 21343 21815 --- ncurses-5.7.orig/test/test.priv.h 2008-10-04 14:53:41.000000000 -0700 21344 +++ ncurses-5.7/test/test.priv.h 2009-02- 15 23:21:06.507320016-080021816 +++ ncurses-5.7/test/test.priv.h 2009-02-22 21:39:59.257334543 -0800 21345 21817 @@ -29,7 +29,7 @@ 21346 21818 /**************************************************************************** … … 21364 21836 diff -Naur ncurses-5.7.orig/TO-DO ncurses-5.7/TO-DO 21365 21837 --- ncurses-5.7.orig/TO-DO 2008-10-11 12:22:27.000000000 -0700 21366 +++ ncurses-5.7/TO-DO 2009-02- 15 23:21:01.795020533-080021838 +++ ncurses-5.7/TO-DO 2009-02-22 21:39:54.285016622 -0800 21367 21839 @@ -25,7 +25,7 @@ 21368 21840 -- sale, use or other dealings in this Software without prior written --
Note: See TracChangeset
for help on using the changeset viewer.
