| … | |
… | |
| 21 | |
21 | |
| 22 | my $self = $class->SUPER::new (%arg, |
22 | my $self = $class->SUPER::new (%arg, |
| 23 | setup_req => { |
23 | setup_req => { |
| 24 | extmap => 1, |
24 | extmap => 1, |
| 25 | excmd => 1, |
25 | excmd => 1, |
|
|
26 | ywidget => 1, |
| 26 | %{$arg{setup_req} || {}}, |
27 | %{$arg{setup_req} || {}}, |
| 27 | }, |
28 | }, |
| 28 | ); |
29 | ); |
| 29 | |
30 | |
| 30 | $self->{map_widget}->clr_commands; |
31 | $self->{map_widget}->clr_commands; |
| … | |
… | |
| 47 | sort { (length $a) <=> (length $b) } |
48 | sort { (length $a) <=> (length $b) } |
| 48 | @args |
49 | @args |
| 49 | } sort { $a->{par} <=> $b->{par} } |
50 | } sort { $a->{par} <=> $b->{par} } |
| 50 | CFPlus::Pod::find command => "*"; |
51 | CFPlus::Pod::find command => "*"; |
| 51 | |
52 | |
|
|
53 | $self->connect_ext (event_music => sub { |
|
|
54 | my ($ev) = @_; |
|
|
55 | |
|
|
56 | return unless $::CFG->{bgm_enable}; |
|
|
57 | |
|
|
58 | my $faces = $ev->{faces}; |
|
|
59 | my @songs; |
|
|
60 | |
|
|
61 | # request music from server if appropriate |
|
|
62 | if (my $faces = $ev->{faces}) { |
|
|
63 | for (@$faces) { |
|
|
64 | my ($face, $pri, $chksum) = @$_; |
|
|
65 | utf8::downgrade $chksum; |
|
|
66 | |
|
|
67 | $chksum = unpack "H*", $chksum; |
|
|
68 | $self->{music_map}{$face} = $chksum; |
|
|
69 | |
|
|
70 | # check if already cached |
|
|
71 | CFPlus::DB::get "res-metadata" => $chksum, sub { |
|
|
72 | my ($meta_json) = @_; |
|
|
73 | my $path = CFPlus::DB::path_of_res $chksum; |
|
|
74 | |
|
|
75 | if (defined $meta_json) { |
|
|
76 | my $meta = $self->{json_coder}->decode ($meta_json); |
|
|
77 | $meta->{path} = $path; |
|
|
78 | $self->{music_meta}{$chksum} = $meta; |
|
|
79 | &::audio_music_set ($self->{songs}); |
|
|
80 | } else { |
|
|
81 | ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." }); |
|
|
82 | $self->ask_face ($face, -100 - $pri, undef, sub { |
|
|
83 | my $len = length $_[1]; |
|
|
84 | my ($meta_json, $data) = unpack "(w/a*)*", $_[1]; |
|
|
85 | |
|
|
86 | CFPlus::DB::write_file $path, $data, sub { |
|
|
87 | CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub { |
|
|
88 | my $meta = $self->{json_coder}->decode ($meta_json); |
|
|
89 | $meta->{path} = $path; |
|
|
90 | $self->{music_meta}{$chksum} = $meta; |
|
|
91 | |
|
|
92 | ::message ({ markup => "downloaded song #$face, size $len octets" }); |
|
|
93 | &::audio_music_set ($self->{songs}); |
|
|
94 | }; |
|
|
95 | }; |
|
|
96 | }); |
|
|
97 | } |
|
|
98 | } |
|
|
99 | } |
|
|
100 | } |
|
|
101 | |
|
|
102 | if (my $play = $ev->{play}) { |
|
|
103 | &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]); |
|
|
104 | } |
|
|
105 | }); |
|
|
106 | |
| 52 | $self->connect_ext (event_capabilities => sub { |
107 | $self->connect_ext (event_capabilities => sub { |
| 53 | my ($cap) = @_; |
108 | my ($cap) = @_; |
| 54 | |
109 | |
| 55 | if (my $ts = $cap->{tileset}) { |
110 | if (my $ts = $cap->{tileset}) { |
| 56 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
111 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
| … | |
… | |
| 61 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
116 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
| 62 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
117 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
| 63 | |
118 | |
| 64 | $self->setup_req (mapsize => "${w}x${h}"); |
119 | $self->setup_req (mapsize => "${w}x${h}"); |
| 65 | } |
120 | } |
|
|
121 | } |
|
|
122 | }); |
|
|
123 | |
|
|
124 | $self->{json_coder} |
|
|
125 | ->convert_blessed |
|
|
126 | ->filter_json_single_key_object (__widget_ref__ => sub { |
|
|
127 | $self->{widget}{$_[0]} |
|
|
128 | }); |
|
|
129 | |
|
|
130 | # widgetset new |
|
|
131 | $self->connect_ext (ws_n => sub { |
|
|
132 | my ($arg) = @_; |
|
|
133 | |
|
|
134 | $self->{widgetset}{$arg{id}} = { |
|
|
135 | w => {}, |
|
|
136 | }; |
|
|
137 | }); |
|
|
138 | |
|
|
139 | # widgetset destroy |
|
|
140 | $self->connect_ext (ws_d => sub { |
|
|
141 | my ($arg) = @_; |
|
|
142 | |
|
|
143 | my $ws = delete $self->{widgetset}{$arg{id}} |
|
|
144 | or return; |
|
|
145 | |
|
|
146 | $_->destroy |
|
|
147 | for values %{$ws->{w}}; |
|
|
148 | }); |
|
|
149 | |
|
|
150 | # widgetset destroy |
|
|
151 | $self->connect_ext (ws_c => sub { |
|
|
152 | my ($arg) = @_; |
|
|
153 | |
|
|
154 | my $args = $arg->{args} || {}; |
|
|
155 | |
|
|
156 | for my $ev (grep /^on_/, keys %$args) { |
|
|
157 | $args->{$ev} = sub { |
|
|
158 | my $id = shift->{s_id}; |
|
|
159 | $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); |
|
|
160 | |
|
|
161 | 1 |
|
|
162 | }; |
|
|
163 | } |
|
|
164 | |
|
|
165 | if (my $widget = eval { |
|
|
166 | local $SIG{__DIE__}; |
|
|
167 | "CFPlus::UI::$arg->{class}"->new ( |
|
|
168 | %$args, |
|
|
169 | s_ws => $arg->{ws}, |
|
|
170 | s_id => $arg->{id}, |
|
|
171 | ) |
|
|
172 | } |
|
|
173 | ) { |
|
|
174 | $self->{widget}{$arg->{id}} |
|
|
175 | = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} |
|
|
176 | = $widget; |
|
|
177 | |
|
|
178 | $widget->connect (on_destroy => sub { |
|
|
179 | my ($widget) = @_; |
|
|
180 | |
|
|
181 | delete $self->{widget}{$widget->{s_id}}; |
|
|
182 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; |
|
|
183 | }); |
|
|
184 | } else { |
|
|
185 | warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; |
|
|
186 | $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); |
|
|
187 | } |
|
|
188 | }); |
|
|
189 | |
|
|
190 | # widget call |
|
|
191 | $self->connect_ext (w_c => sub { |
|
|
192 | my ($arg) = @_; |
|
|
193 | |
|
|
194 | my $w = $self->{widget}{$arg->{id}} |
|
|
195 | or return; |
|
|
196 | my $m = $arg->{name}; |
|
|
197 | |
|
|
198 | my $a = $arg->{args} || []; |
|
|
199 | |
|
|
200 | if (exists $arg->{rid}) { |
|
|
201 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); |
|
|
202 | } else { |
|
|
203 | $w->$m (@$a); |
|
|
204 | } |
|
|
205 | }); |
|
|
206 | |
|
|
207 | # widget set |
|
|
208 | $self->connect_ext (w_s => sub { |
|
|
209 | my ($arg) = @_; |
|
|
210 | |
|
|
211 | my $w = $self->{widget}{$arg->{id}} |
|
|
212 | or return; |
|
|
213 | |
|
|
214 | $w->{$_->[0]} = $_->[1] |
|
|
215 | for @{ $arg->{attr} }; |
|
|
216 | }); |
|
|
217 | |
|
|
218 | # widget get |
|
|
219 | $self->connect_ext (w_g => sub { |
|
|
220 | my ($arg) = @_; |
|
|
221 | |
|
|
222 | my $w = $self->{widget}{$arg->{id}} |
|
|
223 | or return; |
|
|
224 | |
|
|
225 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{attr}}]); |
|
|
226 | }); |
|
|
227 | |
|
|
228 | # destroy widgets on logout |
|
|
229 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
|
|
230 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
|
|
231 | $_->destroy |
|
|
232 | for values %{delete $ws->{w} || {}}; |
| 66 | } |
233 | } |
| 67 | }); |
234 | }); |
| 68 | |
235 | |
| 69 | $self->{map_widget}->add_command (@$_) |
236 | $self->{map_widget}->add_command (@$_) |
| 70 | for @cmd_help; |
237 | for @cmd_help; |
| … | |
… | |
| 279 | my @skills = keys %{ $self->{skill_info} }; |
446 | my @skills = keys %{ $self->{skill_info} }; |
| 280 | |
447 | |
| 281 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
448 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
| 282 | $sktbl->clear; |
449 | $sktbl->clear; |
| 283 | |
450 | |
|
|
451 | my @add; |
|
|
452 | |
|
|
453 | push @add, |
| 284 | $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); |
454 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
| 285 | $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); |
455 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
| 286 | $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
456 | 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
| 287 | $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); |
457 | 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
| 288 | $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); |
458 | 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
| 289 | $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
459 | 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
|
|
460 | ; |
| 290 | |
461 | |
| 291 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
462 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
| 292 | |
463 | |
| 293 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
464 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
| 294 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
465 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
| … | |
… | |
| 322 | } |
493 | } |
| 323 | |
494 | |
| 324 | 1 |
495 | 1 |
| 325 | }; |
496 | }; |
| 326 | |
497 | |
|
|
498 | push @add, |
| 327 | $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label |
499 | $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label |
| 328 | text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); |
500 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
| 329 | $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label |
501 | $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label |
| 330 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); |
502 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
| 331 | $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
503 | $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
| 332 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); |
504 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
|
|
505 | ; |
| 333 | |
506 | |
| 334 | $x++ and ($x, $y) = (0, $y + 1); |
507 | $x++ and ($x, $y) = (0, $y + 1); |
| 335 | } |
508 | } |
|
|
509 | |
|
|
510 | $sktbl->add_at (@add); |
| 336 | } |
511 | } |
| 337 | |
512 | |
| 338 | for (grep exists $stats->{$_}, @skills) { |
513 | for (grep exists $stats->{$_}, @skills) { |
| 339 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
514 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
| 340 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
515 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
| … | |
… | |
| 607 | } |
782 | } |
| 608 | |
783 | |
| 609 | sub set_texture { |
784 | sub set_texture { |
| 610 | my ($self, $id, $data) = @_; |
785 | my ($self, $id, $data) = @_; |
| 611 | |
786 | |
|
|
787 | return unless $self->{map}; |
|
|
788 | |
| 612 | $self->{texture}[$id] = my $tex = |
789 | $self->{texture}[$id] = my $tex = |
| 613 | new_from_image CFPlus::Texture |
790 | new_from_image CFPlus::Texture |
| 614 | $data, minify => 1, mipmap => 1; |
791 | $data, minify => 1, mipmap => 1; |
| 615 | |
792 | |
| 616 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
793 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
| 617 | $self->{map_widget}->update; |
794 | $self->{map_widget}->update; |
|
|
795 | |
|
|
796 | $_->() for @{(delete $self->{face_cb}{$id}) || []}; |
|
|
797 | } |
|
|
798 | |
|
|
799 | sub connect_face_update { |
|
|
800 | my ($self, $id, $cb) = @_; |
|
|
801 | |
|
|
802 | push @{$self->{face_cb}{$id}}, $cb; |
|
|
803 | |
|
|
804 | CFPlus::guard { |
|
|
805 | @{$self->{face_cb}{$id}} |
|
|
806 | = grep $_ != $cb, |
|
|
807 | @{$self->{face_cb}{$id}}; |
|
|
808 | } |
| 618 | } |
809 | } |
| 619 | |
810 | |
| 620 | sub sound_play { |
811 | sub sound_play { |
| 621 | my ($self, $x, $y, $soundnum, $type) = @_; |
812 | my ($self, $x, $y, $soundnum, $type) = @_; |
| 622 | |
813 | |
| … | |
… | |
| 630 | |
821 | |
| 631 | $prompt = $LAST_QUERY unless length $prompt; |
822 | $prompt = $LAST_QUERY unless length $prompt; |
| 632 | $LAST_QUERY = $prompt; |
823 | $LAST_QUERY = $prompt; |
| 633 | |
824 | |
| 634 | $self->{query}-> ($self, $flags, $prompt); |
825 | $self->{query}-> ($self, $flags, $prompt); |
|
|
826 | } |
|
|
827 | |
|
|
828 | sub sanitise_xml($) { |
|
|
829 | local $_ = shift; |
|
|
830 | |
|
|
831 | # we now weed out all tags we do not support |
|
|
832 | s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; |
|
|
833 | # now all entities |
|
|
834 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
|
|
835 | |
|
|
836 | # handle some elements |
|
|
837 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
|
|
838 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
|
|
839 | |
|
|
840 | $_ |
| 635 | } |
841 | } |
| 636 | |
842 | |
| 637 | our %NAME_TO_COLOR = ( |
843 | our %NAME_TO_COLOR = ( |
| 638 | black => 0, |
844 | black => 0, |
| 639 | white => 1, |
845 | white => 1, |
| … | |
… | |
| 667 | ); |
873 | ); |
| 668 | |
874 | |
| 669 | sub msg { |
875 | sub msg { |
| 670 | my ($self, $color, $type, $text, @extra) = @_; |
876 | my ($self, $color, $type, $text, @extra) = @_; |
| 671 | |
877 | |
|
|
878 | $text = sanitise_xml $text; |
|
|
879 | |
| 672 | if (my $cb = $self->{cb_msg}{$type}) { |
880 | if (my $cb = $self->{cb_msg}{$type}) { |
| 673 | $_->($self, $color, $type, $text, @extra) for values %$cb; |
881 | $_->($self, $color, $type, $text, @extra) for values %$cb; |
| 674 | } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { |
882 | } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { |
| 675 | $type =~ s/-/_/g; |
883 | $type =~ s/-/_/g; |
| 676 | $self->{$type} = $text; |
884 | $self->{$type} = $text; |
| … | |
… | |
| 789 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
997 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
| 790 | return unless $::CONN; |
998 | return unless $::CONN; |
| 791 | |
999 | |
| 792 | $::FLOORBOX->clear; |
1000 | $::FLOORBOX->clear; |
| 793 | |
1001 | |
|
|
1002 | my @add; |
|
|
1003 | |
| 794 | my $row; |
1004 | my $row; |
| 795 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
1005 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
| 796 | if ($row < 6) { |
1006 | if ($row < 6) { |
| 797 | local $_->{face_widget}; # hack to force recreation of widget |
1007 | local $_->{face_widget}; # hack to force recreation of widget |
| 798 | local $_->{desc_widget}; # hack to force recreation of widget |
1008 | local $_->{desc_widget}; # hack to force recreation of widget |
| 799 | CFPlus::Item::update_widgets $_; |
1009 | CFPlus::Item::update_widgets $_; |
| 800 | |
1010 | |
|
|
1011 | push @add, |
| 801 | $::FLOORBOX->add (0, $row, $_->{face_widget}); |
1012 | 0, $row, $_->{face_widget}, |
| 802 | $::FLOORBOX->add (1, $row, $_->{desc_widget}); |
1013 | 1, $row, $_->{desc_widget}; |
| 803 | |
1014 | |
| 804 | $row++; |
1015 | $row++; |
| 805 | } else { |
1016 | } else { |
| 806 | $::FLOORBOX->add (1, $row, new CFPlus::UI::Button |
1017 | push @add, 1, $row, new CFPlus::UI::Button |
| 807 | text => "More...", |
1018 | text => "More...", |
| 808 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
1019 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
| 809 | ); |
1020 | ; |
| 810 | last; |
1021 | last; |
| 811 | } |
1022 | } |
| 812 | } |
1023 | } |
| 813 | if ($::CONN->{open_container}) { |
1024 | if ($::CONN->{open_container}) { |
| 814 | $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button |
1025 | push @add, 1, $row++, new CFPlus::UI::Button |
| 815 | text => "Close container", |
1026 | text => "Close container", |
| 816 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
1027 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
| 817 | ); |
1028 | ; |
| 818 | } |
1029 | } |
|
|
1030 | |
|
|
1031 | $::FLOORBOX->add_at (@add); |
| 819 | }); |
1032 | }); |
| 820 | |
1033 | |
| 821 | $::WANT_REFRESH++; |
1034 | $::WANT_REFRESH++; |
| 822 | } |
1035 | } |
| 823 | |
1036 | |
| … | |
… | |
| 1010 | |
1223 | |
| 1011 | (delete $self->{npc_dialog})->destroy |
1224 | (delete $self->{npc_dialog})->destroy |
| 1012 | if $self->{npc_dialog}; |
1225 | if $self->{npc_dialog}; |
| 1013 | |
1226 | |
| 1014 | $self->SUPER::destroy; |
1227 | $self->SUPER::destroy; |
|
|
1228 | |
|
|
1229 | %$self = (); |
| 1015 | } |
1230 | } |
| 1016 | |
1231 | |
| 1017 | package CFPlus::NPCDialog; |
1232 | package CFPlus::NPCDialog; |
| 1018 | |
1233 | |
| 1019 | our @ISA = 'CFPlus::UI::Toplevel'; |
1234 | our @ISA = 'CFPlus::UI::Toplevel'; |
| … | |
… | |
| 1110 | |
1325 | |
| 1111 | if ($msg->{msgtype} eq "reply") { |
1326 | if ($msg->{msgtype} eq "reply") { |
| 1112 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
1327 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
| 1113 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
1328 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
| 1114 | |
1329 | |
| 1115 | my $text = "\n" . CFPlus::asxml $msg->{msg}; |
1330 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg}; |
| 1116 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1331 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
| 1117 | my @link; |
1332 | my @link; |
| 1118 | $text =~ s{ |
1333 | $text =~ s{ |
| 1119 | ($match) |
1334 | ($match) |
| 1120 | }{ |
1335 | }{ |
