ncurses 6.2 - patch 20200718

[ncurses.git] / test / demo_new_pair.c

diff --git a/test/demo_new_pair.c b/test/demo_new_pair.c
index 8c29870b81290d25626603f9f44cf5e67ca90afa..bd62a089741ff6d9f768068a5517335eb29d672b 100644 (file)
--- a/test/demo_new_pair.c
+++ b/test/demo_new_pair.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2017 Free Software Foundation, Inc.                        *
+ * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 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            *
@@ -26,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_new_pair.c,v 1.14 2017/06/17 19:48:45 tom Exp $
+ * $Id: demo_new_pair.c,v 1.21 2020/02/02 23:34:34 tom Exp $
  *
  * Demonstrate the alloc_pair() function.
  */
@@ -63,19 +64,19 @@ next_attr(int now)
        attr_t bits[MAX_BITS];
 
        init = TRUE;
-       bits[limit++] = A_NORMAL;
+       bits[limit++] = WA_NORMAL;
        if (valid_cap("smso"))
-           bits[limit++] = A_STANDOUT;
+           bits[limit++] = WA_STANDOUT;
        if (valid_cap("smul"))
-           bits[limit++] = A_UNDERLINE;
+           bits[limit++] = WA_UNDERLINE;
        if (valid_cap("rev"))
-           bits[limit++] = A_REVERSE;
+           bits[limit++] = WA_REVERSE;
        if (valid_cap("blink"))
-           bits[limit++] = A_BLINK;
+           bits[limit++] = WA_BLINK;
        if (valid_cap("dim"))
-           bits[limit++] = A_DIM;
+           bits[limit++] = WA_DIM;
        if (valid_cap("bold"))
-           bits[limit++] = A_BOLD;
+           bits[limit++] = WA_BOLD;
        for (j = 0; j < limit; ++j) {
            for (k = 0; k < limit; ++k) {
                table[j * limit + k] = bits[j] | bits[k];
@@ -223,7 +224,7 @@ main(int argc, char *argv[])
 
     if (isatty(fileno(stderr))) {
        output = stderr;
-    } else if ((ch = open("/dev/tty", O_WRONLY)) != 0) {
+    } else if ((ch = open("/dev/tty", O_WRONLY)) >= 0) {
        output = fdopen(ch, "w");
     } else {
        fprintf(stderr, "cannot open terminal for output\n");
@@ -231,6 +232,7 @@ main(int argc, char *argv[])
     }
     if (newterm(NULL, output, stdin) == 0) {
        fprintf(stderr, "Cannot initialize terminal\n");
+       fclose(output);
        ExitProgram(EXIT_FAILURE);
     }
     (void) cbreak();           /* read chars without wait for \n */
@@ -322,7 +324,9 @@ main(int argc, char *argv[])
            break;
        wch[0] = use_wide ? 0xff03 : '#';
        wch[1] = 0;
-       setcchar(&temp, wch, my_attrs, (short) my_pair, NULL);
+       setcchar(&temp, wch, my_attrs,
+                (short) my_pair,
+                (use_init ? NULL : (void *) &my_pair));
        /*
         * At the end of a page, move the cursor to the home position.
         */
@@ -333,7 +337,7 @@ main(int argc, char *argv[])
        total_cells += 1 + (use_wide ? 1 : 0);
        ++current;
     }
-    endwin();
+    stop_curses();
     fclose(output);
 
     printf("%.1f cells/second\n",