ncurses 6.0 - patch 20170114

[ncurses.git] / ncurses / tinfo / lib_tparm.c

diff --git a/ncurses/tinfo/lib_tparm.c b/ncurses/tinfo/lib_tparm.c
index 439115b01e83a6712336aa0938028b1597da6aaf..53a36092723aec2dc1b6ef48197946cfc1c6c427 100644 (file)
--- a/ncurses/tinfo/lib_tparm.c
+++ b/ncurses/tinfo/lib_tparm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2015,2016 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            *
@@ -42,7 +42,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tparm.c,v 1.90 2013/11/09 14:53:05 tom Exp $")
+MODULE_ID("$Id: lib_tparm.c,v 1.95 2016/05/28 23:22:52 tom Exp $")
 
 /*
  *     char *
@@ -253,6 +253,9 @@ parse_format(const char *s, char *format, int *len)
            case 'x':           /* FALLTHRU */
            case 'X':           /* FALLTHRU */
            case 's':
+#ifdef EXP_XTERM_1005
+           case 'u':
+#endif
                *format++ = *s;
                done = TRUE;
                break;
@@ -372,6 +375,9 @@ _nc_tparm_analyze(const char *string, char *p_is_s[NUM_PARM], int *popcount)
            case 'x':           /* FALLTHRU */
            case 'X':           /* FALLTHRU */
            case 'c':           /* FALLTHRU */
+#ifdef EXP_XTERM_1005
+           case 'u':
+#endif
                if (lastpop <= 0)
                    number++;
                lastpop = -1;
@@ -466,6 +472,8 @@ tparam_internal(int use_TPARM_ARG, const char *string, va_list ap)
     int i;
     const char *cp = string;
     size_t len2;
+    bool termcap_hack;
+    bool incremented_two;
 
     if (cp == NULL)
        return NULL;
@@ -482,6 +490,8 @@ tparam_internal(int use_TPARM_ARG, const char *string, va_list ap)
     if (TPS(fmt_buff) == 0)
        return NULL;
 
+    incremented_two = FALSE;
+
     if (number > NUM_PARM)
        number = NUM_PARM;
     if (popcount > NUM_PARM)
@@ -514,8 +524,9 @@ tparam_internal(int use_TPARM_ARG, const char *string, va_list ap)
      * style, which means tparam() will expand termcap strings OK.
      */
     TPS(stack_ptr) = 0;
+    termcap_hack = FALSE;
     if (popcount == 0) {
-       popcount = number;
+       termcap_hack = TRUE;
        for (i = number - 1; i >= 0; i--) {
            if (p_is_s[i])
                spush(p_is_s[i]);
@@ -561,6 +572,20 @@ tparam_internal(int use_TPARM_ARG, const char *string, va_list ap)
                save_char(npop());
                break;
 
+#ifdef EXP_XTERM_1005
+           case 'u':
+               {
+                   unsigned char target[10];
+                   unsigned source = (unsigned) npop();
+                   int rc = _nc_conv_to_utf8(target, source, (unsigned)
+                                             sizeof(target));
+                   int n;
+                   for (n = 0; n < rc; ++n) {
+                       save_char(target[n]);
+                   }
+               }
+               break;
+#endif
            case 'l':
                npush((int) strlen(spop()));
                break;
@@ -573,10 +598,11 @@ tparam_internal(int use_TPARM_ARG, const char *string, va_list ap)
                cp++;
                i = (UChar(*cp) - '1');
                if (i >= 0 && i < NUM_PARM) {
-                   if (p_is_s[i])
+                   if (p_is_s[i]) {
                        spush(p_is_s[i]);
-                   else
+                   } else {
                        npush((int) param[i]);
+                   }
                }
                break;
 
@@ -645,11 +671,15 @@ tparam_internal(int use_TPARM_ARG, const char *string, va_list ap)
                break;
 
            case 'A':
-               npush(npop() && npop());
+               y = npop();
+               x = npop();
+               npush(y && x);
                break;
 
            case 'O':
-               npush(npop() || npop());
+               y = npop();
+               x = npop();
+               npush(y || x);
                break;
 
            case '&':
@@ -691,10 +721,26 @@ tparam_internal(int use_TPARM_ARG, const char *string, va_list ap)
                break;
 
            case 'i':
-               if (p_is_s[0] == 0)
-                   param[0]++;
-               if (p_is_s[1] == 0)
-                   param[1]++;
+               /*
+                * Increment the first two parameters -- if they are numbers
+                * rather than strings.  As a side effect, assign into the
+                * stack; if this is termcap, then the stack was populated
+                * using the termcap hack above rather than via the terminfo
+                * 'p' case.
+                */
+               if (!incremented_two) {
+                   incremented_two = TRUE;
+                   if (p_is_s[0] == 0) {
+                       param[0]++;
+                       if (termcap_hack)
+                           TPS(stack)[0].data.num = (int) param[0];
+                   }
+                   if (p_is_s[1] == 0) {
+                       param[1]++;
+                       if (termcap_hack)
+                           TPS(stack)[1].data.num = (int) param[1];
+                   }
+               }
                break;
 
            case '?':