ncurses 6.0 - patch 20171216

[ncurses.git] / progs / tic.c

diff --git a/progs/tic.c b/progs/tic.c
index e89c477b68e534a8cffbc41962b3c00e3f8f9a8c..478da6c472a22ada8392fbe9ec3735ad52aeee7a 100644 (file)
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -48,7 +48,7 @@
 #include <parametrized.h>
 #include <transform.h>
 
 #include <parametrized.h>
 #include <transform.h>
 

-MODULE_ID("$Id: tic.c,v 1.247 2017/10/09 15:16:15 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.248 2017/12/16 23:05:21 tom Exp $")

 
 #define STDIN_NAME "<stdin>"
 
 
 #define STDIN_NAME "<stdin>"
 


@@ -1755,14 +1755,22 @@ expected_params(const char *name)
     return result;
 }
 
     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)
 {
 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')
     if (name[0] == 'u' &&
        (name[1] >= '0' && name[1] <= '9') &&
        name[2] == '\0')

-       result = 1;
+       result = (name[1] == '6') ? 2 : 0;

     return result;
 }
 
     return result;
 }
 


@@ -1844,7 +1852,10 @@ check_params(TERMTYPE2 *tp, const char *name, char *value, int extended)
            analyzed = popcount;
        }
        if (actual != analyzed && expected != analyzed) {
            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 {
                _nc_warning("tparm will use %d parameters for %s",
                            analyzed, name);
            } else {


@@ -2705,7 +2716,7 @@ check_termtype(TERMTYPE2 *tp, bool literal)
             * check for consistent number of parameters.
             */
            if (j >= SIZEOF(parametrized) ||
             * 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));
            }
                parametrized[j] > 0) {
                check_params(tp, name, a, (j >= STRCOUNT));
            }