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.96 by root, Fri Apr 6 07:45:35 2007 UTC vs.
Revision 1.158 by root, Tue Aug 21 11:23:04 2007 UTC

… …
15use Crossfire::Protocol::Base 0.95; 15use Crossfire::Protocol::Base 0.95;
16 16
17use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
18 18
19sub new { 19sub new {
20 my $class = shift; 20 my ($class, %arg) = @_;
21 21
22 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 xwidget1 => 1,#d#
27 %{$arg{setup_req} || {}},
28 },
29 );
23 30
24 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
25 32
26 my @cmd_help = map { 33 my @cmd_help = map {
27 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
41 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
42 @args 49 @args
43 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
44 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
45 52
53 $self->connect_ext (ambient_music => sub {
54 my ($songs) = @_;
55 &::audio_music_set_ambient ($songs);
56 });
57
46 $self->connect_ext (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
47 my ($cap) = @_; 59 my (%cap) = @_;
48 60
61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want;
63
64 $self->send_exti_req (resource => "exp_table", sub {
65 my ($exp_table) = @_;
66
67 $self->register_face_handler ($exp_table, sub {
68 my ($face) = @_;
69
70 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
71 $_->() for values %{ $self->{on_exp_update} || {} };
72 });
73
74 ()
75 });
76
49 if (my $ts = $cap->{tileset}) { 77 if (my $ts = $cap{tileset}) {
50 if (my ($default) = grep $_->[2] & 1, @$ts) { 78 if (my ($default) = grep $_->[2] & 1, @$ts) {
51 $self->{tileset} = $default; 79 $self->{tileset} = $default;
52 $self->{tilesize} = $default->[3]; 80 $self->{tilesize} = $default->[3];
53 $self->setup_req (tileset => $default->[0]); 81 $self->setup_req (tileset => $default->[0]);
54 82
… …
58 $self->setup_req (mapsize => "${w}x${h}"); 86 $self->setup_req (mapsize => "${w}x${h}");
59 } 87 }
60 } 88 }
61 }); 89 });
62 90
91 $self->{json_coder}
92 ->convert_blessed
93 ->filter_json_single_key_object (__w_ => sub {
94 $self->{widget}{$_[0]}
95 });
96
97 # widgetset new
98 $self->connect_ext (ws_n => sub {
99 my ($id) = @_;
100
101 $self->{widgetset}{$id} = {
102 w => {},
103 };
104 });
105
106 # widgetset destroy
107 $self->connect_ext (ws_d => sub {
108 my ($id) = @_;
109
110 my $ws = delete $self->{widgetset}{$id}
111 or return;
112
113 $_->destroy
114 for values %{$ws->{w}};
115 });
116
117 # widgetset create
118 $self->connect_ext (ws_c => sub {
119 my ($ws, $id, $class, $args) = @_;
120
121 for my $ev (grep /^on_/, keys %$args) {
122 my $rid = $args->{$ev};
123 $args->{$ev} = sub {
124 my $id = shift->{s_id};
125 $self->send_exti_msg (w_e => $id, $rid, @_);
126
127 1
128 };
129 }
130
131 $self->widget_associate (
132 $ws, $id => scalar eval {
133 local $SIG{__DIE__};
134 "CFPlus::UI::$class"->new (%$args)
135 }
136 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
137 });
138
139 # widgetset associate
140 $self->connect_ext (ws_a => sub {
141 my (%ass) = @_;
142
143 # everything that has a name, wether conceivably useful or not
144 my %wkw = (
145 root => $CFPlus::UI::ROOT,
146 tooltip => $CFPlus::UI::TOOLTIP,
147
148 mapwidget => $::MAPWIDGET,
149 buttonbar => $::BUTTONBAR,
150 metaserver => $::METASERVER,
151 buttonbar => $::BUTTONBAR,
152 login_button => $::LOGIN_BUTTON,
153 quit_dialog => $::QUIT_DIALOG,
154 host_entry => $::HOST_ENTRY,
155 metaserver => $::METASERVER,
156 server_info => $::SERVER_INFO,
157
158 setup_dialog => $::SETUP_DIALOG,
159 setup_notebook => $::SETUP_NOTEBOOK,
160 setup_server => $::SETUP_SERVER,
161 setup_keyboard => $::SETUP_KEYBOARD,
162
163 pl_notebook => $::PL_NOTEBOOK,
164 pl_window => $::PL_WINDOW,
165 inventory_page => $::INVENTORY_PAGE,
166 stats_page => $::STATS_PAGE,
167 skill_page => $::SKILL_PAGE,
168 spell_page => $::SPELL_PAGE,
169 spell_list => $::SPELL_LIST,
170
171 floorbox => $::FLOORBOX,
172 help_window => $::HELP_WINDOW,
173 message_window => $::MESSAGE_WINDOW,
174 statusbox => $::SDTATUSBOX,
175
176 inv => $::INV,
177 invr => $::INVR,
178 invr_hb => $::INVR_HB,
179 );
180
181 while (my ($id, $name) = each %ass) {
182 $self->widget_associate (undef, $id => $wkw{$name})
183 or warn "server failed to associate non-existent well-known widget $name\n";
184 }
185 });
186
187 # widget call
188 $self->connect_ext (w_c => sub {
189 my ($id, $rid, $method, @args) = @_;
190
191 my $w = $self->{widget}{$id}
192 or return;
193
194 if ($rid) {
195 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
196 } else {
197 $w->$method (@args);
198 }
199 });
200
201 # widget set
202 $self->connect_ext (w_s => sub {
203 my ($id, $attr) = @_;
204
205 my $w = $self->{widget}{$id}
206 or return;
207
208 for (my $i = 0; $i < $#$attr; $i += 2) {
209 my ($member, $value) = @$attr[$i, $i+1];
210 if (defined $value) {
211 $w->{$member} = $value;
212 } else {
213 delete $w->{$member};
214 }
215 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
216 }
217 });
218
219 # widget get
220 $self->connect_ext (w_g => sub {
221 my ($id, $rid, $attr) = @_;
222
223 my $w = $self->{widget}{$id}
224 or return;
225
226 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
227 });
228
229 # message window
230 $self->connect_ext (channel_info => sub {
231 my ($info) = @_;
232 $self->{channels}->{$info->{id}} = $info;
233 $::MESSAGE_WINDOW->add_channel ($info);
234 });
235
236 # destroy widgets on logout
237 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
238 for my $ws (values %{delete $self->{widgetset} || {}}) {
239 $_->destroy
240 for values %{delete $ws->{w} || {}};
241 }
242 });
243
63 $self->{map_widget}->add_command (@$_) 244 $self->{map_widget}->add_command (@$_)
64 for @cmd_help; 245 for @cmd_help;
65 246
66 { 247 {
67 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 248 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
… …
81 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 262 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
82 263
83 $self 264 $self
84} 265}
85 266
267sub widget_associate {
268 my ($self, $ws, $id, $widget) = @_;
269
270 if ($widget) {
271 $widget->{s_id} = $id;
272 $self->{widget}{$id} = $widget;
273
274 if ($ws) {
275 $widget->{s_ws} = $ws;
276 $self->{widgetset}{$ws}{w}{$id} = $widget;
277 }
278
279 $widget->connect (on_destroy => sub {
280 my ($widget) = @_;
281
282 delete $self->{widget}{$widget->{s_id}};
283 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
284 if exists $widget->{s_ws};
285 });
286
287 1
288 } else {
289 $self->send_exti_msg (w_e => $id, undef);
290
291 0
292 }
293}
294
295sub update_fx_want {
296 my ($self) = @_;
297
298 $self->send_exti_msg (fx_want => {
299 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
300 5 => !!$::CFG->{audio_enable}, # FT_SOUND
301 6 => 1, # FT_RSRC
302 });
303}
304
86sub logprint { 305sub logprint {
87 my ($self, @a) = @_; 306 my ($self, @a) = @_;
88 307
89 $self->{log_fh} ||= do { 308 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
90 my $path = "$Crossfire::VARDIR/log.$self->{host}";
91
92 open my $fh, ">>:utf8", $path
93 or die "Couldn't open logfile $path: $!";
94
95 $fh->autoflush (1);
96
97 $fh;
98 };
99
100 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
101
102 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
103 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
104
105 print {$self->{log_fh}} "$ts ", @a, "\n";
106} 309}
107 310
108sub _stat_numdiff { 311sub _stat_numdiff {
109 my ($self, $name, $old, $new) = @_; 312 my ($self, $name, $old, $new) = @_;
110 313
… …
243 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 446 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
244 $::GAUGES->{food} ->set_value ($fo, $fo_m); 447 $::GAUGES->{food} ->set_value ($fo, $fo_m);
245 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 448 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
246 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 449 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
247 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 450 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
248 my $rng = $stats->{+CS_STAT_RANGE}; 451 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
249 $rng =~ s/^Range: //; # thank you so much dear server 452 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
250 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
251 my $title = $stats->{+CS_STAT_TITLE}; 453 my $title = $stats->{+CS_STAT_TITLE};
252 $title =~ s/^Player: //; 454 $title =~ s/^Player: //;
253 $::STATWIDS->{title} ->set_text ("Title: " . $title); 455 $::STATWIDS->{title} ->set_text ("Title: " . $title);
254 456
255 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 457 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
275 my @skills = keys %{ $self->{skill_info} }; 477 my @skills = keys %{ $self->{skill_info} };
276 478
277 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 479 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
278 $sktbl->clear; 480 $sktbl->clear;
279 481
482 my $sw = $self->{skillwid}{""} ||= [
280 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 483 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
281 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 484 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
485 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
282 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 486 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
283 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 487 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
284 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 488 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
489 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
285 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 490 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
491 ];
492
493 my @add = @$sw;
286 494
287 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 495 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
288 496
289 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 497 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
290 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 498 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
318 } 526 }
319 527
320 1 528 1
321 }; 529 };
322 530
323 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 531 my $sw = $self->{skillwid}{$idx} ||= [
532 # exp
533 (new CFPlus::UI::Label
324 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 534 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
325 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 535
536 # level
537 (new CFPlus::UI::Label
326 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 538 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
539
540 # progress
541 (new CFPlus::UI::ExperienceProgress),
542
543 # label
327 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 544 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
328 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 545 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
546 ];
547
548 push @add,
549 $x * 4 + 0, $y, $sw->[0],
550 $x * 4 + 1, $y, $sw->[1],
551 $x * 4 + 2, $y, $sw->[2],
552 $x * 4 + 3, $y, $sw->[3],
553 ;
329 554
330 $x++ and ($x, $y) = (0, $y + 1); 555 $x++ and ($x, $y) = (0, $y + 1);
331 } 556 }
557
558 $sktbl->add_at (@add);
332 } 559 }
333 560
334 for (grep exists $stats->{$_}, @skills) { 561 for (grep exists $stats->{$_}, @skills) {
562 my $sw = $self->{skillwid}{$_};
335 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 563 $sw->[0]->set_text (::formsep ($stats->{$_}[1]));
336 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 564 $sw->[1]->set_text ($stats->{$_}[0] * 1);
565 $sw->[2]->set_value (@{$stats->{$_}});
337 } 566 }
338} 567}
339 568
340sub macro_send { 569sub macro_send {
341 my ($self, $macro) = @_; 570 my ($self, $macro) = @_;
… …
369} 598}
370 599
371sub feed_map1a { 600sub feed_map1a {
372 my ($self, $data) = @_; 601 my ($self, $data) = @_;
373 602
374 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 603 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
604 my $delay;
605
606 for my $tile (@$missing) {
607 next if $self->{delay}{$tile};
608
609 $delay = 1;
610
611 if (my $tex = $::CONN->{texture}[$tile]) {
612 $tex->upload;
613 } else {
614 $self->{delay}{$tile} = 1;
615
616 # we assume the face is in-flight and will eventually come
617 push @{$self->{tile_cb}{$tile}}, sub {
618 delete $self->{delay}{$tile};
619 $_[0]->upload;
620 };
621 }
622 }
623
624 if ($delay) {
625 # delay the map drawing a tiny bit in the hope of getting the missing fetched
626 Event->timer (after => 0.03, cb => sub {
627 $_[0]->w->cancel;
628 $self->{map_widget}->update;
629 });
630 } else {
375 $self->{map_widget}->update; 631 $self->{map_widget}->update;
632 }
376} 633}
377 634
378sub magicmap { 635sub magicmap {
379 my ($self, $w, $h, $x, $y, $data) = @_; 636 my ($self, $w, $h, $x, $y, $data) = @_;
380 637
… …
387 my $map_info = delete $self->{map_info} 644 my $map_info = delete $self->{map_info}
388 or return; 645 or return;
389 646
390 my ($hash, $x, $y, $w, $h) = @$map_info; 647 my ($hash, $x, $y, $w, $h) = @$map_info;
391 648
392 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 649 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
650 $self->{map_cache_new}{$hash} = \$data;
393 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 651 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
394 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
395} 652}
396 653
397sub map_clear { 654sub map_clear {
398 my ($self) = @_; 655 my ($self) = @_;
399 656
… …
402 659
403 $self->{map}->clear; 660 $self->{map}->clear;
404 delete $self->{map_widget}{magicmap}; 661 delete $self->{map_widget}{magicmap};
405} 662}
406 663
664sub bg_fetch {
665 my ($self) = @_;
666
667 my $tile;
668
669 do {
670 $tile = pop @{$self->{bg_fetch}}
671 or return;
672 } while $self->{texture}[$tile];
673
674 CFPlus::DB::get tilecache => $tile, sub {
675 my ($data) = @_;
676
677 return unless $self->{map}; # stop when destroyed
678
679 if (defined $data) {
680 $self->have_tile ($tile, $data);
681 $self->{texture}[$tile]->upload;
682 }
683
684 $self->bg_fetch;
685 };
686}
407 687
408sub load_map($$$) { 688sub load_map($$$) {
409 my ($self, $hash, $x, $y) = @_; 689 my ($self, $hash, $x, $y) = @_;
410 690
411 CFPlus::DB::get $self->{mapcache} => $hash, sub { 691 my $gen = $self->{map_change_gen};
692
693 my $cb = sub {
694 return unless $gen == $self->{map_change_gen};
695
412 my ($data) = @_; 696 my ($data) = @_;
413 697
414 if (defined $data) { 698 if (defined $data) {
699 $self->{map_cache_new}{$hash} = \$data;
700
415 $data = Compress::LZF::decompress $data; 701 my $data = Compress::LZF::decompress $data;
416 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
417 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
418 CFPlus::DB::get tilecache => $id, sub {
419 my ($data) = @_;
420 702
421 $self->set_texture ($id => $data) 703 my $inprogress = @{ $self->{bg_fetch} || [] };
422 if defined $data; 704 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
423 }; 705 $self->bg_fetch unless $inprogress;
424 }
425 } 706 }
426 }; 707 };
708
709 if (my $rdata = $self->{map_cache_old}{$hash}) {
710 $cb->($$rdata);
711 } else {
712 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
713 }
427} 714}
428 715
429# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 716# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
430# (server resource,s latency, bandwidth), so this hack is warranted. 717# (server resource,s latency, bandwidth), so this hack is warranted.
431# the right fix is to make real tiled maps with an overview file 718# the right fix is to make real tiled maps with an overview file
… …
495 782
496 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 783 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
497 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 784 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
498 785
499 } else { 786 } else {
787 my $gen = $self->{map_change_gen};
500 $self->send_mapinfo ("spatial $path$tile", sub { 788 $self->send_mapinfo ("spatial $path$tile", sub {
789 return unless $gen == $self->{map_change_gen};
790
501 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 791 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
502 792
503 return if $mode ne "spatial"; 793 return if $mode ne "spatial";
504 794
505 $x += $self->{map}->ox; 795 $x += $self->{map}->ox;
… …
519 809
520sub map_change { 810sub map_change {
521 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 811 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
522 812
523 $self->flush_map; 813 $self->flush_map;
814
815 ++$self->{map_change_gen};
816 $self->{map_cache_old} = delete $self->{map_cache_new};
524 817
525 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 818 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
526 819
527 my $mapmapw = $self->{mapmap}->{w}; 820 my $mapmapw = $self->{mapmap}->{w};
528 my $mapmaph = $self->{mapmap}->{h}; 821 my $mapmaph = $self->{mapmap}->{h};
… …
547} 840}
548 841
549sub face_find { 842sub face_find {
550 my ($self, $facenum, $face, $cb) = @_; 843 my ($self, $facenum, $face, $cb) = @_;
551 844
552 my $hash = "$face->{chksum},$face->{name}"; 845 if ($face->{type} == 0) { # FT_FACE
553
554 my $id = CFPlus::DB::get_tile_id_sync $hash; 846 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
555 847
556 $face->{id} = $id; 848 $face->{id} = $id;
557 $self->{faceid}[$facenum] = $id;
558
559 $self->{map}->set_tileid ($facenum => $id); 849 $self->{map}->set_tileid ($facenum => $id);
560 850
561 CFPlus::DB::get tilecache => $id, $cb; 851 CFPlus::DB::get tilecache => $id, $cb;
852
853 } elsif ($face->{type} & 1) { # with metadata
854 CFPlus::DB::get res_meta => $face->{name}, $cb;
855
856 } else { # no metadata
857 CFPlus::DB::get res_data => $face->{name}, $cb;
858 }
562} 859}
563 860
564sub face_update { 861sub face_update {
565 my ($self, $facenum, $face, $changed) = @_; 862 my ($self, $facenum, $face, $changed) = @_;
566 863
864 if ($face->{type} == 0) {
865 # image, FT_FACE
567 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 866 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
568 if $changed; 867 if $changed;
569 868
570 $self->set_texture ($face->{id} => delete $face->{image}); 869 $self->have_tile ($face->{id}, delete $face->{data});
571}
572 870
573sub set_texture { 871 } elsif ($face->{type} & 1) {
872 # split metadata case, FT_MUSIC, FT_SOUND
873 if ($changed) { # new data
874 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
875 $face->{data} = $meta;
876
877 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
878 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
879 }
880
881 $face->{data} = $self->{json_coder}->decode ($face->{data});
882
883 ::add_license ($face);
884
885 if ($face->{type} == 3) { # FT_MUSIC
886 ::message ({ markup => "downloaded song #$facenum" })
887 if $changed;
888
889 &::audio_music_push ($facenum);
890 } elsif ($face->{type} == 5) { # FT_SOUND
891 ::message ({ markup => "downloaded sound #$facenum" })
892 if $changed;
893
894 &::audio_sound_push ($facenum);
895 }
896
897 } else {
898 # flat resource case, FT_RSRC
899 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
900 if $changed;
901 }
902
903 if (my $cbs = $self->{face_cb}{$facenum}) {
904 $_->($face, $changed) for @$cbs;
905 }
906}
907
908sub smooth_update {
909 my ($self, $facenum, $face) = @_;
910
911 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
912}
913
914sub have_tile {
574 my ($self, $id, $data) = @_; 915 my ($self, $tile, $data) = @_;
575 916
576 $self->{texture}[$id] ||= do { 917 return unless $self->{map};
577 my $tex = 918
919 my $tex = $self->{texture}[$tile] ||=
578 new_from_image CFPlus::Texture 920 new CFPlus::Texture
921 tile => $tile,
922 image => $data, delete_image => 1,
579 $data, minify => 1, mipmap => 1; 923 minify => 1, mipmap => 1;
580 924
581 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 925 if (my $cbs = delete $self->{tile_cb}{$tile}) {
582 $self->{map_widget}->update; 926 $_->($tex) for @$cbs;
583
584 $tex
585 }; 927 }
928}
929
930# call in non-void context registers a temporary
931# hook with handle, otherwise its permanent
932sub on_face_change {
933 my ($self, $num, $cb) = @_;
934
935 push @{$self->{face_cb}{$num}}, $cb;
936
937 defined wantarray
938 ? CFPlus::guard {
939 @{$self->{face_cb}{$num}}
940 = grep $_ != $cb,
941 @{$self->{face_cb}{$num}};
942 }
943 : ()
944}
945
946# call in non-void context registers a temporary
947# hook with handle, otherwise its permanent
948sub register_face_handler {
949 my ($self, $num, $cb) = @_;
950
951 return unless $num;
952
953 # invoke if available right now
954 $cb->($self->{face}[$num], 0)
955 unless exists $self->{face}[$num]{loading};
956
957 # future changes
958 $self->on_face_change ($num => $cb)
586} 959}
587 960
588sub sound_play { 961sub sound_play {
589 my ($self, $x, $y, $soundnum, $type) = @_; 962 my ($self, $type, $face, $dx, $dy, $vol) = @_;
590 963
591 $self->{sound_play}->($x, $y, $soundnum, $type); 964 &::audio_sound_play ($face, $dx, $dy, $vol)
965 unless $type & 1; # odd types are silent for future expansion
592} 966}
593 967
594my $LAST_QUERY; # server is stupid, stupid, stupid 968my $LAST_QUERY; # server is stupid, stupid, stupid
595 969
596sub query { 970sub query {
… …
600 $LAST_QUERY = $prompt; 974 $LAST_QUERY = $prompt;
601 975
602 $self->{query}-> ($self, $flags, $prompt); 976 $self->{query}-> ($self, $flags, $prompt);
603} 977}
604 978
605sub drawinfo { 979sub sanitise_xml($) {
606 my ($self, $color, $text) = @_; 980 local $_ = shift;
607 981
608 my @color = ( 982 # we now weed out all tags we do not support
983 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
984 # now all entities
985 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
986
987 # handle some elements
988 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
989 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
990
991 $_
992}
993
994our %NAME_TO_COLOR = (
995 black => 0,
996 white => 1,
997 darkblue => 2,
998 red => 3,
999 orange => 4,
1000 lightblue => 5,
1001 darkorange => 6,
1002 green => 7,
1003 darkgreen => 8,
1004 grey => 9,
1005 brown => 10,
1006 yellow => 11,
1007 tan => 12,
1008);
1009
1010our @CF_COLOR = (
609 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1011 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
610 [1.00, 1.00, 1.00], 1012 [1.00, 1.00, 1.00],
611 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1013 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
612 [1.00, 0.00, 0.00], 1014 [1.00, 0.00, 0.00],
613 [1.00, 0.54, 0.00], 1015 [1.00, 0.54, 0.00],
614 [0.11, 0.56, 1.00], 1016 [0.11, 0.56, 1.00],
615 [0.93, 0.46, 0.00], 1017 [0.93, 0.46, 0.00],
616 [0.18, 0.54, 0.34], 1018 [0.18, 0.54, 0.34],
617 [0.56, 0.73, 0.56], 1019 [0.56, 0.73, 0.56],
618 [0.80, 0.80, 0.80], 1020 [0.80, 0.80, 0.80],
619 [0.75, 0.61, 0.20], 1021 [0.75, 0.61, 0.20],
620 [0.99, 0.77, 0.26], 1022 [0.99, 0.77, 0.26],
621 [0.74, 0.65, 0.41], 1023 [0.74, 0.65, 0.41],
622 ); 1024);
623 1025
624 my $fg = $color[$color % @color]; 1026sub msg {
1027 my ($self, $color, $type, $text, @extra) = @_;
625 1028
1029 $text = sanitise_xml $text;
1030
1031 if (my $cb = $self->{cb_msg}{$type}) {
1032 $_->($self, $color, $type, $text, @extra) for values %$cb;
1033 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
1034 $type =~ s/-/_/g;
1035 $self->{$type} = $text;
1036 } else {
626 $self->logprint ("info: ", $text); 1037 $self->logprint ("msg: ", $text);
1038 return if $color < 0; # negative color == ignore if not understood
627 1039
1040 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
1041
628 # try to create single paragraphs of multiple lines sent by the server 1042 ## try to create single paragraphs of multiple lines sent by the server
1043 # no longer neecssary with TRT servers
629 $text =~ s/(?<=\S)\n(?=\w)/ /g; 1044 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
630 1045
631 $text = CFPlus::asxml $text; 1046 ::message ({
632 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1047 fg => $fg,
633 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1048 markup => $_,
634 1049 type => $type,
635 ::message ({ fg => $fg, markup => $_ }) 1050 extra => [@extra],
1051 color_flags => $color
636 for split /\n/, $text; 1052 }) for split /\n/, $text;
637 1053
638 $self->{statusbox}->add ($text, 1054 $self->{statusbox}->add ($text,
639 group => $text, 1055 group => $text,
640 fg => $fg, 1056 fg => $fg,
641 timeout => $color >= 2 ? 180 : 10, 1057 timeout => $color >= 2 ? 180 : 10,
642 tooltip_font => $::FONT_FIXED, 1058 tooltip_font => $::FONT_FIXED,
643 ); 1059 );
644} 1060 }
645
646sub drawextinfo {
647 my ($self, $color, $type, $subtype, $message) = @_;
648
649 $self->drawinfo ($color, $message);
650} 1061}
651 1062
652sub spell_add { 1063sub spell_add {
653 my ($self, $spell) = @_; 1064 my ($self, $spell) = @_;
654 1065
… …
702 $self->{map_widget}->clr_commands; 1113 $self->{map_widget}->clr_commands;
703 1114
704 ::stop_game (); 1115 ::stop_game ();
705} 1116}
706 1117
707sub image_info {
708 my ($self, $numfaces) = @_;
709
710 $self->{num_faces} = $numfaces;
711 $self->{face_prefetch} = [1 .. $numfaces];
712 $self->face_prefetch;
713}
714
715sub face_prefetch {
716 my ($self) = @_;
717
718 return unless $::CFG->{face_prefetch};
719
720 if ($self->{num_faces}) {
721 return if @{ $self->{send_queue} || [] };
722 my $todo = @{ $self->{face_prefetch} }
723 or return;
724
725 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
726
727 $self->send ("requestinfo image_sums $face $face");
728
729 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
730 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
731 } elsif (!exists $self->{num_faces}) {
732 $self->send ("requestinfo image_info");
733
734 $self->{num_faces} = 0;
735
736 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
737 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
738 }
739}
740
741sub update_floorbox { 1118sub update_floorbox {
742 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1119 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
743 return unless $::CONN; 1120 return unless $::CONN;
744 1121
745 $::FLOORBOX->clear; 1122 $::FLOORBOX->clear;
1123
1124 my @add;
746 1125
747 my $row; 1126 my $row;
748 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1127 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
749 if ($row < 6) { 1128 if ($row < 6) {
750 local $_->{face_widget}; # hack to force recreation of widget 1129 local $_->{face_widget}; # hack to force recreation of widget
751 local $_->{desc_widget}; # hack to force recreation of widget 1130 local $_->{desc_widget}; # hack to force recreation of widget
752 CFPlus::Item::update_widgets $_; 1131 CFPlus::Item::update_widgets $_;
753 1132
1133 push @add,
754 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1134 0, $row, $_->{face_widget},
755 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1135 1, $row, $_->{desc_widget};
756 1136
757 $row++; 1137 $row++;
758 } else { 1138 } else {
759 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1139 push @add, 1, $row, new CFPlus::UI::Button
760 text => "More...", 1140 text => "More...",
761 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1141 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
762 ); 1142 ;
763 last; 1143 last;
764 } 1144 }
765 } 1145 }
766 if ($::CONN->{open_container}) { 1146 if ($::CONN->{open_container}) {
767 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1147 push @add, 1, $row++, new CFPlus::UI::Button
768 text => "Close container", 1148 text => "Close container",
769 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1149 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
770 ); 1150 ;
771 } 1151 }
772 });
773 1152
1153 $::FLOORBOX->add_at (@add);
1154 });
1155
774 $::WANT_REFRESH++; 1156 $::WANT_REFRESH->start;
775} 1157}
776 1158
777sub set_opencont { 1159sub set_opencont {
778 my ($conn, $tag, $name) = @_; 1160 my ($conn, $tag, $name) = @_;
779 $conn->{open_container} = $tag; 1161 $conn->{open_container} = $tag;
780 update_floorbox; 1162 update_floorbox;
781 1163
782 $::INV_RIGHT_HB->clear (); 1164 $::INVR_HB->clear ();
783 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1165 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
784 1166
785 if ($tag != 0) { # Floor isn't closable, is it? 1167 if ($tag != 0) { # Floor isn't closable, is it?
786 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1168 $::INVR_HB->add (new CFPlus::UI::Button
787 text => "Close container", 1169 text => "Close container",
788 tooltip => "Close the currently open container (if one is open)", 1170 tooltip => "Close the currently open container (if one is open)",
789 on_activate => sub { 1171 on_activate => sub {
790 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1172 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
791 if $tag != 0; 1173 if $tag != 0;
792 #if $CONN->{open_container} != 0;
793 0 1174 0
794 }, 1175 },
795 ); 1176 );
796 } 1177 }
797 1178
… …
887 $::SERVER_INFO->set_markup ( 1268 $::SERVER_INFO->set_markup (
888 "server <tt>$self->{host}:$self->{port}</tt>\n" 1269 "server <tt>$self->{host}:$self->{port}</tt>\n"
889 . "protocol version <tt>$self->{version}</tt>\n" 1270 . "protocol version <tt>$self->{version}</tt>\n"
890 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1271 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
891 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1272 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1273 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
892 . "editing support $yesno[!!$self->{editor_support}]\n" 1274 . "editing support $yesno[!!$self->{editor_support}]\n"
893 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1275 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1276 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
894 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1277 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
895 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1278 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
896 . "map size $self->{mapw}×$self->{maph}\n" 1279 . "map size $self->{mapw}×$self->{maph}\n"
897 ); 1280 );
898 1281
899 ::setup_build_button ($self->{editor_support}->{builder_ui});
900} 1282}
901 1283
902sub logged_in { 1284sub logged_in {
903 my ($self) = @_; 1285 my ($self) = @_;
904 1286
905 $self->send_ext_req (cfplus_support => version => 1, sub { 1287 $self->send_ext_req (cfplus_support => version => 2, sub {
1288 my (%msg) = @_;
1289
906 $self->{cfplus_ext} = $_[0]{version}; 1290 $self->{cfplus_ext} = $msg{version};
907 $self->update_server_info; 1291 $self->update_server_info;
908 1292
909 if ($self->{cfplus_ext} >= 2) { 1293 if ($self->{cfplus_ext} >= 2) {
910 $self->send_ext_req ("editor_support", sub { 1294 $self->send_ext_req ("editor_support", sub {
911 $self->{editor_support} = $_[0]; 1295 $self->{editor_support} = { @_ };
912 $self->update_server_info; 1296 $self->update_server_info;
913 1297
914 0 1298 0
915 }); 1299 });
916 } 1300 }
… …
924 $self->send_command ("output-count $::CFG->{output_count}"); 1308 $self->send_command ("output-count $::CFG->{output_count}");
925 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1309 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
926 $self->send_command ("pickup $::CFG->{pickup}"); 1310 $self->send_command ("pickup $::CFG->{pickup}");
927} 1311}
928 1312
929sub buildat {
930 my ($self, $builditem, $x, $y) = @_;
931
932 if ($self->{cfplus_ext}) {
933 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
934 }
935}
936
937sub lookat { 1313sub lookat {
938 my ($self, $x, $y) = @_; 1314 my ($self, $x, $y) = @_;
939 1315
940 if ($self->{cfplus_ext}) { 1316 if ($self->{cfplus_ext}) {
941 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1317 $self->send_ext_req (lookat => $x, $y, sub {
942 my ($msg) = @_; 1318 my (%msg) = @_;
943 1319
944 if (exists $msg->{npc_dialog}) { 1320 if (exists $msg{npc_dialog}) {
945 # start npc chat dialog 1321 # start npc chat dialog
946 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1322 $self->{npc_dialog} = new CFPlus::NPCDialog::
947 dx => $x, 1323 token => $msg{npc_dialog},
948 dy => $y,
949 title => "$msg->{npc_dialog} (NPC)", 1324 title => "$msg{npc_dialog}[0] (NPC)",
950 conn => $self, 1325 conn => $self,
951 ; 1326 ;
952 } 1327 }
953 }); 1328 });
954 } 1329 }
… …
961 1336
962 (delete $self->{npc_dialog})->destroy 1337 (delete $self->{npc_dialog})->destroy
963 if $self->{npc_dialog}; 1338 if $self->{npc_dialog};
964 1339
965 $self->SUPER::destroy; 1340 $self->SUPER::destroy;
1341
1342 %$self = ();
966} 1343}
967 1344
968package CFPlus::NPCDialog; 1345package CFPlus::NPCDialog;
969 1346
970our @ISA = 'CFPlus::UI::Toplevel'; 1347our @ISA = 'CFPlus::UI::Toplevel';
… …
1017 on_activate => sub { $this->destroy; 1 }, 1394 on_activate => sub { $this->destroy; 1 },
1018 ; 1395 ;
1019 1396
1020 $self->update_options; 1397 $self->update_options;
1021 1398
1022 $self->{id} = $self->{conn}->send_ext_req ( 1399 $self->{id} = "npc-channel-" . $self->{conn}->token;
1023 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1400 $self->{conn}->connect_ext ($self->{id} => sub {
1024 sub { $this && $this->feed (@_) } 1401 $this->feed (@_) if $this;
1025 ); 1402 });
1403
1404 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1026 1405
1027 $self->{entry}->grab_focus; 1406 $self->{entry}->grab_focus;
1028 1407
1029 $self->{textview}->add_paragraph ({ 1408 $self->{textview}->add_paragraph ({
1030 fg => [1, 1, 0, 1], 1409 fg => [1, 1, 0, 1],
… …
1053 ); 1432 );
1054 } 1433 }
1055} 1434}
1056 1435
1057sub feed { 1436sub feed {
1058 my ($self, $msg) = @_; 1437 my ($self, $type, @arg) = @_;
1059 1438
1060 CFPlus::weaken $self; 1439 CFPlus::weaken $self;
1061 1440
1062 if ($msg->{msgtype} eq "reply") { 1441 if ($type eq "update") {
1442 my (%info) = @arg;
1443
1063 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1444 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1064 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1445 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1065
1066 my $text = "\n" . CFPlus::asxml $msg->{msg};
1067 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1068 my @link;
1069 $text =~ s{
1070 ($match)
1071 }{
1072 my $kw = $1;
1073
1074 push @link, new CFPlus::UI::Label
1075 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1076 can_hover => 1,
1077 can_events => 1,
1078 padding_x => 0,
1079 padding_y => 0,
1080 on_button_up => sub {
1081 $self->send ($kw);
1082 };
1083
1084 "\x{fffc}"
1085 }giex;
1086 1446
1447 if (exists $info{msg}) {
1448 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1449 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1450 my @link;
1451 $text =~ s{
1452 ($match)
1453 }{
1454 my $kw = $1;
1455
1456 push @link, new CFPlus::UI::Label
1457 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1458 can_hover => 1,
1459 can_events => 1,
1460 padding_x => 0,
1461 padding_y => 0,
1462 on_button_up => sub {
1463 $self->send ($kw);
1464 };
1465
1466 "\x{fffc}"
1467 }giex;
1468
1087 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1469 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1088 $self->{textview}->scroll_to_bottom; 1470 $self->{textview}->scroll_to_bottom;
1471 }
1472
1089 $self->update_options; 1473 $self->update_options;
1090 } else { 1474 } else {
1091 $self->destroy; 1475 $self->destroy;
1092 } 1476 }
1093 1477
… …
1098 my ($self, $msg) = @_; 1482 my ($self, $msg) = @_;
1099 1483
1100 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1484 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1101 $self->{textview}->scroll_to_bottom; 1485 $self->{textview}->scroll_to_bottom;
1102 1486
1103 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1487 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1104} 1488}
1105 1489
1106sub destroy { 1490sub destroy {
1107 my ($self) = @_; 1491 my ($self) = @_;
1108 1492
1109 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1493 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1110 1494
1111 if ($self->{conn}) { 1495 if ($self->{conn}) {
1112 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1496 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1113 delete $self->{conn}{npc_dialog}; 1497 delete $self->{conn}{npc_dialog};
1114 $self->{conn}->disconnect_ext ($self->{id}); 1498 $self->{conn}->disconnect_ext ($self->{id});
1115 } 1499 }
1116 1500
1117 $self->SUPER::destroy; 1501 $self->SUPER::destroy;

Diff Legend

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