ncurses 6.2 - patch 20200301

[ncurses.git] / test / blue.c

diff --git a/test/blue.c b/test/blue.c
index 45fce074d3c2fe68e42113141d156937a7ea7e7c..922caab94396181e9c957a5b9ebe5421072329f4 100644 (file)
--- a/test/blue.c
+++ b/test/blue.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2013,2016 Free Software Foundation, Inc.              *
+ * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 1998-2016,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            *
@@ -36,7 +37,7 @@
  *****************************************************************************/
 
 /*
- * $Id: blue.c,v 1.42 2016/04/09 23:55:52 tom Exp $
+ * $Id: blue.c,v 1.53 2020/02/02 23:34:34 tom Exp $
  */
 
 #include <test.priv.h>
@@ -105,7 +106,7 @@ static int letters[4] =
     'c',                       /* clubs */
 };
 
-#ifdef HAVE_LANGINFO_CODESET
+#if HAVE_LANGINFO_CODESET
 
 #if HAVE_TIGETSTR
 static int glyphs[] =
@@ -153,14 +154,14 @@ init_vars(void)
 static void
 shuffle(int size)
 {
-    int i, j, numswaps, swapnum, temp;
+    int numswaps, swapnum;
 
     numswaps = size * 10;      /* an arbitrary figure */
 
     for (swapnum = 0; swapnum < numswaps; swapnum++) {
-       i = rand() % size;
-       j = rand() % size;
-       temp = deck[i];
+       int i = rand() % size;
+       int j = rand() % size;
+       int temp = deck[i];
        deck[i] = deck[j];
        deck[j] = temp;
     }
@@ -169,11 +170,11 @@ shuffle(int size)
 static void
 deal_cards(void)
 {
-    int ptr, card = 0, value, csuit, crank, suit, aces[4];
+    int card = 0, value, csuit, crank, suit, aces[4];
 
     memset(aces, 0, sizeof(aces));
     for (suit = HEARTS; suit <= CLUBS; suit++) {
-       ptr = freeptr[suit];
+       int ptr = freeptr[suit];
        grid[ptr++] = NOCARD;   /* 1st card space is blank */
        while ((ptr % GRID_WIDTH) != 0) {
            value = deck[card++];
@@ -196,20 +197,24 @@ deal_cards(void)
 static void
 printcard(int value)
 {
-    (void) addch(' ');
+    AddCh(' ');
     if (value == NOCARD) {
        (void) addstr("   ");
     } else {
        int which = (value / SUIT_LENGTH);
        int isuit = (value % SUIT_LENGTH);
-       attr_t color = COLOR_PAIR(((which % 2) == 0)
-                                 ? RED_ON_WHITE
-                                 : BLACK_ON_WHITE);
+       chtype color = (chtype) COLOR_PAIR(((which % 2) == 0)
+                                          ? RED_ON_WHITE
+                                          : BLACK_ON_WHITE);
 
-       addch(ranks[isuit][0] | (chtype) COLOR_PAIR(BLUE_ON_WHITE));
-       addch(ranks[isuit][1] | (chtype) COLOR_PAIR(BLUE_ON_WHITE));
+       AddCh(ranks[isuit][0] | (chtype) COLOR_PAIR(BLUE_ON_WHITE));
+       AddCh(ranks[isuit][1] | (chtype) COLOR_PAIR(BLUE_ON_WHITE));
 
-       attr_on(color, NULL);
+#ifdef NCURSES_VERSION
+       (attron) ((int) color); /* quieter compiler warnings */
+#else
+       attron(color);          /* PDCurses, etc., either no macro or wrong */
+#endif
 #if USE_WIDEC_SUPPORT
        {
            wchar_t values[2];
@@ -218,11 +223,15 @@ printcard(int value)
            addwstr(values);
        }
 #else
-       addch((chtype) suits[which]);
+       AddCh(suits[which]);
+#endif
+#ifdef NCURSES_VERSION
+       (attroff) ((int) color);
+#else
+       attroff(color);
 #endif
-       attr_off(color, NULL);
     }
-    (void) addch(' ');
+    AddCh(' ');
 }
 
 static void
@@ -331,16 +340,16 @@ play_game(void)
            } else {
                char buf[BUFSIZ];
 
-               (void) sprintf(buf,
-                              "Type [%s] to move, r to redraw, q or INTR to quit: ",
-                              live);
+               _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf))
+                           "Type [%s] to move, r to redraw, q or INTR to quit: ",
+                           live);
 
                do {
                    move(PROMPTROW, 0);
                    (void) addstr(buf);
                    move(PROMPTROW, (int) strlen(buf));
                    clrtoeol();
-                   (void) addch(' ');
+                   AddCh(' ');
                } while
                    (((c = (char) getch()) < 'a' || c > 'd')
                     && (c != 'r')
@@ -380,10 +389,10 @@ play_game(void)
 static int
 collect_discards(void)
 {
-    int row, col, cardno = 0, finish, gridno;
+    int row, col, cardno = 0, gridno;
 
     for (row = HEARTS; row <= CLUBS; row++) {
-       finish = 0;
+       int finish = 0;
        for (col = 1; col < GRID_WIDTH; col++) {
            gridno = row * GRID_WIDTH + col;
 
@@ -459,13 +468,11 @@ use_pc_display(void)
 int
 main(int argc, char *argv[])
 {
-    CATCHALL(die);
-
     setlocale(LC_ALL, "");
 
     use_pc_display();
 
-    initscr();
+    InitAndCatch(initscr(), die);
 
     start_color();
     init_pair(RED_ON_WHITE, COLOR_RED, COLOR_WHITE);