/****************************************************************************
- * 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 *
* authorization. *
****************************************************************************/
/*
- * $Id: demo_new_pair.c,v 1.16 2017/09/04 11:47:44 tom Exp $
+ * $Id: demo_new_pair.c,v 1.21 2020/02/02 23:34:34 tom Exp $
*
* Demonstrate the alloc_pair() function.
*/
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];
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");
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.
*/
total_cells += 1 + (use_wide ? 1 : 0);
++current;
}
- exit_curses();
+ stop_curses();
fclose(output);
printf("%.1f cells/second\n",