X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Flrtest.c;h=ae47b4e74c04197942eea782b6730f10206fb35c;hp=fb99641117ce5f47e3753cefffcc202fb2e65b84;hb=119b5a6788c26bf7dcc99fcfd54e072946352a93;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce

diff --git a/test/lrtest.c b/test/lrtest.c
index fb996411..ae47b4e7 100644
--- a/test/lrtest.c
+++ b/test/lrtest.c
@@ -1,16 +1,43 @@
+/****************************************************************************
+ * 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            *
+ * "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.                                                           *
+ ****************************************************************************/
 /*
  * Test lower-right-hand corner access
  *
- * by Eric S. Raymond <esr@thyrsus.com>
+ * originally by Eric S. Raymond <esr@thyrsus.com>, written for animation
+ * and resizing -T.Dickey
  *
  * This can't be part of the ncurses test-program, because ncurses rips off the
  * bottom line to do labels.
  *
- * $Id: lrtest.c,v 0.14 1999/10/23 19:44:35 tom Exp $
+ * $Id: lrtest.c,v 1.24 2017/09/04 11:28:19 tom Exp $
  */
 
 #include <test.priv.h>
-#include <term.h>
 
 typedef struct {
     int y, x, mode, dir, inc;
@@ -22,9 +49,9 @@ typedef struct {
  * really write to all positions properly.
  */
 static void
-show(MARK * m)
+show(MARK *m)
 {
-    mvaddch(m->y, m->x, m->value);
+    MvAddCh(m->y, m->x, m->value);
     if (m->mode == 0) {		/* along the x-direction */
 	m->x += m->inc;
 	if (m->x >= COLS) {
@@ -56,8 +83,8 @@ show(MARK * m)
 
 int
 main(
-    int argc GCC_UNUSED,
-    char *argv[]GCC_UNUSED)
+	int argc GCC_UNUSED,
+	char *argv[]GCC_UNUSED)
 {
     static MARK marks[] =
     {
@@ -70,6 +97,8 @@ main(
 	{2, 0, 1, 1, 1, '*' | A_REVERSE}
     };
 
+    setlocale(LC_ALL, "");
+
     initscr();
     noecho();
     cbreak();
@@ -82,9 +111,12 @@ main(
 #endif
     move(LINES / 2 - 1, 4);
     if (!(has_ic()
+#if HAVE_SETUPTERM
     /* see PutCharLR() */
-	    || auto_right_margin
-	    || (enter_am_mode && exit_am_mode))) {
+	  || auto_right_margin
+	  || (enter_am_mode && exit_am_mode)
+#endif
+	)) {
 	addstr("Your terminal lacks the capabilities needed to address the\n");
 	move(LINES / 2, 4);
 	addstr("lower-right-hand corner of the screen.\n");
@@ -103,7 +135,7 @@ main(
 	unsigned n;
 
 	box(stdscr, 0, 0);
-	for (n = 0; n < sizeof(marks) / sizeof(marks[0]); n++) {
+	for (n = 0; n < SIZEOF(marks); n++) {
 	    show(&marks[n]);
 	}
 
@@ -114,19 +146,36 @@ main(
 		nodelay(stdscr, FALSE);
 	    else if (ch == ' ')
 		nodelay(stdscr, TRUE);
+#ifdef TRACE
+	    else if (ch == 'T')
+		trace(0);
+	    else if (ch == 't')
+		trace(TRACE_CALLS | TRACE_ICALLS | TRACE_UPDATE);
+#endif
 #ifdef KEY_RESIZE
 	    else if (ch == KEY_RESIZE) {
+		for (n = 0; n < SIZEOF(marks); n++) {
+		    if (marks[n].mode == 0) {	/* moving along x-direction */
+			if (marks[n].y)
+			    marks[n].y = LINES - 1;
+		    } else {
+			if (marks[n].x)
+			    marks[n].x = COLS - 1;
+		    }
+		}
+		flash();
 		erase();
+		wrefresh(curscr);
 		goto restart;
 	    }
 #endif
 	}
 	napms(50);
+	refresh();
     }
 
-    curs_set(1);
-    endwin();
-    return 0;
+    exit_curses();
+    ExitProgram(EXIT_SUCCESS);
 }
 
 /* lrtest.c ends here */