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.117 by root, Fri Jul 13 05:31:31 2007 UTC vs.
Revision 1.130 by root, Tue Jul 24 00:28:07 2007 UTC

… …
48 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
49 @args 49 @args
50 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
52 52
53 $self->connect_ext (event_music => sub { 53 $self->connect_ext (music => sub {
54 my ($ev) = @_; 54 my (%ev) = @_;
55 55
56 return unless $::CFG->{bgm_enable}; 56 return unless $::CFG->{bgm_enable};
57 57
58 my $faces = $ev->{faces}; 58 my $faces = $ev{faces};
59 my @songs; 59 my @songs;
60 60
61 # request music from server if appropriate 61 # request music from server if appropriate
62 if (my $faces = $ev->{faces}) { 62 if (my $faces = $ev{faces}) {
63 for (@$faces) { 63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_; 64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum; 65 utf8::downgrade $chksum;
66 66
67 $chksum = unpack "H*", $chksum; 67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum; 68 $self->{music_map}{$face} = $chksum;
69 69
70 # check if already cached 70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub { 71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta) = @_; 72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
73 74
74 if (defined $meta) { 75 if (defined $meta_json) {
75 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta); 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});
76 } else { 80 } else {
77 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." }); 81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
78 $self->ask_face ($face, -100 - $pri, undef, sub { 82 $self->ask_face ($face, -100 - $pri, undef, sub {
79 my $len = length $_[1]; 83 my $len = length $_[1];
80 my ($meta, $data) = unpack "(w/a*)*", $_[1]; 84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
81 85
82 CFPlus::DB::write_file $chksum, $data, sub { }; 86 CFPlus::DB::write_file $path, $data, sub {
83 CFPlus::DB::put "res-metadata" => $chksum => $meta, sub { }; 87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
84
85 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta); 88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
86 ::message ({ markup => "downloaded song #$face, size $len octets" }); 92 ::message ({ markup => "downloaded song #$face, size $len octets" });
87
88 &::audio_music_set ($self->{songs}); 93 &::audio_music_set ($self->{songs});
94 };
95 };
89 }); 96 });
90 } 97 }
91 } 98 }
92 } 99 }
93 } 100 }
94 101
95 if (my $play = $ev->{play}) { 102 if (my $play = $ev{play}) {
96 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]); 103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
97 } 104 }
98 }); 105 });
99 106
100 $self->connect_ext (event_capabilities => sub { 107 $self->connect_ext (capabilities => sub {
101 my ($cap) = @_; 108 my (%cap) = @_;
102 109
103 if (my $ts = $cap->{tileset}) { 110 if (my $ts = $cap{tileset}) {
104 if (my ($default) = grep $_->[2] & 1, @$ts) { 111 if (my ($default) = grep $_->[2] & 1, @$ts) {
105 $self->{tileset} = $default; 112 $self->{tileset} = $default;
106 $self->{tilesize} = $default->[3]; 113 $self->{tilesize} = $default->[3];
107 $self->setup_req (tileset => $default->[0]); 114 $self->setup_req (tileset => $default->[0]);
108 115
… …
114 } 121 }
115 }); 122 });
116 123
117 $self->{json_coder} 124 $self->{json_coder}
118 ->convert_blessed 125 ->convert_blessed
119 ->filter_json_single_key_object (__widget_ref__ => sub { 126 ->filter_json_single_key_object (__w_ => sub {
120 $self->{widget}{$_[0]} 127 $self->{widget}{$_[0]}
121 }); 128 });
122 129
130 # widgetset new
123 $self->connect_ext (ws_n => sub { 131 $self->connect_ext (ws_n => sub {
124 my ($arg) = @_; 132 my ($id) = @_;
125 133
126 $self->{widgetset}{$arg{id}} = { 134 $self->{widgetset}{$id} = {
127 w => {}, 135 w => {},
128 }; 136 };
129 }); 137 });
130 138
139 # widgetset destroy
131 $self->connect_ext (ws_d => sub { 140 $self->connect_ext (ws_d => sub {
132 my ($arg) = @_; 141 my ($id) = @_;
133 142
134 my $ws = delete $self->{widgetset}{$arg{id}} 143 my $ws = delete $self->{widgetset}{$id}
135 or return; 144 or return;
136 145
137 $_->destroy 146 $_->destroy
138 for values %{$ws->{w}}; 147 for values %{$ws->{w}};
139 }); 148 });
140 149
150 # widgetset create
141 $self->connect_ext (ws_c => sub { 151 $self->connect_ext (ws_c => sub {
142 my ($arg) = @_; 152 my ($ws, $id, $class, $args) = @_;
143
144 my $args = $arg->{args} || {};
145 153
146 for my $ev (grep /^on_/, keys %$args) { 154 for my $ev (grep /^on_/, keys %$args) {
147 $args->{$ev} = sub { 155 $args->{$ev} = sub {
148 my $id = shift->{s_id}; 156 my $id = shift->{s_id};
149 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 157 $self->send_exti_msg (w_e => $id, $ev, \@_);
150 158
151 1 159 1
152 }; 160 };
153 } 161 }
154 162
155 if (my $widget = eval { 163 if (my $widget = eval {
156 local $SIG{__DIE__}; 164 local $SIG{__DIE__};
157 "CFPlus::UI::$arg->{class}"->new ( 165 "CFPlus::UI::$class"->new (
158 %$args, 166 %$args,
159 s_ws => $arg->{ws}, 167 s_ws => $ws,
160 s_id => $arg->{id}, 168 s_id => $id,
161 ) 169 )
162 } 170 }
163 ) { 171 ) {
164 $self->{widget}{$arg->{id}} 172 $self->{widget}{$id}
165 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 173 = $self->{widgetset}{$ws}{w}{$id}
166 = $widget; 174 = $widget;
167 175
168 $widget->connect (on_destroy => sub { 176 $widget->connect (on_destroy => sub {
169 my ($widget) = @_; 177 my ($widget) = @_;
170 178
171 delete $self->{widget}{$widget->{s_id}}; 179 delete $self->{widget}{$widget->{s_id}};
172 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 180 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
173 }); 181 });
174 } else { 182 } else {
175 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 183 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
176 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 184 $self->send_exti_msg (w_e => $id, "destroy");
177 } 185 }
178 }); 186 });
179 187
188 # widget call
180 $self->connect_ext (w_c => sub { 189 $self->connect_ext (w_c => sub {
181 my ($arg) = @_; 190 my ($id, $rid, $method, $args) = @_;
182 191
183 my $w = $self->{widget}{$arg->{id}} 192 my $w = $self->{widget}{$id}
184 or return; 193 or return;
185 my $m = $arg->{name};
186 194
187 my $a = $arg->{args} || []; 195 $args ||= [];
188 196
189 if (exists $arg->{rid}) { 197 if ($rid) {
190 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); 198 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
191 } else { 199 } else {
192 $w->$m (@$a); 200 $w->$method (@$args);
193 } 201 }
194 }); 202 });
195 203
204 # widget set
196 $self->connect_ext (w_s => sub { 205 $self->connect_ext (w_s => sub {
197 my ($arg) = @_; 206 my ($id, $attr) = @_;
198 207
199 my $w = $self->{widget}{$arg->{id}} 208 my $w = $self->{widget}{$id}
200 or return; 209 or return;
201 210
202 $w->{$arg->{name}} = $arg->{value}; 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 }
203 }); 220 });
204 221
222 # widget get
205 $self->connect_ext (w_g => sub { 223 $self->connect_ext (w_g => sub {
206 my ($arg) = @_; 224 my ($id, $rid, $attr) = @_;
207 225
208 my $w = $self->{widget}{$arg->{id}} 226 my $w = $self->{widget}{$id}
209 or return; 227 or return;
210 228
211 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 229 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
212 }); 230 });
213 231
232 # destroy widgets on logout
214 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 233 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
215 for my $ws (values %{delete $self->{widgetset} || {}}) { 234 for my $ws (values %{delete $self->{widgetset} || {}}) {
216 $_->destroy 235 $_->destroy
217 for values %{delete $ws->{w} || {}}; 236 for values %{delete $ws->{w} || {}};
218 } 237 }
… …
431 my @skills = keys %{ $self->{skill_info} }; 450 my @skills = keys %{ $self->{skill_info} };
432 451
433 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 452 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
434 $sktbl->clear; 453 $sktbl->clear;
435 454
455 my @add;
456
457 push @add,
436 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 458 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
437 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 459 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
438 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 460 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
439 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 461 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
440 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 462 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
441 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 463 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
464 ;
442 465
443 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>";
444 467
445 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);
446 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);
… …
474 } 497 }
475 498
476 1 499 1
477 }; 500 };
478 501
502 push @add,
479 $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
480 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),
481 $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
482 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),
483 $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,
484 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 ;
485 510
486 $x++ and ($x, $y) = (0, $y + 1); 511 $x++ and ($x, $y) = (0, $y + 1);
487 } 512 }
513
514 $sktbl->add_at (@add);
488 } 515 }
489 516
490 for (grep exists $stats->{$_}, @skills) { 517 for (grep exists $stats->{$_}, @skills) {
491 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 518 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
492 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 519 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
759} 786}
760 787
761sub set_texture { 788sub set_texture {
762 my ($self, $id, $data) = @_; 789 my ($self, $id, $data) = @_;
763 790
791 return unless $self->{map};
792
764 $self->{texture}[$id] = my $tex = 793 $self->{texture}[$id] = my $tex =
765 new_from_image CFPlus::Texture 794 new_from_image CFPlus::Texture
766 $data, minify => 1, mipmap => 1; 795 $data, minify => 1, mipmap => 1;
767 796
768 $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}});
769 $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 }
770} 813}
771 814
772sub sound_play { 815sub sound_play {
773 my ($self, $x, $y, $soundnum, $type) = @_; 816 my ($self, $x, $y, $soundnum, $type) = @_;
774 817
… …
958 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
959 return unless $::CONN; 1002 return unless $::CONN;
960 1003
961 $::FLOORBOX->clear; 1004 $::FLOORBOX->clear;
962 1005
1006 my @add;
1007
963 my $row; 1008 my $row;
964 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} }) {
965 if ($row < 6) { 1010 if ($row < 6) {
966 local $_->{face_widget}; # hack to force recreation of widget 1011 local $_->{face_widget}; # hack to force recreation of widget
967 local $_->{desc_widget}; # hack to force recreation of widget 1012 local $_->{desc_widget}; # hack to force recreation of widget
968 CFPlus::Item::update_widgets $_; 1013 CFPlus::Item::update_widgets $_;
969 1014
1015 push @add,
970 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1016 0, $row, $_->{face_widget},
971 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1017 1, $row, $_->{desc_widget};
972 1018
973 $row++; 1019 $row++;
974 } else { 1020 } else {
975 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1021 push @add, 1, $row, new CFPlus::UI::Button
976 text => "More...", 1022 text => "More...",
977 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1023 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
978 ); 1024 ;
979 last; 1025 last;
980 } 1026 }
981 } 1027 }
982 if ($::CONN->{open_container}) { 1028 if ($::CONN->{open_container}) {
983 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1029 push @add, 1, $row++, new CFPlus::UI::Button
984 text => "Close container", 1030 text => "Close container",
985 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1031 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
986 ); 1032 ;
987 } 1033 }
1034
1035 $::FLOORBOX->add_at (@add);
988 }); 1036 });
989 1037
990 $::WANT_REFRESH++; 1038 $::WANT_REFRESH++;
991} 1039}
992 1040
… …
1118} 1166}
1119 1167
1120sub logged_in { 1168sub logged_in {
1121 my ($self) = @_; 1169 my ($self) = @_;
1122 1170
1123 $self->send_ext_req (cfplus_support => version => 1, sub { 1171 $self->send_ext_req (cfplus_support => version => 2, sub {
1172 my (%msg) = @_;
1173
1124 $self->{cfplus_ext} = $_[0]{version}; 1174 $self->{cfplus_ext} = $msg{version};
1125 $self->update_server_info; 1175 $self->update_server_info;
1126 1176
1127 if ($self->{cfplus_ext} >= 2) { 1177 if ($self->{cfplus_ext} >= 2) {
1128 $self->send_ext_req ("editor_support", sub { 1178 $self->send_ext_req ("editor_support", sub {
1129 $self->{editor_support} = $_[0]; 1179 $self->{editor_support} = { @_ };
1130 $self->update_server_info; 1180 $self->update_server_info;
1131 1181
1132 0 1182 0
1133 }); 1183 });
1134 } 1184 }
… …
1154 1204
1155sub lookat { 1205sub lookat {
1156 my ($self, $x, $y) = @_; 1206 my ($self, $x, $y) = @_;
1157 1207
1158 if ($self->{cfplus_ext}) { 1208 if ($self->{cfplus_ext}) {
1159 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1209 $self->send_ext_req (lookat => $x, $y, sub {
1160 my ($msg) = @_; 1210 my (%msg) = @_;
1161 1211
1162 if (exists $msg->{npc_dialog}) { 1212 if (exists $msg{npc_dialog}) {
1163 # start npc chat dialog 1213 # start npc chat dialog
1164 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1214 $self->{npc_dialog} = new CFPlus::NPCDialog::
1165 dx => $x, 1215 token => $msg{npc_dialog},
1166 dy => $y,
1167 title => "$msg->{npc_dialog} (NPC)", 1216 title => "$msg{npc_dialog}[0] (NPC)",
1168 conn => $self, 1217 conn => $self,
1169 ; 1218 ;
1170 } 1219 }
1171 }); 1220 });
1172 } 1221 }
… …
1237 on_activate => sub { $this->destroy; 1 }, 1286 on_activate => sub { $this->destroy; 1 },
1238 ; 1287 ;
1239 1288
1240 $self->update_options; 1289 $self->update_options;
1241 1290
1242 $self->{id} = $self->{conn}->send_ext_req ( 1291 $self->{id} = "npc-channel-" . $self->{conn}->token;
1243 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1292 $self->{conn}->connect_ext ($self->{id} => sub {
1244 sub { $this && $this->feed (@_) } 1293 $this->feed (@_) if $this;
1245 ); 1294 });
1295
1296 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1246 1297
1247 $self->{entry}->grab_focus; 1298 $self->{entry}->grab_focus;
1248 1299
1249 $self->{textview}->add_paragraph ({ 1300 $self->{textview}->add_paragraph ({
1250 fg => [1, 1, 0, 1], 1301 fg => [1, 1, 0, 1],
… …
1273 ); 1324 );
1274 } 1325 }
1275} 1326}
1276 1327
1277sub feed { 1328sub feed {
1278 my ($self, $msg) = @_; 1329 my ($self, $type, @arg) = @_;
1279 1330
1280 CFPlus::weaken $self; 1331 CFPlus::weaken $self;
1281 1332
1282 if ($msg->{msgtype} eq "reply") { 1333 if ($type eq "update") {
1334 my (%info) = @arg;
1335
1283 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1336 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1284 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1337 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1285
1286 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1287 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1288 my @link;
1289 $text =~ s{
1290 ($match)
1291 }{
1292 my $kw = $1;
1293
1294 push @link, new CFPlus::UI::Label
1295 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1296 can_hover => 1,
1297 can_events => 1,
1298 padding_x => 0,
1299 padding_y => 0,
1300 on_button_up => sub {
1301 $self->send ($kw);
1302 };
1303
1304 "\x{fffc}"
1305 }giex;
1306 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
1307 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1361 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1308 $self->{textview}->scroll_to_bottom; 1362 $self->{textview}->scroll_to_bottom;
1363 }
1364
1309 $self->update_options; 1365 $self->update_options;
1310 } else { 1366 } else {
1311 $self->destroy; 1367 $self->destroy;
1312 } 1368 }
1313 1369
… …
1318 my ($self, $msg) = @_; 1374 my ($self, $msg) = @_;
1319 1375
1320 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1376 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1321 $self->{textview}->scroll_to_bottom; 1377 $self->{textview}->scroll_to_bottom;
1322 1378
1323 $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);
1324} 1380}
1325 1381
1326sub destroy { 1382sub destroy {
1327 my ($self) = @_; 1383 my ($self) = @_;
1328 1384
1329 #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
1330 1386
1331 if ($self->{conn}) { 1387 if ($self->{conn}) {
1332 $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};
1333 delete $self->{conn}{npc_dialog}; 1389 delete $self->{conn}{npc_dialog};
1334 $self->{conn}->disconnect_ext ($self->{id}); 1390 $self->{conn}->disconnect_ext ($self->{id});
1335 } 1391 }
1336 1392
1337 $self->SUPER::destroy; 1393 $self->SUPER::destroy;

Diff Legend

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