ncurses 6.2 - patch 20200718

[ncurses.git] / test / firstlast.c

diff --git a/test/firstlast.c b/test/firstlast.c
index f5328c722cfcebc8a93f5cf8dd66a08a52856064..0a8e5ee0a69491412cb46e8efe4074ba4a6498f6 100644 (file)
--- a/test/firstlast.c
+++ b/test/firstlast.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 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 +30,7 @@
  * This test was written by Alexander V. Lukyanov to demonstrate difference
  * between ncurses 4.1 and SVR4 curses
  *
- * $Id: firstlast.c,v 1.7 2010/05/01 19:11:55 tom Exp $
+ * $Id: firstlast.c,v 1.9 2020/02/02 23:34:34 tom Exp $
  */
 
 #include <test.priv.h>
@@ -40,6 +41,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 +55,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;
        }