ncurses 6.1 - patch 20191102

[ncurses.git] / test / dots_mvcur.c

diff --git a/test/dots_mvcur.c b/test/dots_mvcur.c
index b45ace86bafd37b34d629db184893e633816ecfc..16d5ca5ecf75a44223011ef53710acd8947c103a 100644 (file)
--- a/test/dots_mvcur.c
+++ b/test/dots_mvcur.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2007-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 2007-2017,2019 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            *


@@ -29,7 +29,7 @@
 /*
  * Author: Thomas E. Dickey - 2007
  *
 /*
  * Author: Thomas E. Dickey - 2007
  *

- * $Id: dots_mvcur.c,v 1.7 2011/04/23 19:17:20 tom Exp $
+ * $Id: dots_mvcur.c,v 1.21 2019/08/24 22:19:28 tom Exp $

  *
  * A simple demo of the terminfo interface, and mvcur.
  */
  *
  * A simple demo of the terminfo interface, and mvcur.
  */


@@ -40,8 +40,6 @@
 
 #include <time.h>
 
 
 #include <time.h>
 

-#define valid(s) ((s != 0) && s != (char *)-1)
-

 static bool interrupted = FALSE;
 static long total_chars = 0;
 static time_t started;
 static bool interrupted = FALSE;
 static long total_chars = 0;
 static time_t started;


@@ -53,7 +51,7 @@ TPUTS_PROTO(outc, c)
 
     if (interrupted) {
        char tmp = (char) c;
 
     if (interrupted) {
        char tmp = (char) c;

-       if (write(STDOUT_FILENO, &tmp, 1) == -1)
+       if (write(STDOUT_FILENO, &tmp, (size_t) 1) == -1)

            rc = EOF;
     } else {
        if (putc(c, stdout) == EOF)
            rc = EOF;
     } else {
        if (putc(c, stdout) == EOF)


@@ -63,9 +61,9 @@ TPUTS_PROTO(outc, c)
 }
 
 static bool
 }
 
 static bool

-outs(char *s)
+outs(const char *s)

 {
 {

-    if (valid(s)) {
+    if (VALID_STRING(s)) {

        tputs(s, 1, outc);
        return TRUE;
     }
        tputs(s, 1, outc);
        return TRUE;
     }


@@ -81,7 +79,7 @@ cleanup(void)
     outs(clear_screen);
     outs(cursor_normal);
 
     outs(clear_screen);
     outs(cursor_normal);
 

-    printf("\n\n%ld total chars, rate %.2f/sec\n",
+    printf("\n\n%ld total cells, rate %.2f/sec\n",

           total_chars,
           ((double) (total_chars) / (double) (time((time_t *) 0) - started)));
 }
           total_chars,
           ((double) (total_chars) / (double) (time((time_t *) 0) - started)));
 }


@@ -99,62 +97,142 @@ ranf(void)
     return ((double) r / 32768.);
 }
 
     return ((double) r / 32768.);
 }
 

