diff --git a/termtest.c b/termtest.c index 48ddd63..437760e 100644 --- a/termtest.c +++ b/termtest.c @@ -1,7 +1,7 @@ // // termtest: terminal evaluation tool // -// Copyright (c) 2020, Přemysl Eric Janouch +// Copyright (c) 2020 - 2021, Přemysl Eric Janouch // // Permission to use, copy, modify, and/or distribute this software for any // purpose with or without fee is hereby granted. @@ -32,6 +32,9 @@ #include #include +// tiparm is ncurses-specific, let's make this a tiny bit more portable. +#define TIPARM(s, v1) tparm((s), (long) (v1)) + #define CSI "\x1b[" #define OSC "\x1b]" #define DCS "\x1bP" @@ -295,16 +298,16 @@ int main(int argc, char *argv[]) { && set_a_foreground && set_a_background && exit_attribute_mode; printf("Terminfo: %d\n", bbc_supported); if (bbc_supported) { - tputs(tiparm(set_a_foreground, COLOR_GREEN), 1, putchar); - tputs(tiparm(set_a_background, COLOR_BLUE), 1, putchar); + tputs(TIPARM(set_a_foreground, COLOR_GREEN), 1, putchar); + tputs(TIPARM(set_a_background, COLOR_BLUE), 1, putchar); printf("Terminfo%s ", exit_attribute_mode); tputs(enter_bold_mode, 1, putchar); - tputs(tiparm(set_a_foreground, COLOR_GREEN), 1, putchar); - tputs(tiparm(set_a_background, COLOR_BLUE), 1, putchar); + tputs(TIPARM(set_a_foreground, COLOR_GREEN), 1, putchar); + tputs(TIPARM(set_a_background, COLOR_BLUE), 1, putchar); printf("Bold%s ", exit_attribute_mode); tputs(enter_blink_mode, 1, putchar); - tputs(tiparm(set_a_foreground, COLOR_GREEN), 1, putchar); - tputs(tiparm(set_a_background, COLOR_BLUE), 1, putchar); + tputs(TIPARM(set_a_foreground, COLOR_GREEN), 1, putchar); + tputs(TIPARM(set_a_background, COLOR_BLUE), 1, putchar); printf("Blink%s ", exit_attribute_mode); printf("\n"); }