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

Diff Legend

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