rpms/ncurses/devel ncurses-5.4-filter.patch, NONE, 1.1 ncurses.spec, 1.30, 1.31

[fedora-cvs-commits at redhat.com]

Author: praszyk

Update of /cvs/dist/rpms/ncurses/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9669

Modified Files:
	ncurses.spec 
Added Files:
	ncurses-5.4-filter.patch 
Log Message:
Clear window after: filter()+initscr()+endwin()+refresh().See bug #2966


ncurses-5.4-filter.patch:
 base/lib_newterm.c |    6 +++---
 tty/lib_mvcur.c    |    8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

--- NEW FILE ncurses-5.4-filter.patch ---
--- ncurses-5.4/ncurses/tty/lib_mvcur.c.rasold	2005-09-30 12:41:07.000000000 +0200
+++ ncurses-5.4/ncurses/tty/lib_mvcur.c	2005-09-30 12:51:50.000000000 +0200
@@ -171,6 +171,7 @@
 
 static int normalized_cost(const char *const cap, int affcnt);
 
+bool _nc_internal_filter_mode=FALSE;
 /****************************************************************************
  *
  * Initialization/wrapup (including cost pre-computation)
@@ -266,7 +267,7 @@
 /* what to do at initialization time and after each shellout */
 {
     /* initialize screen for cursor access */
-    if (enter_ca_mode) {
+    if (enter_ca_mode && _nc_internal_filter_mode != TRUE) {
 	TPUTS_TRACE("enter_ca_mode");
 	putp(enter_ca_mode);
     }
@@ -418,13 +419,14 @@
 /* wrap up cursor-addressing mode */
 {
     /* leave cursor at screen bottom */
-    mvcur(-1, -1, screen_lines - 1, 0);
+    if (_nc_internal_filter_mode != TRUE)
+        mvcur(-1, -1, screen_lines - 1, 0);
 
     /* set cursor to normal mode */
     if (SP->_cursor != -1)
 	curs_set(1);
 
-    if (exit_ca_mode) {
+    if (exit_ca_mode && _nc_internal_filter_mode != TRUE) {
 	TPUTS_TRACE("exit_ca_mode");
 	putp(exit_ca_mode);
     }
--- ncurses-5.4/ncurses/base/lib_newterm.c.rasold	2005-09-30 12:27:08.000000000 +0200
+++ ncurses-5.4/ncurses/base/lib_newterm.c	2005-09-30 12:46:30.000000000 +0200
@@ -92,13 +92,13 @@
  * aside from possibly delaying a filter() call until some terminals have been
  * initialized.
  */
-static int filter_mode = FALSE;
+extern bool _nc_internal_filter_mode;
 
 NCURSES_EXPORT(void)
 filter(void)
 {
     T((T_CALLED("filter")));
-    filter_mode = TRUE;
+    _nc_internal_filter_mode = TRUE;
     returnVoid;
 }
 
@@ -117,7 +117,7 @@
 	returnSP(0);
 
     /* implement filter mode */
-    if (filter_mode) {
+    if (_nc_internal_filter_mode) {
 	LINES = 1;
 
 	clear_screen = 0;


Index: ncurses.spec
===================================================================
RCS file: /cvs/dist/rpms/ncurses/devel/ncurses.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ncurses.spec	3 Aug 2005 12:04:47 -0000	1.30
+++ ncurses.spec	30 Sep 2005 13:17:40 -0000	1.31
@@ -2,7 +2,7 @@
 Name: ncurses
 Version: 5.4
 %define includedirw %{_includedir}/ncursesw
-Release: 18
+Release: 19
 License: distributable
 Group: System Environment/Libraries
 URL: http://dickey.his.com/ncurses/ncurses.html
@@ -19,6 +19,7 @@
 Patch5: ncurses-5.4-20050115.patch
 Patch6: ncurses-5.4-20050122.patch
 Patch7: ncurses-5.4-xterm-kbs.patch
+Patch8: ncurses-5.4-filter.patch
 BuildRequires: sharutils
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -61,6 +62,7 @@
 %patch5 -p1 -b .20050115
 %patch6 -p1 -b .20050122
 %patch7 -p1 -b .xterm-kbs
+%patch8 -p1 -b .filter
 
 %build
 CFLAGS="%{optflags} -DPURE_TERMINFO -DSVR4_CURSES"
@@ -167,6 +169,10 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Fri Sep 30 2005 5.4-19 <praszyk at redhat.com> 5.4-19
+- Clear window after: filter()+initscr()+endwin()+refresh()
+  See bug #2966, patch ncurses-5.4-filter.patch
+
 * Wed Aug 03 2005 Karsten Hopp <karsten at redhat.de> 5.4-18
 - rebuild with new rpm