ncurses 6.0 - patch 20151226

[ncurses.git] / test / demo_termcap.c

diff --git a/test/demo_termcap.c b/test/demo_termcap.c
index 110797e502e01db460ae80bc38d89a05355635a1..c62dba8e0ce96c2b95e6d9ac1e89d61c3960a9c2 100644 (file)
--- a/test/demo_termcap.c
+++ b/test/demo_termcap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2005-2013,2014 Free Software Foundation, Inc.              *
+ * Copyright (c) 2005-2014,2015 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -29,7 +29,7 @@
 /*
  * Author: Thomas E. Dickey
  *
 /*
  * Author: Thomas E. Dickey
  *

- * $Id: demo_termcap.c,v 1.43 2014/08/31 23:11:39 tom Exp $
+ * $Id: demo_termcap.c,v 1.49 2015/10/10 20:41:16 tom Exp $

  *
  * A simple demo of the termcap interface.
  */
  *
  * A simple demo of the termcap interface.
  */


@@ -46,6 +46,12 @@
 #endif
 #endif
 
 #endif
 #endif
 

+#ifdef NCURSES_VERSION
+#include <termcap.h>
+#endif
+
+static void failed(const char *) GCC_NORETURN;
+

 static void
 failed(const char *msg)
 {
 static void
 failed(const char *msg)
 {


@@ -162,6 +168,72 @@ free_dblist(void)
     }
 }
 
     }
 }
 

