ncurses 5.9 - patch 20130112

[ncurses.git] / test / firstlast.c

diff --git a/test/firstlast.c b/test/firstlast.c
index 6a79a33fbfb134af0e4dbc5db2e65c105533e1f2..f5328c722cfcebc8a93f5cf8dd66a08a52856064 100644 (file)
--- a/test/firstlast.c
+++ b/test/firstlast.c
@@ -1,8 +1,35 @@
+/****************************************************************************
+ * Copyright (c) 1998-2009,2010 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            *
+ * "Software"), to deal in the Software without restriction, including      *
+ * without limitation the rights to use, copy, modify, merge, publish,      *
+ * distribute, distribute with modifications, sublicense, and/or sell       *
+ * copies of the Software, and to permit persons to whom the Software is    *
+ * furnished to do so, subject to the following conditions:                 *
+ *                                                                          *
+ * The above copyright notice and this permission notice shall be included  *
+ * in all copies or substantial portions of the Software.                   *
+ *                                                                          *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+ *                                                                          *
+ * Except as contained in this notice, the name(s) of the above copyright   *
+ * holders shall not be used in advertising or otherwise to promote the     *
+ * sale, use or other dealings in this Software without prior written       *
+ * authorization.                                                           *
+ ****************************************************************************/

 /*
  * 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.3 2001/09/15 21:46:34 tom Exp $
+ * $Id: firstlast.c,v 1.7 2010/05/01 19:11:55 tom Exp $

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


@@ -11,20 +38,26 @@ 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;
+

     for (;;) {
        for (s = str; *s; s++) {
     for (;;) {
        for (s = str; *s; s++) {

-           if (waddch(w, *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;
            }

+           x0 = x1;
+           y0 = y1;

        }
     }
 }
 
 int
        }
     }
 }
 
 int

-main(
-       int argc GCC_UNUSED,
-       char *argv[]GCC_UNUSED)
+main(int argc GCC_UNUSED,
+     char *argv[]GCC_UNUSED)

 {
     WINDOW *large, *small;
     initscr();
 {
     WINDOW *large, *small;
     initscr();


@@ -40,14 +73,14 @@ main(
     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! */