X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftrace%2Flib_tracechr.c;fp=ncurses%2Ftrace%2Flib_tracechr.c;h=9846dc1d7bc74c8c7303d1e84348edac606952bc;hp=479756ac59beee19b3b92988f31ee65ec04d5663;hb=bd7ef7c2309fd00aa4576168c46f557c622cb9c3;hpb=9edffa2f21102c06dcf682d58b074c407bcedd0a

diff --git a/ncurses/trace/lib_tracechr.c b/ncurses/trace/lib_tracechr.c
index 479756ac..9846dc1d 100644
--- a/ncurses/trace/lib_tracechr.c
+++ b/ncurses/trace/lib_tracechr.c
@@ -39,18 +39,20 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_tracechr.c,v 1.13 2007/04/21 23:16:37 tom Exp $")
+MODULE_ID("$Id: lib_tracechr.c,v 1.17 2008/05/31 19:57:47 tom Exp $")
 
 #ifdef TRACE
-#define MyBuffer _nc_globals.tracechr_buf
 
 NCURSES_EXPORT(char *)
-_tracechar(int ch)
+_nc_tracechar(SCREEN *sp, int ch)
 {
     NCURSES_CONST char *name;
+    char *MyBuffer = ((sp != 0)
+		      ? sp->tracechr_buf
+		      : _nc_globals.tracechr_buf);
 
     if (ch > KEY_MIN || ch < 0) {
-	name = keyname(ch);
+	name = _nc_keyname(sp, ch);
 	if (name == 0 || *name == '\0')
 	    name = "NULL";
 	(void) sprintf(MyBuffer, "'%.30s' = %#03o", name, ch);
@@ -62,13 +64,19 @@ _tracechar(int ch)
 	 */
 	(void) sprintf(MyBuffer, "%#03o", ch);
     } else {
-	name = unctrl((chtype) ch);
+	name = _nc_unctrl(sp, (chtype) ch);
 	if (name == 0 || *name == 0)
 	    name = "null";	/* shouldn't happen */
 	(void) sprintf(MyBuffer, "'%.30s' = %#03o", name, ch);
     }
     return (MyBuffer);
 }
+
+NCURSES_EXPORT(char *)
+_tracechar(int ch)
+{
+    return _nc_tracechar(SP, ch);
+}
 #else
 empty_module(_nc_lib_tracechr)
 #endif