ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.169 by root, Sat Sep 1 07:22:21 2007 UTC vs.
Revision 1.175 by root, Thu Sep 6 15:06:25 2007 UTC

… …
9use CFPlus::DB; 9use CFPlus::DB;
10use CFPlus::UI; 10use CFPlus::UI;
11use CFPlus::Pod; 11use CFPlus::Pod;
12use CFPlus::Macro; 12use CFPlus::Macro;
13use CFPlus::Item; 13use CFPlus::Item;
14
15use Crossfire::Protocol::Base 0.95;
16 14
17use base 'Crossfire::Protocol::Base'; 15use base 'Crossfire::Protocol::Base';
18 16
19sub new { 17sub new {
20 my ($class, %arg) = @_; 18 my ($class, %arg) = @_;
… …
969 967
970sub sanitise_xml($) { 968sub sanitise_xml($) {
971 local $_ = shift; 969 local $_ = shift;
972 970
973 # we now weed out all tags we do not support 971 # we now weed out all tags we do not support
974 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 972 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
973 }{
974 "&lt;"
975 }gex;
976
975 # now all entities 977 # now all entities
976 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 978 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
977 979
978 # handle some elements 980 # handle some elements
979 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 981 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
1032 1034
1033 ## try to create single paragraphs of multiple lines sent by the server 1035 ## try to create single paragraphs of multiple lines sent by the server
1034 # no longer neecssary with TRT servers 1036 # no longer neecssary with TRT servers
1035 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1037 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1036 1038
1039 for (split /\n/, $text) {
1037 ::message ({ 1040 ::message ({
1038 fg => $fg, 1041 fg => $fg,
1039 markup => $_, 1042 markup => $_,
1040 type => $type, 1043 type => $type,
1041 extra => [@extra], 1044 extra => [@extra],
1042 color_flags => $color 1045 color_flags => $color, #d# ugly, kill
1043 }) for split /\n/, $text; 1046 });
1047
1048 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1049 # actually, this is an ugly design. _we_ should control the channels,
1050 # not some random other widget, as the channels are clearly protocol-specific.
1051 # then we could also react to flags such as CLEAR without resorting to
1052 # hacks such as color_flags, above.
1053 }
1044 1054
1045 $self->{statusbox}->add ($text, 1055 $self->{statusbox}->add ($text,
1046 group => $text, 1056 group => $text,
1047 fg => $fg, 1057 fg => $fg,
1048 timeout => $color >= 2 ? 180 : 10, 1058 timeout => $color >= 2 ? 180 : 10,
1049 tooltip_font => $::FONT_FIXED, 1059 tooltip_font => $::FONT_FIXED,
1050 ); 1060 ) if $type eq "info";
1051 } 1061 }
1052} 1062}
1053 1063
1054sub spell_add { 1064sub spell_add {
1055 my ($self, $spell) = @_; 1065 my ($self, $spell) = @_;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines