X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=test%2Ftracemunch;h=1c9314321871f07aa0ef64d4d435af173a507bd9;hb=b86393354bb86154b7b860989e5ed8655611d30b;hp=10ed5317e1b71617a5b7cce2dcea08d715a47ce3;hpb=b22573b1ba4b51da883fa5f805b52f153fa5fae9;p=ncurses.git

diff --git a/test/tracemunch b/test/tracemunch
index 10ed5317..1c931432 100755
--- a/test/tracemunch
+++ b/test/tracemunch
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# $Id: tracemunch,v 1.12 2017/06/29 09:23:58 tom Exp $
+# $Id: tracemunch,v 1.17 2017/12/23 17:51:31 tom Exp $
 ##############################################################################
 # Copyright (c) 1998-2005,2017 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -76,6 +76,15 @@ sub transaddr {
         $n = $win_addr{$addr};
         $arg =~ s/\b$addr\b/window$n/g;
     }
+    if ( $arg =~ /add_wch\((window\d+,)?0x[[:xdigit:]]+\)/i ) {
+        $arg =~ s/(0x[[:xdigit:]]+)[)]/\&wch)/i;
+    }
+    elsif ( $arg =~ /color_content\((screen\d+,)?\d+(,0x[[:xdigit:]]+){3}/i ) {
+        $arg =~ s/(,0x[[:xdigit:]]+){3}[)]/,\&r,\&g,\&b)/i;
+    }
+    elsif ( $arg =~ /pair_content\((screen\d+,)?\d+(,0x[[:xdigit:]]+){2}/i ) {
+        $arg =~ s/(,0x[[:xdigit:]]+){2}[)]/,\&fg,\&bg)/i;
+    }
 
     return $arg;
 }
@@ -83,7 +92,7 @@ sub transaddr {
 while (<STDIN>) {
     my $addr;
     my $n;
-    my $awaiting;
+    my $awaiting = "";
 
   CLASSIFY: {