ncurses 5.7 - patch 20091205

[ncurses.git] / ncurses / trace / lib_tracedmp.c

diff --git a/ncurses/trace/lib_tracedmp.c b/ncurses/trace/lib_tracedmp.c
index b5d758bdf486474fae9c8e48e7d0603bcdeabd0a..c7fcbf2e0d56c7bc57208a719ec511110401d6dd 100644 (file)
--- a/ncurses/trace/lib_tracedmp.c
+++ b/ncurses/trace/lib_tracedmp.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2002,2005 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2008,2009 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            *
@@ -39,15 +39,16 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_tracedmp.c,v 1.26 2005/01/29 16:23:51 tom Exp $")
+MODULE_ID("$Id: lib_tracedmp.c,v 1.32 2009/04/18 21:01:38 tom Exp $")
 
 #ifdef TRACE
+
+#define my_buffer _nc_globals.tracedmp_buf
+#define my_length _nc_globals.tracedmp_used
+
 NCURSES_EXPORT(void)
 _tracedump(const char *name, WINDOW *win)
 {
-    static char *buf = 0;
-    static size_t used = 0;
-
     int i, j, n, width;
 
     /* compute narrowest possible display width */
@@ -66,13 +67,13 @@ _tracedump(const char *name, WINDOW *win)
     }
     if (width < win->_maxx)
        ++width;
-    if (++width + 1 > (int) used) {
-       used = 2 * (width + 1);
-       buf = typeRealloc(char, used, buf);
+    if (++width + 1 > (int) my_length) {
+       my_length = (unsigned) (2 * (width + 1));
+       my_buffer = typeRealloc(char, my_length, my_buffer);
     }
 
     for (n = 0; n <= win->_maxy; ++n) {
-       char *ep = buf;
+       char *ep = my_buffer;
        bool haveattrs, havecolors;
 
        /*
@@ -81,24 +82,48 @@ _tracedump(const char *name, WINDOW *win)
         * we map those to '.' and '?' respectively.
         */
        for (j = 0; j < width; ++j) {
-           chtype test = CharOf(win->_line[n].text[j]);
-           ep[j] = (UChar(test) == test
+           chtype test = (chtype) CharOf(win->_line[n].text[j]);
+           ep[j] = (char) ((UChar(test) == test
 #if USE_WIDEC_SUPPORT
-                    && (win->_line[n].text[j].chars[1] == 0)
+                            && (win->_line[n].text[j].chars[1] == 0)
 #endif
-               )
-               ? (iscntrl(UChar(test))
-                  ? '.'
-                  : UChar(test))
-               : '?';
+                           )
+                           ? (iscntrl(UChar(test))
+                              ? '.'
+                              : UChar(test))
+                           : '?');
        }
        ep[j] = '\0';
-       _tracef("%s[%2d] %3d%3d ='%s'",
+       _tracef("%s[%2d] %3ld%3ld ='%s'",
                name, n,
-               win->_line[n].firstchar,
-               win->_line[n].lastchar,
+               (long) win->_line[n].firstchar,
+               (long) win->_line[n].lastchar,
                ep);
 
+       /* if there are multi-column characters on the line, print them now */
+       if_WIDEC({
+           bool multicolumn = FALSE;
+           for (j = 0; j < width; ++j)
+               if (WidecExt(win->_line[n].text[j]) != 0) {
+                   multicolumn = TRUE;
+                   break;
+               }
+           if (multicolumn) {
+               ep = my_buffer;
+               for (j = 0; j < width; ++j) {
+                   chtype test = WidecExt(win->_line[n].text[j]);
+                   if (test) {
+                       ep[j] = (char) (test + '0');
+                   } else {
+                       ep[j] = ' ';
+                   }
+               }
+               ep[j] = '\0';
+               _tracef("%*s[%2d]%*s='%s'", (int) strlen(name),
+                       "widec", n, 8, " ", my_buffer);
+           }
+       });
+
        /* dump A_COLOR part, will screw up if there are more than 96 */
        havecolors = FALSE;
        for (j = 0; j < width; ++j)
@@ -107,28 +132,28 @@ _tracedump(const char *name, WINDOW *win)
                break;
            }
        if (havecolors) {
-           ep = buf;
+           ep = my_buffer;
            for (j = 0; j < width; ++j) {
                int pair = GetPair(win->_line[n].text[j]);
                if (pair >= 52)
                    ep[j] = '?';
                else if (pair >= 36)
-                   ep[j] = pair + 'A';
+                   ep[j] = (char) (pair + 'A');
                else if (pair >= 10)
-                   ep[j] = pair + 'a';
+                   ep[j] = (char) (pair + 'a');
                else if (pair >= 1)
-                   ep[j] = pair + '0';
+                   ep[j] = (char) (pair + '0');
                else
                    ep[j] = ' ';
            }
            ep[j] = '\0';
            _tracef("%*s[%2d]%*s='%s'", (int) strlen(name),
-                   "colors", n, 8, " ", buf);
+                   "colors", n, 8, " ", my_buffer);
        }
 
        for (i = 0; i < 4; ++i) {
            const char *hex = " 123456789ABCDEF";
-           attr_t mask = (0xf << ((i + 4) * 4));
+           attr_t mask = (attr_t) (0xf << ((i + 4) * 4));
 
            haveattrs = FALSE;
            for (j = 0; j < width; ++j)
@@ -137,23 +162,23 @@ _tracedump(const char *name, WINDOW *win)
                    break;
                }
            if (haveattrs) {
-               ep = buf;
+               ep = my_buffer;
                for (j = 0; j < width; ++j)
                    ep[j] = hex[(AttrOf(win->_line[n].text[j]) & mask) >>
                                ((i + 4) * 4)];
                ep[j] = '\0';
                _tracef("%*s%d[%2d]%*s='%s'", (int) strlen(name) -
-                       1, "attrs", i, n, 8, " ", buf);
+                       1, "attrs", i, n, 8, " ", my_buffer);
            }
        }
     }
 #if NO_LEAKS
-    free(buf);
-    buf = 0;
-    used = 0;
+    free(my_buffer);
+    my_buffer = 0;
+    my_length = 0;
 #endif
 }
 
 #else
-empty_module(_nc_lib_tracedmp)
+EMPTY_MODULE(_nc_lib_tracedmp)
 #endif /* TRACE */