--- deliantra/Deliantra-Client/DC/Protocol.pm	2007/09/01 07:22:21	1.169
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2007/09/06 15:06:25	1.175
@@ -12,8 +12,6 @@
 use CFPlus::Macro;
 use CFPlus::Item;
 
-use Crossfire::Protocol::Base 0.95;
-
 use base 'Crossfire::Protocol::Base';
 
 sub new {
@@ -971,7 +969,11 @@
    local $_ = shift;
 
    # we now weed out all tags we do not support
-   s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
+   s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
+   }{
+      "&lt;"
+   }gex;
+
    # now all entities
    s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
 
@@ -1034,20 +1036,28 @@
       # no longer neecssary with TRT servers
       #$text =~ s/(?<=\S)\n(?=\w)/ /g;
 
-      ::message ({
-         fg          => $fg,
-         markup      => $_,
-         type        => $type,
-         extra       => [@extra],
-         color_flags => $color
-      }) for split /\n/, $text;
+      for (split /\n/, $text) {
+         ::message ({
+            fg     => $fg,
+            markup => $_,
+            type   => $type,
+            extra  => [@extra],
+            color_flags => $color, #d# ugly, kill
+         });
+
+         $color &= ~NDI_CLEAR; # only clear once for multiline messages
+         # actually, this is an ugly design. _we_ should control the channels,
+         # not some random other widget, as the channels are clearly protocol-specific.
+         # then we could also react to flags such as CLEAR without resorting to
+         # hacks such as color_flags, above.
+      }
 
       $self->{statusbox}->add ($text,
          group        => $text,
          fg           => $fg,
          timeout      => $color >= 2 ? 180 : 10,
          tooltip_font => $::FONT_FIXED,
-      );
+      ) if $type eq "info";
    }
 }