ncurses 5.9 - patch 20120225

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

diff --git a/ncurses/trace/lib_tracechr.c b/ncurses/trace/lib_tracechr.c
index e97e67931464f1a18f5c7c29d5a53005f3c51737..8977f752b50553c24bf912f8ba23aec98312a3d0 100644 (file)
--- a/ncurses/trace/lib_tracechr.c
+++ b/ncurses/trace/lib_tracechr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2009,2012 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            *
@@ -29,41 +29,59 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
-
-
 /*
  *     lib_tracechr.c - Tracing/Debugging routines
  */
-
-#ifndef TRACE
-#define TRACE                  /* turn on internal defs for this module */
-#endif
-
 #include <curses.priv.h>
 
 #include <ctype.h>
 
+MODULE_ID("$Id: lib_tracechr.c,v 1.22 2012/02/22 22:40:24 tom Exp $")
+
 #ifdef TRACE
-char *_tracechar(const unsigned char ch)
+
+#define MyBufSize sizeof(_nc_globals.tracechr_buf)
+
+NCURSES_EXPORT(char *)
+_nc_tracechar(SCREEN *sp, int ch)
 {
-    static char crep[20];
-    /* 
-     * We can show the actual character if it's either an ordinary printable
-     * or one of the high-half characters.
-     */
-    if (isprint(ch) || (ch & 0x80))
-    {
-       crep[0] = '\'';
-       crep[1] = ch;   /* necessary; printf tries too hard on metachars */
-       (void) sprintf(crep + 2, "' = 0x%02x", (unsigned)ch);
+    NCURSES_CONST char *name;
+    char *MyBuffer = ((sp != 0)
+                     ? sp->tracechr_buf
+                     : _nc_globals.tracechr_buf);
+
+    if (ch > KEY_MIN || ch < 0) {
+       name = safe_keyname(SP_PARM, ch);
+       if (name == 0 || *name == '\0')
+           name = "NULL";
+       _nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize)
+                   "'%.30s' = %#03o", name, ch);
+    } else if (!is8bits(ch) || !isprint(UChar(ch))) {
+       /*
+        * workaround for glibc bug:
+        * sprintf changes the result from unctrl() to an empty string if it
+        * does not correspond to a valid multibyte sequence.
+        */
+       _nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize)
+                   "%#03o", ch);
+    } else {
+       name = safe_unctrl(SP_PARM, (chtype) ch);
+       if (name == 0 || *name == 0)
+           name = "null";      /* shouldn't happen */
+       _nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize)
+                   "'%.30s' = %#03o", name, ch);
     }
-    else
-       (void) sprintf(crep, "0x%02x", (unsigned)ch);
-    return(crep);
+    return (MyBuffer);
+}
+
+NCURSES_EXPORT(char *)
+_tracechar(int ch)
+{
+    return _nc_tracechar(CURRENT_SCREEN, ch);
 }
 #else
-extern void _nc_lib_tracechr(void);
-       void _nc_lib_tracechr(void) { }
+EMPTY_MODULE(_nc_lib_tracechr)
 #endif