Changeset ad0deddb4298f15386cb0fca17ff0b2265b9ba7d

Timestamp:

10/28/09 10:00:15 (4 weeks ago)

Author:

Karl Ramm <kcr@1ts.org>

git-author:

Karl Ramm <kcr@1ts.org> / 2009-10-25T12:11:13Z-0400

Parents:

7ca5d3e3f8c76c75f3200773de375d80ac951461

Children:

48d130b1d845e04389262e8cbfdd3064726b9468

git-committer:

Karl Ramm <kcr@1ts.org> / 2009-10-28T10:00:15Z-0400

Message:

make control characters human-readable

Random control characters that make it through the formatting code
should not be passed silently to the user's terminal...

Location:

perl/lib/BarnOwl/Style

Files:

• Default.pm (modified) (5 diffs)
• OneLine.pm (modified) (1 diff)

perl/lib/BarnOwl/Style/Default.pm

@@ -24 +24 @@
     }
     $fmt = BarnOwl::Style::boldify($fmt) if $self->should_bold($m);
+    $fmt = $self->humanize($fmt);
     return $fmt;
 }
@@ -86 +87 @@
     if ( $m->is_personal ) {
         my $personal_context = $m->personal_context;
-        $personal_context = ' [' . $personal_context . ']' if $personal_context;
+        $personal_context = ' [' . $self->humanize($personal_context, 1) . ']' if $personal_context;
 
         if ( $m->direction eq "out" ) {
@@ -94 +95 @@
         }
     } else {
-        $header = $m->context;
+        $header = $self->humanize($m->context, 1);
         if(defined $m->subcontext) {
-            $header .= ' / ' . $m->subcontext;
+            $header .= ' / ' . $self->humanize($m->subcontext, 1);
         }
         $header .= ' / @b{' . $m->pretty_sender . '}';
@@ -102 +103 @@
 
     if($m->opcode) {
-        $header .= " [" . $m->opcode . "]";
+        $header .= " [" . $self->humanize($m->opcode, 1) . "]";
     }
     $header .= "  " . $self->format_time($m);
@@ -138 +139 @@
 }
 
+=head3 humanize STRING [one_line]
+
+Method that takes a STRING with control characters and makes it human
+readable in such a way as to not do anything funky with the terminal.
+If one_line is true, be more conservative about what we treat as
+control character.
+
+=cut
+
+sub humanize
+{
+  my $self = shift;
+  my $s = shift;
+  my $oneline = shift;
+  sub _humanize_char
+  {
+    my $c = ord(shift);
+
+    if ($c < ord(' ')) {
+      return ('^' . chr($c + ord('@')));
+    } elsif ($c == 255) {
+      return ('^?');
+    } else {
+      return (sprintf('\\x{%x}', $c));
+    }
+  }
+  my $colorize = (BarnOwl::getvar('colorztext') eq 'on')
+    ? '@color(cyan)' : '';
+
+  my $chars = $oneline ? qr/[[:cntrl:]]/ : qr/[^[:print:]]|[\r\cK\f]/;
+
+  $s =~ s/($chars)/
+    "\@b($colorize" . _humanize_char($1) . ')'/eg;
+
+  return $s;
+}
+
+=head3 humanize_short STRING
+
+As above, but always be conservative, and replace with a '?' instead
+of something mmore elaborate.
+
+=cut
+
+sub humanize_short
+{
+  my $self = shift;
+  my $s = shift;
+
+  $s =~ s/[[:cntrl:]]/?/g;
+
+  return $s;
+}
 
 1;

perl/lib/BarnOwl/Style/OneLine.pm

@@ -80 +80 @@
   $body =~ tr/\n/ /;
   $line .= $body;
+  $line = $self->humanize_short($line);
   return $line;
 }