ncurses 6.0 - patch 20170930

[ncurses.git] / test / firstlast.c

diff --git a/test/firstlast.c b/test/firstlast.c
index f639f4aaba06ae080049ba491888b6a1d4cd083a..fb09cb27c7a7051e39ea2ebcf85acd7e9e0e77b8 100644 (file)
--- a/test/firstlast.c
+++ b/test/firstlast.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2017 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -29,7 +29,7 @@
  * This test was written by Alexander V. Lukyanov to demonstrate difference
  * between ncurses 4.1 and SVR4 curses
  *
- * $Id: firstlast.c,v 1.6 2009/07/15 23:29:46 tom Exp $
+ * $Id: firstlast.c,v 1.8 2017/09/06 01:07:39 tom Exp $
  */
 
 #include <test.priv.h>
@@ -40,6 +40,11 @@ fill(WINDOW *w, const char *str)
     const char *s;
     int x0 = -1, y0 = -1;
     int x1, y1;
+    int maxx, maxy, limit;
+
+    getmaxyx(w, maxy, maxx);
+    wmove(w, 0, 0);
+    limit = maxy * maxx;
 
     for (;;) {
        for (s = str; *s; s++) {
@@ -49,6 +54,16 @@ fill(WINDOW *w, const char *str)
                wmove(w, 0, 0);
                return;
            }
+           /* waddch() should return ERR at the lower-right corner */
+           if (--limit < 0) {
+               beep();
+               if (*str == '?')
+                   return;
+               napms(500);
+               wmove(w, maxy - 1, 0);
+               str = "?";
+               limit = maxx + 1;
+           }
            x0 = x1;
            y0 = y1;
        }
@@ -73,14 +88,14 @@ main(int argc GCC_UNUSED,
     wrefresh(large);
     wrefresh(small);
 
-    mvwaddstr(small, 5, 5, "   Test <place to change> String   ");
+    MvWAddStr(small, 5, 5, "   Test <place to change> String   ");
     wrefresh(small);
     getch();
 
     touchwin(large);
     wrefresh(large);
 
-    mvwaddstr(small, 5, 5, "   Test <***************> String   ");
+    MvWAddStr(small, 5, 5, "   Test <***************> String   ");
     wrefresh(small);
 
     /* DIFFERENCE! */