ncurses 5.7 - patch 20091010

[ncurses.git] / test / ncurses.c

diff --git a/test/ncurses.c b/test/ncurses.c
index 70b0d86af28395b382730b42b89d7cd9fb146571..f351122cfa9e40081b9ac2a55471c69db9e270d8 100644 (file)
--- a/test/ncurses.c
+++ b/test/ncurses.c
@@ -40,7 +40,7 @@ AUTHOR
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 
-$Id: ncurses.c,v 1.343 2009/07/30 09:13:37 tom Exp $
+$Id: ncurses.c,v 1.347 2009/10/03 22:01:56 tom Exp $
 
 ***************************************************************************/
 
@@ -232,7 +232,7 @@ wGetstring(WINDOW *win, char *buffer, int limit)
 
     echo();
     getyx(win, y0, x0);
-    wattrset(win, A_REVERSE);
+    (void) wattrset(win, A_REVERSE);
 
     x = (int) strlen(buffer);
     while (!done) {
@@ -365,7 +365,7 @@ wGet_wstring(WINDOW *win, wchar_t *buffer, int limit)
 
     echo();
     getyx(win, y0, x0);
-    wattrset(win, A_REVERSE);
+    (void) wattrset(win, A_REVERSE);
 
     x = (int) wcslen(buffer);
     while (!done) {
@@ -629,12 +629,12 @@ wgetch_help(WINDOW *win, GetchFlags flags)
        int flg = ((strstr(help[n], "toggle") != 0)
                   && (flags[UChar(*help[n])] != FALSE));
        if (flg)
-           standout();
+           (void) standout();
        mvprintw(row, col, "%s", help[n]);
        if (col == 0)
            clrtoeol();
        if (flg)
-           standend();
+           (void) standend();
     }
     wrefresh(stdscr);
     wmove(win, y, x);
@@ -1358,7 +1358,7 @@ show_attr(int row, int skip, bool arrow, chtype attr, const char *name)
            addch(ch | attr);
        }
     } else {
-       attrset(attr);
+       (void) attrset(attr);
        addstr(attr_test_string);
        attroff(attr);
     }
@@ -2010,7 +2010,7 @@ color_test(void)
                    hello = numbered;
                }
                printw("%-*.*s", width, width, hello);
-               attrset(A_NORMAL);
+               (void) attrset(A_NORMAL);
 
                if ((i % per_row) == 0 && InxToFG(i) == min_colors) {
                    show_color_name(row, 0, InxToBG(i), opt_wide);
@@ -2395,9 +2395,9 @@ color_edit(void)
                     (i == current ? '>' : ' '),
                     (i < (int) SIZEOF(the_color_names)
                      ? the_color_names[i] : numeric));
-           attrset(COLOR_PAIR(i));
+           (void) attrset(COLOR_PAIR(i));
            addstr("        ");
-           attrset(A_NORMAL);
+           (void) attrset(A_NORMAL);
 
            color_content((short) i, &red, &green, &blue);
            addstr("   R = ");
@@ -2405,20 +2405,20 @@ color_edit(void)
                attron(A_STANDOUT);
            printw("%04d", red);
            if (current == i && field == 0)
-               attrset(A_NORMAL);
+               (void) attrset(A_NORMAL);
            addstr(", G = ");
            if (current == i && field == 1)
                attron(A_STANDOUT);
            printw("%04d", green);
            if (current == i && field == 1)
-               attrset(A_NORMAL);
+               (void) attrset(A_NORMAL);
            addstr(", B = ");
            if (current == i && field == 2)
                attron(A_STANDOUT);
            printw("%04d", blue);
            if (current == i && field == 2)
-               attrset(A_NORMAL);
-           attrset(A_NORMAL);
+               (void) attrset(A_NORMAL);
+           (void) attrset(A_NORMAL);
            printw(" ( %3d %3d %3d )",
                   scaled_rgb(red),
                   scaled_rgb(green),
@@ -3382,6 +3382,128 @@ show_wacs_chars(int repeat, attr_t attr, short pair)
 #endif
 }
 