+static int
+get_number(NCURSES_CONST char *cap, int map)
+{
+    int result = map;
+    if (cap != 0) {
+       int check = tigetnum(cap);
+       if (check > 0)
+           result = check;
+    }
+    return result;
+}
+
+static void
+usage(void)
+{
+    static const char *msg[] =
+    {
+       "Usage: dots_termcap [options]"
+       ,""
+       ,"Options:"
+       ," -T TERM  override $TERM"
+#if HAVE_USE_ENV
+       ," -e       allow environment $LINES / $COLUMNS"
+#endif
+       ," -f       use tigetnum rather than <term.h> mapping"
+       ," -m SIZE  set margin (default: 2)"
+       ," -s MSECS delay 1% of the time (default: 1 msecs)"
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+       fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(EXIT_FAILURE);
+}
+

 int
 main(int argc GCC_UNUSED,
      char *argv[]GCC_UNUSED)
 {
     int x0 = 1, y0 = 1;
 int
 main(int argc GCC_UNUSED,
      char *argv[]GCC_UNUSED)
 {
     int x0 = 1, y0 = 1;

-    int x, y, z, p;
+    int ch;

     double r;
     double c;
     SCREEN *sp;
     double r;
     double c;
     SCREEN *sp;

+    int my_colors;
+    int f_option = 0;
+    int m_option = 2;
+    int s_option = 1;
+    size_t need;
+    char *my_env;
+
+    while ((ch = getopt(argc, argv, "T:efm:s:")) != -1) {
+       switch (ch) {
+       case 'T':
+           need = 6 + strlen(optarg);
+           my_env = malloc(need);
+           _nc_SPRINTF(my_env, _nc_SLIMIT(need) "TERM=%s", optarg);
+           putenv(my_env);
+           break;
+#if HAVE_USE_ENV
+       case 'e':
+           use_env(TRUE);
+           break;
+#endif
+       case 'f':
+           f_option = 1;
+           break;
+       case 'm':
+           m_option = atoi(optarg);
+           break;
+       case 's':
+           s_option = atoi(optarg);
+           break;
+       default:
+           usage();
+           break;
+       }
+    }

 
 

-    CATCHALL(onsig);
+    InitAndCatch((sp = newterm((char *) 0, stdout, stdin)), onsig);
+    refresh();                 /* needed with Solaris curses to cancel endwin */
+
+    if (sp == 0) {
+       fprintf(stderr, "Cannot initialize terminal\n");
+       ExitProgram(EXIT_FAILURE);
+    }

 
     srand((unsigned) time(0));
 
     srand((unsigned) time(0));

-    sp = newterm((char *) 0, stdout, stdin);
+

     outs(clear_screen);
     outs(cursor_home);
     outs(cursor_invisible);
     outs(clear_screen);
     outs(cursor_home);
     outs(cursor_invisible);

-    if (max_colors > 1) {
-       if (!valid(set_a_foreground)
-           || !valid(set_a_background)
-           || (!valid(orig_colors) && !valid(orig_pair)))
-           max_colors = -1;
+
+#define GetNumber(ln,sn) get_number(f_option ? #sn : 0, ln)
+    my_colors = GetNumber(max_colors, colors);
+    if (my_colors > 1) {
+       if (!VALID_STRING(set_a_foreground)
+           || !VALID_STRING(set_a_background)
+           || (!VALID_STRING(orig_colors) && !VALID_STRING(orig_pair)))
+           my_colors = -1;

     }
 
     }
 

-    r = (double) (lines - 4);
-    c = (double) (columns - 4);
+    r = (double) (GetNumber(lines, lines) - (m_option * 2));
+    c = (double) (GetNumber(columns, cols) - (m_option * 2));

     started = time((time_t *) 0);
 
     while (!interrupted) {
     started = time((time_t *) 0);
 
     while (!interrupted) {

-       x = (int) (c * ranf()) + 2;
-       y = (int) (r * ranf()) + 2;
-       p = (ranf() > 0.9) ? '*' : ' ';
+       int x = (int) (c * ranf()) + m_option;
+       int y = (int) (r * ranf()) + m_option;
+       int p = (ranf() > 0.9) ? '*' : ' ';

 
        if (mvcur(y0, x0, y, x) != ERR) {
            x0 = x;
            y0 = y;
        }
 
 
        if (mvcur(y0, x0, y, x) != ERR) {
            x0 = x;
            y0 = y;
        }
 

-       if (max_colors > 0) {
-           z = (int) (ranf() * max_colors);
+       if (my_colors > 0) {
+           int z = (int) (ranf() * my_colors);

            if (ranf() > 0.01) {
                tputs(tparm2(set_a_foreground, z), 1, outc);
            } else {
                tputs(tparm2(set_a_background, z), 1, outc);
            if (ranf() > 0.01) {
                tputs(tparm2(set_a_foreground, z), 1, outc);
            } else {
                tputs(tparm2(set_a_background, z), 1, outc);

-               napms(1);
+               napms(s_option);

            }
            }

-       } else if (valid(exit_attribute_mode)
-                  && valid(enter_reverse_mode)) {
+       } else if (VALID_STRING(exit_attribute_mode)
+                  && VALID_STRING(enter_reverse_mode)) {

            if (ranf() <= 0.01) {
                outs((ranf() > 0.6)
                     ? enter_reverse_mode
                     : exit_attribute_mode);
            if (ranf() <= 0.01) {
                outs((ranf() > 0.6)
                     ? enter_reverse_mode
                     : exit_attribute_mode);

-               napms(1);
+               napms(s_option);

            }
        }
        outc(p);
            }
        }
        outc(p);

+       ++x0;

        fflush(stdout);
        ++total_chars;
     }
        fflush(stdout);
        ++total_chars;
     }