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

Diff Legend

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