- Timestamp:
- Mar 1, 2009, 10:43:08 AM (16 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- 4635005
- Parents:
- 4a0ccf9
- File:
-
- 1 moved
-
patches/ncurses-5.7-branch_update-10.patch (moved) (moved from patches/ncurses-5.7-branch_update-9.patch ) (142 diffs)
Legend:
- Unmodified
- Added
- Removed
-
patches/ncurses-5.7-branch_update-10.patch
r4a0ccf9 r4a3510d 1 1 Submitted By: Jim Gifford (jim at cross-lfs dot org) 2 Date: 02-2 2-20092 Date: 02-28-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-2009022 1.7 rechecked periodically. This patch covers up to 5.7-20090228. 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-2 2 21:40:16.166419890-080011 +++ ncurses-5.7/aclocal.m4 2009-02-28 20:38:54.327061041 -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-2 2 21:40:06.801819807-0800888 +++ ncurses-5.7/Ada95/gen/adacurses-config.in 2009-02-28 20:38:50.310805699 -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-2 2 21:40:06.801819807-0800962 +++ ncurses-5.7/Ada95/gen/Makefile.in 2009-02-28 20:38:50.306805140 -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-2 2 21:40:06.805818410-08001018 +++ ncurses-5.7/Ada95/samples/Makefile.in 2009-02-28 20:38:50.310805699 -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-2 2 21:40:06.805818410-08001057 +++ ncurses-5.7/Ada95/src/Makefile.in 2009-02-28 20:38:50.310805699 -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-2 2 21:39:52.800922475-08001149 +++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb 2009-02-28 20:38:37.153962564 -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-2 2 21:39:52.804923033-08001172 +++ ncurses-5.7/c++/cursesw.cc 2009-02-28 20:38:37.161961447 -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-2 2 21:40:02.885566699-08001209 +++ ncurses-5.7/c++/Makefile.in 2009-02-28 20:38:46.290546165 -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-2 2 21:40:02.885566699-08001243 +++ ncurses-5.7/config.guess 2009-02-28 20:38:46.290546165 -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-2 2 21:40:02.885566699-08001313 +++ ncurses-5.7/config.sub 2009-02-28 20:38:46.290546165 -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-2 2 21:40:17.902529403-08001397 +++ ncurses-5.7/configure 2009-02-28 20:38:57.039235088 -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-2 2 21:40:17.902529403-080013284 +++ ncurses-5.7/configure.in 2009-02-28 20:38:57.043235088 -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-2 2 21:40:19.474632211-080013552 +++ ncurses-5.7/dist.mk 2009-02-28 20:38:59.855417236 -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 7 2009/02/21 21:20:20tom Exp $13558 +# $Id: dist.mk,v 1.688 2009/02/28 14:49:13 tom Exp $ 13559 13559 # Makefile for creating ncurses distributions. 13560 13560 # … … 13565 13565 NCURSES_MINOR = 7 13566 13566 -NCURSES_PATCH = 20081102 13567 +NCURSES_PATCH = 2009022 113567 +NCURSES_PATCH = 20090228 13568 13568 13569 13569 # We don't append the patch to the version, since this only applies to releases 13570 13570 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) 13571 diff -Naur ncurses-5.7.orig/form/fld_def.c ncurses-5.7/form/fld_def.c 13572 --- ncurses-5.7.orig/form/fld_def.c 2007-10-13 12:29:58.000000000 -0700 13573 +++ ncurses-5.7/form/fld_def.c 2009-02-28 20:38:59.855417236 -0800 13574 @@ -32,7 +32,7 @@ 13575 13576 #include "form.priv.h" 13577 13578 -MODULE_ID("$Id: fld_def.c,v 1.36 2007/10/13 19:29:58 tom Exp $") 13579 +MODULE_ID("$Id: fld_def.c,v 1.37 2009/02/28 19:00:51 juergen Exp $") 13580 13581 /* this can't be readonly */ 13582 static FIELD default_field = 13583 @@ -252,8 +252,8 @@ 13584 if (field->type != 0) 13585 { 13586 field->type->ref--; 13587 + _nc_Free_Argument(field->type, (TypeArgument *)(field->arg)); 13588 } 13589 - _nc_Free_Argument(field->type, (TypeArgument *)(field->arg)); 13590 } 13591 13592 /*--------------------------------------------------------------------------- 13571 13593 diff -Naur ncurses-5.7.orig/form/frm_driver.c ncurses-5.7/form/frm_driver.c 13572 13594 --- 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-2 2 21:39:55.861116636-080013595 +++ ncurses-5.7/form/frm_driver.c 2009-02-28 20:38:39.770130185 -0800 13574 13596 @@ -32,7 +32,7 @@ 13575 13597 … … 13591 13613 diff -Naur ncurses-5.7.orig/form/Makefile.in ncurses-5.7/form/Makefile.in 13592 13614 --- ncurses-5.7.orig/form/Makefile.in 2007-04-28 07:56:11.000000000 -0700 13593 +++ ncurses-5.7/form/Makefile.in 2009-02-2 2 21:40:02.905568096-080013615 +++ ncurses-5.7/form/Makefile.in 2009-02-28 20:38:46.310547562 -0800 13594 13616 @@ -1,6 +1,6 @@ 13595 13617 -# $Id: Makefile.in,v 1.47 2007/04/28 14:56:11 tom Exp $ … … 13612 13634 diff -Naur ncurses-5.7.orig/include/capdefaults.c ncurses-5.7/include/capdefaults.c 13613 13635 --- ncurses-5.7.orig/include/capdefaults.c 2008-08-04 05:33:42.000000000 -0700 13614 +++ ncurses-5.7/include/capdefaults.c 2009-02-2 2 21:40:19.474632211 -080013636 +++ ncurses-5.7/include/capdefaults.c 2009-02-28 20:38:58.435326721 -0800 13615 13637 @@ -32,7 +32,7 @@ 13616 13638 * and: Thomas E. Dickey 1996-on * … … 13638 13660 diff -Naur ncurses-5.7.orig/include/curses.h.in ncurses-5.7/include/curses.h.in 13639 13661 --- ncurses-5.7.orig/include/curses.h.in 2008-08-30 13:11:29.000000000 -0700 13640 +++ ncurses-5.7/include/curses.h.in 2009-02-2 2 21:40:19.474632211 -080013662 +++ ncurses-5.7/include/curses.h.in 2009-02-28 20:38:58.435326721 -0800 13641 13663 @@ -1,5 +1,5 @@ 13642 13664 /**************************************************************************** … … 13864 13886 diff -Naur ncurses-5.7.orig/include/curses.tail ncurses-5.7/include/curses.tail 13865 13887 --- ncurses-5.7.orig/include/curses.tail 2008-07-05 13:20:38.000000000 -0700 13866 +++ ncurses-5.7/include/curses.tail 2009-02-2 2 21:39:52.804923033-080013888 +++ ncurses-5.7/include/curses.tail 2009-02-28 20:38:37.161961447 -0800 13867 13889 @@ -1,4 +1,4 @@ 13868 13890 -/* $Id: curses.tail,v 1.16 2008/07/05 20:20:38 tom Exp $ */ … … 13881 13903 diff -Naur ncurses-5.7.orig/include/curses.wide ncurses-5.7/include/curses.wide 13882 13904 --- ncurses-5.7.orig/include/curses.wide 2007-03-10 09:52:23.000000000 -0800 13883 +++ ncurses-5.7/include/curses.wide 2009-02-2 2 21:39:54.289015784-080013905 +++ ncurses-5.7/include/curses.wide 2009-02-28 20:38:38.454044419 -0800 13884 13906 @@ -1,9 +1,11 @@ 13885 13907 -/* $Id: curses.wide,v 1.34 2007/03/10 17:52:23 tom Exp $ */ … … 13895 13917 13896 13918 extern NCURSES_EXPORT_VAR(cchar_t *) _nc_wacs; 13919 diff -Naur ncurses-5.7.orig/include/MKterm.h.awk.in ncurses-5.7/include/MKterm.h.awk.in 13920 --- ncurses-5.7.orig/include/MKterm.h.awk.in 2008-05-24 16:13:59.000000000 -0700 13921 +++ ncurses-5.7/include/MKterm.h.awk.in 2009-02-28 20:38:59.855417236 -0800 13922 @@ -1,7 +1,7 @@ 13923 # vile:awkmode 13924 BEGIN { 13925 print "/****************************************************************************" 13926 - print " * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. *" 13927 + print " * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. *" 13928 print " * *" 13929 print " * Permission is hereby granted, free of charge, to any person obtaining a *" 13930 print " * copy of this software and associated documentation files (the *" 13931 @@ -34,7 +34,7 @@ 13932 print "/* and: Thomas E. Dickey 1995-on */" 13933 print "/****************************************************************************/" 13934 print "" 13935 - print "/* $Id: MKterm.h.awk.in,v 1.50 2008/05/24 23:13:59 tom Exp $ */" 13936 + print "/* $Id: MKterm.h.awk.in,v 1.53 2009/02/28 21:27:45 tom Exp $ */" 13937 print "" 13938 print "/*" 13939 print "** term.h -- Definition of struct term" 13940 @@ -228,8 +228,16 @@ 13941 print " char * _termname; /* used for termname() */" 13942 print "} TERMINAL;" 13943 print "" 13944 - print "#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@" 13945 + print "#if @BROKEN_LINKER@ && !@cf_cv_enable_reentrant@" 13946 + print "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;" 13947 + print "#elif @cf_cv_enable_reentrant@" 13948 print "NCURSES_WRAPPED_VAR(TERMINAL *, cur_term);" 13949 + print "#define cur_term NCURSES_PUBLIC_VAR(cur_term())" 13950 + print "#else" 13951 + print "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;" 13952 + print "#endif" 13953 + print "" 13954 + print "#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@" 13955 print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolnames);" 13956 print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolcodes);" 13957 print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolfnames);" 13958 @@ -240,7 +248,6 @@ 13959 print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strcodes);" 13960 print "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strfnames);" 13961 print "" 13962 - print "#define cur_term NCURSES_PUBLIC_VAR(cur_term())" 13963 print "#define boolnames NCURSES_PUBLIC_VAR(boolnames())" 13964 print "#define boolcodes NCURSES_PUBLIC_VAR(boolcodes())" 13965 print "#define boolfnames NCURSES_PUBLIC_VAR(boolfnames())" 13966 @@ -253,8 +260,6 @@ 13967 print "" 13968 print "#else" 13969 print "" 13970 - print "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;" 13971 - print "" 13972 print "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolnames[];" 13973 print "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolcodes[];" 13974 print "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolfnames[];" 13897 13975 diff -Naur ncurses-5.7.orig/INSTALL ncurses-5.7/INSTALL 13898 13976 --- ncurses-5.7.orig/INSTALL 2008-11-02 13:13:51.000000000 -0800 13899 +++ ncurses-5.7/INSTALL 2009-02-2 2 21:40:02.877566978-080013977 +++ ncurses-5.7/INSTALL 2009-02-28 20:38:46.282546444 -0800 13900 13978 @@ -1,5 +1,5 @@ 13901 13979 ------------------------------------------------------------------------------- … … 13948 14026 diff -Naur ncurses-5.7.orig/man/curs_color.3x ncurses-5.7/man/curs_color.3x 13949 14027 --- ncurses-5.7.orig/man/curs_color.3x 2005-12-17 16:00:37.000000000 -0800 13950 +++ ncurses-5.7/man/curs_color.3x 2009-02-2 2 21:40:14.670322949-080014028 +++ ncurses-5.7/man/curs_color.3x 2009-02-28 20:38:53.014978628 -0800 13951 14029 @@ -1,5 +1,5 @@ 13952 14030 .\"*************************************************************************** … … 13979 14057 diff -Naur ncurses-5.7.orig/man/curs_mouse.3x ncurses-5.7/man/curs_mouse.3x 13980 14058 --- ncurses-5.7.orig/man/curs_mouse.3x 2006-12-30 15:43:34.000000000 -0800 13981 +++ ncurses-5.7/man/curs_mouse.3x 2009-02-2 2 21:39:52.804923033-080014059 +++ ncurses-5.7/man/curs_mouse.3x 2009-02-28 20:38:37.161961447 -0800 13982 14060 @@ -1,6 +1,6 @@ 13983 14061 '\" t … … 14025 14103 diff -Naur ncurses-5.7.orig/man/keybound.3x ncurses-5.7/man/keybound.3x 14026 14104 --- ncurses-5.7.orig/man/keybound.3x 2006-02-25 13:47:06.000000000 -0800 14027 +++ ncurses-5.7/man/keybound.3x 2009-02-2 2 21:39:57.593227825-080014105 +++ ncurses-5.7/man/keybound.3x 2009-02-28 20:38:41.374231037 -0800 14028 14106 @@ -1,5 +1,5 @@ 14029 14107 .\"*************************************************************************** … … 14046 14124 diff -Naur ncurses-5.7.orig/man/tabs.1 ncurses-5.7/man/tabs.1 14047 14125 --- ncurses-5.7.orig/man/tabs.1 1969-12-31 16:00:00.000000000 -0800 14048 +++ ncurses-5.7/man/tabs.1 2009-02-2 2 21:39:51.140814638-080014126 +++ ncurses-5.7/man/tabs.1 2009-02-28 20:38:35.777872887 -0800 14049 14127 @@ -0,0 +1,143 @@ 14050 14128 +.\"*************************************************************************** … … 14193 14271 diff -Naur ncurses-5.7.orig/man/tset.1 ncurses-5.7/man/tset.1 14194 14272 --- ncurses-5.7.orig/man/tset.1 2006-12-24 07:00:30.000000000 -0800 14195 +++ ncurses-5.7/man/tset.1 2009-02-2 2 21:39:51.140814638-080014273 +++ ncurses-5.7/man/tset.1 2009-02-28 20:38:35.777872887 -0800 14196 14274 @@ -1,5 +1,5 @@ 14197 14275 .\"*************************************************************************** … … 14214 14292 diff -Naur ncurses-5.7.orig/MANIFEST ncurses-5.7/MANIFEST 14215 14293 --- ncurses-5.7.orig/MANIFEST 2008-10-25 16:47:24.000000000 -0700 14216 +++ ncurses-5.7/MANIFEST 2009-02-2 2 21:40:02.877566978-080014294 +++ ncurses-5.7/MANIFEST 2009-02-28 20:38:46.282546444 -0800 14217 14295 @@ -640,6 +640,7 @@ 14218 14296 ./man/ncurses.3x … … 14257 14335 diff -Naur ncurses-5.7.orig/menu/Makefile.in ncurses-5.7/menu/Makefile.in 14258 14336 --- ncurses-5.7.orig/menu/Makefile.in 2007-04-28 07:56:11.000000000 -0700 14259 +++ ncurses-5.7/menu/Makefile.in 2009-02-2 2 21:40:02.905568096-080014337 +++ ncurses-5.7/menu/Makefile.in 2009-02-28 20:38:46.310547562 -0800 14260 14338 @@ -1,6 +1,6 @@ 14261 14339 -# $Id: Makefile.in,v 1.48 2007/04/28 14:56:11 tom Exp $ … … 14276 14354 LD = @LD@ 14277 14355 LN_S = @LN_S@ 14356 diff -Naur ncurses-5.7.orig/menu/m_cursor.c ncurses-5.7/menu/m_cursor.c 14357 --- ncurses-5.7.orig/menu/m_cursor.c 2005-10-22 16:03:32.000000000 -0700 14358 +++ ncurses-5.7/menu/m_cursor.c 2009-02-28 20:38:59.855417236 -0800 14359 @@ -1,5 +1,5 @@ 14360 /**************************************************************************** 14361 - * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. * 14362 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 14363 * * 14364 * Permission is hereby granted, free of charge, to any person obtaining a * 14365 * copy of this software and associated documentation files (the * 14366 @@ -37,7 +37,7 @@ 14367 14368 #include "menu.priv.h" 14369 14370 -MODULE_ID("$Id: m_cursor.c,v 1.20 2005/10/22 23:03:32 tom Exp $") 14371 +MODULE_ID("$Id: m_cursor.c,v 1.21 2009/02/28 21:02:46 juergen Exp $") 14372 14373 /*--------------------------------------------------------------------------- 14374 | Facility : libnmenu 14375 @@ -90,7 +90,7 @@ 14376 14377 if (E_OK == err) 14378 { 14379 - win = menu->userwin ? menu->userwin : stdscr; 14380 + win = Get_Menu_UserWin(menu); 14381 sub = menu->usersub ? menu->usersub : win; 14382 assert(win && sub); 14383 14384 diff -Naur ncurses-5.7.orig/menu/m_driver.c ncurses-5.7/menu/m_driver.c 14385 --- ncurses-5.7.orig/menu/m_driver.c 2008-08-03 15:08:22.000000000 -0700 14386 +++ ncurses-5.7/menu/m_driver.c 2009-02-28 20:38:59.855417236 -0800 14387 @@ -1,5 +1,5 @@ 14388 /**************************************************************************** 14389 - * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc. * 14390 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 14391 * * 14392 * Permission is hereby granted, free of charge, to any person obtaining a * 14393 * copy of this software and associated documentation files (the * 14394 @@ -37,7 +37,7 @@ 14395 14396 #include "menu.priv.h" 14397 14398 -MODULE_ID("$Id: m_driver.c,v 1.27 2008/08/03 22:08:22 tom Exp $") 14399 +MODULE_ID("$Id: m_driver.c,v 1.28 2009/02/28 21:02:46 juergen Exp $") 14400 14401 /* Macros */ 14402 14403 @@ -197,7 +197,7 @@ 14404 14405 /*--------------------------------------------------------------------------- 14406 | Facility : libnmenu 14407 -| Function : int menu_driver(MENU *menu, int c) 14408 +| Function : int menu_driver(MENU* menu, int c) 14409 | 14410 | Description : Central dispatcher for the menu. Translates the logical 14411 | request 'c' into a menu action. 14412 diff -Naur ncurses-5.7.orig/menu/menu.priv.h ncurses-5.7/menu/menu.priv.h 14413 --- ncurses-5.7.orig/menu/menu.priv.h 2005-01-15 17:02:23.000000000 -0800 14414 +++ ncurses-5.7/menu/menu.priv.h 2009-02-28 20:38:59.859415560 -0800 14415 @@ -1,5 +1,5 @@ 14416 /**************************************************************************** 14417 - * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. * 14418 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 14419 * * 14420 * Permission is hereby granted, free of charge, to any person obtaining a * 14421 * copy of this software and associated documentation files (the * 14422 @@ -30,7 +30,7 @@ 14423 * Author: Juergen Pfeifer, 1995,1997 * 14424 ****************************************************************************/ 14425 14426 -/* $Id: menu.priv.h,v 1.22 2005/01/16 01:02:23 tom Exp $ */ 14427 +/* $Id: menu.priv.h,v 1.23 2009/02/28 21:02:57 juergen Exp $ */ 14428 14429 /*************************************************************************** 14430 * Module menu.priv.h * 14431 @@ -56,8 +56,12 @@ 14432 /* Normalize menu to default if none was given */ 14433 #define Normalize_Menu( menu ) ((menu)=(menu)?(menu):&_nc_Default_Menu) 14434 14435 +#define Get_Menu_Screen( menu ) (menu->userwin ? \ 14436 + _nc_screen_of(menu->userwin) : CURRENT_SCREEN) 14437 + 14438 /* Get the user defined (framing) window of the menu */ 14439 -#define Get_Menu_UserWin(menu) ((menu)->userwin ? (menu)->userwin : stdscr) 14440 +#define Get_Menu_UserWin(menu) ((menu)->userwin ? \ 14441 + (menu)->userwin : CURRENT_SCREEN->_stdscr) 14442 14443 /* Normalize menu window */ 14444 #define Get_Menu_Window( menu ) \ 14445 diff -Naur ncurses-5.7.orig/menu/m_global.c ncurses-5.7/menu/m_global.c 14446 --- ncurses-5.7.orig/menu/m_global.c 2005-12-31 13:51:52.000000000 -0800 14447 +++ ncurses-5.7/menu/m_global.c 2009-02-28 20:38:59.855417236 -0800 14448 @@ -1,5 +1,5 @@ 14449 /**************************************************************************** 14450 - * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. * 14451 + * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * 14452 * * 14453 * Permission is hereby granted, free of charge, to any person obtaining a * 14454 * copy of this software and associated documentation files (the * 14455 @@ -37,7 +37,7 @@ 14456 14457 #include "menu.priv.h" 14458 14459 -MODULE_ID("$Id: m_global.c,v 1.23 2005/12/31 21:51:52 tom Exp $") 14460 +MODULE_ID("$Id: m_global.c,v 1.24 2009/02/28 21:02:46 juergen Exp $") 14461 14462 static char mark[] = "-"; 14463 /* *INDENT-OFF* */ 14464 @@ -496,7 +496,7 @@ 14465 14466 /*--------------------------------------------------------------------------- 14467 | Facility : libnmenu 14468 -| Function : void _nc_Show_Menu(const MENU *menu) 14469 +| Function : void _nc_Show_Menu(const MENU* menu) 14470 | 14471 | Description : Update the window that is associated with the menu 14472 | 14473 @@ -543,8 +543,10 @@ 14474 | Return Values : - 14475 +--------------------------------------------------------------------------*/ 14476 NCURSES_EXPORT(void) 14477 - _nc_New_TopRow_and_CurrentItem 14478 - (MENU * menu, int new_toprow, ITEM * new_current_item) 14479 +_nc_New_TopRow_and_CurrentItem( 14480 + MENU * menu, 14481 + int new_toprow, 14482 + ITEM * new_current_item) 14483 { 14484 ITEM *cur_item; 14485 bool mterm_called = FALSE; 14486 diff -Naur ncurses-5.7.orig/menu/m_post.c ncurses-5.7/menu/m_post.c 14487 --- ncurses-5.7.orig/menu/m_post.c 2004-12-25 15:57:04.000000000 -0800 14488 +++ ncurses-5.7/menu/m_post.c 2009-02-28 20:38:59.855417236 -0800 14489 @@ -1,5 +1,5 @@ 14490 /**************************************************************************** 14491 - * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. * 14492 + * Copyright (c) 1998-2004,2009 Free Software Foundation, Inc. * 14493 * * 14494 * Permission is hereby granted, free of charge, to any person obtaining a * 14495 * copy of this software and associated documentation files (the * 14496 @@ -37,7 +37,7 @@ 14497 14498 #include "menu.priv.h" 14499 14500 -MODULE_ID("$Id: m_post.c,v 1.26 2004/12/25 23:57:04 tom Exp $") 14501 +MODULE_ID("$Id: m_post.c,v 1.27 2009/02/28 21:02:46 juergen Exp $") 14502 14503 /*--------------------------------------------------------------------------- 14504 | Facility : libnmenu 14505 @@ -255,7 +255,7 @@ 14506 14507 /*--------------------------------------------------------------------------- 14508 | Facility : libnmenu 14509 -| Function : int post_menu(MENU *) 14510 +| Function : int post_menu(MENU* menu) 14511 | 14512 | Description : Post a menu to the screen. This makes it visible. 14513 | 14514 @@ -329,7 +329,7 @@ 14515 14516 /*--------------------------------------------------------------------------- 14517 | Facility : libnmenu 14518 -| Function : int unpost_menu(MENU *) 14519 +| Function : int unpost_menu(MENU*) 14520 | 14521 | Description : Detach menu from screen 14522 | 14278 14523 diff -Naur ncurses-5.7.orig/misc/gen-pkgconfig.in ncurses-5.7/misc/gen-pkgconfig.in 14279 14524 --- ncurses-5.7.orig/misc/gen-pkgconfig.in 1969-12-31 16:00:00.000000000 -0800 14280 +++ ncurses-5.7/misc/gen-pkgconfig.in 2009-02-2 2 21:40:14.670322949-080014525 +++ ncurses-5.7/misc/gen-pkgconfig.in 2009-02-28 20:38:53.014978628 -0800 14281 14526 @@ -0,0 +1,119 @@ 14282 14527 +#!@SHELL@ … … 14401 14646 diff -Naur ncurses-5.7.orig/misc/Makefile.in ncurses-5.7/misc/Makefile.in 14402 14647 --- ncurses-5.7.orig/misc/Makefile.in 2007-03-31 08:54:17.000000000 -0700 14403 +++ ncurses-5.7/misc/Makefile.in 2009-02-2 2 21:40:16.170420449-080014648 +++ ncurses-5.7/misc/Makefile.in 2009-02-28 20:38:54.335061600 -0800 14404 14649 @@ -1,6 +1,6 @@ 14405 14650 -# $Id: Makefile.in,v 1.43 2007/03/31 15:54:17 tom Exp $ … … 14482 14727 14483 14728 realclean : distclean 14729 diff -Naur ncurses-5.7.orig/misc/ncu-indent ncurses-5.7/misc/ncu-indent 14730 --- ncurses-5.7.orig/misc/ncu-indent 2008-08-03 08:46:44.000000000 -0700 14731 +++ ncurses-5.7/misc/ncu-indent 2009-02-28 20:38:59.859415560 -0800 14732 @@ -26,7 +26,7 @@ 14733 #* sale, use or other dealings in this Software without prior written * 14734 #* authorization. * 14735 #****************************************************************************/ 14736 -# $Id: ncu-indent,v 1.17 2008/08/03 15:46:44 tom Exp $ 14737 +# $Id: ncu-indent,v 1.20 2009/02/21 20:56:23 tom Exp $ 14738 NOOP=no 14739 OPTS=' 14740 --blank-lines-after-procedures 14741 @@ -44,6 +44,8 @@ 14742 --swallow-optional-blank-lines 14743 --tab-size8 14744 14745 +-T NCURSES_SP_ARGx 14746 +-T NCURSES_SP_DCLx 14747 -T NCURSES_EXPORT_VAR 14748 -T NCURSES_INLINE 14749 -T SCREEN 14750 @@ -88,11 +90,12 @@ 14751 mv "$name" "$save" 14752 sed \ 14753 -e '/EMPTY_MODULE(/s/)$/);/' \ 14754 + -e 's,\(MODULEID(\),//\1,' \ 14755 -e '/MODULE_ID(/s/)$/);/' \ 14756 -e 's,\<GCC_NORETURN;,;//GCC_NORETURN;,' \ 14757 -e 's,\<GCC_PRINTFLIKE(,;//GCC_PRINTFLIKE(,' \ 14758 -e 's,\<GCC_SCANFLIKE(,;//GCC_SCANFLIKE(,' \ 14759 - -e 's,\(\<NCURSES_EXPORT_VAR\>\),//\1,' \ 14760 + -e 's,\(\<NCURSES_EXPORT_VAR\>.*;\),//\1,' \ 14761 "$save" >"$test" 14762 cp "$test" "$name" 14763 chmod u+w "$name" 14764 @@ -100,11 +103,12 @@ 14765 ${INDENT_PROG-indent} -npro $OPTS "$name" 14766 sed \ 14767 -e '/EMPTY_MODULE(/s/);$/)/' \ 14768 + -e 's,//\(MODULEID(\),\1,' \ 14769 -e '/MODULE_ID(/s/);$/)/' \ 14770 -e 's,;[ ]*//GCC_NORETURN;, GCC_NORETURN;,' \ 14771 -e 's,;[ ]*//GCC_PRINTFLIKE(, GCC_PRINTFLIKE(,' \ 14772 -e 's,;[ ]*//GCC_SCANFLIKE(, GCC_SCANFLIKE(,' \ 14773 - -e 's,//\(\<NCURSES_EXPORT_VAR\>\),\1,' \ 14774 + -e 's,//\(\<NCURSES_EXPORT_VAR\>[ ]*\),\1,' \ 14775 "$name" >"$test" 14776 mv "$test" "$name" 14777 rm -f "${name}~" 14484 14778 diff -Naur ncurses-5.7.orig/misc/ncurses-config.in ncurses-5.7/misc/ncurses-config.in 14485 14779 --- ncurses-5.7.orig/misc/ncurses-config.in 2007-03-17 13:02:19.000000000 -0700 14486 +++ ncurses-5.7/misc/ncurses-config.in 2009-02-2 2 21:40:14.670322949-080014780 +++ ncurses-5.7/misc/ncurses-config.in 2009-02-28 20:38:53.014978628 -0800 14487 14781 @@ -1,7 +1,7 @@ 14488 14782 #!@SHELL@ … … 14611 14905 diff -Naur ncurses-5.7.orig/misc/terminfo.src ncurses-5.7/misc/terminfo.src 14612 14906 --- ncurses-5.7.orig/misc/terminfo.src 2008-10-12 16:03:54.000000000 -0700 14613 +++ ncurses-5.7/misc/terminfo.src 2009-02-2 2 21:40:06.821818969-080014907 +++ ncurses-5.7/misc/terminfo.src 2009-02-28 20:38:50.326805978 -0800 14614 14908 @@ -6,8 +6,8 @@ 14615 14909 # Report bugs and new terminal descriptions to … … 14777 15071 diff -Naur ncurses-5.7.orig/mk-1st.awk ncurses-5.7/mk-1st.awk 14778 15072 --- ncurses-5.7.orig/mk-1st.awk 2007-03-24 15:10:55.000000000 -0700 14779 +++ ncurses-5.7/mk-1st.awk 2009-02-2 2 21:40:04.169651068-080015073 +++ ncurses-5.7/mk-1st.awk 2009-02-28 20:38:47.598636401 -0800 14780 15074 @@ -1,6 +1,6 @@ 14781 15075 -# $Id: mk-1st.awk,v 1.78 2007/03/24 22:10:55 tom Exp $ … … 14807 15101 diff -Naur ncurses-5.7.orig/ncurses/base/define_key.c ncurses-5.7/ncurses/base/define_key.c 14808 15102 --- ncurses-5.7.orig/ncurses/base/define_key.c 2006-12-30 15:23:31.000000000 -0800 14809 +++ ncurses-5.7/ncurses/base/define_key.c 2009-02-2 2 21:40:17.906529403-080015103 +++ ncurses-5.7/ncurses/base/define_key.c 2009-02-28 20:38:57.043235088 -0800 14810 15104 @@ -1,5 +1,5 @@ 14811 15105 /**************************************************************************** … … 14876 15170 diff -Naur ncurses-5.7.orig/ncurses/base/keybound.c ncurses-5.7/ncurses/base/keybound.c 14877 15171 --- ncurses-5.7.orig/ncurses/base/keybound.c 2006-06-17 11:19:24.000000000 -0700 14878 +++ ncurses-5.7/ncurses/base/keybound.c 2009-02-2 2 21:40:19.478632211 -080015172 +++ ncurses-5.7/ncurses/base/keybound.c 2009-02-28 20:38:58.435326721 -0800 14879 15173 @@ -1,5 +1,5 @@ 14880 15174 /**************************************************************************** … … 14927 15221 diff -Naur ncurses-5.7.orig/ncurses/base/key_defined.c ncurses-5.7/ncurses/base/key_defined.c 14928 15222 --- ncurses-5.7.orig/ncurses/base/key_defined.c 2006-12-30 15:22:55.000000000 -0800 14929 +++ ncurses-5.7/ncurses/base/key_defined.c 2009-02-2 2 21:40:19.478632211 -080015223 +++ ncurses-5.7/ncurses/base/key_defined.c 2009-02-28 20:38:58.435326721 -0800 14930 15224 @@ -1,5 +1,5 @@ 14931 15225 /**************************************************************************** … … 14973 15267 diff -Naur ncurses-5.7.orig/ncurses/base/keyok.c ncurses-5.7/ncurses/base/keyok.c 14974 15268 --- ncurses-5.7.orig/ncurses/base/keyok.c 2006-12-30 08:22:33.000000000 -0800 14975 +++ ncurses-5.7/ncurses/base/keyok.c 2009-02-2 2 21:40:17.906529403-080015269 +++ ncurses-5.7/ncurses/base/keyok.c 2009-02-28 20:38:57.043235088 -0800 14976 15270 @@ -1,5 +1,5 @@ 14977 15271 /**************************************************************************** … … 15045 15339 diff -Naur ncurses-5.7.orig/ncurses/base/legacy_coding.c ncurses-5.7/ncurses/base/legacy_coding.c 15046 15340 --- ncurses-5.7.orig/ncurses/base/legacy_coding.c 2005-12-17 15:38:17.000000000 -0800 15047 +++ ncurses-5.7/ncurses/base/legacy_coding.c 2009-02-2 2 21:40:19.478632211 -080015341 +++ ncurses-5.7/ncurses/base/legacy_coding.c 2009-02-28 20:38:58.435326721 -0800 15048 15342 @@ -1,5 +1,5 @@ 15049 15343 /**************************************************************************** … … 15094 15388 diff -Naur ncurses-5.7.orig/ncurses/base/lib_addch.c ncurses-5.7/ncurses/base/lib_addch.c 15095 15389 --- ncurses-5.7.orig/ncurses/base/lib_addch.c 2008-08-16 12:20:04.000000000 -0700 15096 +++ ncurses-5.7/ncurses/base/lib_addch.c 2009-02-2 2 21:40:13.074219583-080015390 +++ ncurses-5.7/ncurses/base/lib_addch.c 2009-02-28 20:38:51.642889230 -0800 15097 15391 @@ -1,5 +1,5 @@ 15098 15392 /**************************************************************************** … … 15151 15445 diff -Naur ncurses-5.7.orig/ncurses/base/lib_beep.c ncurses-5.7/ncurses/base/lib_beep.c 15152 15446 --- ncurses-5.7.orig/ncurses/base/lib_beep.c 2005-04-09 08:20:04.000000000 -0700 15153 +++ ncurses-5.7/ncurses/base/lib_beep.c 2009-02-2 2 21:40:17.906529403-080015447 +++ ncurses-5.7/ncurses/base/lib_beep.c 2009-02-28 20:38:57.043235088 -0800 15154 15448 @@ -1,5 +1,5 @@ 15155 15449 /**************************************************************************** … … 15199 15493 diff -Naur ncurses-5.7.orig/ncurses/base/lib_color.c ncurses-5.7/ncurses/base/lib_color.c 15200 15494 --- ncurses-5.7.orig/ncurses/base/lib_color.c 2007-04-07 10:07:28.000000000 -0700 15201 +++ ncurses-5.7/ncurses/base/lib_color.c 2009-02-2 2 21:40:17.906529403-080015495 +++ ncurses-5.7/ncurses/base/lib_color.c 2009-02-28 20:38:57.047235367 -0800 15202 15496 @@ -1,5 +1,5 @@ 15203 15497 /**************************************************************************** … … 15612 15906 diff -Naur ncurses-5.7.orig/ncurses/base/lib_colorset.c ncurses-5.7/ncurses/base/lib_colorset.c 15613 15907 --- ncurses-5.7.orig/ncurses/base/lib_colorset.c 2005-01-29 13:40:51.000000000 -0800 15614 +++ ncurses-5.7/ncurses/base/lib_colorset.c 2009-02-2 2 21:40:14.670322949-080015908 +++ ncurses-5.7/ncurses/base/lib_colorset.c 2009-02-28 20:38:53.014978628 -0800 15615 15909 @@ -1,5 +1,5 @@ 15616 15910 /**************************************************************************** … … 15660 15954 diff -Naur ncurses-5.7.orig/ncurses/base/lib_dft_fgbg.c ncurses-5.7/ncurses/base/lib_dft_fgbg.c 15661 15955 --- ncurses-5.7.orig/ncurses/base/lib_dft_fgbg.c 2005-11-26 12:03:38.000000000 -0800 15662 +++ ncurses-5.7/ncurses/base/lib_dft_fgbg.c 2009-02-2 2 21:40:17.906529403-080015956 +++ ncurses-5.7/ncurses/base/lib_dft_fgbg.c 2009-02-28 20:38:57.047235367 -0800 15663 15957 @@ -1,5 +1,5 @@ 15664 15958 /**************************************************************************** … … 15748 16042 diff -Naur ncurses-5.7.orig/ncurses/base/lib_echo.c ncurses-5.7/ncurses/base/lib_echo.c 15749 16043 --- ncurses-5.7.orig/ncurses/base/lib_echo.c 2000-12-09 18:43:27.000000000 -0800 15750 +++ ncurses-5.7/ncurses/base/lib_echo.c 2009-02-2 2 21:40:19.478632211 -080016044 +++ ncurses-5.7/ncurses/base/lib_echo.c 2009-02-28 20:38:58.435326721 -0800 15751 16045 @@ -1,5 +1,5 @@ 15752 16046 /**************************************************************************** … … 15814 16108 diff -Naur ncurses-5.7.orig/ncurses/base/lib_endwin.c ncurses-5.7/ncurses/base/lib_endwin.c 15815 16109 --- 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-2 2 21:40:17.910529962-080016110 +++ ncurses-5.7/ncurses/base/lib_endwin.c 2009-02-28 20:38:57.047235367 -0800 15817 16111 @@ -1,5 +1,5 @@ 15818 16112 /**************************************************************************** … … 15867 16161 diff -Naur ncurses-5.7.orig/ncurses/base/lib_flash.c ncurses-5.7/ncurses/base/lib_flash.c 15868 16162 --- 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-2 2 21:40:17.910529962-080016163 +++ ncurses-5.7/ncurses/base/lib_flash.c 2009-02-28 20:38:57.047235367 -0800 15870 16164 @@ -1,5 +1,5 @@ 15871 16165 /**************************************************************************** … … 15916 16210 diff -Naur ncurses-5.7.orig/ncurses/base/lib_freeall.c ncurses-5.7/ncurses/base/lib_freeall.c 15917 16211 --- ncurses-5.7.orig/ncurses/base/lib_freeall.c 2008-09-27 06:09:57.000000000 -0700 15918 +++ ncurses-5.7/ncurses/base/lib_freeall.c 2009-02-2 2 21:39:55.861116636-080016212 +++ ncurses-5.7/ncurses/base/lib_freeall.c 2009-02-28 20:38:39.770130185 -0800 15919 16213 @@ -40,7 +40,7 @@ 15920 16214 extern int malloc_errfd; /* FIXME */ … … 15937 16231 diff -Naur ncurses-5.7.orig/ncurses/base/lib_getch.c ncurses-5.7/ncurses/base/lib_getch.c 15938 16232 --- ncurses-5.7.orig/ncurses/base/lib_getch.c 2008-09-20 12:46:13.000000000 -0700 15939 +++ ncurses-5.7/ncurses/base/lib_getch.c 2009-02-2 2 21:40:17.910529962-080016233 +++ ncurses-5.7/ncurses/base/lib_getch.c 2009-02-28 20:38:59.859415560 -0800 15940 16234 @@ -1,5 +1,5 @@ 15941 16235 /**************************************************************************** … … 15958 16252 15959 16253 -MODULE_ID("$Id: lib_getch.c,v 1.99 2008/09/20 19:46:13 tom Exp $") 15960 +MODULE_ID("$Id: lib_getch.c,v 1.10 0 2009/02/15 00:36:00 tom Exp $")16254 +MODULE_ID("$Id: lib_getch.c,v 1.101 2009/02/28 19:16:40 tom Exp $") 15961 16255 15962 16256 #include <fifo_defs.h> … … 16004 16298 static int 16005 16299 _nc_use_meta(WINDOW *win) 16300 @@ -84,9 +94,9 @@ 16301 } 16302 16303 #ifdef NCURSES_WGETCH_EVENTS 16304 -#define TWAIT_MASK 7 16305 +#define TWAIT_MASK (TW_ANY | TW_EVENT) 16306 #else 16307 -#define TWAIT_MASK 3 16308 +#define TWAIT_MASK TW_ANY 16309 #endif 16310 16311 /* 16312 @@ -109,7 +119,7 @@ 16313 && (sp->_sysmouse_head < sp->_sysmouse_tail) 16314 && (rc == 0) 16315 && (errno == EINTR)) { 16316 - rc |= 2; 16317 + rc |= TW_MOUSE; 16318 } 16319 #endif 16320 return rc; 16321 @@ -173,7 +183,7 @@ 16322 } else 16323 mask = 0; 16324 16325 - if (mask & 4) { 16326 + if (mask & TW_EVENT) { 16327 T(("fifo_push: ungetch KEY_EVENT")); 16328 _nc_ungetch(sp, KEY_EVENT); 16329 return KEY_EVENT; 16330 @@ -185,7 +195,7 @@ 16331 #endif 16332 16333 #if USE_GPM_SUPPORT || USE_EMX_MOUSE 16334 - if ((sp->_mouse_fd >= 0) && (mask & 2)) { 16335 + if ((sp->_mouse_fd >= 0) && (mask & TW_MOUSE)) { 16336 sp->_mouse_event(sp); 16337 ch = KEY_MOUSE; 16338 n = 1; 16339 @@ -260,12 +270,12 @@ 16340 { 16341 #ifdef USE_PTHREADS 16342 SCREEN *sp = _nc_screen_of(win); 16343 - if (_nc_use_pthreads && sp != SP) { 16344 + if (_nc_use_pthreads && sp != CURRENT_SCREEN) { 16345 SCREEN *save_SP; 16346 16347 /* temporarily switch to the window's screen to check/refresh */ 16348 _nc_lock_global(curses); 16349 - save_SP = SP; 16350 + save_SP = CURRENT_SCREEN; 16351 _nc_set_screen(sp); 16352 recur_wrefresh(win); 16353 _nc_set_screen(save_SP); 16354 @@ -286,12 +296,12 @@ 16355 16356 if (sp != 0) { 16357 #ifdef USE_PTHREADS 16358 - if (_nc_use_pthreads && sp != SP) { 16359 + if (_nc_use_pthreads && sp != CURRENT_SCREEN) { 16360 SCREEN *save_SP; 16361 16362 /* temporarily switch to the window's screen to get cooked input */ 16363 _nc_lock_global(curses); 16364 - save_SP = SP; 16365 + save_SP = CURRENT_SCREEN; 16366 _nc_set_screen(sp); 16367 rc = recur_wgetnstr(win, buf); 16368 _nc_set_screen(save_SP); 16369 @@ -402,7 +412,7 @@ 16370 rc = check_mouse_activity(sp, delay EVENTLIST_2nd(evl)); 16371 16372 #ifdef NCURSES_WGETCH_EVENTS 16373 - if (rc & 4) { 16374 + if (rc & TW_EVENT) { 16375 *result = KEY_EVENT; 16376 returnCode(KEY_CODE_YES); 16377 } 16378 @@ -427,7 +437,7 @@ 16379 * increase the wait with mouseinterval(). 16380 */ 16381 int runcount = 0; 16382 - int rc; 16383 + int rc = 0; 16384 16385 do { 16386 ch = kgetch(sp EVENTLIST_2nd(evl)); 16387 @@ -442,10 +452,10 @@ 16388 (ch == KEY_MOUSE 16389 && (((rc = check_mouse_activity(sp, sp->_maxclick 16390 EVENTLIST_2nd(evl))) != 0 16391 - && !(rc & 4)) 16392 + && !(rc & TW_EVENT)) 16393 || !sp->_mouse_parse(sp, runcount))); 16394 #ifdef NCURSES_WGETCH_EVENTS 16395 - if ((rc & 4) && !ch == KEY_EVENT) { 16396 + if ((rc & TW_EVENT) && !(ch == KEY_EVENT)) { 16397 _nc_ungetch(sp, ch); 16398 ch = KEY_EVENT; 16399 } 16400 @@ -645,7 +655,7 @@ 16401 TR(TRACE_IEVENT, ("waiting for rest of sequence")); 16402 rc = check_mouse_activity(sp, timeleft EVENTLIST_2nd(evl)); 16403 #ifdef NCURSES_WGETCH_EVENTS 16404 - if (rc & 4) { 16405 + if (rc & TW_EVENT) { 16406 TR(TRACE_IEVENT, ("interrupted by a user event")); 16407 /* FIXME Should have preserved remainder timeleft for reuse... */ 16408 peek = head; /* Restart interpreting later */ 16006 16409 diff -Naur ncurses-5.7.orig/ncurses/base/lib_isendwin.c ncurses-5.7/ncurses/base/lib_isendwin.c 16007 16410 --- ncurses-5.7.orig/ncurses/base/lib_isendwin.c 2000-12-09 18:43:27.000000000 -0800 16008 +++ ncurses-5.7/ncurses/base/lib_isendwin.c 2009-02-2 2 21:40:17.910529962-080016411 +++ ncurses-5.7/ncurses/base/lib_isendwin.c 2009-02-28 20:38:57.047235367 -0800 16009 16412 @@ -1,5 +1,5 @@ 16010 16413 /**************************************************************************** … … 16050 16453 diff -Naur ncurses-5.7.orig/ncurses/base/lib_mouse.c ncurses-5.7/ncurses/base/lib_mouse.c 16051 16454 --- ncurses-5.7.orig/ncurses/base/lib_mouse.c 2008-10-18 14:48:55.000000000 -0700 16052 +++ ncurses-5.7/ncurses/base/lib_mouse.c 2009-02-22 21:39:55.861116636 -0800 16053 @@ -79,7 +79,7 @@ 16455 +++ ncurses-5.7/ncurses/base/lib_mouse.c 2009-02-28 20:38:59.859415560 -0800 16456 @@ -1,5 +1,5 @@ 16457 /**************************************************************************** 16458 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 16459 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 16460 * * 16461 * Permission is hereby granted, free of charge, to any person obtaining a * 16462 * copy of this software and associated documentation files (the * 16463 @@ -79,9 +79,8 @@ 16054 16464 16055 16465 #include <curses.priv.h> 16056 16466 16057 16467 -MODULE_ID("$Id: lib_mouse.c,v 1.102 2008/10/18 21:48:55 tom Exp $") 16058 +MODULE_ID("$Id: lib_mouse.c,v 1.10 4 2008/11/30 01:37:27tom Exp $")16059 16060 16468 +MODULE_ID("$Id: lib_mouse.c,v 1.105 2009/02/28 21:09:20 tom Exp $") 16469 16470 -#include <term.h> 16061 16471 #include <tic.h> 16062 @@ -694,11 +694,16 @@ 16472 16473 #if USE_GPM_SUPPORT 16474 @@ -150,7 +149,7 @@ 16475 #define LIBGPM_SONAME "libgpm.so" 16476 #endif 16477 16478 -#define GET_DLSYM(name) (my_##name = (TYPE_##name) dlsym(SP->_dlopen_gpm, #name)) 16479 +#define GET_DLSYM(name) (my_##name = (TYPE_##name) dlsym(SP_PARM->_dlopen_gpm, #name)) 16480 16481 #endif /* USE_GPM_SUPPORT */ 16482 16483 @@ -164,13 +163,13 @@ 16484 #define LastEV(sp) ((sp)->_mouse_events + EV_MAX - 1) 16485 16486 #undef NEXT 16487 -#define NEXT(ep) ((ep >= LastEV(sp)) \ 16488 - ? FirstEV(sp) \ 16489 +#define NEXT(ep) ((ep >= LastEV(SP_PARM)) \ 16490 + ? FirstEV(SP_PARM) \ 16491 : ep + 1) 16492 16493 #undef PREV 16494 -#define PREV(ep) ((ep <= FirstEV(sp)) \ 16495 - ? LastEV(sp) \ 16496 +#define PREV(ep) ((ep <= FirstEV(SP_PARM)) \ 16497 + ? LastEV(SP_PARM) \ 16498 : ep - 1) 16499 16500 #define IndexEV(sp, ep) (ep - FirstEV(sp)) 16501 @@ -340,7 +339,7 @@ 16502 static void 16503 handle_sysmouse(int sig GCC_UNUSED) 16504 { 16505 - sysmouse_server(SP); 16506 + sysmouse_server(CURRENT_SCREEN); 16507 } 16508 #endif /* USE_SYSMOUSE */ 16509 16510 @@ -359,7 +358,9 @@ 16511 #if USE_EMX_MOUSE 16512 sp->_emxmouse_activated = enable; 16513 #else 16514 - putp(TPARM_1(sp->_mouse_xtermcap, enable)); 16515 + NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_ARGx 16516 + "xterm-mouse", 16517 + TPARM_1(sp->_mouse_xtermcap, enable)); 16518 #endif 16519 sp->_mouse_active = enable; 16520 } 16521 @@ -398,7 +399,7 @@ 16522 static void 16523 unload_gpm_library(SCREEN *sp) 16524 { 16525 - if (SP->_dlopen_gpm != 0) { 16526 + if (sp->_dlopen_gpm != 0) { 16527 T(("unload GPM library")); 16528 sp->_mouse_gpm_loaded = FALSE; 16529 sp->_mouse_fd = -1; 16530 @@ -694,11 +695,16 @@ 16063 16531 16064 16532 #if USE_GPM_SUPPORT … … 16079 16547 eventp->id = NORMAL_EVENT; 16080 16548 16081 @@ -731,6 +73 6,7 @@16549 @@ -731,6 +737,7 @@ 16082 16550 /* bump the next-free pointer into the circular list */ 16083 16551 sp->_mouse_eventp = eventp = NEXT(eventp); … … 16087 16555 } 16088 16556 break; 16089 @@ -1397,10 +1403,16 @@ 16090 16557 @@ -937,7 +944,7 @@ 16558 switch (sp->_mouse_type) { 16559 case M_XTERM: 16560 #if NCURSES_EXT_FUNCS 16561 - keyok(KEY_MOUSE, on); 16562 + NCURSES_SP_NAME(keyok) (NCURSES_SP_ARGx KEY_MOUSE, on); 16563 #endif 16564 TPUTS_TRACE("xterm mouse initialization"); 16565 enable_xterm_mouse(sp, 1); 16566 @@ -989,7 +996,7 @@ 16567 return; 16568 } 16569 } 16570 - _nc_flush(); 16571 + NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG); 16572 } 16573 16574 /************************************************************************** 16575 @@ -1264,13 +1271,13 @@ 16576 * 16577 **************************************************************************/ 16578 16579 -static int 16580 -_nc_getmouse(SCREEN *sp, MEVENT * aevent) 16581 +NCURSES_EXPORT(int) 16582 +NCURSES_SP_NAME(getmouse) (NCURSES_SP_DCLx MEVENT * aevent) 16583 { 16584 - T((T_CALLED("getmouse(%p)"), aevent)); 16585 + T((T_CALLED("getmouse(%p,%p)"), SP_PARM, aevent)); 16586 16587 - if ((aevent != 0) && (sp != 0) && (sp->_mouse_type != M_NONE)) { 16588 - MEVENT *eventp = sp->_mouse_eventp; 16589 + if ((aevent != 0) && (SP_PARM != 0) && (SP_PARM->_mouse_type != M_NONE)) { 16590 + MEVENT *eventp = SP_PARM->_mouse_eventp; 16591 /* compute the current-event pointer */ 16592 MEVENT *prev = PREV(eventp); 16593 16594 @@ -1278,8 +1285,8 @@ 16595 *aevent = *prev; 16596 16597 TR(TRACE_IEVENT, ("getmouse: returning event %s from slot %ld", 16598 - _nc_tracemouse(sp, prev), 16599 - (long) IndexEV(sp, prev))); 16600 + _nc_tracemouse(SP_PARM, prev), 16601 + (long) IndexEV(SP_PARM, prev))); 16602 16603 prev->id = INVALID_EVENT; /* so the queue slot becomes free */ 16604 returnCode(OK); 16605 @@ -1287,57 +1294,61 @@ 16606 returnCode(ERR); 16607 } 16608 16609 +#if NCURSES_SP_FUNCS 16610 /* grab a copy of the current mouse event */ 16611 NCURSES_EXPORT(int) 16612 getmouse(MEVENT * aevent) 16613 { 16614 - return _nc_getmouse(SP, aevent); 16615 + return NCURSES_SP_NAME(getmouse) (CURRENT_SCREEN, aevent); 16616 } 16617 +#endif 16618 16619 -static int 16620 -_nc_ungetmouse(SCREEN *sp, MEVENT * aevent) 16621 +NCURSES_EXPORT(int) 16622 +NCURSES_SP_NAME(ungetmouse) (NCURSES_SP_DCLx MEVENT * aevent) 16623 { 16624 int result = ERR; 16625 16626 - T((T_CALLED("ungetmouse(%p)"), aevent)); 16627 + T((T_CALLED("ungetmouse(%p,%p)"), SP_PARM, aevent)); 16628 16629 - if (aevent != 0 && sp != 0) { 16630 - MEVENT *eventp = sp->_mouse_eventp; 16631 + if (aevent != 0 && SP_PARM != 0) { 16632 + MEVENT *eventp = SP_PARM->_mouse_eventp; 16633 16634 /* stick the given event in the next-free slot */ 16635 *eventp = *aevent; 16636 16637 /* bump the next-free pointer into the circular list */ 16638 - sp->_mouse_eventp = NEXT(eventp); 16639 + SP_PARM->_mouse_eventp = NEXT(eventp); 16640 16641 /* push back the notification event on the keyboard queue */ 16642 - result = _nc_ungetch(sp, KEY_MOUSE); 16643 + result = NCURSES_SP_NAME(ungetch) (NCURSES_SP_ARGx KEY_MOUSE); 16644 } 16645 returnCode(result); 16646 } 16647 16648 +#if NCURSES_SP_FUNCS 16649 /* enqueue a synthesized mouse event to be seen by the next wgetch() */ 16650 NCURSES_EXPORT(int) 16651 ungetmouse(MEVENT * aevent) 16652 { 16653 - return _nc_ungetmouse(SP, aevent); 16654 + return NCURSES_SP_NAME(ungetmouse) (CURRENT_SCREEN, aevent); 16655 } 16656 +#endif 16657 16658 NCURSES_EXPORT(mmask_t) 16659 -mousemask(mmask_t newmask, mmask_t * oldmask) 16660 +NCURSES_SP_NAME(mousemask) (NCURSES_SP_DCLx mmask_t newmask, mmask_t * oldmask) 16661 /* set the mouse event mask */ 16662 { 16663 mmask_t result = 0; 16664 16665 - T((T_CALLED("mousemask(%#lx,%p)"), (unsigned long) newmask, oldmask)); 16666 + T((T_CALLED("mousemask(%p,%#lx,%p)"), SP_PARM, (unsigned long) newmask, oldmask)); 16667 16668 - if (SP != 0) { 16669 + if (SP_PARM != 0) { 16670 if (oldmask) 16671 - *oldmask = SP->_mouse_mask; 16672 + *oldmask = SP_PARM->_mouse_mask; 16673 16674 - if (newmask || SP->_mouse_initialized) { 16675 - _nc_mouse_init(SP); 16676 - if (SP->_mouse_type != M_NONE) { 16677 + if (newmask || SP_PARM->_mouse_initialized) { 16678 + _nc_mouse_init(SP_PARM); 16679 + if (SP_PARM->_mouse_type != M_NONE) { 16680 result = newmask & 16681 (REPORT_MOUSE_POSITION 16682 | BUTTON_ALT 16683 @@ -1349,15 +1360,23 @@ 16684 | BUTTON_DOUBLE_CLICKED 16685 | BUTTON_TRIPLE_CLICKED); 16686 16687 - mouse_activate(SP, (bool) (result != 0)); 16688 + mouse_activate(SP_PARM, (bool) (result != 0)); 16689 16690 - SP->_mouse_mask = result; 16691 + SP_PARM->_mouse_mask = result; 16692 } 16693 } 16694 } 16695 returnBits(result); 16696 } 16697 16698 +#if NCURSES_SP_FUNCS 16699 +NCURSES_EXPORT(mmask_t) 16700 +mousemask(mmask_t newmask, mmask_t * oldmask) 16701 +{ 16702 + return NCURSES_SP_NAME(mousemask) (CURRENT_SCREEN, newmask, oldmask); 16703 +} 16704 +#endif 16705 + 16706 NCURSES_EXPORT(bool) 16707 wenclose(const WINDOW *win, int y, int x) 16708 /* check to see if given window encloses given screen location */ 16709 @@ -1377,17 +1396,17 @@ 16710 } 16711 16712 NCURSES_EXPORT(int) 16713 -mouseinterval(int maxclick) 16714 +NCURSES_SP_NAME(mouseinterval) (NCURSES_SP_DCLx int maxclick) 16715 /* set the maximum mouse interval within which to recognize a click */ 16716 { 16717 int oldval; 16718 16719 - T((T_CALLED("mouseinterval(%d)"), maxclick)); 16720 + T((T_CALLED("mouseinterval(%p,%d)"), SP_PARM, maxclick)); 16721 16722 - if (SP != 0) { 16723 - oldval = SP->_maxclick; 16724 + if (SP_PARM != 0) { 16725 + oldval = SP_PARM->_maxclick; 16726 if (maxclick >= 0) 16727 - SP->_maxclick = maxclick; 16728 + SP_PARM->_maxclick = maxclick; 16729 } else { 16730 oldval = DEFAULT_MAXCLICK; 16731 } 16732 @@ -1395,15 +1414,37 @@ 16733 returnCode(oldval); 16734 } 16735 16736 +#if NCURSES_SP_FUNCS 16737 +NCURSES_EXPORT(int) 16738 +mouseinterval(int maxclick) 16739 +{ 16740 + return NCURSES_SP_NAME(mouseinterval) (CURRENT_SCREEN, maxclick); 16741 +} 16742 +#endif 16743 + 16091 16744 /* This may be used by other routines to ask for the existence of mouse 16092 16745 support */ … … 16095 16748 +NCURSES_EXPORT(bool) 16096 16749 +_nc_has_mouse(SCREEN *sp) 16750 { 16751 - return (SP->_mouse_type == M_NONE ? 0 : 1); 16752 + return (((0 == sp) || (sp->_mouse_type == M_NONE)) ? FALSE : TRUE); 16753 } 16754 16755 NCURSES_EXPORT(bool) 16756 +NCURSES_SP_NAME(has_mouse) (NCURSES_SP_DCL0) 16097 16757 +{ 16098 + return ((sp->_mouse_type == M_NONE) ? FALSE : TRUE);16758 + return _nc_has_mouse(SP_PARM); 16099 16759 +} 16100 16760 + 16761 +#if NCURSES_SP_FUNCS 16101 16762 +NCURSES_EXPORT(bool) 16102 16763 +has_mouse(void) 16764 +{ 16765 + return _nc_has_mouse(CURRENT_SCREEN); 16766 +} 16767 +#endif 16768 + 16769 +NCURSES_EXPORT(bool) 16770 wmouse_trafo(const WINDOW *win, int *pY, int *pX, bool to_screen) 16103 16771 { 16104 - return (SP->_mouse_type == M_NONE ? 0 : 1); 16105 + return _nc_has_mouse(SP); 16106 } 16107 16108 NCURSES_EXPORT(bool) 16772 bool result = FALSE; 16109 16773 diff -Naur ncurses-5.7.orig/ncurses/base/lib_newterm.c ncurses-5.7/ncurses/base/lib_newterm.c 16110 16774 --- ncurses-5.7.orig/ncurses/base/lib_newterm.c 2008-08-16 14:20:48.000000000 -0700 16111 +++ ncurses-5.7/ncurses/base/lib_newterm.c 2009-02-2 2 21:40:17.910529962-080016775 +++ ncurses-5.7/ncurses/base/lib_newterm.c 2009-02-28 20:38:57.047235367 -0800 16112 16776 @@ -1,5 +1,5 @@ 16113 16777 /**************************************************************************** … … 16220 16884 diff -Naur ncurses-5.7.orig/ncurses/base/lib_newwin.c ncurses-5.7/ncurses/base/lib_newwin.c 16221 16885 --- ncurses-5.7.orig/ncurses/base/lib_newwin.c 2008-06-07 06:58:09.000000000 -0700 16222 +++ ncurses-5.7/ncurses/base/lib_newwin.c 2009-02-2 2 21:40:17.910529962-080016886 +++ ncurses-5.7/ncurses/base/lib_newwin.c 2009-02-28 20:38:57.047235367 -0800 16223 16887 @@ -1,5 +1,5 @@ 16224 16888 /**************************************************************************** … … 16282 16946 diff -Naur ncurses-5.7.orig/ncurses/base/lib_nl.c ncurses-5.7/ncurses/base/lib_nl.c 16283 16947 --- ncurses-5.7.orig/ncurses/base/lib_nl.c 2000-12-09 18:43:27.000000000 -0800 16284 +++ ncurses-5.7/ncurses/base/lib_nl.c 2009-02-2 2 21:40:19.478632211 -080016948 +++ ncurses-5.7/ncurses/base/lib_nl.c 2009-02-28 20:38:58.435326721 -0800 16285 16949 @@ -1,5 +1,5 @@ 16286 16950 /**************************************************************************** … … 16366 17030 diff -Naur ncurses-5.7.orig/ncurses/base/lib_pad.c ncurses-5.7/ncurses/base/lib_pad.c 16367 17031 --- ncurses-5.7.orig/ncurses/base/lib_pad.c 2006-10-14 13:47:13.000000000 -0700 16368 +++ ncurses-5.7/ncurses/base/lib_pad.c 2009-02-2 2 21:40:17.910529962-080017032 +++ ncurses-5.7/ncurses/base/lib_pad.c 2009-02-28 20:38:57.047235367 -0800 16369 17033 @@ -1,5 +1,5 @@ 16370 17034 /**************************************************************************** … … 16413 17077 diff -Naur ncurses-5.7.orig/ncurses/base/lib_screen.c ncurses-5.7/ncurses/base/lib_screen.c 16414 17078 --- ncurses-5.7.orig/ncurses/base/lib_screen.c 2008-08-16 12:05:37.000000000 -0700 16415 +++ ncurses-5.7/ncurses/base/lib_screen.c 2009-02-2 2 21:40:17.910529962-080017079 +++ ncurses-5.7/ncurses/base/lib_screen.c 2009-02-28 20:38:57.047235367 -0800 16416 17080 @@ -1,5 +1,5 @@ 16417 17081 /**************************************************************************** … … 16531 17195 diff -Naur ncurses-5.7.orig/ncurses/base/lib_set_term.c ncurses-5.7/ncurses/base/lib_set_term.c 16532 17196 --- ncurses-5.7.orig/ncurses/base/lib_set_term.c 2008-08-04 11:11:12.000000000 -0700 16533 +++ ncurses-5.7/ncurses/base/lib_set_term.c 2009-02-2 2 21:40:17.910529962-080017197 +++ ncurses-5.7/ncurses/base/lib_set_term.c 2009-02-28 20:38:57.051235647 -0800 16534 17198 @@ -1,5 +1,5 @@ 16535 17199 /**************************************************************************** … … 16581 17245 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatrof.c ncurses-5.7/ncurses/base/lib_slkatrof.c 16582 17246 --- ncurses-5.7.orig/ncurses/base/lib_slkatrof.c 2005-01-08 15:01:32.000000000 -0800 16583 +++ ncurses-5.7/ncurses/base/lib_slkatrof.c 2009-02-2 2 21:40:19.478632211-080017247 +++ ncurses-5.7/ncurses/base/lib_slkatrof.c 2009-02-28 20:38:58.439326442 -0800 16584 17248 @@ -1,5 +1,5 @@ 16585 17249 /**************************************************************************** … … 16629 17293 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatron.c ncurses-5.7/ncurses/base/lib_slkatron.c 16630 17294 --- ncurses-5.7.orig/ncurses/base/lib_slkatron.c 2005-01-08 15:02:01.000000000 -0800 16631 +++ ncurses-5.7/ncurses/base/lib_slkatron.c 2009-02-2 2 21:40:19.478632211-080017295 +++ ncurses-5.7/ncurses/base/lib_slkatron.c 2009-02-28 20:38:58.439326442 -0800 16632 17296 @@ -1,5 +1,5 @@ 16633 17297 /**************************************************************************** … … 16677 17341 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c ncurses-5.7/ncurses/base/lib_slkatr_set.c 16678 17342 --- ncurses-5.7.orig/ncurses/base/lib_slkatr_set.c 2005-01-28 13:11:53.000000000 -0800 16679 +++ ncurses-5.7/ncurses/base/lib_slkatr_set.c 2009-02-2 2 21:40:19.478632211-080017343 +++ ncurses-5.7/ncurses/base/lib_slkatr_set.c 2009-02-28 20:38:58.439326442 -0800 16680 17344 @@ -1,5 +1,5 @@ 16681 17345 /**************************************************************************** … … 16748 17412 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkatrset.c ncurses-5.7/ncurses/base/lib_slkatrset.c 16749 17413 --- ncurses-5.7.orig/ncurses/base/lib_slkatrset.c 2005-01-08 13:46:47.000000000 -0800 16750 +++ ncurses-5.7/ncurses/base/lib_slkatrset.c 2009-02-2 2 21:40:19.478632211-080017414 +++ ncurses-5.7/ncurses/base/lib_slkatrset.c 2009-02-28 20:38:58.439326442 -0800 16751 17415 @@ -1,5 +1,5 @@ 16752 17416 /**************************************************************************** … … 16788 17452 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkattr.c ncurses-5.7/ncurses/base/lib_slkattr.c 16789 17453 --- ncurses-5.7.orig/ncurses/base/lib_slkattr.c 2005-01-08 13:44:28.000000000 -0800 16790 +++ ncurses-5.7/ncurses/base/lib_slkattr.c 2009-02-2 2 21:40:19.478632211-080017454 +++ ncurses-5.7/ncurses/base/lib_slkattr.c 2009-02-28 20:38:58.439326442 -0800 16791 17455 @@ -1,5 +1,5 @@ 16792 17456 /**************************************************************************** … … 16832 17496 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slk.c ncurses-5.7/ncurses/base/lib_slk.c 16833 17497 --- ncurses-5.7.orig/ncurses/base/lib_slk.c 2008-09-27 07:07:33.000000000 -0700 16834 +++ ncurses-5.7/ncurses/base/lib_slk.c 2009-02-2 2 21:40:17.910529962-080017498 +++ ncurses-5.7/ncurses/base/lib_slk.c 2009-02-28 20:38:57.051235647 -0800 16835 17499 @@ -1,5 +1,5 @@ 16836 17500 /**************************************************************************** … … 16878 17542 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkclear.c ncurses-5.7/ncurses/base/lib_slkclear.c 16879 17543 --- ncurses-5.7.orig/ncurses/base/lib_slkclear.c 2007-12-29 09:51:47.000000000 -0800 16880 +++ ncurses-5.7/ncurses/base/lib_slkclear.c 2009-02-2 2 21:40:19.478632211-080017544 +++ ncurses-5.7/ncurses/base/lib_slkclear.c 2009-02-28 20:38:58.439326442 -0800 16881 17545 @@ -1,5 +1,5 @@ 16882 17546 /**************************************************************************** … … 16934 17598 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkcolor.c ncurses-5.7/ncurses/base/lib_slkcolor.c 16935 17599 --- ncurses-5.7.orig/ncurses/base/lib_slkcolor.c 2005-01-28 13:11:53.000000000 -0800 16936 +++ ncurses-5.7/ncurses/base/lib_slkcolor.c 2009-02-2 2 21:40:19.478632211-080017600 +++ ncurses-5.7/ncurses/base/lib_slkcolor.c 2009-02-28 20:38:58.439326442 -0800 16937 17601 @@ -1,5 +1,5 @@ 16938 17602 /**************************************************************************** … … 16998 17662 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkinit.c ncurses-5.7/ncurses/base/lib_slkinit.c 16999 17663 --- ncurses-5.7.orig/ncurses/base/lib_slkinit.c 2008-01-12 12:23:39.000000000 -0800 17000 +++ ncurses-5.7/ncurses/base/lib_slkinit.c 2009-02-2 2 21:40:17.914529962-080017664 +++ ncurses-5.7/ncurses/base/lib_slkinit.c 2009-02-28 20:38:57.051235647 -0800 17001 17665 @@ -1,5 +1,5 @@ 17002 17666 /**************************************************************************** … … 17041 17705 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slklab.c ncurses-5.7/ncurses/base/lib_slklab.c 17042 17706 --- ncurses-5.7.orig/ncurses/base/lib_slklab.c 2003-03-29 14:53:48.000000000 -0800 17043 +++ ncurses-5.7/ncurses/base/lib_slklab.c 2009-02-2 2 21:40:19.478632211-080017707 +++ ncurses-5.7/ncurses/base/lib_slklab.c 2009-02-28 20:38:58.439326442 -0800 17044 17708 @@ -1,5 +1,5 @@ 17045 17709 /**************************************************************************** … … 17088 17752 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkrefr.c ncurses-5.7/ncurses/base/lib_slkrefr.c 17089 17753 --- ncurses-5.7.orig/ncurses/base/lib_slkrefr.c 2008-09-27 07:07:53.000000000 -0700 17090 +++ ncurses-5.7/ncurses/base/lib_slkrefr.c 2009-02-2 2 21:40:17.914529962-080017754 +++ ncurses-5.7/ncurses/base/lib_slkrefr.c 2009-02-28 20:38:57.051235647 -0800 17091 17755 @@ -1,5 +1,5 @@ 17092 17756 /**************************************************************************** … … 17166 17830 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slkset.c ncurses-5.7/ncurses/base/lib_slkset.c 17167 17831 --- ncurses-5.7.orig/ncurses/base/lib_slkset.c 2007-10-13 13:08:46.000000000 -0700 17168 +++ ncurses-5.7/ncurses/base/lib_slkset.c 2009-02-2 2 21:40:19.478632211-080017832 +++ ncurses-5.7/ncurses/base/lib_slkset.c 2009-02-28 20:38:58.439326442 -0800 17169 17833 @@ -1,5 +1,5 @@ 17170 17834 /**************************************************************************** … … 17227 17891 diff -Naur ncurses-5.7.orig/ncurses/base/lib_slktouch.c ncurses-5.7/ncurses/base/lib_slktouch.c 17228 17892 --- ncurses-5.7.orig/ncurses/base/lib_slktouch.c 2000-12-09 18:43:27.000000000 -0800 17229 +++ ncurses-5.7/ncurses/base/lib_slktouch.c 2009-02-2 2 21:40:19.478632211-080017893 +++ ncurses-5.7/ncurses/base/lib_slktouch.c 2009-02-28 20:38:58.439326442 -0800 17230 17894 @@ -1,5 +1,5 @@ 17231 17895 /**************************************************************************** … … 17278 17942 diff -Naur ncurses-5.7.orig/ncurses/base/lib_ungetch.c ncurses-5.7/ncurses/base/lib_ungetch.c 17279 17943 --- ncurses-5.7.orig/ncurses/base/lib_ungetch.c 2008-05-31 09:44:54.000000000 -0700 17280 +++ ncurses-5.7/ncurses/base/lib_ungetch.c 2009-02-2 2 21:40:17.914529962-080017944 +++ ncurses-5.7/ncurses/base/lib_ungetch.c 2009-02-28 20:38:57.055236206 -0800 17281 17945 @@ -1,5 +1,5 @@ 17282 17946 /**************************************************************************** … … 17324 17988 diff -Naur ncurses-5.7.orig/ncurses/base/lib_winch.c ncurses-5.7/ncurses/base/lib_winch.c 17325 17989 --- 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-2 2 21:40:19.478632211-080017990 +++ ncurses-5.7/ncurses/base/lib_winch.c 2009-02-28 20:38:58.439326442 -0800 17327 17991 @@ -39,16 +39,16 @@ 17328 17992 … … 17348 18012 diff -Naur ncurses-5.7.orig/ncurses/base/MKkeyname.awk ncurses-5.7/ncurses/base/MKkeyname.awk 17349 18013 --- ncurses-5.7.orig/ncurses/base/MKkeyname.awk 2008-07-12 11:40:00.000000000 -0700 17350 +++ ncurses-5.7/ncurses/base/MKkeyname.awk 2009-02-2 2 21:40:17.906529403-080018014 +++ ncurses-5.7/ncurses/base/MKkeyname.awk 2009-02-28 20:38:57.043235088 -0800 17351 18015 @@ -1,6 +1,6 @@ 17352 18016 -# $Id: MKkeyname.awk,v 1.40 2008/07/12 18:40:00 tom Exp $ … … 17383 18047 diff -Naur ncurses-5.7.orig/ncurses/base/MKlib_gen.sh ncurses-5.7/ncurses/base/MKlib_gen.sh 17384 18048 --- 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-2 2 21:40:19.478632211 -080018049 +++ ncurses-5.7/ncurses/base/MKlib_gen.sh 2009-02-28 20:38:58.435326721 -0800 17386 18050 @@ -2,7 +2,7 @@ 17387 18051 # … … 17404 18068 diff -Naur ncurses-5.7.orig/ncurses/base/tries.c ncurses-5.7/ncurses/base/tries.c 17405 18069 --- 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-2 2 21:40:19.478632211-080018070 +++ ncurses-5.7/ncurses/base/tries.c 2009-02-28 20:38:58.439326442 -0800 17407 18071 @@ -39,7 +39,7 @@ 17408 18072 … … 17427 18091 diff -Naur ncurses-5.7.orig/ncurses/curses.priv.h ncurses-5.7/ncurses/curses.priv.h 17428 18092 --- ncurses-5.7.orig/ncurses/curses.priv.h 2008-10-04 14:37:45.000000000 -0700 17429 +++ ncurses-5.7/ncurses/curses.priv.h 2009-02-2 2 21:40:19.478632211-080018093 +++ ncurses-5.7/ncurses/curses.priv.h 2009-02-28 20:38:59.859415560 -0800 17430 18094 @@ -1,5 +1,5 @@ 17431 18095 /**************************************************************************** … … 17435 18099 * Permission is hereby granted, free of charge, to any person obtaining a * 17436 18100 * copy of this software and associated documentation files (the * 17437 @@ -34,7 +34,7 @@ 18101 @@ -30,11 +30,12 @@ 18102 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 18103 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 18104 * and: Thomas E. Dickey 1996-on * 18105 + * and: Juergen Pfeifer * 18106 ****************************************************************************/ 17438 18107 17439 18108 17440 18109 /* 17441 18110 - * $Id: curses.priv.h,v 1.394 2008/10/04 21:37:45 tom Exp $ 17442 + * $Id: curses.priv.h,v 1.40 2 2009/02/21 22:54:34tom Exp $18111 + * $Id: curses.priv.h,v 1.403 2009/02/28 20:55:48 tom Exp $ 17443 18112 * 17444 18113 * curses.priv.h 17445 18114 * 17446 @@ -97,8 +9 7,6 @@18115 @@ -97,8 +98,6 @@ 17447 18116 extern int errno; 17448 18117 #endif … … 17453 18122 #if HAVE_WORKING_POLL 17454 18123 #define USE_FUNC_POLL 1 17455 @@ -257,6 +25 5,38 @@18124 @@ -257,6 +256,38 @@ 17456 18125 #define NCURSES_OPAQUE 0 17457 18126 … … 17492 18161 #include <term_entry.h> 17493 18162 #include <nc_tparm.h> 17494 @@ -289,7 +3 19,7 @@18163 @@ -289,7 +320,7 @@ 17495 18164 #if NCURSES_NO_PADDING 17496 18165 #define GetNoPadding(sp) ((sp) ? (sp)->_no_padding : _nc_prescreen._no_padding) … … 17501 18170 #define GetNoPadding(sp) FALSE 17502 18171 #define SetNoPadding(sp) /*nothing*/ 17503 @@ -404,6 +43 4,8 @@18172 @@ -404,6 +435,8 @@ 17504 18173 #define C_SHIFT 9 /* we need more bits than there are colors */ 17505 18174 #define C_MASK ((1 << C_SHIFT) - 1) … … 17510 18179 17511 18180 #define COLOR_DEFAULT C_MASK 17512 @@ -464,13 +49 6,13 @@18181 @@ -464,13 +497,13 @@ 17513 18182 } slk_ent; 17514 18183 … … 17530 18199 } SLK; 17531 18200 17532 @@ -703,6 +73 5,8 @@18201 @@ -703,6 +736,8 @@ 17533 18202 char *_setbuf; /* buffered I/O for output */ 17534 18203 bool _filtered; /* filter() was called */ … … 17539 18208 TERMINAL *_term; /* terminal type information */ 17540 18209 TTY _saved_tty; /* savetty/resetty information */ 17541 @@ -794,11 +82 8,13 @@18210 @@ -794,11 +829,13 @@ 17542 18211 int _color_count; /* count of colors in palette */ 17543 18212 colorpair_t *_color_pairs; /* screen's color pair list */ … … 17553 18222 chtype _ok_attributes; /* valid attributes for terminal */ 17554 18223 chtype _xmc_suppress; /* attributes to suppress if xmc */ 17555 @@ -1263,7 +1 299,7 @@18224 @@ -1263,7 +1300,7 @@ 17556 18225 #define returnBool(code) TRACE_RETURN(code,bool) 17557 18226 #define returnCPtr(code) TRACE_RETURN(code,cptr) … … 17562 18231 #define returnPtr(code) TRACE_RETURN(code,ptr) 17563 18232 #define returnSP(code) TRACE_RETURN(code,sp) 17564 @@ -1322,7 +135 8,7 @@18233 @@ -1322,7 +1359,7 @@ 17565 18234 #define returnBool(code) return code 17566 18235 #define returnCPtr(code) return code … … 17571 18240 #define returnPtr(code) return code 17572 18241 #define returnSP(code) return code 17573 @@ -1519,7 +155 5,7 @@18242 @@ -1519,7 +1556,7 @@ 17574 18243 extern NCURSES_EXPORT(void) _nc_screen_wrap (void); 17575 18244 … … 17580 18249 /* lib_mvcur.c */ 17581 18250 #define INFINITY 1000000 /* cost: too high to use */ 17582 @@ -1681,6 +1717,8 @@ 18251 @@ -1592,6 +1629,8 @@ 18252 extern NCURSES_EXPORT(int) _nc_keypad (SCREEN *, bool); 18253 extern NCURSES_EXPORT(int) _nc_ospeed (int); 18254 extern NCURSES_EXPORT(int) _nc_outch (int); 18255 +extern NCURSES_EXPORT(int) _nc_putp(const char *, const char *); 18256 +extern NCURSES_EXPORT(int) _nc_putp_flush(const char *, const char *); 18257 extern NCURSES_EXPORT(int) _nc_read_termcap_entry (const char *const, TERMTYPE *const); 18258 extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, bool, int); 18259 extern NCURSES_EXPORT(int) _nc_timed_wait (SCREEN *, int, int, int * EVENTLIST_2nd(_nc_eventlist *)); 18260 @@ -1663,7 +1702,7 @@ 18261 18262 #define NC_BUFFERED(flag) _nc_set_buffer(SP->_ofp, flag) 18263 18264 -#define NC_OUTPUT ((SP != 0) ? SP->_ofp : stdout) 18265 +#define NC_OUTPUT ((SP_PARM != 0) ? SP_PARM->_ofp : stdout) 18266 18267 /* 18268 * On systems with a broken linker, define 'SP' as a function to force the 18269 @@ -1681,6 +1720,8 @@ 17583 18270 #define _nc_set_screen(sp) SP = sp 17584 18271 #endif … … 17589 18276 * We don't want to use the lines or columns capabilities internally, because 17590 18277 * if the application is running multiple screens under X, it's quite possible 17591 @@ -1715,6 +175 3,66@@18278 @@ -1715,6 +1756,79 @@ 17592 18279 #define MSG_NO_MEMORY "Out of memory" 17593 18280 #define MSG_NO_INPUTS "Premature EOF" … … 17603 18290 + * Exported entrypoints beyond the published API 17604 18291 + */ 18292 +#if NCURSES_SP_FUNCS 17605 18293 +extern NCURSES_EXPORT(WINDOW *) _nc_curscr_of(SCREEN*); 17606 18294 +extern NCURSES_EXPORT(WINDOW *) _nc_newscr_of(SCREEN*); … … 17634 18322 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_resizeterm)(SCREEN*,int,int); 17635 18323 + 18324 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_outch)(SCREEN*, int ch); 18325 +extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_flush)(SCREEN*); 18326 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_putp)(SCREEN*, const char *, const char *); 18327 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_putp_flush)(SCREEN*, const char *, const char *); 17636 18328 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tgetent)(SCREEN*,char*,const char *); 17637 18329 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tputs)(SCREEN*,const char*,int,int(*)(SCREEN*, int)); … … 17653 18345 +#endif 17654 18346 + 18347 +/* FIXME - move these to curses.h.in */ 18348 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(getmouse) (SCREEN*, MEVENT *); 18349 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(ungetmouse) (SCREEN*, MEVENT *); 18350 +extern NCURSES_EXPORT(mmask_t) NCURSES_SP_NAME(mousemask) (SCREEN*, mmask_t, mmask_t *); 18351 +extern NCURSES_EXPORT(int) NCURSES_SP_NAME(mouseinterval) (SCREEN*, int); 18352 +extern NCURSES_EXPORT(bool) NCURSES_SP_NAME(has_mouse) (SCREEN*); 18353 +#endif /* NCURSES_SP_FUNCS */ 18354 + 17655 18355 #ifdef __cplusplus 17656 18356 } … … 17658 18358 diff -Naur ncurses-5.7.orig/ncurses/Makefile.in ncurses-5.7/ncurses/Makefile.in 17659 18359 --- ncurses-5.7.orig/ncurses/Makefile.in 2008-10-18 07:11:54.000000000 -0700 17660 +++ ncurses-5.7/ncurses/Makefile.in 2009-02-2 2 21:40:02.905568096-080018360 +++ ncurses-5.7/ncurses/Makefile.in 2009-02-28 20:38:46.310547562 -0800 17661 18361 @@ -1,6 +1,6 @@ 17662 18362 -# $Id: Makefile.in,v 1.113 2008/10/18 14:11:54 tom Exp $ … … 17679 18379 diff -Naur ncurses-5.7.orig/ncurses/tinfo/entries.c ncurses-5.7/ncurses/tinfo/entries.c 17680 18380 --- ncurses-5.7.orig/ncurses/tinfo/entries.c 2008-09-27 06:11:10.000000000 -0700 17681 +++ ncurses-5.7/ncurses/tinfo/entries.c 2009-02-2 2 21:39:55.861116636-080018381 +++ ncurses-5.7/ncurses/tinfo/entries.c 2009-02-28 20:38:39.770130185 -0800 17682 18382 @@ -37,7 +37,7 @@ 17683 18383 #include <tic.h> … … 17701 18401 diff -Naur ncurses-5.7.orig/ncurses/tinfo/hashed_db.c ncurses-5.7/ncurses/tinfo/hashed_db.c 17702 18402 --- ncurses-5.7.orig/ncurses/tinfo/hashed_db.c 2006-08-19 12:48:38.000000000 -0700 17703 +++ ncurses-5.7/ncurses/tinfo/hashed_db.c 2009-02-2 2 21:39:57.593227825-080018403 +++ ncurses-5.7/ncurses/tinfo/hashed_db.c 2009-02-28 20:38:41.374231037 -0800 17704 18404 @@ -1,5 +1,5 @@ 17705 18405 /**************************************************************************** … … 17807 18507 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c ncurses-5.7/ncurses/tinfo/lib_baudrate.c 17808 18508 --- ncurses-5.7.orig/ncurses/tinfo/lib_baudrate.c 2008-06-28 08:19:24.000000000 -0700 17809 +++ ncurses-5.7/ncurses/tinfo/lib_baudrate.c 2009-02-2 2 21:40:17.918530520-080018509 +++ ncurses-5.7/ncurses/tinfo/lib_baudrate.c 2009-02-28 20:38:57.055236206 -0800 17810 18510 @@ -1,5 +1,5 @@ 17811 18511 /**************************************************************************** … … 17854 18554 +} 17855 18555 +#endif 18556 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_cur_term.c ncurses-5.7/ncurses/tinfo/lib_cur_term.c 18557 --- ncurses-5.7.orig/ncurses/tinfo/lib_cur_term.c 2008-08-16 12:22:55.000000000 -0700 18558 +++ ncurses-5.7/ncurses/tinfo/lib_cur_term.c 2009-02-28 20:38:59.859415560 -0800 18559 @@ -1,5 +1,5 @@ 18560 /**************************************************************************** 18561 - * Copyright (c) 1998-2003,2008 Free Software Foundation, Inc. * 18562 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 18563 * * 18564 * Permission is hereby granted, free of charge, to any person obtaining a * 18565 * copy of this software and associated documentation files (the * 18566 @@ -40,12 +40,14 @@ 18567 #include <term_entry.h> /* TTY, cur_term */ 18568 #include <termcap.h> /* ospeed */ 18569 18570 -MODULE_ID("$Id: lib_cur_term.c,v 1.18 2008/08/16 19:22:55 tom Exp $") 18571 +MODULE_ID("$Id: lib_cur_term.c,v 1.19 2009/02/28 15:49:58 tom Exp $") 18572 18573 #undef CUR 18574 #define CUR termp->type. 18575 18576 -#if BROKEN_LINKER || USE_REENTRANT 18577 +#if BROKEN_LINKER && !USE_REENTRANT 18578 +NCURSES_EXPORT_VAR(TERMINAL *) cur_term = 0; 18579 +#elif BROKEN_LINKER || USE_REENTRANT 18580 NCURSES_EXPORT(TERMINAL *) 18581 NCURSES_PUBLIC_VAR(cur_term) (void) 18582 { 17856 18583 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_has_cap.c ncurses-5.7/ncurses/tinfo/lib_has_cap.c 17857 18584 --- ncurses-5.7.orig/ncurses/tinfo/lib_has_cap.c 2003-10-25 12:43:55.000000000 -0700 17858 +++ ncurses-5.7/ncurses/tinfo/lib_has_cap.c 2009-02-2 2 21:40:17.918530520-080018585 +++ ncurses-5.7/ncurses/tinfo/lib_has_cap.c 2009-02-28 20:38:57.055236206 -0800 17859 18586 @@ -1,5 +1,5 @@ 17860 18587 /**************************************************************************** … … 17916 18643 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_kernel.c ncurses-5.7/ncurses/tinfo/lib_kernel.c 17917 18644 --- ncurses-5.7.orig/ncurses/tinfo/lib_kernel.c 2004-05-08 10:11:21.000000000 -0700 17918 +++ ncurses-5.7/ncurses/tinfo/lib_kernel.c 2009-02-2 2 21:40:17.918530520-080018645 +++ ncurses-5.7/ncurses/tinfo/lib_kernel.c 2009-02-28 20:38:57.055236206 -0800 17919 18646 @@ -1,5 +1,5 @@ 17920 18647 /**************************************************************************** … … 18027 18754 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_longname.c ncurses-5.7/ncurses/tinfo/lib_longname.c 18028 18755 --- ncurses-5.7.orig/ncurses/tinfo/lib_longname.c 2000-12-09 18:55:07.000000000 -0800 18029 +++ ncurses-5.7/ncurses/tinfo/lib_longname.c 2009-02-2 2 21:40:17.918530520-080018756 +++ ncurses-5.7/ncurses/tinfo/lib_longname.c 2009-02-28 20:38:57.055236206 -0800 18030 18757 @@ -1,5 +1,5 @@ 18031 18758 /**************************************************************************** … … 18071 18798 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_napms.c ncurses-5.7/ncurses/tinfo/lib_napms.c 18072 18799 --- ncurses-5.7.orig/ncurses/tinfo/lib_napms.c 2008-05-03 14:34:13.000000000 -0700 18073 +++ ncurses-5.7/ncurses/tinfo/lib_napms.c 2009-02-2 2 21:40:17.918530520-080018800 +++ ncurses-5.7/ncurses/tinfo/lib_napms.c 2009-02-28 20:38:57.055236206 -0800 18074 18801 @@ -1,5 +1,5 @@ 18075 18802 /**************************************************************************** … … 18115 18842 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_options.c ncurses-5.7/ncurses/tinfo/lib_options.c 18116 18843 --- ncurses-5.7.orig/ncurses/tinfo/lib_options.c 2008-08-16 14:20:48.000000000 -0700 18117 +++ ncurses-5.7/ncurses/tinfo/lib_options.c 2009-02-2 2 21:40:17.918530520 -080018844 +++ ncurses-5.7/ncurses/tinfo/lib_options.c 2009-02-28 20:38:59.859415560 -0800 18118 18845 @@ -1,5 +1,5 @@ 18119 18846 /**************************************************************************** … … 18136 18863 18137 18864 -MODULE_ID("$Id: lib_options.c,v 1.58 2008/08/16 21:20:48 Werner.Fink Exp $") 18138 +MODULE_ID("$Id: lib_options.c,v 1. 59 2009/02/15 00:48:40tom Exp $")18865 +MODULE_ID("$Id: lib_options.c,v 1.60 2009/02/28 21:07:56 tom Exp $") 18139 18866 18140 18867 static int _nc_curs_set(SCREEN *, int); … … 18199 18926 ** has_key() 18200 18927 ** 18928 @@ -204,8 +221,9 @@ 18929 #undef CUR 18930 #define CUR (sp->_term)->type. 18931 18932 -static int 18933 -_nc_putp(const char *name GCC_UNUSED, const char *value) 18934 +NCURSES_EXPORT(int) 18935 +NCURSES_SP_NAME(_nc_putp) (NCURSES_SP_DCLx 18936 + const char *name GCC_UNUSED, const char *value) 18937 { 18938 int rc = ERR; 18939 18940 @@ -216,8 +234,17 @@ 18941 return rc; 18942 } 18943 18944 -static int 18945 -_nc_putp_flush(const char *name, const char *value) 18946 +#if NCURSES_SP_FUNCS 18947 +NCURSES_EXPORT(int) 18948 +_nc_putp(const char *name, const char *value) 18949 +{ 18950 + return NCURSES_SP_NAME(_nc_putp) (CURRENT_SCREEN, name, value); 18951 +} 18952 +#endif 18953 + 18954 +NCURSES_EXPORT(int) 18955 +NCURSES_SP_NAME(_nc_putp_flush) (NCURSES_SP_DCLx 18956 + const char *name, const char *value) 18957 { 18958 int rc = _nc_putp(name, value); 18959 if (rc != ERR) { 18960 @@ -226,6 +253,14 @@ 18961 return rc; 18962 } 18963 18964 +#if NCURSES_SP_FUNCS 18965 +NCURSES_EXPORT(int) 18966 +_nc_putp_flush(const char *name, const char *value) 18967 +{ 18968 + return NCURSES_SP_NAME(_nc_putp_flush) (CURRENT_SCREEN, name, value); 18969 +} 18970 +#endif 18971 + 18972 /* Turn the keypad on/off 18973 * 18974 * Note: we flush the output because changing this mode causes some terminals 18975 @@ -245,12 +280,12 @@ 18976 * has wgetch() reading in more than one thread. putp() and below 18977 * may use SP explicitly. 18978 */ 18979 - if (_nc_use_pthreads && sp != SP) { 18980 + if (_nc_use_pthreads && sp != CURRENT_SCREEN) { 18981 SCREEN *save_sp; 18982 18983 /* cannot use use_screen(), since that is not in tinfo library */ 18984 _nc_lock_global(curses); 18985 - save_sp = SP; 18986 + save_sp = CURRENT_SCREEN; 18987 _nc_set_screen(sp); 18988 rc = _nc_keypad(sp, flag); 18989 _nc_set_screen(save_sp); 18990 @@ -313,8 +348,8 @@ 18991 18992 /* Ok, we stay relaxed and don't signal an error if win is NULL */ 18993 18994 - if (SP != 0) { 18995 - SP->_use_meta = flag; 18996 + if (sp != 0) { 18997 + sp->_use_meta = flag; 18998 18999 if (flag) { 19000 _nc_putp("meta_on", meta_on); 18201 19001 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_raw.c ncurses-5.7/ncurses/tinfo/lib_raw.c 18202 19002 --- ncurses-5.7.orig/ncurses/tinfo/lib_raw.c 2007-09-29 14:50:22.000000000 -0700 18203 +++ ncurses-5.7/ncurses/tinfo/lib_raw.c 2009-02-2 2 21:40:17.918530520-080019003 +++ ncurses-5.7/ncurses/tinfo/lib_raw.c 2009-02-28 20:38:57.055236206 -0800 18204 19004 @@ -1,5 +1,5 @@ 18205 19005 /**************************************************************************** … … 18450 19250 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_setup.c ncurses-5.7/ncurses/tinfo/lib_setup.c 18451 19251 --- ncurses-5.7.orig/ncurses/tinfo/lib_setup.c 2008-08-03 15:42:33.000000000 -0700 18452 +++ ncurses-5.7/ncurses/tinfo/lib_setup.c 2009-02-2 2 21:40:17.918530520-080019252 +++ ncurses-5.7/ncurses/tinfo/lib_setup.c 2009-02-28 20:38:57.055236206 -0800 18453 19253 @@ -1,5 +1,5 @@ 18454 19254 /**************************************************************************** … … 18539 19339 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_termname.c ncurses-5.7/ncurses/tinfo/lib_termname.c 18540 19340 --- ncurses-5.7.orig/ncurses/tinfo/lib_termname.c 2003-12-27 10:23:01.000000000 -0800 18541 +++ ncurses-5.7/ncurses/tinfo/lib_termname.c 2009-02-2 2 21:40:19.482631931-080019341 +++ ncurses-5.7/ncurses/tinfo/lib_termname.c 2009-02-28 20:38:58.439326442 -0800 18542 19342 @@ -1,5 +1,5 @@ 18543 19343 /**************************************************************************** … … 18584 19384 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_tparm.c ncurses-5.7/ncurses/tinfo/lib_tparm.c 18585 19385 --- 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-2 2 21:40:19.482631931-080019386 +++ ncurses-5.7/ncurses/tinfo/lib_tparm.c 2009-02-28 20:38:58.439326442 -0800 18587 19387 @@ -40,10 +40,9 @@ 18588 19388 #include <curses.priv.h> … … 18599 19399 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_tputs.c ncurses-5.7/ncurses/tinfo/lib_tputs.c 18600 19400 --- ncurses-5.7.orig/ncurses/tinfo/lib_tputs.c 2008-06-28 06:12:15.000000000 -0700 18601 +++ ncurses-5.7/ncurses/tinfo/lib_tputs.c 2009-02-2 2 21:40:17.918530520 -080019401 +++ ncurses-5.7/ncurses/tinfo/lib_tputs.c 2009-02-28 20:38:59.859415560 -0800 18602 19402 @@ -1,5 +1,5 @@ 18603 19403 /**************************************************************************** … … 18620 19420 18621 19421 -MODULE_ID("$Id: lib_tputs.c,v 1.66 2008/06/28 13:12:15 tom Exp $") 18622 +MODULE_ID("$Id: lib_tputs.c,v 1.6 7 2009/02/15 00:49:44tom Exp $")19422 +MODULE_ID("$Id: lib_tputs.c,v 1.68 2009/02/28 21:08:18 tom Exp $") 18623 19423 18624 19424 NCURSES_EXPORT_VAR(char) PC = 0; /* used by termcap library */ … … 18633 19433 T((T_CALLED("delay_output(%d)"), ms)); 18634 19434 18635 @@ -92, 6 +93,14@@19435 @@ -92,19 +93,35 @@ 18636 19436 returnCode(OK); 18637 19437 } … … 18646 19446 + 18647 19447 NCURSES_EXPORT(void) 18648 _nc_flush(void) 19448 -_nc_flush(void) 19449 +NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_DCL0) 19450 { 19451 (void) fflush(NC_OUTPUT); 19452 } 19453 19454 +#if NCURSES_SP_FUNCS 19455 +NCURSES_EXPORT(void) 19456 +_nc_flush(void) 19457 +{ 19458 + NCURSES_SP_NAME(_nc_flush) (CURRENT_SCREEN); 19459 +} 19460 +#endif 19461 + 19462 NCURSES_EXPORT(int) 19463 -_nc_outch(int ch) 19464 +NCURSES_SP_NAME(_nc_outch) (NCURSES_SP_DCLx int ch) 19465 { 19466 COUNT_OUTCHARS(1); 19467 19468 - if (SP != 0 19469 - && SP->_cleanup) { 19470 + if (SP_PARM != 0 19471 + && SP_PARM->_cleanup) { 19472 char tmp = ch; 19473 /* 19474 * POSIX says write() is safe in a signal handler, but the 19475 @@ -117,6 +134,14 @@ 19476 return OK; 19477 } 19478 19479 +#if NCURSES_SP_FUNCS 19480 +NCURSES_EXPORT(int) 19481 +_nc_outch(int ch) 19482 +{ 19483 + return NCURSES_SP_NAME(_nc_outch) (CURRENT_SCREEN, ch); 19484 +} 19485 +#endif 19486 + 19487 NCURSES_EXPORT(int) 19488 putp(const char *string) 18649 19489 { 18650 19490 diff -Naur ncurses-5.7.orig/ncurses/tinfo/lib_ttyflags.c ncurses-5.7/ncurses/tinfo/lib_ttyflags.c 18651 19491 --- ncurses-5.7.orig/ncurses/tinfo/lib_ttyflags.c 2008-08-03 15:10:44.000000000 -0700 18652 +++ ncurses-5.7/ncurses/tinfo/lib_ttyflags.c 2009-02-2 2 21:40:17.918530520-080019492 +++ ncurses-5.7/ncurses/tinfo/lib_ttyflags.c 2009-02-28 20:38:57.059236485 -0800 18653 19493 @@ -1,5 +1,5 @@ 18654 19494 /**************************************************************************** … … 18766 19606 diff -Naur ncurses-5.7.orig/ncurses/tinfo/make_keys.c ncurses-5.7/ncurses/tinfo/make_keys.c 18767 19607 --- 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-2 2 21:40:19.482631931-080019608 +++ ncurses-5.7/ncurses/tinfo/make_keys.c 2009-02-28 20:38:58.439326442 -0800 18769 19609 @@ -39,16 +39,16 @@ 18770 19610 #define USE_TERMLIB 1 … … 18811 19651 diff -Naur ncurses-5.7.orig/ncurses/tinfo/MKnames.awk ncurses-5.7/ncurses/tinfo/MKnames.awk 18812 19652 --- 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-2 2 21:40:19.482631931-080019653 +++ ncurses-5.7/ncurses/tinfo/MKnames.awk 2009-02-28 20:38:58.439326442 -0800 18814 19654 @@ -25,7 +25,7 @@ 18815 19655 # use or other dealings in this Software without prior written # … … 18832 19672 diff -Naur ncurses-5.7.orig/ncurses/tinfo/name_match.c ncurses-5.7/ncurses/tinfo/name_match.c 18833 19673 --- 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-2 2 21:40:19.482631931-080019674 +++ ncurses-5.7/ncurses/tinfo/name_match.c 2009-02-28 20:38:58.439326442 -0800 18835 19675 @@ -31,10 +31,9 @@ 18836 19676 ****************************************************************************/ … … 18847 19687 diff -Naur ncurses-5.7.orig/ncurses/tinfo/use_screen.c ncurses-5.7/ncurses/tinfo/use_screen.c 18848 19688 --- 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-2 2 21:40:19.482631931-080019689 +++ ncurses-5.7/ncurses/tinfo/use_screen.c 2009-02-28 20:38:58.443328118 -0800 18850 19690 @@ -32,7 +32,7 @@ 18851 19691 … … 18866 19706 18867 19707 code = func(screen, data); 19708 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_traceatr.c ncurses-5.7/ncurses/trace/lib_traceatr.c 19709 --- ncurses-5.7.orig/ncurses/trace/lib_traceatr.c 2008-08-03 09:24:53.000000000 -0700 19710 +++ ncurses-5.7/ncurses/trace/lib_traceatr.c 2009-02-28 20:38:59.863415840 -0800 19711 @@ -1,5 +1,5 @@ 19712 /**************************************************************************** 19713 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 19714 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 19715 * * 19716 * Permission is hereby granted, free of charge, to any person obtaining a * 19717 * copy of this software and associated documentation files (the * 19718 @@ -30,6 +30,7 @@ 19719 * Author: Thomas Dickey 1996-on * 19720 * and: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 19721 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 19722 + * and: Juergen Pfeifer * 19723 ****************************************************************************/ 19724 19725 /* 19726 @@ -39,7 +40,7 @@ 19727 #include <curses.priv.h> 19728 #include <term.h> /* acs_chars */ 19729 19730 -MODULE_ID("$Id: lib_traceatr.c,v 1.63 2008/08/03 16:24:53 tom Exp $") 19731 +MODULE_ID("$Id: lib_traceatr.c,v 1.64 2009/02/28 21:10:20 tom Exp $") 19732 19733 #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name)) 19734 19735 @@ -228,7 +229,7 @@ 19736 if ((attr & A_ALTCHARSET) && (acs_chars != 0)) { 19737 char *cp; 19738 char *found = 0; 19739 - const ALT_NAMES *sp; 19740 + const ALT_NAMES *strp; 19741 19742 for (cp = acs_chars; cp[0] && cp[1]; cp += 2) { 19743 if (ChCharOf(cp[1]) == ChCharOf(ch)) { 19744 @@ -239,9 +240,9 @@ 19745 19746 if (found != 0) { 19747 ch = ChCharOf(*found); 19748 - for (sp = names; sp->val; sp++) 19749 - if (sp->val == ch) { 19750 - result = sp->name; 19751 + for (strp = names; strp->val; strp++) 19752 + if (strp->val == ch) { 19753 + result = strp->name; 19754 break; 19755 } 19756 } 19757 @@ -260,7 +261,8 @@ 19758 if ((found = _nc_altcharset_name(ChAttrOf(ch), ch)) != 0) { 19759 (void) _nc_trace_bufcat(bufnum, found); 19760 } else 19761 - (void) _nc_trace_bufcat(bufnum, _nc_tracechar(SP, (int) ChCharOf(ch))); 19762 + (void) _nc_trace_bufcat(bufnum, _nc_tracechar(CURRENT_SCREEN, 19763 + (int) ChCharOf(ch))); 19764 19765 if (ChAttrOf(ch) != A_NORMAL) { 19766 (void) _nc_trace_bufcat(bufnum, " | "); 19767 @@ -320,7 +322,7 @@ 19768 if (PUTC_ch != L'\0') { 19769 /* it could not be a multibyte sequence */ 19770 (void) _nc_trace_bufcat(bufnum, 19771 - _nc_tracechar(SP, 19772 + _nc_tracechar(CURRENT_SCREEN, 19773 UChar(ch->chars[PUTC_i]))); 19774 } 19775 break; 19776 @@ -329,7 +331,7 @@ 19777 if (n) 19778 (void) _nc_trace_bufcat(bufnum, ", "); 19779 (void) _nc_trace_bufcat(bufnum, 19780 - _nc_tracechar(SP, 19781 + _nc_tracechar(CURRENT_SCREEN, 19782 UChar(PUTC_buf[n]))); 19783 } 19784 } 18868 19785 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracebits.c ncurses-5.7/ncurses/trace/lib_tracebits.c 18869 19786 --- 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-2 2 21:40:19.482631931-080019787 +++ ncurses-5.7/ncurses/trace/lib_tracebits.c 2009-02-28 20:38:58.443328118 -0800 18871 19788 @@ -33,9 +33,8 @@ 18872 19789 ****************************************************************************/ … … 18880 19797 #if SVR4_TERMIO && !defined(_POSIX_SOURCE) 18881 19798 #define _POSIX_SOURCE 19799 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_trace.c ncurses-5.7/ncurses/trace/lib_trace.c 19800 --- ncurses-5.7.orig/ncurses/trace/lib_trace.c 2008-08-23 11:04:29.000000000 -0700 19801 +++ ncurses-5.7/ncurses/trace/lib_trace.c 2009-02-28 20:38:59.859415560 -0800 19802 @@ -1,5 +1,5 @@ 19803 /**************************************************************************** 19804 - * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * 19805 + * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * 19806 * * 19807 * Permission is hereby granted, free of charge, to any person obtaining a * 19808 * copy of this software and associated documentation files (the * 19809 @@ -30,6 +30,7 @@ 19810 * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 * 19811 * and: Eric S. Raymond <esr@snark.thyrsus.com> * 19812 * and: Thomas E. Dickey 1996-on * 19813 + * and: Juergen Pfeifer * 19814 ****************************************************************************/ 19815 19816 /* 19817 @@ -46,7 +47,7 @@ 19818 19819 #include <ctype.h> 19820 19821 -MODULE_ID("$Id: lib_trace.c,v 1.71 2008/08/23 18:04:29 tom Exp $") 19822 +MODULE_ID("$Id: lib_trace.c,v 1.72 2009/02/28 20:37:37 tom Exp $") 19823 19824 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */ 19825 19826 @@ -56,26 +57,26 @@ 19827 NCURSES_EXPORT(const char *) 19828 NCURSES_PUBLIC_VAR(_nc_tputs_trace) (void) 19829 { 19830 - return SP ? SP->_tputs_trace : _nc_prescreen._tputs_trace; 19831 + return CURRENT_SCREEN ? CURRENT_SCREEN->_tputs_trace : _nc_prescreen._tputs_trace; 19832 } 19833 NCURSES_EXPORT(long) 19834 NCURSES_PUBLIC_VAR(_nc_outchars) (void) 19835 { 19836 - return SP ? SP->_outchars : _nc_prescreen._outchars; 19837 + return CURRENT_SCREEN ? CURRENT_SCREEN->_outchars : _nc_prescreen._outchars; 19838 } 19839 NCURSES_EXPORT(void) 19840 _nc_set_tputs_trace(const char *s) 19841 { 19842 - if (SP) 19843 - SP->_tputs_trace = s; 19844 + if (CURRENT_SCREEN) 19845 + CURRENT_SCREEN->_tputs_trace = s; 19846 else 19847 _nc_prescreen._tputs_trace = s; 19848 } 19849 NCURSES_EXPORT(void) 19850 _nc_count_outchars(long increment) 19851 { 19852 - if (SP) 19853 - SP->_outchars += increment; 19854 + if (CURRENT_SCREEN) 19855 + CURRENT_SCREEN->_outchars += increment; 19856 else 19857 _nc_prescreen._outchars += increment; 19858 } 18882 19859 diff -Naur ncurses-5.7.orig/ncurses/trace/lib_tracemse.c ncurses-5.7/ncurses/trace/lib_tracemse.c 18883 19860 --- 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-2 2 21:40:19.482631931-080019861 +++ ncurses-5.7/ncurses/trace/lib_tracemse.c 2009-02-28 20:38:58.443328118 -0800 18885 19862 @@ -38,7 +38,7 @@ 18886 19863 … … 18903 19880 diff -Naur ncurses-5.7.orig/ncurses/trace/varargs.c ncurses-5.7/ncurses/trace/varargs.c 18904 19881 --- 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-2 2 21:40:19.482631931-080019882 +++ ncurses-5.7/ncurses/trace/varargs.c 2009-02-28 20:38:58.443328118 -0800 18906 19883 @@ -34,7 +34,7 @@ 18907 19884 … … 18924 19901 diff -Naur ncurses-5.7.orig/ncurses/tty/lib_mvcur.c ncurses-5.7/ncurses/tty/lib_mvcur.c 18925 19902 --- ncurses-5.7.orig/ncurses/tty/lib_mvcur.c 2008-08-16 12:30:58.000000000 -0700 18926 +++ ncurses-5.7/ncurses/tty/lib_mvcur.c 2009-02-2 2 21:40:17.922530520-080019903 +++ ncurses-5.7/ncurses/tty/lib_mvcur.c 2009-02-28 20:38:57.059236485 -0800 18927 19904 @@ -1,5 +1,5 @@ 18928 19905 /**************************************************************************** … … 19015 19992 diff -Naur ncurses-5.7.orig/ncurses/tty/lib_vidattr.c ncurses-5.7/ncurses/tty/lib_vidattr.c 19016 19993 --- ncurses-5.7.orig/ncurses/tty/lib_vidattr.c 2007-06-30 14:58:04.000000000 -0700 19017 +++ ncurses-5.7/ncurses/tty/lib_vidattr.c 2009-02-2 2 21:40:19.482631931-080019994 +++ ncurses-5.7/ncurses/tty/lib_vidattr.c 2009-02-28 20:38:58.443328118 -0800 19018 19995 @@ -1,5 +1,5 @@ 19019 19996 /**************************************************************************** … … 19072 20049 diff -Naur ncurses-5.7.orig/ncurses/tty/tty_update.c ncurses-5.7/ncurses/tty/tty_update.c 19073 20050 --- ncurses-5.7.orig/ncurses/tty/tty_update.c 2008-08-30 13:08:19.000000000 -0700 19074 +++ ncurses-5.7/ncurses/tty/tty_update.c 2009-02-2 2 21:40:17.922530520-080020051 +++ ncurses-5.7/ncurses/tty/tty_update.c 2009-02-28 20:38:57.059236485 -0800 19075 20052 @@ -1,5 +1,5 @@ 19076 20053 /**************************************************************************** … … 19219 20196 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_cchar.c ncurses-5.7/ncurses/widechar/lib_cchar.c 19220 20197 --- 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-2 2 21:40:19.482631931-080020198 +++ ncurses-5.7/ncurses/widechar/lib_cchar.c 2009-02-28 20:38:58.443328118 -0800 19222 20199 @@ -1,5 +1,5 @@ 19223 20200 /**************************************************************************** … … 19249 20226 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_get_wstr.c ncurses-5.7/ncurses/widechar/lib_get_wstr.c 19250 20227 --- 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-2 2 21:40:19.482631931-080020228 +++ ncurses-5.7/ncurses/widechar/lib_get_wstr.c 2009-02-28 20:38:58.443328118 -0800 19252 20229 @@ -38,9 +38,8 @@ 19253 20230 */ … … 19263 20240 diff -Naur ncurses-5.7.orig/ncurses/widechar/lib_wacs.c ncurses-5.7/ncurses/widechar/lib_wacs.c 19264 20241 --- 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-2 2 21:40:19.482631931-080020242 +++ ncurses-5.7/ncurses/widechar/lib_wacs.c 2009-02-28 20:38:58.443328118 -0800 19266 20243 @@ -31,9 +31,8 @@ 19267 20244 ****************************************************************************/ … … 19277 20254 diff -Naur ncurses-5.7.orig/NEWS ncurses-5.7/NEWS 19278 20255 --- ncurses-5.7.orig/NEWS 2008-11-01 17:56:22.000000000 -0700 19279 +++ ncurses-5.7/NEWS 2009-02-2 2 21:40:19.474632211-080020256 +++ ncurses-5.7/NEWS 2009-02-28 20:38:59.855417236 -0800 19280 20257 @@ -1,5 +1,5 @@ 19281 20258 ------------------------------------------------------------------------------- … … 19290 20267 ------------------------------------------------------------------------------- 19291 20268 --- $Id: NEWS,v 1.1320 2008/11/02 00:56:22 tom Exp $ 19292 +-- $Id: NEWS,v 1.136 5 2009/02/22 02:05:30tom Exp $20269 +-- $Id: NEWS,v 1.1367 2009/02/28 22:38:03 tom Exp $ 19293 20270 ------------------------------------------------------------------------------- 19294 20271 19295 20272 This is a log of changes that ncurses has gone through since Zeyd started 19296 @@ -45,6 +45,15 3@@20273 @@ -45,6 +45,158 @@ 19297 20274 Changes through 1.9.9e did not credit all contributions; 19298 20275 it is not possible to add this information. 19299 20276 20277 +20090228 20278 + + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete). 20279 + + modify declaration of cur_term when broken-linker is used, but 20280 + enable-reentrant is not, to match pre-5.7 (report by Charles Wilson). 20281 + 19300 20282 +20090221 19301 20283 + + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete). … … 19450 20432 diff -Naur ncurses-5.7.orig/panel/Makefile.in ncurses-5.7/panel/Makefile.in 19451 20433 --- ncurses-5.7.orig/panel/Makefile.in 2007-04-28 07:56:11.000000000 -0700 19452 +++ ncurses-5.7/panel/Makefile.in 2009-02-2 2 21:40:02.905568096-080020434 +++ ncurses-5.7/panel/Makefile.in 2009-02-28 20:38:46.310547562 -0800 19453 20435 @@ -1,6 +1,6 @@ 19454 20436 -# $Id: Makefile.in,v 1.52 2007/04/28 14:56:11 tom Exp $ … … 19471 20453 diff -Naur ncurses-5.7.orig/progs/Makefile.in ncurses-5.7/progs/Makefile.in 19472 20454 --- ncurses-5.7.orig/progs/Makefile.in 2008-09-07 06:58:55.000000000 -0700 19473 +++ ncurses-5.7/progs/Makefile.in 2009-02-2 2 21:39:51.152816873-080020455 +++ ncurses-5.7/progs/Makefile.in 2009-02-28 20:38:35.789873445 -0800 19474 20456 @@ -1,6 +1,6 @@ 19475 20457 -# $Id: Makefile.in,v 1.79 2008/09/07 13:58:55 tom Exp $ … … 19537 20519 diff -Naur ncurses-5.7.orig/progs/modules ncurses-5.7/progs/modules 19538 20520 --- ncurses-5.7.orig/progs/modules 2006-12-23 16:53:21.000000000 -0800 19539 +++ ncurses-5.7/progs/modules 2009-02-2 2 21:39:51.152816873-080020521 +++ ncurses-5.7/progs/modules 2009-02-28 20:38:35.789873445 -0800 19540 20522 @@ -1,7 +1,7 @@ 19541 20523 -# $Id: modules,v 1.13 2006/12/24 00:53:21 tom Exp $ … … 19558 20540 diff -Naur ncurses-5.7.orig/progs/tabs.c ncurses-5.7/progs/tabs.c 19559 20541 --- ncurses-5.7.orig/progs/tabs.c 1969-12-31 16:00:00.000000000 -0800 19560 +++ ncurses-5.7/progs/tabs.c 2009-02-2 2 21:39:52.804923033-080020542 +++ ncurses-5.7/progs/tabs.c 2009-02-28 20:38:37.161961447 -0800 19561 20543 @@ -0,0 +1,506 @@ 19562 20544 +/**************************************************************************** … … 20068 21050 diff -Naur ncurses-5.7.orig/test/clip_printw.c ncurses-5.7/test/clip_printw.c 20069 21051 --- ncurses-5.7.orig/test/clip_printw.c 1969-12-31 16:00:00.000000000 -0800 20070 +++ ncurses-5.7/test/clip_printw.c 2009-02-2 2 21:39:59.253333985-080021052 +++ ncurses-5.7/test/clip_printw.c 2009-02-28 20:38:42.990334962 -0800 20071 21053 @@ -0,0 +1,360 @@ 20072 21054 +/**************************************************************************** … … 20432 21414 diff -Naur ncurses-5.7.orig/test/demo_forms.c ncurses-5.7/test/demo_forms.c 20433 21415 --- ncurses-5.7.orig/test/demo_forms.c 2008-10-18 13:38:20.000000000 -0700 20434 +++ ncurses-5.7/test/demo_forms.c 2009-02-2 2 21:39:59.253333985-080021416 +++ ncurses-5.7/test/demo_forms.c 2009-02-28 20:38:42.990334962 -0800 20435 21417 @@ -26,7 +26,7 @@ 20436 21418 * authorization. * … … 20467 21449 diff -Naur ncurses-5.7.orig/test/edit_field.c ncurses-5.7/test/edit_field.c 20468 21450 --- ncurses-5.7.orig/test/edit_field.c 2008-10-18 13:40:20.000000000 -0700 20469 +++ ncurses-5.7/test/edit_field.c 2009-02-2 2 21:39:59.253333985-080021451 +++ ncurses-5.7/test/edit_field.c 2009-02-28 20:38:42.990334962 -0800 20470 21452 @@ -26,7 +26,7 @@ 20471 21453 * authorization. * … … 20490 21472 diff -Naur ncurses-5.7.orig/test/edit_field.h ncurses-5.7/test/edit_field.h 20491 21473 --- ncurses-5.7.orig/test/edit_field.h 2006-06-03 09:38:57.000000000 -0700 20492 +++ ncurses-5.7/test/edit_field.h 2009-02-2 2 21:39:59.253333985-080021474 +++ ncurses-5.7/test/edit_field.h 2009-02-28 20:38:42.990334962 -0800 20493 21475 @@ -1,5 +1,5 @@ 20494 21476 /**************************************************************************** … … 20520 21502 diff -Naur ncurses-5.7.orig/test/filter.c ncurses-5.7/test/filter.c 20521 21503 --- ncurses-5.7.orig/test/filter.c 2006-12-09 08:53:47.000000000 -0800 20522 +++ ncurses-5.7/test/filter.c 2009-02-2 2 21:39:55.861116636-080021504 +++ ncurses-5.7/test/filter.c 2009-02-28 20:38:39.770130185 -0800 20523 21505 @@ -1,5 +1,5 @@ 20524 21506 /**************************************************************************** … … 20592 21574 diff -Naur ncurses-5.7.orig/test/insdelln.c ncurses-5.7/test/insdelln.c 20593 21575 --- ncurses-5.7.orig/test/insdelln.c 1969-12-31 16:00:00.000000000 -0800 20594 +++ ncurses-5.7/test/insdelln.c 2009-02-2 2 21:39:59.253333985-080021576 +++ ncurses-5.7/test/insdelln.c 2009-02-28 20:38:42.990334962 -0800 20595 21577 @@ -0,0 +1,380 @@ 20596 21578 +/**************************************************************************** … … 20976 21958 diff -Naur ncurses-5.7.orig/test/modules ncurses-5.7/test/modules 20977 21959 --- ncurses-5.7.orig/test/modules 2007-08-18 10:57:08.000000000 -0700 20978 +++ ncurses-5.7/test/modules 2009-02-2 2 21:39:59.253333985-080021960 +++ ncurses-5.7/test/modules 2009-02-28 20:38:42.990334962 -0800 20979 21961 @@ -1,4 +1,4 @@ 20980 21962 -# $Id: modules,v 1.36 2007/08/18 17:57:08 tom Exp $ … … 21001 21983 diff -Naur ncurses-5.7.orig/test/ncurses.c ncurses-5.7/test/ncurses.c 21002 21984 --- ncurses-5.7.orig/test/ncurses.c 2008-09-27 07:34:58.000000000 -0700 21003 +++ ncurses-5.7/test/ncurses.c 2009-02-2 2 21:40:14.674322391 -080021985 +++ ncurses-5.7/test/ncurses.c 2009-02-28 20:38:53.018977231 -0800 21004 21986 @@ -40,7 +40,7 @@ 21005 21987 Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993 … … 21493 22475 diff -Naur ncurses-5.7.orig/test/programs ncurses-5.7/test/programs 21494 22476 --- ncurses-5.7.orig/test/programs 2008-08-16 14:47:39.000000000 -0700 21495 +++ ncurses-5.7/test/programs 2009-02-2 2 21:39:59.257334543-080022477 +++ ncurses-5.7/test/programs 2009-02-28 20:38:42.994335242 -0800 21496 22478 @@ -1,4 +1,4 @@ 21497 22479 -# $Id: programs,v 1.14 2008/08/16 21:47:39 tom Exp $ … … 21516 22498 key_names $(LDFLAGS_CURSES) $(LOCAL_LIBS) key_names 21517 22499 keynames $(LDFLAGS_CURSES) $(LOCAL_LIBS) keynames 22500 diff -Naur ncurses-5.7.orig/test/railroad.c ncurses-5.7/test/railroad.c 22501 --- ncurses-5.7.orig/test/railroad.c 2008-02-09 10:08:43.000000000 -0800 22502 +++ ncurses-5.7/test/railroad.c 2009-02-28 20:38:59.863415840 -0800 22503 @@ -29,7 +29,7 @@ 22504 /* 22505 * Author: Thomas E. Dickey - 2000 22506 * 22507 - * $Id: railroad.c,v 1.16 2008/02/09 18:08:43 tom Exp $ 22508 + * $Id: railroad.c,v 1.17 2008/12/07 02:07:41 juergen Exp $ 22509 * 22510 * A simple demo of the termcap interface. 22511 */ 22512 @@ -82,7 +82,7 @@ 22513 } 22514 22515 static void 22516 -ShowCursor(int flag) 22517 +MyShowCursor(int flag) 22518 { 22519 if (startC != 0 && finisC != 0) { 22520 tputs(flag ? startC : finisC, 1, outc); 22521 @@ -166,7 +166,7 @@ 22522 { 22523 Underline(0); 22524 StandOut(0); 22525 - ShowCursor(1); 22526 + MyShowCursor(1); 22527 } 22528 22529 static void 22530 @@ -214,14 +214,14 @@ 22531 startC = tgetstr("ve", &ap); 22532 finisC = tgetstr("vi", &ap); 22533 22534 - ShowCursor(0); 22535 + MyShowCursor(0); 22536 22537 CATCHALL(onsig); 22538 22539 while (*args) { 22540 ShowSign(*args++); 22541 } 22542 - ShowCursor(1); 22543 + MyShowCursor(1); 22544 } 22545 } 22546 21518 22547 diff -Naur ncurses-5.7.orig/test/README ncurses-5.7/test/README 21519 22548 --- ncurses-5.7.orig/test/README 2008-10-18 14:02:45.000000000 -0700 21520 +++ ncurses-5.7/test/README 2009-02-2 2 21:39:59.253333985-080022549 +++ ncurses-5.7/test/README 2009-02-28 20:38:42.990334962 -0800 21521 22550 @@ -25,7 +25,7 @@ 21522 22551 -- sale, use or other dealings in this Software without prior written -- … … 21814 22843 diff -Naur ncurses-5.7.orig/test/test.priv.h ncurses-5.7/test/test.priv.h 21815 22844 --- ncurses-5.7.orig/test/test.priv.h 2008-10-04 14:53:41.000000000 -0700 21816 +++ ncurses-5.7/test/test.priv.h 2009-02-2 2 21:39:59.257334543-080022845 +++ ncurses-5.7/test/test.priv.h 2009-02-28 20:38:42.994335242 -0800 21817 22846 @@ -29,7 +29,7 @@ 21818 22847 /**************************************************************************** … … 21836 22865 diff -Naur ncurses-5.7.orig/TO-DO ncurses-5.7/TO-DO 21837 22866 --- ncurses-5.7.orig/TO-DO 2008-10-11 12:22:27.000000000 -0700 21838 +++ ncurses-5.7/TO-DO 2009-02-2 2 21:39:54.285016622-080022867 +++ ncurses-5.7/TO-DO 2009-02-28 20:38:38.454044419 -0800 21839 22868 @@ -25,7 +25,7 @@ 21840 22869 -- sale, use or other dealings in this Software without prior written --
Note:
See TracChangeset
for help on using the changeset viewer.
