ncurses 6.1 - patch 20181027

[ncurses.git] / test / rain.c

diff --git a/test/rain.c b/test/rain.c
index ef2f6cbc58c1bb3b9b9ad223dad1771285bfad82..6f238fb6b3b78ca7733fac5b410e3d37bdff1dbf 100644 (file)
--- a/test/rain.c
+++ b/test/rain.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2017,2018 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            *


@@ -26,9 +26,10 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
  * authorization.                                                           *
  ****************************************************************************/
 /*

- * $Id: rain.c,v 1.37 2010/09/25 22:16:12 juergen Exp $
+ * $Id: rain.c,v 1.49 2018/06/23 21:35:06 tom Exp $

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

+#include <popup_msg.h>

 
 /* rain 11/3/1980 EPS/CITHEP */
 
 
 /* rain 11/3/1980 EPS/CITHEP */
 


@@ -66,31 +67,38 @@ typedef struct {
 static STATS drop_threads[MAX_THREADS];
 #endif
 
 static STATS drop_threads[MAX_THREADS];
 #endif
 

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

 static void
 onsig(int n GCC_UNUSED)
 {
 static void
 onsig(int n GCC_UNUSED)
 {

-    curs_set(1);
-    endwin();
+    exit_curses();

     ExitProgram(EXIT_FAILURE);
 }
 
     ExitProgram(EXIT_FAILURE);
 }
 

-static float
+static double

 ranf(void)
 {
     long r = (rand() & 077777);
 ranf(void)
 {
     long r = (rand() & 077777);

-    return ((float) r / 32768.);
+    return ((double) r / 32768.);

 }
 
 static int
 random_x(void)
 {
 }
 
 static int
 random_x(void)
 {

-    return (((float) (COLS - 4) * ranf()) + 2);
+    return (int) (((double) (COLS - 4) * ranf()) + 2);

 }
 
 static int
 random_y(void)
 {
 }
 
 static int
 random_y(void)
 {

-    return (((float) (LINES - 4) * ranf()) + 2);
+    return (int) (((double) (LINES - 4) * ranf()) + 2);

 }
 
 static int
 }
 
 static int


@@ -102,10 +110,7 @@ next_j(int j)
        --j;
     if (has_colors()) {
        int z = (int) (3 * ranf());
        --j;
     if (has_colors()) {
        int z = (int) (3 * ranf());

-       chtype color = COLOR_PAIR(z);
-       if (z)
-           color |= A_BOLD;
-       (void) attrset(color);
+       (void) attrset(AttrArg(COLOR_PAIR(z), (z ? A_BOLD : A_NORMAL)));

     }
     return j;
 }
     }
     return j;
 }


@@ -222,7 +227,7 @@ draw_drop(void *arg)
      * Find myself in the list of threads so we can count the number of loops.
      */
     for (mystats = 0; mystats < MAX_THREADS; ++mystats) {
      * Find myself in the list of threads so we can count the number of loops.
      */
     for (mystats = 0; mystats < MAX_THREADS; ++mystats) {

-#ifdef __MINGW32__
+#if defined(_WIN32) && !defined(__WINPTHREADS_VERSION)

        if (drop_threads[mystats].myself.p == pthread_self().p)
 #else
        if (drop_threads[mystats].myself == pthread_self())
        if (drop_threads[mystats].myself.p == pthread_self().p)
 #else
        if (drop_threads[mystats].myself == pthread_self())


@@ -256,7 +261,7 @@ draw_drop(void *arg)
 /*
  * The description of pthread_create() is misleading, since it implies that
  * threads will exit cleanly after their function returns.
 /*
  * The description of pthread_create() is misleading, since it implies that
  * threads will exit cleanly after their function returns.

- * 
+ *

  * Since they do not (and the number of threads is limited by system
  * resources), make a limited number of threads, and signal any that are
  * waiting when we want a thread past that limit.
  * Since they do not (and the number of threads is limited by system
  * resources), make a limited number of threads, and signal any that are
  * waiting when we want a thread past that limit.


@@ -288,34 +293,80 @@ start_drop(DATA * data)
 static int
 get_input(void)
 {
 static int
 get_input(void)
 {

-    return USING_WINDOW(stdscr, wgetch);
+    return USING_WINDOW1(stdscr, wgetch, safe_wgetch);
+}
+
+static void
+usage(void)
+{
+    static const char *msg[] =
+    {
+       "Usage: rain [options]"
+       ,""
+       ,"Options:"
+#if HAVE_USE_DEFAULT_COLORS
+       ," -d       invoke use_default_colors"
+#endif
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+       fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(EXIT_FAILURE);

 }
 
 int
 }
 
 int

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

 {
 {

+    static const char *help[] =
+    {
+       "Commands:",
+       " q/Q        exit the program",
+       " s          do single-step",
+       " <space>    undo single-step",
+       "",
+       0
+    };
+

     bool done = FALSE;
     DATA drop;
 #ifndef USE_PTHREADS
     DATA last[MAX_DROP];
 #endif
     int j = 0;
     bool done = FALSE;
     DATA drop;
 #ifndef USE_PTHREADS
     DATA last[MAX_DROP];
 #endif
     int j = 0;

+    int ch;
+#if HAVE_USE_DEFAULT_COLORS
+    bool d_option = FALSE;
+#endif

 
 

-    setlocale(LC_ALL, "");
+    while ((ch = getopt(argc, argv, "d")) != -1) {
+       switch (ch) {
+#if HAVE_USE_DEFAULT_COLORS
+       case 'd':
+           d_option = TRUE;
+           break;
+#endif
+       default:
+           usage();
+           /* NOTREACHED */
+       }
+    }
+    if (optind < argc)
+       usage();

 
 

-    CATCHALL(onsig);
+    setlocale(LC_ALL, "");

 
 

-    initscr();
+    InitAndCatch(initscr(), onsig);

     if (has_colors()) {
        int bg = COLOR_BLACK;
        start_color();
 #if HAVE_USE_DEFAULT_COLORS
     if (has_colors()) {
        int bg = COLOR_BLACK;
        start_color();
 #if HAVE_USE_DEFAULT_COLORS

-       if (use_default_colors() == OK)
+       if (d_option && (use_default_colors() == OK))

            bg = -1;
 #endif
            bg = -1;
 #endif

-       init_pair(1, COLOR_BLUE, bg);
-       init_pair(2, COLOR_CYAN, bg);
+       init_pair(1, COLOR_BLUE, (short) bg);
+       init_pair(2, COLOR_CYAN, (short) bg);

     }
     nl();
     noecho();
     }
     nl();
     noecho();


@@ -376,11 +427,17 @@ main(int argc GCC_UNUSED,
        case (KEY_RESIZE):
            break;
 #endif
        case (KEY_RESIZE):
            break;
 #endif

+       case HELP_KEY_1:
+           popup_msg(stdscr, help);
+           break;
+       case ERR:
+           break;
+       default:
+           beep();

        }
        napms(50);
     }
        }
        napms(50);
     }

-    curs_set(1);
-    endwin();
+    exit_curses();

 #ifdef USE_PTHREADS
     printf("Counts per thread:\n");
     for (j = 0; j < MAX_THREADS; ++j)
 #ifdef USE_PTHREADS
     printf("Counts per thread:\n");
     for (j = 0; j < MAX_THREADS; ++j)