X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fdemo_new_pair.c;h=ac0d9bf3362de6a37a5a6980afc0b66bc0d5de31;hp=8c29870b81290d25626603f9f44cf5e67ca90afa;hb=9a9dd79463eba7af0b06b6a1f7e580b632ec1be1;hpb=af3d0ee323cbb22d2a7596d564bf68f7307f5076

diff --git a/test/demo_new_pair.c b/test/demo_new_pair.c
index 8c29870b..ac0d9bf3 100644
--- 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-2020,2021 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.24 2021/02/21 01:24:06 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];
@@ -135,6 +136,7 @@ usage(void)
 	"Repeatedly print using all possible color combinations.",
 	"",
 	"Options:",
+	" -g       use getcchar to check setcchar",
 	" -i       use init_pair rather than alloc_pair",
 	" -p       start in paged-mode",
 	" -s       start in single-step mode",
@@ -185,6 +187,7 @@ main(int argc, char *argv[])
     };
 
     bool done = FALSE;
+    bool check_set = FALSE;
     bool clobber = FALSE;
     bool hascolor = FALSE;
     bool use_init = FALSE;
@@ -201,8 +204,11 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    while ((ch = getopt(argc, argv, "ipsw")) != -1) {
+    while ((ch = getopt(argc, argv, "gipsw")) != -1) {
 	switch (ch) {
+	case 'g':
+	    check_set = TRUE;
+	    break;
 	case 'i':
 	    use_init = TRUE;
 	    break;
@@ -223,7 +229,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 +237,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 +329,42 @@ 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));
+
+	if (check_set) {
+	    int problem = 0;
+	    wchar_t chk_wch[2];
+	    attr_t chk_attrs = 0;
+	    short chk_pair = 0;
+	    int chk_pair2 = 0;
+
+#define AllButColor(a) ((a) & (A_ATTRIBUTES & ~A_COLOR))
+
+	    if (getcchar(&temp, NULL, &chk_attrs, &chk_pair,
+			 (use_init ? NULL : (void *) &chk_pair2)) != 2) {
+		problem = 1;
+	    } else if (getcchar(&temp, chk_wch, &chk_attrs, &chk_pair,
+				(use_init ? NULL : (void *) &chk_pair2)) != OK) {
+		problem = 2;
+	    } else if (chk_wch[0] != wch[0]) {
+		problem = 3;
+	    } else if (AllButColor(my_attrs) != AllButColor(chk_attrs)) {
+		problem = 4;
+	    } else if (my_pair != chk_pair) {
+		problem = 4;
+	    } else if (!use_init && (my_pair != chk_pair2)) {
+		problem = 5;
+	    }
+	    if (problem) {
+		wch[0] = (wchar_t) (problem + '0');
+		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 +375,7 @@ main(int argc, char *argv[])
 	total_cells += 1 + (use_wide ? 1 : 0);
 	++current;
     }
-    endwin();
+    stop_curses();
     fclose(output);
 
     printf("%.1f cells/second\n",