From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Sun, 14 Aug 2005 21:17:37 +0000 (+0000)
Subject: clean up do_credits() even more
X-Git-Tag: v1.3.9~55
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=c71e031d8ab9312247843a8dd0165c86e2d58bdf;p=nano.git

clean up do_credits() even more


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2991 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---

diff --git a/ChangeLog b/ChangeLog
index ac7c55cf..e51104ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -332,8 +332,11 @@ CVS code -
 	- Various cleanups.  Turn on the MORE_SPACE and NO_HELP flags
 	  before showing the credits, so that they use as much of the
 	  screen as possible, and set the flags back to their original
-	  values afterward.  Also, only call scrollok() just before and
-	  after we scroll. (DLR)
+	  values afterward.  Also, call wscrl(1) instead of scroll(),
+	  only call scrollok() just before and after we scroll, and
+	  tweak where screen updates occur so that messages are properly
+	  displayed when they first scroll onto the bottom line of the
+	  screen. (DLR)
 - configure.ac:
 	- Since we only use vsnprintf() now, remove the tests for
 	  snprintf(). (DLR)
diff --git a/src/winio.c b/src/winio.c
index abcfde8e..119e5504 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -4278,9 +4278,11 @@ void do_credits(void)
     blank_edit();
     blank_statusbar();
     blank_bottombars();
+
     wrefresh(topwin);
     wrefresh(edit);
     wrefresh(bottomwin);
+    napms(700);
 
     for (crpos = 0; crpos < CREDIT_LEN + editwinrows / 2; crpos++) {
 	if ((kbinput = wgetch(edit)) != ERR)
@@ -4303,16 +4305,23 @@ void do_credits(void)
 		start_x, what);
 	}
 
+	wrefresh(edit);
+
+	if ((kbinput = wgetch(edit)) != ERR)
+	    break;
 	napms(700);
+
 	scrollok(edit, TRUE);
-	scroll(edit);
+	wscrl(edit, 1);
 	scrollok(edit, FALSE);
 	wrefresh(edit);
+
 	if ((kbinput = wgetch(edit)) != ERR)
 	    break;
 	napms(700);
+
 	scrollok(edit, TRUE);
-	scroll(edit);
+	wscrl(edit, 1);
 	scrollok(edit, FALSE);
 	wrefresh(edit);
     }