ncurses 5.5

[ncurses.git] / test / rain.c

diff --git a/test/rain.c b/test/rain.c
index 646ab96ee639f7b10af6dc42fa260287fbe22309..19e7f9000c29ba639a8bca2d0b81ba7589b1bd2d 100644 (file)
--- a/test/rain.c
+++ b/test/rain.c
@@ -1,22 +1,22 @@
 /*
- * $Id: rain.c,v 1.13 1999/10/23 01:31:26 tom Exp $
+ * $Id: rain.c,v 1.20 2002/06/29 23:32:18 tom Exp $
  */
 #include <test.priv.h>
 
-#include <term.h>      /* for tparm() */
-
-#include <signal.h>
-
 /* rain 11/3/1980 EPS/CITHEP */
 
 static float ranf(void);
 static void onsig(int sig);
 
-static int next_j(int j)
+static int
+next_j(int j)
 {
-    if (j==0) j=4; else --j;
+    if (j == 0)
+       j = 4;
+    else
+       --j;
     if (has_colors()) {
-       int z = (int)(3*ranf());
+       int z = (int) (3 * ranf());
        chtype color = COLOR_PAIR(z);
        if (z)
            color |= A_BOLD;
@@ -28,23 +28,26 @@ static int next_j(int j)
 int
 main(
        int argc GCC_UNUSED,
-       char *argv[] GCC_UNUSED)
+       char *argv[]GCC_UNUSED)
 {
-int x, y, j;
-static int xpos[5], ypos[5];
-float r;
-float c;
+    int x, y, j;
+    static int xpos[5], ypos[5];
+    float r;
+    float c;
+
+    setlocale(LC_ALL, "");
 
-    for (j=SIGHUP;j<=SIGTERM;j++)
-       if (signal(j,SIG_IGN)!=SIG_IGN) signal(j,onsig);
+    for (j = SIGHUP; j <= SIGTERM; j++)
+       if (signal(j, SIG_IGN) != SIG_IGN)
+           signal(j, onsig);
 
     initscr();
     if (has_colors()) {
        int bg = COLOR_BLACK;
        start_color();
-#ifdef NCURSES_VERSION
+#if HAVE_USE_DEFAULT_COLORS
        if (use_default_colors() == OK)
-               bg = -1;
+           bg = -1;
 #endif
        init_pair(1, COLOR_BLUE, bg);
        init_pair(2, COLOR_CYAN, bg);
@@ -54,18 +57,18 @@ float c;
     curs_set(0);
     timeout(0);
 
-    r = (float)(LINES - 4);
-    c = (float)(COLS - 4);
-    for (j=5;--j>=0;) {
-       xpos[j]=(int)(c* ranf())+2;
-       ypos[j]=(int)(r* ranf())+2;
+    r = (float) (LINES - 4);
+    c = (float) (COLS - 4);
+    for (j = 5; --j >= 0;) {
+       xpos[j] = (int) (c * ranf()) + 2;
+       ypos[j] = (int) (r * ranf()) + 2;
     }
 
-    for (j=0;;) {
-       x=(int)(c*ranf())+2;
-       y=(int)(r*ranf())+2;
+    for (j = 0;;) {
+       x = (int) (c * ranf()) + 2;
+       y = (int) (r * ranf()) + 2;
 
-       mvaddch(y,x, '.');
+       mvaddch(y, x, '.');
 
        mvaddch(ypos[j], xpos[j], 'o');
 
@@ -73,33 +76,33 @@ float c;
        mvaddch(ypos[j], xpos[j], 'O');
 
        j = next_j(j);
-       mvaddch( ypos[j]-1, xpos[j],    '-');
-       mvaddstr(ypos[j],   xpos[j]-1, "|.|");
-       mvaddch( ypos[j]+1, xpos[j],    '-');
+       mvaddch(ypos[j] - 1, xpos[j], '-');
+       mvaddstr(ypos[j], xpos[j] - 1, "|.|");
+       mvaddch(ypos[j] + 1, xpos[j], '-');
 
        j = next_j(j);
-       mvaddch( ypos[j]-2, xpos[j],     '-');
-       mvaddstr(ypos[j]-1, xpos[j]-1,  "/ \\");
-       mvaddstr(ypos[j],   xpos[j]-2,  "| O |");
-       mvaddstr(ypos[j]+1, xpos[j]-1,  "\\ /");
-       mvaddch( ypos[j]+2, xpos[j],     '-');
+       mvaddch(ypos[j] - 2, xpos[j], '-');
+       mvaddstr(ypos[j] - 1, xpos[j] - 1, "/ \\");
+       mvaddstr(ypos[j], xpos[j] - 2, "| O |");
+       mvaddstr(ypos[j] + 1, xpos[j] - 1, "\\ /");
+       mvaddch(ypos[j] + 2, xpos[j], '-');
 
        j = next_j(j);
-       mvaddch( ypos[j]-2, xpos[j],     ' ');
-       mvaddstr(ypos[j]-1, xpos[j]-1,  "   ");
-       mvaddstr(ypos[j],   xpos[j]-2, "     ");
-       mvaddstr(ypos[j]+1, xpos[j]-1,  "   ");
-       mvaddch( ypos[j]+2, xpos[j],     ' ');
-
-       xpos[j] = x; ypos[j] = y;
-
-       switch(getch())
-       {
-       case('q'):
-       case('Q'):
+       mvaddch(ypos[j] - 2, xpos[j], ' ');
+       mvaddstr(ypos[j] - 1, xpos[j] - 1, "   ");
+       mvaddstr(ypos[j], xpos[j] - 2, "     ");
+       mvaddstr(ypos[j] + 1, xpos[j] - 1, "   ");
+       mvaddch(ypos[j] + 2, xpos[j], ' ');
+
+       xpos[j] = x;
+       ypos[j] = y;
+
+       switch (getch()) {
+       case ('q'):
+       case ('Q'):
            curs_set(1);
            endwin();
-           return(EXIT_SUCCESS);
+           ExitProgram(EXIT_SUCCESS);
        case 's':
            nodelay(stdscr, FALSE);
            break;
@@ -107,9 +110,9 @@ float c;
            nodelay(stdscr, TRUE);
            break;
 #ifdef KEY_RESIZE
-       case(KEY_RESIZE):
-           r = (float)(LINES - 4);
-           c = (float)(COLS - 4);
+       case (KEY_RESIZE):
+           r = (float) (LINES - 4);
+           c = (float) (COLS - 4);
            break;
 #endif
        }
@@ -122,7 +125,7 @@ onsig(int n GCC_UNUSED)
 {
     curs_set(1);
     endwin();
-    exit(EXIT_FAILURE);
+    ExitProgram(EXIT_FAILURE);
 }
 
 static float