ncurses 6.0 - patch 20171216

[ncurses.git] / progs / tic.c

diff --git a/progs/tic.c b/progs/tic.c
index 3545c3c92a9b401db68eceddf5f99477e3f6d8d4..478da6c472a22ada8392fbe9ec3735ad52aeee7a 100644 (file)
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -48,7 +48,7 @@
 #include <parametrized.h>
 #include <transform.h>
 
-MODULE_ID("$Id: tic.c,v 1.244 2017/09/20 00:39:37 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.248 2017/12/16 23:05:21 tom Exp $")
 
 #define STDIN_NAME "<stdin>"
 
@@ -674,8 +674,6 @@ add_digit(int *target, int source)
     *target = (*target * 10) + (source - '0');
 }
 
-#define VtoTrace(opt) (unsigned) ((opt > 0) ? opt : (opt == 0))
-
 int
 main(int argc, char *argv[])
 {
@@ -1757,14 +1755,22 @@ expected_params(const char *name)
     return result;
 }
 
+/*
+ * ncurses assumes that u6 could be used for getting the cursor-position, but
+ * that is not implemented.  Make a special case for that, to quiet needless
+ * warnings.
+ *
+ * There are other string-capability extensions (see terminfo.src) which could
+ * have parameters such as "Ss", "%u", but are not used by ncurses.
+ */
 static int
 is_user_capability(const char *name)
 {
-    int result = 0;
+    int result = -1;
     if (name[0] == 'u' &&
        (name[1] >= '0' && name[1] <= '9') &&
        name[2] == '\0')
-       result = 1;
+       result = (name[1] == '6') ? 2 : 0;
     return result;
 }
 
@@ -1846,7 +1852,10 @@ check_params(TERMTYPE2 *tp, const char *name, char *value, int extended)
            analyzed = popcount;
        }
        if (actual != analyzed && expected != analyzed) {
-           if (is_user_capability(name)) {
+           int user_cap = is_user_capability(name);
+           if ((user_cap == analyzed) && using_extensions) {
+               ;               /* ignore */
+           } else if (user_cap >= 0) {
                _nc_warning("tparm will use %d parameters for %s",
                            analyzed, name);
            } else {
@@ -1925,7 +1934,7 @@ skip_DECSCNM(const char *value, int *flag)
 }
 
 static void
-check_delays(const char *name, const char *value)
+check_delays(TERMTYPE2 *tp, const char *name, const char *value)
 {
     const char *p, *q;
     const char *first = 0;
@@ -1975,6 +1984,14 @@ check_delays(const char *name, const char *value)
                    _nc_warning("function-key %s has delay", name);
                } else if (proportional && !line_capability(name)) {
                    _nc_warning("non-line capability using proportional delay: %s", name);
+               } else if (!xon_xoff &&
+                          !mandatory &&
+                          strchr(_nc_first_name(tp->term_names), '+') == 0) {
+                   _nc_warning("%s in %s is used since no xon/xoff",
+                               (proportional
+                                ? "proportional delay"
+                                : "delay"),
+                               name);
                }
            } else {
                p = q - 1;      /* restart scan */
@@ -2699,11 +2716,11 @@ check_termtype(TERMTYPE2 *tp, bool literal)
             * check for consistent number of parameters.
             */
            if (j >= SIZEOF(parametrized) ||
-               is_user_capability(name) ||
+               is_user_capability(name) > 0 ||
                parametrized[j] > 0) {
                check_params(tp, name, a, (j >= STRCOUNT));
            }
-           check_delays(ExtStrname(tp, (int) j, strnames), a);
+           check_delays(tp, ExtStrname(tp, (int) j, strnames), a);
            if (capdump) {
                check_infotocap(tp, (int) j, a);
            }