X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ftestcurs.c;h=bf602bffc5b26feef5786c5171f928eeb23ee7e2;hp=fd189a94492743370815a0557699824f887b0f83;hb=25358bc041a5566ce2de4c9c792837e552b35671;hpb=46722468f47c2b77b3987729b4bcf2321cccfd01

diff --git a/test/testcurs.c b/test/testcurs.c
index fd189a94..bf602bff 100644
--- a/test/testcurs.c
+++ b/test/testcurs.c
@@ -7,11 +7,10 @@
  *  wrs(5/28/93) -- modified to be consistent (perform identically) with either
  *                  PDCurses or under Unix System V, R4
  *
- * $Id: testcurs.c,v 1.31 2002/09/14 22:45:15 tom Exp $
+ * $Id: testcurs.c,v 1.37 2005/12/31 20:23:09 tom Exp $
  */
 
 #include <test.priv.h>
-#include <ctype.h>
 
 #if defined(XCURSES)
 char *XCursesProgramName = "testcurs";
@@ -34,7 +33,7 @@ struct commands {
 };
 typedef struct commands COMMAND;
 
-const COMMAND command[] =
+static const COMMAND command[] =
 {
     {"General Test", introTest},
     {"Pad Test", padTest},
@@ -59,7 +58,7 @@ strdup(char *s)
 }
 #endif /* not HAVE_STRDUP */
 
-int width, height;
+static int width, height;
 
 int
 main(
@@ -159,7 +158,7 @@ Continue(WINDOW *win)
     int x1 = getmaxx(win);
     int y0 = y1 < 10 ? y1 : 10;
     int x0 = 1;
-    long save;
+    chtype save;
 
     save = mvwinch(win, y0, x1 - 1);
 
@@ -343,13 +342,19 @@ inputTest(WINDOW *win)
     mvwaddstr(win, 1, 1, "Press keys (or mouse buttons) to show their names");
     mvwaddstr(win, 2, 1, "Press spacebar to finish");
     wrefresh(win);
+
     keypad(win, TRUE);
     raw();
     noecho();
+
+#if HAVE_TYPEAHEAD
     typeahead(-1);
+#endif
+
 #if defined(PDCURSES)
     mouse_set(ALL_MOUSE_EVENTS);
 #endif
+
     for (;;) {
 	wmove(win, 3, 5);
 	c = wgetch(win);
@@ -359,7 +364,7 @@ inputTest(WINDOW *win)
 	else if (isprint(c))
 	    wprintw(win, "Key Pressed: %c", c);
 	else
-	    wprintw(win, "Key Pressed: %s", unctrl(c));
+	    wprintw(win, "Key Pressed: %s", unctrl(UChar(c)));
 #if defined(PDCURSES)
 	if (c == KEY_MOUSE) {
 	    int button = 0;
@@ -401,7 +406,8 @@ inputTest(WINDOW *win)
 
     repeat = 0;
     do {
-	static const char *fmt[] = {
+	static const char *fmt[] =
+	{
 	    "%d %10s",
 	    "%d %[a-zA-Z]s",
 	    "%d %[][a-zA-Z]s",
@@ -440,6 +446,17 @@ outputTest(WINDOW *win)
     chtype ch;
     int by, bx;
 
+#if !HAVE_TIGETSTR
+#if HAVE_TGETENT
+    char tc_buffer[4096];
+    char tc_parsed[4096];
+    char *area_pointer = tc_parsed;
+    tgetent(tc_buffer, getenv("TERM"));
+#else
+#define tgetstr(a,b) 0
+#endif
+#endif /* !HAVE_TIGETSTR */
+
     nl();
     wclear(win);
     mvwaddstr(win, 1, 1,
@@ -530,8 +547,10 @@ outputTest(WINDOW *win)
     winsch(win, ch);
     Continue(win);
 
+#if HAVE_WINSSTR
     mvwinsstr(win, 6, 2, "A1B2C3D4E5");
     Continue(win);
+#endif
 
     wmove(win, 5, 1);
     winsertln(win);
@@ -554,14 +573,14 @@ outputTest(WINDOW *win)
     *Buffer = 0;
     scanw("%s", Buffer);
 
-    if (tigetstr("cvvis") != 0) {
+    if (TIGETSTR("cvvis", "vs") != 0) {
 	wclear(win);
 	curs_set(2);
 	mvwaddstr(win, 1, 1, "The cursor should appear as a block (visible)");
 	Continue(win);
     }
 
-    if (tigetstr("civis") != 0) {
+    if (TIGETSTR("civis", "vi") != 0) {
 	wclear(win);
 	curs_set(0);
 	mvwaddstr(win, 1, 1,
@@ -569,7 +588,7 @@ outputTest(WINDOW *win)
 	Continue(win);
     }
 
-    if (tigetstr("cnorm") != 0) {
+    if (TIGETSTR("cnorm", "ve") != 0) {
 	wclear(win);
 	curs_set(1);
 	mvwaddstr(win, 1, 1, "The cursor should be an underline (normal)");
@@ -586,6 +605,8 @@ outputTest(WINDOW *win)
 #endif
 
     werase(win);
+
+#if HAVE_TERMNAME
     mvwaddstr(win, 1, 1, "Information About Your Terminal");
     mvwaddstr(win, 3, 1, termname());
     mvwaddstr(win, 4, 1, longname());
@@ -593,6 +614,7 @@ outputTest(WINDOW *win)
 	mvwaddstr(win, 5, 1, "This terminal supports blinking.");
     else
 	mvwaddstr(win, 5, 1, "This terminal does NOT support blinking.");
+#endif
 
     mvwaddnstr(win, 7, 5, "Have a nice day!ok", 16);
     wrefresh(win);
@@ -690,12 +712,12 @@ padTest(WINDOW *dummy GCC_UNUSED)
 static void
 display_menu(int old_option, int new_option)
 {
-    register size_t i;
+    int i;
 
     attrset(A_NORMAL);
     mvaddstr(3, 20, "PDCurses Test Program");
 
-    for (i = 0; i < MAX_OPTIONS; i++)
+    for (i = 0; i < (int) MAX_OPTIONS; i++)
 	mvaddstr(5 + i, 25, command[i].text);
     if (old_option != (-1))
 	mvaddstr(5 + old_option, 25, command[old_option].text);