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.107 by root, Sun Jun 24 03:46:46 2007 UTC vs.
Revision 1.130 by root, Tue Jul 24 00:28:07 2007 UTC

… …
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 (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 (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) {
57 $self->{tileset} = $default; 112 $self->{tileset} = $default;
58 $self->{tilesize} = $default->[3]; 113 $self->{tilesize} = $default->[3];
59 $self->setup_req (tileset => $default->[0]); 114 $self->setup_req (tileset => $default->[0]);
60 115
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 (__w_ => sub {
127 $self->{widget}{$_[0]}
128 });
129
130 # widgetset new
131 $self->connect_ext (ws_n => sub {
132 my ($id) = @_;
133
134 $self->{widgetset}{$id} = {
135 w => {},
136 };
137 });
138
139 # widgetset destroy
140 $self->connect_ext (ws_d => sub {
141 my ($id) = @_;
142
143 my $ws = delete $self->{widgetset}{$id}
144 or return;
145
146 $_->destroy
147 for values %{$ws->{w}};
148 });
149
150 # widgetset create
151 $self->connect_ext (ws_c => sub {
152 my ($ws, $id, $class, $args) = @_;
153
154 for my $ev (grep /^on_/, keys %$args) {
155 $args->{$ev} = sub {
156 my $id = shift->{s_id};
157 $self->send_exti_msg (w_e => $id, $ev, \@_);
158
159 1
160 };
161 }
162
163 if (my $widget = eval {
164 local $SIG{__DIE__};
165 "CFPlus::UI::$class"->new (
166 %$args,
167 s_ws => $ws,
168 s_id => $id,
169 )
170 }
171 ) {
172 $self->{widget}{$id}
173 = $self->{widgetset}{$ws}{w}{$id}
174 = $widget;
175
176 $widget->connect (on_destroy => sub {
177 my ($widget) = @_;
178
179 delete $self->{widget}{$widget->{s_id}};
180 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
181 });
182 } else {
183 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
184 $self->send_exti_msg (w_e => $id, "destroy");
185 }
186 });
187
188 # widget call
189 $self->connect_ext (w_c => sub {
190 my ($id, $rid, $method, $args) = @_;
191
192 my $w = $self->{widget}{$id}
193 or return;
194
195 $args ||= [];
196
197 if ($rid) {
198 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
199 } else {
200 $w->$method (@$args);
201 }
202 });
203
204 # widget set
205 $self->connect_ext (w_s => sub {
206 my ($id, $attr) = @_;
207
208 my $w = $self->{widget}{$id}
209 or return;
210
211 for (my $i = 0; $i < $#$attr; $i += 2) {
212 my ($member, $value) = @$attr[$i, $i+1];
213 if (defined $value) {
214 $w->{$member} = $value;
215 } else {
216 delete $w->{$member};
217 }
218 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
219 }
220 });
221
222 # widget get
223 $self->connect_ext (w_g => sub {
224 my ($id, $rid, $attr) = @_;
225
226 my $w = $self->{widget}{$id}
227 or return;
228
229 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
230 });
231
232 # destroy widgets on logout
233 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
234 for my $ws (values %{delete $self->{widgetset} || {}}) {
235 $_->destroy
236 for values %{delete $ws->{w} || {}};
66 } 237 }
67 }); 238 });
68 239
69 $self->{map_widget}->add_command (@$_) 240 $self->{map_widget}->add_command (@$_)
70 for @cmd_help; 241 for @cmd_help;
… …
279 my @skills = keys %{ $self->{skill_info} }; 450 my @skills = keys %{ $self->{skill_info} };
280 451
281 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 452 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
282 $sktbl->clear; 453 $sktbl->clear;
283 454
455 my @add;
456
457 push @add,
284 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 458 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
285 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 459 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
286 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 460 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
287 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 461 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
288 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 462 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
289 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 463 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
464 ;
290 465
291 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 466 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
292 467
293 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 468 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); 469 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
322 } 497 }
323 498
324 1 499 1
325 }; 500 };
326 501
502 push @add,
327 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 503 $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); 504 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 505 $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); 506 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, 507 $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); 508 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
509 ;
333 510
334 $x++ and ($x, $y) = (0, $y + 1); 511 $x++ and ($x, $y) = (0, $y + 1);
335 } 512 }
513
514 $sktbl->add_at (@add);
336 } 515 }
337 516
338 for (grep exists $stats->{$_}, @skills) { 517 for (grep exists $stats->{$_}, @skills) {
339 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 518 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
340 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 519 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
607} 786}
608 787
609sub set_texture { 788sub set_texture {
610 my ($self, $id, $data) = @_; 789 my ($self, $id, $data) = @_;
611 790
791 return unless $self->{map};
792
612 $self->{texture}[$id] = my $tex = 793 $self->{texture}[$id] = my $tex =
613 new_from_image CFPlus::Texture 794 new_from_image CFPlus::Texture
614 $data, minify => 1, mipmap => 1; 795 $data, minify => 1, mipmap => 1;
615 796
616 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 797 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
617 $self->{map_widget}->update; 798 $self->{map_widget}->update;
799
800 $_->() for @{(delete $self->{face_cb}{$id}) || []};
801}
802
803sub connect_face_update {
804 my ($self, $id, $cb) = @_;
805
806 push @{$self->{face_cb}{$id}}, $cb;
807
808 CFPlus::guard {
809 @{$self->{face_cb}{$id}}
810 = grep $_ != $cb,
811 @{$self->{face_cb}{$id}};
812 }
618} 813}
619 814
620sub sound_play { 815sub sound_play {
621 my ($self, $x, $y, $soundnum, $type) = @_; 816 my ($self, $x, $y, $soundnum, $type) = @_;
622 817
… …
630 825
631 $prompt = $LAST_QUERY unless length $prompt; 826 $prompt = $LAST_QUERY unless length $prompt;
632 $LAST_QUERY = $prompt; 827 $LAST_QUERY = $prompt;
633 828
634 $self->{query}-> ($self, $flags, $prompt); 829 $self->{query}-> ($self, $flags, $prompt);
830}
831
832sub sanitise_xml($) {
833 local $_ = shift;
834
835 # we now weed out all tags we do not support
836 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
837 # now all entities
838 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
839
840 # handle some elements
841 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
842 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
843
844 $_
635} 845}
636 846
637our %NAME_TO_COLOR = ( 847our %NAME_TO_COLOR = (
638 black => 0, 848 black => 0,
639 white => 1, 849 white => 1,
… …
667); 877);
668 878
669sub msg { 879sub msg {
670 my ($self, $color, $type, $text, @extra) = @_; 880 my ($self, $color, $type, $text, @extra) = @_;
671 881
672 # we now weed out all tags we do not support 882 $text = sanitise_xml $text;
673 $text =~ s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
674 # now all entities
675 $text =~ s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
676
677 # handle some elements
678 $text =~ s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
679 $text =~ s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
680 883
681 if (my $cb = $self->{cb_msg}{$type}) { 884 if (my $cb = $self->{cb_msg}{$type}) {
682 $_->($self, $color, $type, $text, @extra) for values %$cb; 885 $_->($self, $color, $type, $text, @extra) for values %$cb;
683 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { 886 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
684 $type =~ s/-/_/g; 887 $type =~ s/-/_/g;
… …
798 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
799 return unless $::CONN; 1002 return unless $::CONN;
800 1003
801 $::FLOORBOX->clear; 1004 $::FLOORBOX->clear;
802 1005
1006 my @add;
1007
803 my $row; 1008 my $row;
804 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1009 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
805 if ($row < 6) { 1010 if ($row < 6) {
806 local $_->{face_widget}; # hack to force recreation of widget 1011 local $_->{face_widget}; # hack to force recreation of widget
807 local $_->{desc_widget}; # hack to force recreation of widget 1012 local $_->{desc_widget}; # hack to force recreation of widget
808 CFPlus::Item::update_widgets $_; 1013 CFPlus::Item::update_widgets $_;
809 1014
1015 push @add,
810 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1016 0, $row, $_->{face_widget},
811 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1017 1, $row, $_->{desc_widget};
812 1018
813 $row++; 1019 $row++;
814 } else { 1020 } else {
815 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1021 push @add, 1, $row, new CFPlus::UI::Button
816 text => "More...", 1022 text => "More...",
817 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1023 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
818 ); 1024 ;
819 last; 1025 last;
820 } 1026 }
821 } 1027 }
822 if ($::CONN->{open_container}) { 1028 if ($::CONN->{open_container}) {
823 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1029 push @add, 1, $row++, new CFPlus::UI::Button
824 text => "Close container", 1030 text => "Close container",
825 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1031 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
826 ); 1032 ;
827 } 1033 }
1034
1035 $::FLOORBOX->add_at (@add);
828 }); 1036 });
829 1037
830 $::WANT_REFRESH++; 1038 $::WANT_REFRESH++;
831} 1039}
832 1040
… …
958} 1166}
959 1167
960sub logged_in { 1168sub logged_in {
961 my ($self) = @_; 1169 my ($self) = @_;
962 1170
963 $self->send_ext_req (cfplus_support => version => 1, sub { 1171 $self->send_ext_req (cfplus_support => version => 2, sub {
1172 my (%msg) = @_;
1173
964 $self->{cfplus_ext} = $_[0]{version}; 1174 $self->{cfplus_ext} = $msg{version};
965 $self->update_server_info; 1175 $self->update_server_info;
966 1176
967 if ($self->{cfplus_ext} >= 2) { 1177 if ($self->{cfplus_ext} >= 2) {
968 $self->send_ext_req ("editor_support", sub { 1178 $self->send_ext_req ("editor_support", sub {
969 $self->{editor_support} = $_[0]; 1179 $self->{editor_support} = { @_ };
970 $self->update_server_info; 1180 $self->update_server_info;
971 1181
972 0 1182 0
973 }); 1183 });
974 } 1184 }
… …
994 1204
995sub lookat { 1205sub lookat {
996 my ($self, $x, $y) = @_; 1206 my ($self, $x, $y) = @_;
997 1207
998 if ($self->{cfplus_ext}) { 1208 if ($self->{cfplus_ext}) {
999 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1209 $self->send_ext_req (lookat => $x, $y, sub {
1000 my ($msg) = @_; 1210 my (%msg) = @_;
1001 1211
1002 if (exists $msg->{npc_dialog}) { 1212 if (exists $msg{npc_dialog}) {
1003 # start npc chat dialog 1213 # start npc chat dialog
1004 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1214 $self->{npc_dialog} = new CFPlus::NPCDialog::
1005 dx => $x, 1215 token => $msg{npc_dialog},
1006 dy => $y,
1007 title => "$msg->{npc_dialog} (NPC)", 1216 title => "$msg{npc_dialog}[0] (NPC)",
1008 conn => $self, 1217 conn => $self,
1009 ; 1218 ;
1010 } 1219 }
1011 }); 1220 });
1012 } 1221 }
… …
1019 1228
1020 (delete $self->{npc_dialog})->destroy 1229 (delete $self->{npc_dialog})->destroy
1021 if $self->{npc_dialog}; 1230 if $self->{npc_dialog};
1022 1231
1023 $self->SUPER::destroy; 1232 $self->SUPER::destroy;
1233
1234 %$self = ();
1024} 1235}
1025 1236
1026package CFPlus::NPCDialog; 1237package CFPlus::NPCDialog;
1027 1238
1028our @ISA = 'CFPlus::UI::Toplevel'; 1239our @ISA = 'CFPlus::UI::Toplevel';
… …
1075 on_activate => sub { $this->destroy; 1 }, 1286 on_activate => sub { $this->destroy; 1 },
1076 ; 1287 ;
1077 1288
1078 $self->update_options; 1289 $self->update_options;
1079 1290
1080 $self->{id} = $self->{conn}->send_ext_req ( 1291 $self->{id} = "npc-channel-" . $self->{conn}->token;
1081 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1292 $self->{conn}->connect_ext ($self->{id} => sub {
1082 sub { $this && $this->feed (@_) } 1293 $this->feed (@_) if $this;
1083 ); 1294 });
1295
1296 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1084 1297
1085 $self->{entry}->grab_focus; 1298 $self->{entry}->grab_focus;
1086 1299
1087 $self->{textview}->add_paragraph ({ 1300 $self->{textview}->add_paragraph ({
1088 fg => [1, 1, 0, 1], 1301 fg => [1, 1, 0, 1],
… …
1111 ); 1324 );
1112 } 1325 }
1113} 1326}
1114 1327
1115sub feed { 1328sub feed {
1116 my ($self, $msg) = @_; 1329 my ($self, $type, @arg) = @_;
1117 1330
1118 CFPlus::weaken $self; 1331 CFPlus::weaken $self;
1119 1332
1120 if ($msg->{msgtype} eq "reply") { 1333 if ($type eq "update") {
1334 my (%info) = @arg;
1335
1121 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1336 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1122 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1337 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1123
1124 my $text = "\n" . CFPlus::asxml $msg->{msg};
1125 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1126 my @link;
1127 $text =~ s{
1128 ($match)
1129 }{
1130 my $kw = $1;
1131
1132 push @link, new CFPlus::UI::Label
1133 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1134 can_hover => 1,
1135 can_events => 1,
1136 padding_x => 0,
1137 padding_y => 0,
1138 on_button_up => sub {
1139 $self->send ($kw);
1140 };
1141
1142 "\x{fffc}"
1143 }giex;
1144 1338
1339 if (exists $info{msg}) {
1340 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1341 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1342 my @link;
1343 $text =~ s{
1344 ($match)
1345 }{
1346 my $kw = $1;
1347
1348 push @link, new CFPlus::UI::Label
1349 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1350 can_hover => 1,
1351 can_events => 1,
1352 padding_x => 0,
1353 padding_y => 0,
1354 on_button_up => sub {
1355 $self->send ($kw);
1356 };
1357
1358 "\x{fffc}"
1359 }giex;
1360
1145 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1361 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1146 $self->{textview}->scroll_to_bottom; 1362 $self->{textview}->scroll_to_bottom;
1363 }
1364
1147 $self->update_options; 1365 $self->update_options;
1148 } else { 1366 } else {
1149 $self->destroy; 1367 $self->destroy;
1150 } 1368 }
1151 1369
… …
1156 my ($self, $msg) = @_; 1374 my ($self, $msg) = @_;
1157 1375
1158 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1376 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1159 $self->{textview}->scroll_to_bottom; 1377 $self->{textview}->scroll_to_bottom;
1160 1378
1161 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1379 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1162} 1380}
1163 1381
1164sub destroy { 1382sub destroy {
1165 my ($self) = @_; 1383 my ($self) = @_;
1166 1384
1167 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1385 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1168 1386
1169 if ($self->{conn}) { 1387 if ($self->{conn}) {
1170 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1388 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1171 delete $self->{conn}{npc_dialog}; 1389 delete $self->{conn}{npc_dialog};
1172 $self->{conn}->disconnect_ext ($self->{id}); 1390 $self->{conn}->disconnect_ext ($self->{id});
1173 } 1391 }
1174 1392
1175 $self->SUPER::destroy; 1393 $self->SUPER::destroy;

Diff Legend

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