ncurses 5.0

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

diff --git a/ncurses/comp_expand.c b/ncurses/tinfo/comp_expand.c
similarity index 63%
rename from ncurses/comp_expand.c
rename to ncurses/tinfo/comp_expand.c
index 6cdf188ad56204f957a5b0309fa7a470b7a0f4ee..eb552fadabda0d524ad94d4c949b3ff1ed8c515e 100644 (file)
--- a/ncurses/comp_expand.c
+++ b/ncurses/tinfo/comp_expand.c
@@ -35,7 +35,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: comp_expand.c,v 1.4 1998/02/11 12:14:00 tom Exp $")
+MODULE_ID("$Id: comp_expand.c,v 1.11 1999/03/07 00:51:07 tom Exp $")
 
 static int trailing_spaces(const char *src)
 {
@@ -49,7 +49,7 @@ static int trailing_spaces(const char *src)
 #define REALCTL(s) (CHAR_OF(s) < 127 && iscntrl(CHAR_OF(s)))
 #define REALPRINT(s) (CHAR_OF(s) < 127 && isprint(CHAR_OF(s)))
 
-char *_nc_tic_expand(const char *srcp, bool tic_format)
+char *_nc_tic_expand(const char *srcp, bool tic_format, int numbers)
 {
 static char *  buffer;
 static size_t  length;
@@ -60,62 +60,114 @@ bool               islong = (strlen(str) > 3);
 size_t         need = (2 + strlen(str)) * 4;
 int            ch;
 
-       if (buffer == 0) {
-               buffer = malloc(length = need);
-       } else if (need > length) {
-               buffer = realloc(buffer, length = need);
+       if (buffer == 0 || need > length) {
+               if ((buffer = typeRealloc(char, length = need, buffer)) == 0)
+                       return 0;
        }
 
-       bufp = 0;
-       ptr = str;
-       while ((ch = (*str & 0xff)) != 0) {
+       bufp = 0;
+       ptr = str;
+       while ((ch = (*str & 0xff)) != 0) {
                if (ch == '%' && REALPRINT(str+1)) {
-                       buffer[bufp++] = *str++;
-                       buffer[bufp++] = *str;
+                       buffer[bufp++] = *str++;
+                       /*
+                        * Though the character literals are more compact, most
+                        * terminal descriptions use numbers and are not easy
+                        * to read in character-literal form.
+                        */
+                       switch (numbers) {
+                       case -1:
+                           if (str[0] == S_QUOTE
+                            && str[1] != '\\'
+                            && REALPRINT(str+1)
+                            && str[2] == S_QUOTE) {
+                               sprintf(buffer+bufp, "{%d}", str[1]);
+                               bufp += strlen(buffer+bufp);
+                               str += 2;
+                           } else {
+                               buffer[bufp++] = *str;
+                           }
+                           break;
+                       /*
+                        * If we have a "%{number}", try to translate it into
+                        * a "%'char'" form, since that will run a little faster
+                        * when we're interpreting it.  Also, having one form
+                        * for the constant makes it simpler to compare terminal
+                        * descriptions.
+                        */
+                       case 1:
+                           if (str[0] == L_BRACE
+                            && isdigit(str[1])) {
+                               char *dst = 0;
+                               long value = strtol(str+1, &dst, 0);
+                               if (dst != 0
+                                && *dst == R_BRACE
+                                && value < 127
+                                && value != '\\'       /* FIXME */
+                                && isprint((int)value)) {
+                                       ch = (int)value;
+                                       buffer[bufp++] = S_QUOTE;
+                                       if (ch == '\\'
+                                        || ch == S_QUOTE)
+                                               buffer[bufp++] = '\\';
+                                       buffer[bufp++] = ch;
+                                       buffer[bufp++] = S_QUOTE;
+                                       str = dst;
+                               } else {
+                                       buffer[bufp++] = *str;
+                               }
+                           } else {
+                                   buffer[bufp++] = *str;
+                           }
+                           break;
+                       default:
+                           buffer[bufp++] = *str;
+                           break;
+                       }
                }
                else if (ch == 128) {
-                       buffer[bufp++] = '\\';
-                       buffer[bufp++] = '0';
+                       buffer[bufp++] = '\\';
+                       buffer[bufp++] = '0';
                }
                else if (ch == '\033') {
-                       buffer[bufp++] = '\\';
-                       buffer[bufp++] = 'E';
+                       buffer[bufp++] = '\\';
+                       buffer[bufp++] = 'E';
                }
                else if (ch == '\\' && tic_format && (str == srcp || str[-1] != '^')) {
-                       buffer[bufp++] = '\\';
-                       buffer[bufp++] = '\\';
+                       buffer[bufp++] = '\\';
+                       buffer[bufp++] = '\\';
                }
                else if (ch == ' ' && tic_format && (str == srcp || trailing_spaces(str))) {
-                       buffer[bufp++] = '\\';
-                       buffer[bufp++] = 's';
+                       buffer[bufp++] = '\\';
+                       buffer[bufp++] = 's';
                }
                else if ((ch == ',' || ch == ':' || ch == '^') && tic_format) {
-                       buffer[bufp++] = '\\';
-                       buffer[bufp++] = ch;
+                       buffer[bufp++] = '\\';
+                       buffer[bufp++] = ch;
                }
                else if (REALPRINT(str) && (ch != ',' && ch != ':' && !(ch == '!' && !tic_format) && ch != '^'))
-                       buffer[bufp++] = ch;
+                       buffer[bufp++] = ch;
 #if 0          /* FIXME: this would be more readable (in fact the whole 'islong' logic should be removed) */
                else if (ch == '\b') {
-                       buffer[bufp++] = '\\';
-                       buffer[bufp++] = 'b';
+                       buffer[bufp++] = '\\';
+                       buffer[bufp++] = 'b';
                }
                else if (ch == '\f') {
-                       buffer[bufp++] = '\\';
-                       buffer[bufp++] = 'f';
+                       buffer[bufp++] = '\\';
+                       buffer[bufp++] = 'f';
                }
                else if (ch == '\t' && islong) {
-                       buffer[bufp++] = '\\';
-                       buffer[bufp++] = 't';
+                       buffer[bufp++] = '\\';
+                       buffer[bufp++] = 't';
                }
 #endif
                else if (ch == '\r' && (islong || (strlen(srcp) > 2 && str[1] == '\0'))) {
-                       buffer[bufp++] = '\\';
-                       buffer[bufp++] = 'r';
+                       buffer[bufp++] = '\\';
+                       buffer[bufp++] = 'r';
                }
                else if (ch == '\n' && islong) {
-                       buffer[bufp++] = '\\';
-                       buffer[bufp++] = 'n';
+                       buffer[bufp++] = '\\';
+                       buffer[bufp++] = 'n';
                }
 #define UnCtl(c) ((c) + '@')
                else if (REALCTL(str) && ch != '\\' && (!islong || isdigit(str[1])))
@@ -130,8 +182,8 @@ int         ch;
                }
 
                str++;
-       }
+       }
 
-       buffer[bufp] = '\0';
-       return(buffer);
+       buffer[bufp] = '\0';
+       return(buffer);
 }