+#ifdef WACS_D_PLUS
+static void
+show_wacs_chars_double(int repeat, attr_t attr, short pair)
+/* display the wide-ACS character set */
+{
+    cchar_t temp;
+
+    int n;
+
+/*#define BOTH2(name) #name, &(name) */
+#define BOTH2(name) #name, MERGE_ATTR(name)
+
+    erase();
+    attron(A_BOLD);
+    mvaddstr(0, 20, "Display of the Wide-ACS Character Set");
+    attroff(A_BOLD);
+    refresh();
+
+    n = show_1_wacs(0, repeat, BOTH2(WACS_D_ULCORNER));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_D_URCORNER));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_D_LLCORNER));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_D_LRCORNER));
+
+    n = show_1_wacs(n, repeat, BOTH2(WACS_D_LTEE));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_D_RTEE));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_D_TTEE));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_D_BTEE));
+
+    n = show_1_wacs(n, repeat, BOTH2(WACS_D_HLINE));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_D_VLINE));
+
+    n = show_1_wacs(n, repeat, BOTH2(WACS_LARROW));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_RARROW));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_UARROW));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_DARROW));
+
+    n = show_1_wacs(n, repeat, BOTH2(WACS_BLOCK));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_BOARD));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_LANTERN));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_BULLET));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_CKBOARD));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_DEGREE));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_DIAMOND));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_PLMINUS));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_PLUS));
+
+#ifdef CURSES_WACS_ARRAY
+    n = show_1_wacs(n, repeat, BOTH2(WACS_GEQUAL));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_NEQUAL));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_LEQUAL));
+
+    n = show_1_wacs(n, repeat, BOTH2(WACS_STERLING));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_PI));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_S1));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_S3));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_S7));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_S9));
+#endif
+}
+#endif
+
+#ifdef WACS_T_PLUS
+static void
+show_wacs_chars_thick(int repeat, attr_t attr, short pair)
+/* display the wide-ACS character set */
+{
+    cchar_t temp;
+
+    int n;
+
+/*#define BOTH2(name) #name, &(name) */
+#define BOTH2(name) #name, MERGE_ATTR(name)
+
+    erase();
+    attron(A_BOLD);
+    mvaddstr(0, 20, "Display of the Wide-ACS Character Set");
+    attroff(A_BOLD);
+    refresh();
+
+    n = show_1_wacs(0, repeat, BOTH2(WACS_T_ULCORNER));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_T_URCORNER));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_T_LLCORNER));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_T_LRCORNER));
+
+    n = show_1_wacs(n, repeat, BOTH2(WACS_T_LTEE));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_T_RTEE));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_T_TTEE));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_T_BTEE));
+
+    n = show_1_wacs(n, repeat, BOTH2(WACS_T_HLINE));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_T_VLINE));
+
+    n = show_1_wacs(n, repeat, BOTH2(WACS_LARROW));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_RARROW));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_UARROW));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_DARROW));
+
+    n = show_1_wacs(n, repeat, BOTH2(WACS_BLOCK));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_BOARD));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_LANTERN));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_BULLET));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_CKBOARD));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_DEGREE));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_DIAMOND));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_PLMINUS));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_PLUS));
+
+#ifdef CURSES_WACS_ARRAY
+    n = show_1_wacs(n, repeat, BOTH2(WACS_GEQUAL));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_NEQUAL));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_LEQUAL));
+
+    n = show_1_wacs(n, repeat, BOTH2(WACS_STERLING));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_PI));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_S1));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_S3));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_S7));
+    n = show_1_wacs(n, repeat, BOTH2(WACS_S9));
+#endif
+}
+#endif
+
 #undef MERGE_ATTR
 
 #define MERGE_ATTR(n,wch) merge_wide_attr(&temp[n], wch, attr, pair)
@@ -3514,6 +3636,16 @@ wide_acs_display(void)
        case 'a':
            ToggleAcs(last_show_wacs, show_wacs_chars);
            break;
+#ifdef WACS_D_PLUS
+       case 'd':
+           ToggleAcs(last_show_wacs, show_wacs_chars_double);
+           break;
+#endif
+#ifdef WACS_T_PLUS
+       case 't':
+           ToggleAcs(last_show_wacs, show_wacs_chars_thick);
+           break;
+#endif
        case 'x':
            ToggleAcs(last_show_wacs, show_wbox_chars);
            break;
@@ -3553,7 +3685,7 @@ wide_acs_display(void)
            show_upper_widechars(digit * 32 + 128, repeat, space, attr, pair);
 
        mvprintw(LINES - 3, 0,
-                "Select: a WACS, x box, u UTF-8, 0-9,+/- non-ASCII, </> repeat, ESC=quit");
+                "Select: a/d/t WACS, x box, u UTF-8, 0-9,+/- non-ASCII, </> repeat, ESC=quit");
        if (use_colors) {
            mvprintw(LINES - 2, 0,
                     "v/V, f/F, b/B cycle through video attributes (%s) and color %d/%d.",
@@ -5037,7 +5169,7 @@ flushinp_test(WINDOW *win)
        wbkgd(subWin, COLOR_PAIR(2) | ' ');
     }
 #endif
-    wattrset(subWin, A_BOLD);
+    (void) wattrset(subWin, A_BOLD);
     box(subWin, ACS_VLINE, ACS_HLINE);
     mvwaddstr(subWin, 2, 1, "This is a subwindow");
     wrefresh(win);
@@ -5857,18 +5989,18 @@ overlap_test_1_attr(WINDOW *win, int flavor, int col)
 
     switch (flavor) {
     case 0:
-       wattrset(win, A_NORMAL);
+       (void) wattrset(win, A_NORMAL);
        break;
     case 1:
-       wattrset(win, A_BOLD);
+       (void) wattrset(win, A_BOLD);
        break;
     case 2:
        init_pair(cpair, COLOR_BLUE, COLOR_WHITE);
-       wattrset(win, COLOR_PAIR(cpair) | A_NORMAL);
+       (void) wattrset(win, COLOR_PAIR(cpair) | A_NORMAL);
        break;
     case 3:
        init_pair(cpair, COLOR_WHITE, COLOR_BLUE);
-       wattrset(win, COLOR_PAIR(cpair) | A_BOLD);
+       (void) wattrset(win, COLOR_PAIR(cpair) | A_BOLD);
        break;
     }
 }
@@ -5973,7 +6105,7 @@ overlap_help(int state, int flavors[OVERLAP_FLAVORS])
            break;
        }
        overlap_helpitem(state, item, msg);
-       wattrset(stdscr, A_NORMAL);
+       (void) wattrset(stdscr, A_NORMAL);
        wbkgdset(stdscr, ' ' | A_NORMAL);
     }
     move(LINES - 1, 0);
@@ -5998,7 +6130,7 @@ overlap_test_1(int flavor, int col, WINDOW *a, char fill)
 {
     overlap_test_1_attr(a, flavor, col);
     fillwin(a, fill);
-    wattrset(a, A_NORMAL);
+    (void) wattrset(a, A_NORMAL);
 }
 
 static void
@@ -6580,7 +6712,7 @@ main(int argc, char *argv[])
            min_colors = -1;
        }
 #if NCURSES_VERSION_PATCH >= 20000708
-       else if (assumed_colors)
+       if (assumed_colors)
            assume_default_colors(default_fg, default_bg);
 #endif
 #endif