+static void
+show_string(const char *name, const char *value)
+{
+    printf(FNAME(str), name);
+    if (value == ((char *) -1)) {
+       printf("CANCELLED");
+    } else if (value == ((char *) 0)) {
+       printf("ABSENT");
+    } else {
+       while (*value != 0) {
+           int ch = UChar(*value++);
+           switch (ch) {
+           case '\177':
+               fputs("^?", stdout);
+               break;
+           case '\033':
+               fputs("\\E", stdout);
+               break;
+           case '\b':
+               fputs("\\b", stdout);
+               break;
+           case '\f':
+               fputs("\\f", stdout);
+               break;
+           case '\n':
+               fputs("\\n", stdout);
+               break;
+           case '\r':
+               fputs("\\r", stdout);
+               break;
+           case ' ':
+               fputs("\\s", stdout);
+               break;
+           case '\t':
+               fputs("\\t", stdout);
+               break;
+           case '^':
+               fputs("\\^", stdout);
+               break;
+           case ':':
+               fputs("\\072", stdout);
+               break;
+           case '\\':
+               fputs("\\\\", stdout);
+               break;
+           default:
+               if (isgraph(ch))
+                   fputc(ch, stdout);
+               else if (ch < 32)
+                   printf("^%c", ch + '@');
+               else
+                   printf("\\%03o", ch);
+               break;
+           }
+       }
+    }
+    printf("\n");
+}
+
+static void
+show_number(const char *name, int value)
+{
+    printf(FNAME(num), name);
+    printf(" %d\n", value);
+}
+

 static void
 dumpit(NCURSES_CONST char *cap)
 {
 static void
 dumpit(NCURSES_CONST char *cap)
 {


@@ -184,61 +256,13 @@ dumpit(NCURSES_CONST char *cap)
             * Note that the strings returned are mostly terminfo format, since
             * ncurses does not convert except for a handful of special cases.
             */
             * Note that the strings returned are mostly terminfo format, since
             * ncurses does not convert except for a handful of special cases.
             */

-           printf(FNAME(str), cap);
-           while (*str != 0) {
-               int ch = UChar(*str++);
-               switch (ch) {
-               case '\177':
-                   fputs("^?", stdout);
-                   break;
-               case '\033':
-                   fputs("\\E", stdout);
-                   break;
-               case '\b':
-                   fputs("\\b", stdout);
-                   break;
-               case '\f':
-                   fputs("\\f", stdout);
-                   break;
-               case '\n':
-                   fputs("\\n", stdout);
-                   break;
-               case '\r':
-                   fputs("\\r", stdout);
-                   break;
-               case ' ':
-                   fputs("\\s", stdout);
-                   break;
-               case '\t':
-                   fputs("\\t", stdout);
-                   break;
-               case '^':
-                   fputs("\\^", stdout);
-                   break;
-               case ':':
-                   fputs("\\072", stdout);
-                   break;
-               case '\\':
-                   fputs("\\\\", stdout);
-                   break;
-               default:
-                   if (isgraph(ch))
-                       fputc(ch, stdout);
-                   else if (ch < 32)
-                       printf("^%c", ch + '@');
-                   else
-                       printf("\\%03o", ch);
-                   break;
-               }
-           }
-           printf("\n");
+           show_string(cap, str);

        }
     } else if ((num = tgetnum(cap)) >= 0) {
        total_values++;
        total_n_values++;
        if (!q_opt) {
        }
     } else if ((num = tgetnum(cap)) >= 0) {
        total_values++;
        total_n_values++;
        if (!q_opt) {

-           printf(FNAME(num), cap);
-           printf(" %d\n", num);
+           show_number(cap, num);

        }
     } else if (tgetflag(cap) > 0) {
        total_values++;
        }
     } else if (tgetflag(cap) > 0) {
        total_values++;


@@ -369,6 +393,8 @@ typedef enum {
 static void
 parse_description(const char *input_name)
 {
 static void
 parse_description(const char *input_name)
 {

+    static char empty[1];
+

     FILE *fp;
     struct stat sb;
     size_t count_bools = 0;
     FILE *fp;
     struct stat sb;
     size_t count_bools = 0;


@@ -403,6 +429,7 @@ parse_description(const char *input_name)
     if ((fp = fopen(input_name, "r")) == 0)
        failed("cannot open input-file");
     len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp);
     if ((fp = fopen(input_name, "r")) == 0)
        failed("cannot open input-file");
     len = fread(my_blob, sizeof(char), (size_t) sb.st_size, fp);

+    my_blob[sb.st_size] = '\0';

     fclose(fp);
 
     /*
     fclose(fp);
 
     /*


@@ -585,10 +612,10 @@ parse_description(const char *input_name)
                         * known order.
                         */
                        if (count_strs) {
                         * known order.
                         */
                        if (count_strs) {

-                           my_strvalues[count_strs] = "";
+                           my_strvalues[count_strs] = empty;

                            my_strcodes[count_strs++] = &my_blob[j];
                        } else if (count_nums) {
                            my_strcodes[count_strs++] = &my_blob[j];
                        } else if (count_nums) {

-                           my_numvalues[count_nums] = "";
+                           my_numvalues[count_nums] = empty;

                            my_numcodes[count_nums++] = &my_blob[j];
                        } else {
                            my_boolcodes[count_bools++] = &my_blob[j];
                            my_numcodes[count_nums++] = &my_blob[j];
                        } else {
                            my_boolcodes[count_bools++] = &my_blob[j];


@@ -660,7 +687,7 @@ copy_code_list(NCURSES_CONST char *const *list)
 {
     int pass;
     size_t count;
 {
     int pass;
     size_t count;

-    size_t length = 0;
+    size_t length = 1;

     char **result = 0;
     char *blob = 0;
     char *unused = 0;
     char **result = 0;
     char *blob = 0;
     char *unused = 0;


@@ -709,6 +736,7 @@ usage(void)
        " -q       quiet (prints only counts)",
        " -r COUNT repeat for given count",
        " -s       print string-capabilities",
        " -q       quiet (prints only counts)",
        " -r COUNT repeat for given count",
        " -s       print string-capabilities",

+       " -v       print termcap-variables",

 #ifdef NCURSES_VERSION
        " -x       print extended capabilities",
 #endif
 #ifdef NCURSES_VERSION
        " -x       print extended capabilities",
 #endif


@@ -726,12 +754,13 @@ main(int argc, char *argv[])
     int n;
     char *name;
     bool a_opt = FALSE;
     int n;
     char *name;
     bool a_opt = FALSE;

+    bool v_opt = FALSE;

     char *input_name = 0;
 
     int repeat;
     int r_opt = 1;
 
     char *input_name = 0;
 
     int repeat;
     int r_opt = 1;
 

-    while ((n = getopt(argc, argv, "abd:e:i:nqr:sxy")) != -1) {
+    while ((n = getopt(argc, argv, "abd:e:i:nqr:svxy")) != -1) {

        switch (n) {
        case 'a':
            a_opt = TRUE;
        switch (n) {
        case 'a':
            a_opt = TRUE;


@@ -761,6 +790,9 @@ main(int argc, char *argv[])
        case 's':
            s_opt = TRUE;
            break;
        case 's':
            s_opt = TRUE;
            break;

+       case 'v':
+           v_opt = TRUE;
+           break;

 #if NCURSES_XNAMES
        case 'x':
            x_opt = TRUE;
 #if NCURSES_XNAMES
        case 'x':
            x_opt = TRUE;


@@ -776,7 +808,7 @@ main(int argc, char *argv[])
        }
     }
 
        }
     }
 

-#if NCURSES_XNAMES
+#if HAVE_USE_EXTENDED_NAMES

     use_extended_names(x_opt);
 #endif
 
     use_extended_names(x_opt);
 #endif
 


@@ -833,6 +865,15 @@ main(int argc, char *argv[])
     printf("%ld values (%ld booleans, %ld numbers, %ld strings)\n",
           total_values, total_b_values, total_n_values, total_s_values);
 
     printf("%ld values (%ld booleans, %ld numbers, %ld strings)\n",
           total_values, total_b_values, total_n_values, total_s_values);
 

+#if defined(NCURSES_VERSION) || defined(HAVE_CURSES_DATA_OSPEED)
+    if (v_opt) {
+       show_number("PC", PC);
+       show_string("UP", UP);
+       show_string("BC", BC);
+       show_number("ospeed", ospeed);
+    }
+#endif
+

     free_dblist();
 
     ExitProgram(EXIT_SUCCESS);
     free_dblist();
 
     ExitProgram(EXIT_SUCCESS);