ncurses 6.2 - patch 20200418

[ncurses.git] / test / firstlast.c

diff --git a/test/firstlast.c b/test/firstlast.c
index a76764061e65ec9cfa6aba2404fe029663fb2eb4..0a8e5ee0a69491412cb46e8efe4074ba4a6498f6 100644 (file)
--- a/test/firstlast.c
+++ b/test/firstlast.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2005,2006 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            *
  *                                                                          *
  * 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
  *
  * This test was written by Alexander V. Lukyanov to demonstrate difference
  * between ncurses 4.1 and SVR4 curses
  *

- * $Id: firstlast.c,v 1.5 2006/04/01 19:03:18 tom Exp $
+ * $Id: firstlast.c,v 1.9 2020/02/02 23:34:34 tom Exp $

  */
 
 #include <test.priv.h>
  */
 
 #include <test.priv.h>


@@ -38,12 +39,34 @@ static void
 fill(WINDOW *w, const char *str)
 {
     const char *s;
 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++) {
     for (;;) {
        for (s = str; *s; s++) {

-           if (waddch(w, UChar(*s)) == ERR) {
+           getyx(w, y1, x1);
+           if (waddch(w, UChar(*s)) == ERR
+               || (x1 == x0 && y1 == y0)) {

                wmove(w, 0, 0);
                return;
            }
                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;

        }
     }
 }
        }
     }
 }


@@ -66,14 +89,14 @@ main(int argc GCC_UNUSED,
     wrefresh(large);
     wrefresh(small);
 
     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);
 
     wrefresh(small);
     getch();
 
     touchwin(large);
     wrefresh(large);
 

-    mvwaddstr(small, 5, 5, "   Test <***************> String   ");
+    MvWAddStr(small, 5, 5, "   Test <***************> String   ");

     wrefresh(small);
 
     /* DIFFERENCE! */
     wrefresh(small);
 
     /* DIFFERENCE! */