… | |
… | |
15 | use Crossfire::Protocol::Base 0.95; |
15 | use Crossfire::Protocol::Base 0.95; |
16 | |
16 | |
17 | use base 'Crossfire::Protocol::Base'; |
17 | use base 'Crossfire::Protocol::Base'; |
18 | |
18 | |
19 | sub new { |
19 | sub new { |
20 | my $class = shift; |
20 | my ($class, %arg) = @_; |
21 | |
21 | |
22 | my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); |
22 | my $self = $class->SUPER::new (%arg, |
|
|
23 | setup_req => { |
|
|
24 | extmap => 1, |
|
|
25 | excmd => 1, |
|
|
26 | ywidget => 1, |
|
|
27 | %{$arg{setup_req} || {}}, |
|
|
28 | }, |
|
|
29 | ); |
23 | |
30 | |
24 | $self->{map_widget}->clr_commands; |
31 | $self->{map_widget}->clr_commands; |
25 | |
32 | |
26 | my @cmd_help = map { |
33 | my @cmd_help = map { |
27 | $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
34 | $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
… | |
… | |
55 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
62 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
56 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
63 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
57 | |
64 | |
58 | $self->setup_req (mapsize => "${w}x${h}"); |
65 | $self->setup_req (mapsize => "${w}x${h}"); |
59 | } |
66 | } |
|
|
67 | } |
|
|
68 | }); |
|
|
69 | |
|
|
70 | $self->{json_coder} |
|
|
71 | ->convert_blessed |
|
|
72 | ->filter_json_single_key_object (__widget_ref__ => sub { |
|
|
73 | $self->{widget}{$_[0]} |
|
|
74 | }); |
|
|
75 | |
|
|
76 | $self->connect_ext (ws_n => sub { |
|
|
77 | my ($arg) = @_; |
|
|
78 | |
|
|
79 | $self->{widgetset}{$arg{id}} = { |
|
|
80 | w => {}, |
|
|
81 | }; |
|
|
82 | }); |
|
|
83 | |
|
|
84 | $self->connect_ext (ws_d => sub { |
|
|
85 | my ($arg) = @_; |
|
|
86 | |
|
|
87 | my $ws = delete $self->{widgetset}{$arg{id}} |
|
|
88 | or return; |
|
|
89 | |
|
|
90 | $_->destroy |
|
|
91 | for values %{$ws->{w}}; |
|
|
92 | }); |
|
|
93 | |
|
|
94 | $self->connect_ext (ws_c => sub { |
|
|
95 | my ($arg) = @_; |
|
|
96 | |
|
|
97 | my $args = $arg->{args} || {}; |
|
|
98 | |
|
|
99 | for my $ev (grep /^on_/, keys %$args) { |
|
|
100 | $args->{$ev} = sub { |
|
|
101 | my $id = shift->{s_id}; |
|
|
102 | $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); |
|
|
103 | |
|
|
104 | 1 |
|
|
105 | }; |
|
|
106 | } |
|
|
107 | |
|
|
108 | if (my $widget = eval { |
|
|
109 | local $SIG{__DIE__}; |
|
|
110 | "CFPlus::UI::$arg->{class}"->new ( |
|
|
111 | %$args, |
|
|
112 | s_ws => $arg->{ws}, |
|
|
113 | s_id => $arg->{id}, |
|
|
114 | ) |
|
|
115 | } |
|
|
116 | ) { |
|
|
117 | $self->{widget}{$arg->{id}} |
|
|
118 | = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} |
|
|
119 | = $widget; |
|
|
120 | |
|
|
121 | $widget->connect (on_destroy => sub { |
|
|
122 | my ($widget) = @_; |
|
|
123 | |
|
|
124 | delete $self->{widget}{$widget->{s_id}}; |
|
|
125 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; |
|
|
126 | }); |
|
|
127 | } else { |
|
|
128 | warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; |
|
|
129 | $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); |
|
|
130 | } |
|
|
131 | }); |
|
|
132 | |
|
|
133 | $self->connect_ext (w_c => sub { |
|
|
134 | my ($arg) = @_; |
|
|
135 | |
|
|
136 | my $w = $self->{widget}{$arg->{id}} |
|
|
137 | or return; |
|
|
138 | my $m = $arg->{name}; |
|
|
139 | |
|
|
140 | my $a = $arg->{args} || []; |
|
|
141 | |
|
|
142 | if (exists $arg->{rid}) { |
|
|
143 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); |
|
|
144 | } else { |
|
|
145 | $w->$m (@$a); |
|
|
146 | } |
|
|
147 | }); |
|
|
148 | |
|
|
149 | $self->connect_ext (w_s => sub { |
|
|
150 | my ($arg) = @_; |
|
|
151 | |
|
|
152 | my $w = $self->{widget}{$arg->{id}} |
|
|
153 | or return; |
|
|
154 | |
|
|
155 | $w->{$arg->{name}} = $arg->{value}; |
|
|
156 | }); |
|
|
157 | |
|
|
158 | $self->connect_ext (w_g => sub { |
|
|
159 | my ($arg) = @_; |
|
|
160 | |
|
|
161 | my $w = $self->{widget}{$arg->{id}} |
|
|
162 | or return; |
|
|
163 | |
|
|
164 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); |
|
|
165 | }); |
|
|
166 | |
|
|
167 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
|
|
168 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
|
|
169 | $_->destroy |
|
|
170 | for values %{delete $ws->{w} || {}}; |
60 | } |
171 | } |
61 | }); |
172 | }); |
62 | |
173 | |
63 | $self->{map_widget}->add_command (@$_) |
174 | $self->{map_widget}->add_command (@$_) |
64 | for @cmd_help; |
175 | for @cmd_help; |
… | |
… | |
243 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
354 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
244 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
355 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
245 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
356 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
246 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
357 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
247 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
358 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
248 | my $rng = $stats->{+CS_STAT_RANGE}; |
359 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
249 | $rng =~ s/^Range: //; # thank you so much dear server |
|
|
250 | $::GAUGES->{range} ->set_text ("Rng: " . $rng); |
|
|
251 | my $title = $stats->{+CS_STAT_TITLE}; |
360 | my $title = $stats->{+CS_STAT_TITLE}; |
252 | $title =~ s/^Player: //; |
361 | $title =~ s/^Player: //; |
253 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
362 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
254 | |
363 | |
255 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
364 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
… | |
… | |
402 | |
511 | |
403 | $self->{map}->clear; |
512 | $self->{map}->clear; |
404 | delete $self->{map_widget}{magicmap}; |
513 | delete $self->{map_widget}{magicmap}; |
405 | } |
514 | } |
406 | |
515 | |
|
|
516 | sub bg_fetch { |
|
|
517 | my ($self) = @_; |
|
|
518 | |
|
|
519 | my $id; |
|
|
520 | |
|
|
521 | do { |
|
|
522 | $id = pop @{$self->{bg_fetch}} |
|
|
523 | or return; |
|
|
524 | } while $self->{texture}[$id]; |
|
|
525 | |
|
|
526 | CFPlus::DB::get tilecache => $id, sub { |
|
|
527 | my ($data) = @_; |
|
|
528 | |
|
|
529 | return unless $self->{map}; # stop when destroyed |
|
|
530 | |
|
|
531 | $self->set_texture ($id => $data) |
|
|
532 | if defined $data; |
|
|
533 | |
|
|
534 | $self->bg_fetch; |
|
|
535 | }; |
|
|
536 | } |
407 | |
537 | |
408 | sub load_map($$$) { |
538 | sub load_map($$$) { |
409 | my ($self, $hash, $x, $y) = @_; |
539 | my ($self, $hash, $x, $y) = @_; |
410 | |
540 | |
|
|
541 | my $gen = $self->{map_change_gen}; |
|
|
542 | |
411 | CFPlus::DB::get $self->{mapcache} => $hash, sub { |
543 | CFPlus::DB::get $self->{mapcache} => $hash, sub { |
|
|
544 | return unless $gen == $self->{map_change_gen}; |
|
|
545 | |
412 | my ($data) = @_; |
546 | my ($data) = @_; |
413 | |
547 | |
414 | if (defined $data) { |
548 | if (defined $data) { |
415 | $data = Compress::LZF::decompress $data; |
549 | $data = Compress::LZF::decompress $data; |
416 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
550 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
417 | for my $id ($self->{map}->set_rect ($x, $y, $data)) { |
|
|
418 | CFPlus::DB::get tilecache => $id, sub { |
|
|
419 | my ($data) = @_; |
|
|
420 | |
551 | |
421 | $self->set_texture ($id => $data) |
552 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
422 | if defined $data; |
553 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
423 | }; |
554 | $self->bg_fetch unless $inprogress; |
424 | } |
|
|
425 | } |
555 | } |
426 | }; |
556 | }; |
427 | } |
557 | } |
428 | |
558 | |
429 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
559 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
… | |
… | |
495 | |
625 | |
496 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
626 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
497 | if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; |
627 | if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; |
498 | |
628 | |
499 | } else { |
629 | } else { |
|
|
630 | my $gen = $self->{map_change_gen}; |
500 | $self->send_mapinfo ("spatial $path$tile", sub { |
631 | $self->send_mapinfo ("spatial $path$tile", sub { |
|
|
632 | return unless $gen == $self->{map_change_gen}; |
|
|
633 | |
501 | my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; |
634 | my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; |
502 | |
635 | |
503 | return if $mode ne "spatial"; |
636 | return if $mode ne "spatial"; |
504 | |
637 | |
505 | $x += $self->{map}->ox; |
638 | $x += $self->{map}->ox; |
… | |
… | |
519 | |
652 | |
520 | sub map_change { |
653 | sub map_change { |
521 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
654 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
522 | |
655 | |
523 | $self->flush_map; |
656 | $self->flush_map; |
|
|
657 | |
|
|
658 | ++$self->{map_change_gen}; |
524 | |
659 | |
525 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
660 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
526 | |
661 | |
527 | my $mapmapw = $self->{mapmap}->{w}; |
662 | my $mapmapw = $self->{mapmap}->{w}; |
528 | my $mapmaph = $self->{mapmap}->{h}; |
663 | my $mapmaph = $self->{mapmap}->{h}; |
… | |
… | |
568 | if $changed; |
703 | if $changed; |
569 | |
704 | |
570 | $self->set_texture ($face->{id} => delete $face->{image}); |
705 | $self->set_texture ($face->{id} => delete $face->{image}); |
571 | } |
706 | } |
572 | |
707 | |
|
|
708 | sub smooth_update { |
|
|
709 | my ($self, $facenum, $face) = @_; |
|
|
710 | |
|
|
711 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
|
|
712 | } |
|
|
713 | |
573 | sub set_texture { |
714 | sub set_texture { |
574 | my ($self, $id, $data) = @_; |
715 | my ($self, $id, $data) = @_; |
575 | |
716 | |
576 | $self->{texture}[$id] ||= do { |
717 | $self->{texture}[$id] = my $tex = |
577 | my $tex = |
|
|
578 | new_from_image CFPlus::Texture |
718 | new_from_image CFPlus::Texture |
579 | $data, minify => 1, mipmap => 1; |
719 | $data, minify => 1, mipmap => 1; |
580 | |
720 | |
581 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
721 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
582 | $self->{map_widget}->update; |
722 | $self->{map_widget}->update; |
583 | |
|
|
584 | $tex |
|
|
585 | }; |
|
|
586 | } |
723 | } |
587 | |
724 | |
588 | sub sound_play { |
725 | sub sound_play { |
589 | my ($self, $x, $y, $soundnum, $type) = @_; |
726 | my ($self, $x, $y, $soundnum, $type) = @_; |
590 | |
727 | |
… | |
… | |
600 | $LAST_QUERY = $prompt; |
737 | $LAST_QUERY = $prompt; |
601 | |
738 | |
602 | $self->{query}-> ($self, $flags, $prompt); |
739 | $self->{query}-> ($self, $flags, $prompt); |
603 | } |
740 | } |
604 | |
741 | |
605 | sub drawinfo { |
742 | sub sanitise_xml($) { |
606 | my ($self, $color, $text) = @_; |
743 | local $_ = shift; |
607 | |
744 | |
608 | my @color = ( |
745 | # we now weed out all tags we do not support |
|
|
746 | s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; |
|
|
747 | # now all entities |
|
|
748 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
|
|
749 | |
|
|
750 | # handle some elements |
|
|
751 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
|
|
752 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
|
|
753 | |
|
|
754 | $_ |
|
|
755 | } |
|
|
756 | |
|
|
757 | our %NAME_TO_COLOR = ( |
|
|
758 | black => 0, |
|
|
759 | white => 1, |
|
|
760 | darkblue => 2, |
|
|
761 | red => 3, |
|
|
762 | orange => 4, |
|
|
763 | lightblue => 5, |
|
|
764 | darkorange => 6, |
|
|
765 | green => 7, |
|
|
766 | darkgreen => 8, |
|
|
767 | grey => 9, |
|
|
768 | brown => 10, |
|
|
769 | yellow => 11, |
|
|
770 | tan => 12, |
|
|
771 | ); |
|
|
772 | |
|
|
773 | our @CF_COLOR = ( |
609 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
774 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
610 | [1.00, 1.00, 1.00], |
775 | [1.00, 1.00, 1.00], |
611 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] |
776 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] |
612 | [1.00, 0.00, 0.00], |
777 | [1.00, 0.00, 0.00], |
613 | [1.00, 0.54, 0.00], |
778 | [1.00, 0.54, 0.00], |
614 | [0.11, 0.56, 1.00], |
779 | [0.11, 0.56, 1.00], |
615 | [0.93, 0.46, 0.00], |
780 | [0.93, 0.46, 0.00], |
616 | [0.18, 0.54, 0.34], |
781 | [0.18, 0.54, 0.34], |
617 | [0.56, 0.73, 0.56], |
782 | [0.56, 0.73, 0.56], |
618 | [0.80, 0.80, 0.80], |
783 | [0.80, 0.80, 0.80], |
619 | [0.75, 0.61, 0.20], |
784 | [0.75, 0.61, 0.20], |
620 | [0.99, 0.77, 0.26], |
785 | [0.99, 0.77, 0.26], |
621 | [0.74, 0.65, 0.41], |
786 | [0.74, 0.65, 0.41], |
622 | ); |
787 | ); |
623 | |
788 | |
624 | my $fg = $color[$color % @color]; |
789 | sub msg { |
|
|
790 | my ($self, $color, $type, $text, @extra) = @_; |
625 | |
791 | |
|
|
792 | $text = sanitise_xml $text; |
|
|
793 | |
|
|
794 | if (my $cb = $self->{cb_msg}{$type}) { |
|
|
795 | $_->($self, $color, $type, $text, @extra) for values %$cb; |
|
|
796 | } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { |
|
|
797 | $type =~ s/-/_/g; |
|
|
798 | $self->{$type} = $text; |
|
|
799 | } else { |
626 | $self->logprint ("info: ", $text); |
800 | $self->logprint ("msg: ", $text); |
|
|
801 | return if $color < 0; # negative color == ignore if not understood |
627 | |
802 | |
|
|
803 | my $fg = $CF_COLOR[$color % @CF_COLOR]; |
|
|
804 | |
628 | # try to create single paragraphs of multiple lines sent by the server |
805 | ## try to create single paragraphs of multiple lines sent by the server |
|
|
806 | # no longer neecssary with TRT servers |
629 | $text =~ s/(?<=\S)\n(?=\w)/ /g; |
807 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
630 | |
808 | |
631 | $text = CFPlus::asxml $text; |
|
|
632 | $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; |
|
|
633 | $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; |
|
|
634 | |
|
|
635 | ::message ({ fg => $fg, markup => $_ }) |
809 | ::message ({ fg => $fg, markup => $_ }) |
636 | for split /\n/, $text; |
810 | for split /\n/, $text; |
637 | |
811 | |
638 | $self->{statusbox}->add ($text, |
812 | $self->{statusbox}->add ($text, |
639 | group => $text, |
813 | group => $text, |
640 | fg => $fg, |
814 | fg => $fg, |
641 | timeout => $color >= 2 ? 180 : 10, |
815 | timeout => $color >= 2 ? 180 : 10, |
642 | tooltip_font => $::FONT_FIXED, |
816 | tooltip_font => $::FONT_FIXED, |
643 | ); |
817 | ); |
644 | } |
818 | } |
645 | |
|
|
646 | sub drawextinfo { |
|
|
647 | my ($self, $color, $type, $subtype, $message) = @_; |
|
|
648 | |
|
|
649 | $self->drawinfo ($color, $message); |
|
|
650 | } |
819 | } |
651 | |
820 | |
652 | sub spell_add { |
821 | sub spell_add { |
653 | my ($self, $spell) = @_; |
822 | my ($self, $spell) = @_; |
654 | |
823 | |
… | |
… | |
887 | $::SERVER_INFO->set_markup ( |
1056 | $::SERVER_INFO->set_markup ( |
888 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
1057 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
889 | . "protocol version <tt>$self->{version}</tt>\n" |
1058 | . "protocol version <tt>$self->{version}</tt>\n" |
890 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
1059 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
891 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
1060 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
|
|
1061 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
892 | . "editing support $yesno[!!$self->{editor_support}]\n" |
1062 | . "editing support $yesno[!!$self->{editor_support}]\n" |
893 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
1063 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
|
|
1064 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
894 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1065 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
895 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1066 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
896 | . "map size $self->{mapw}×$self->{maph}\n" |
1067 | . "map size $self->{mapw}×$self->{maph}\n" |
897 | ); |
1068 | ); |
898 | |
1069 | |
… | |
… | |
961 | |
1132 | |
962 | (delete $self->{npc_dialog})->destroy |
1133 | (delete $self->{npc_dialog})->destroy |
963 | if $self->{npc_dialog}; |
1134 | if $self->{npc_dialog}; |
964 | |
1135 | |
965 | $self->SUPER::destroy; |
1136 | $self->SUPER::destroy; |
|
|
1137 | |
|
|
1138 | %$self = (); |
966 | } |
1139 | } |
967 | |
1140 | |
968 | package CFPlus::NPCDialog; |
1141 | package CFPlus::NPCDialog; |
969 | |
1142 | |
970 | our @ISA = 'CFPlus::UI::Toplevel'; |
1143 | our @ISA = 'CFPlus::UI::Toplevel'; |
… | |
… | |
1061 | |
1234 | |
1062 | if ($msg->{msgtype} eq "reply") { |
1235 | if ($msg->{msgtype} eq "reply") { |
1063 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
1236 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
1064 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
1237 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
1065 | |
1238 | |
1066 | my $text = "\n" . CFPlus::asxml $msg->{msg}; |
1239 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg}; |
1067 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1240 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1068 | my @link; |
1241 | my @link; |
1069 | $text =~ s{ |
1242 | $text =~ s{ |
1070 | ($match) |
1243 | ($match) |
1071 | }{ |
1244 | }{ |