X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftrace%2Flib_tracechr.c;h=a1f9f5aa27069bdb8b22e5e3d3b8a9e3922e9b56;hp=e97e67931464f1a18f5c7c29d5a53005f3c51737;hb=59108c98bda25ae50b3a319e2bcb7f4b9a174024;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce

diff --git a/ncurses/trace/lib_tracechr.c b/ncurses/trace/lib_tracechr.c
index e97e6793..a1f9f5aa 100644
--- 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-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            *
@@ -29,41 +29,54 @@
 /****************************************************************************
  *  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.20 2009/04/18 22:48:29 tom Exp $")
+
 #ifdef TRACE
-char *_tracechar(const unsigned char ch)
+
+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";
+	(void) sprintf(MyBuffer, "'%.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.
+	 */
+	(void) sprintf(MyBuffer, "%#03o", ch);
+    } else {
+	name = safe_unctrl(SP_PARM, (chtype) ch);
+	if (name == 0 || *name == 0)
+	    name = "null";	/* shouldn't happen */
+	(void) sprintf(MyBuffer, "'%.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