ncurses 6.2 - patch 20201219

[ncurses.git] / test / worm.c

diff --git a/test/worm.c b/test/worm.c
index 70c92a2167b390be707585142587320a8fbd8514..6304e4b06a88e750d006bc68a6c52276de1fb968 100644 (file)
--- a/test/worm.c
+++ b/test/worm.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 1998-2016,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            *


@@ -52,7 +53,7 @@
   traces will be dumped.  The program stops and waits for one character of
   input at the beginning and end of the interval.
 
   traces will be dumped.  The program stops and waits for one character of
   input at the beginning and end of the interval.
 

-  $Id: worm.c,v 1.75 2017/09/08 20:00:50 tom Exp $
+  $Id: worm.c,v 1.82 2020/02/02 23:34:34 tom Exp $

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


@@ -97,6 +98,7 @@ static unsigned long sequence = 0;
 static bool quitting = FALSE;
 
 static WORM worm[MAX_WORMS];
 static bool quitting = FALSE;
 
 static WORM worm[MAX_WORMS];

+static int max_refs;

 static int **refs;
 static int last_x, last_y;
 
 static int **refs;
 static int last_x, last_y;
 


@@ -196,12 +198,25 @@ static const struct options {
 };
 /* *INDENT-ON* */
 
 };
 /* *INDENT-ON* */
 

+#if HAVE_USE_WINDOW
+static int
+safe_wgetch(WINDOW *w, void *data GCC_UNUSED)
+{
+    return wgetch(w);
+}
+static int
+safe_wrefresh(WINDOW *w, void *data GCC_UNUSED)
+{
+    return wrefresh(w);
+}
+#endif
+

 #ifdef KEY_RESIZE
 static void
 failed(const char *s)
 {
     perror(s);
 #ifdef KEY_RESIZE
 static void
 failed(const char *s)
 {
     perror(s);

-    exit_curses();
+    stop_curses();

     ExitProgram(EXIT_FAILURE);
 }
 #endif
     ExitProgram(EXIT_FAILURE);
 }
 #endif


@@ -209,8 +224,8 @@ failed(const char *s)
 static void
 cleanup(void)
 {
 static void
 cleanup(void)
 {

-    USING_WINDOW(stdscr, wrefresh);
-    exit_curses();
+    USING_WINDOW1(stdscr, wrefresh, safe_wrefresh);
+    stop_curses();

 }
 
 static void
 }
 
 static void


@@ -290,6 +305,7 @@ draw_worm(WINDOW *win, void *data)
     switch (op->nopts) {
     case 0:
        done = TRUE;
     switch (op->nopts) {
     case 0:
        done = TRUE;

+       Trace(("done - draw_worm"));

        break;
     case 1:
        w->orientation = op->opts[0];
        break;
     case 1:
        w->orientation = op->opts[0];


@@ -380,17 +396,18 @@ static int
 get_input(void)
 {
     int ch;
 get_input(void)
 {
     int ch;

-    ch = USING_WINDOW(stdscr, wgetch);
+    ch = USING_WINDOW1(stdscr, wgetch, safe_wgetch);

     return ch;
 }
 
 #ifdef KEY_RESIZE
 static int
     return ch;
 }
 
 #ifdef KEY_RESIZE
 static int

-update_refs(WINDOW *win)
+update_refs(WINDOW *win, void *data)

 {
     int x, y;
 
     (void) win;
 {
     int x, y;
 
     (void) win;

+    (void) data;

     if (last_x != COLS - 1) {
        for (y = 0; y <= last_y; y++) {
            refs[y] = typeRealloc(int, (size_t) COLS, refs[y]);
     if (last_x != COLS - 1) {
        for (y = 0; y <= last_y; y++) {
            refs[y] = typeRealloc(int, (size_t) COLS, refs[y]);


@@ -404,6 +421,7 @@ update_refs(WINDOW *win)
     if (last_y != LINES - 1) {
        for (y = LINES; y <= last_y; y++)
            free(refs[y]);
     if (last_y != LINES - 1) {
        for (y = LINES; y <= last_y; y++)
            free(refs[y]);

+       max_refs = LINES;

        refs = typeRealloc(int *, (size_t) LINES, refs);
        for (y = last_y + 1; y < LINES; y++) {
            refs[y] = typeMalloc(int, (size_t) COLS);
        refs = typeRealloc(int *, (size_t) LINES, refs);
        for (y = last_y + 1; y < LINES; y++) {
            refs[y] = typeMalloc(int, (size_t) COLS);


@@ -455,7 +473,6 @@ main(int argc, char *argv[])
     struct worm *w;
     int *ip;
     bool done = FALSE;
     struct worm *w;
     int *ip;
     bool done = FALSE;

-    int max_refs;

 #if HAVE_USE_DEFAULT_COLORS
     bool opt_d = FALSE;
 #endif
 #if HAVE_USE_DEFAULT_COLORS
     bool opt_d = FALSE;
 #endif


@@ -583,7 +600,7 @@ main(int argc, char *argv[])
            }
        }
     }
            }
        }
     }

-    USING_WINDOW(stdscr, wrefresh);
+    USING_WINDOW1(stdscr, wrefresh, safe_wrefresh);

     nodelay(stdscr, TRUE);
 
     while (!done) {
     nodelay(stdscr, TRUE);
 
     while (!done) {


@@ -592,10 +609,10 @@ main(int argc, char *argv[])
 #ifdef TRACE
            if (trace_start || trace_end) {
                if (generation == trace_start) {
 #ifdef TRACE
            if (trace_start || trace_end) {
                if (generation == trace_start) {

-                   trace(TRACE_CALLS);
+                   curses_trace(TRACE_CALLS);

                    get_input();
                } else if (generation == trace_end) {
                    get_input();
                } else if (generation == trace_end) {

-                   trace(0);
+                   curses_trace(0);

                    get_input();
                }
 
                    get_input();
                }
 


@@ -616,6 +633,7 @@ main(int argc, char *argv[])
            if (ch == 'q') {
                quitting = TRUE;
                done = TRUE;
            if (ch == 'q') {
                quitting = TRUE;
                done = TRUE;

+               Trace(("done - quitting"));

                continue;
            } else if (ch == 's') {
                nodelay(stdscr, FALSE);
                continue;
            } else if (ch == 's') {
                nodelay(stdscr, FALSE);


@@ -626,7 +644,7 @@ main(int argc, char *argv[])
 
        done = draw_all_worms();
        napms(10);
 
        done = draw_all_worms();
        napms(10);

-       USING_WINDOW(stdscr, wrefresh);
+       USING_WINDOW1(stdscr, wrefresh, safe_wrefresh);

     }
 
     Trace(("Cleanup"));
     }
 
     Trace(("Cleanup"));