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.106 by root, Sun Apr 29 20:03:08 2007 UTC vs.
Revision 1.158 by root, Tue Aug 21 11:23:04 2007 UTC

… …
21 21
22 my $self = $class->SUPER::new (%arg, 22 my $self = $class->SUPER::new (%arg,
23 setup_req => { 23 setup_req => {
24 extmap => 1, 24 extmap => 1,
25 excmd => 1, 25 excmd => 1,
26 xwidget1 => 1,#d#
26 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
27 }, 28 },
28 ); 29 );
29 30
30 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
47 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
48 @args 49 @args
49 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
50 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
51 52
53 $self->connect_ext (ambient_music => sub {
54 my ($songs) = @_;
55 &::audio_music_set_ambient ($songs);
56 });
57
52 $self->connect_ext (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
53 my ($cap) = @_; 59 my (%cap) = @_;
54 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
55 if (my $ts = $cap->{tileset}) { 77 if (my $ts = $cap{tileset}) {
56 if (my ($default) = grep $_->[2] & 1, @$ts) { 78 if (my ($default) = grep $_->[2] & 1, @$ts) {
57 $self->{tileset} = $default; 79 $self->{tileset} = $default;
58 $self->{tilesize} = $default->[3]; 80 $self->{tilesize} = $default->[3];
59 $self->setup_req (tileset => $default->[0]); 81 $self->setup_req (tileset => $default->[0]);
60 82
… …
64 $self->setup_req (mapsize => "${w}x${h}"); 86 $self->setup_req (mapsize => "${w}x${h}");
65 } 87 }
66 } 88 }
67 }); 89 });
68 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
69 $self->{map_widget}->add_command (@$_) 244 $self->{map_widget}->add_command (@$_)
70 for @cmd_help; 245 for @cmd_help;
71 246
72 { 247 {
73 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 248 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
… …
87 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 262 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
88 263
89 $self 264 $self
90} 265}
91 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
92sub logprint { 305sub logprint {
93 my ($self, @a) = @_; 306 my ($self, @a) = @_;
94 307
95 $self->{log_fh} ||= do { 308 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
96 my $path = "$Crossfire::VARDIR/log.$self->{host}";
97
98 open my $fh, ">>:utf8", $path
99 or die "Couldn't open logfile $path: $!";
100
101 $fh->autoflush (1);
102
103 $fh;
104 };
105
106 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
107
108 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
109 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
110
111 print {$self->{log_fh}} "$ts ", @a, "\n";
112} 309}
113 310
114sub _stat_numdiff { 311sub _stat_numdiff {
115 my ($self, $name, $old, $new) = @_; 312 my ($self, $name, $old, $new) = @_;
116 313
… …
249 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 446 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
250 $::GAUGES->{food} ->set_value ($fo, $fo_m); 447 $::GAUGES->{food} ->set_value ($fo, $fo_m);
251 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 448 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
252 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 449 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
253 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 450 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
451 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
254 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 452 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
255 my $title = $stats->{+CS_STAT_TITLE}; 453 my $title = $stats->{+CS_STAT_TITLE};
256 $title =~ s/^Player: //; 454 $title =~ s/^Player: //;
257 $::STATWIDS->{title} ->set_text ("Title: " . $title); 455 $::STATWIDS->{title} ->set_text ("Title: " . $title);
258 456
… …
279 my @skills = keys %{ $self->{skill_info} }; 477 my @skills = keys %{ $self->{skill_info} };
280 478
281 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 479 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
282 $sktbl->clear; 480 $sktbl->clear;
283 481
482 my $sw = $self->{skillwid}{""} ||= [
284 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 483 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
285 $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),
286 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 486 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
287 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 487 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
288 $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),
289 $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;
290 494
291 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>";
292 496
293 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);
294 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);
… …
322 } 526 }
323 527
324 1 528 1
325 }; 529 };
326 530
327 $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
328 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),
329 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 535
536 # level
537 (new CFPlus::UI::Label
330 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 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
331 $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,
332 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 ;
333 554
334 $x++ and ($x, $y) = (0, $y + 1); 555 $x++ and ($x, $y) = (0, $y + 1);
335 } 556 }
557
558 $sktbl->add_at (@add);
336 } 559 }
337 560
338 for (grep exists $stats->{$_}, @skills) { 561 for (grep exists $stats->{$_}, @skills) {
562 my $sw = $self->{skillwid}{$_};
339 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 563 $sw->[0]->set_text (::formsep ($stats->{$_}[1]));
340 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 564 $sw->[1]->set_text ($stats->{$_}[0] * 1);
565 $sw->[2]->set_value (@{$stats->{$_}});
341 } 566 }
342} 567}
343 568
344sub macro_send { 569sub macro_send {
345 my ($self, $macro) = @_; 570 my ($self, $macro) = @_;
… …
373} 598}
374 599
375sub feed_map1a { 600sub feed_map1a {
376 my ($self, $data) = @_; 601 my ($self, $data) = @_;
377 602
378 $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 {
379 $self->{map_widget}->update; 631 $self->{map_widget}->update;
632 }
380} 633}
381 634
382sub magicmap { 635sub magicmap {
383 my ($self, $w, $h, $x, $y, $data) = @_; 636 my ($self, $w, $h, $x, $y, $data) = @_;
384 637
… …
391 my $map_info = delete $self->{map_info} 644 my $map_info = delete $self->{map_info}
392 or return; 645 or return;
393 646
394 my ($hash, $x, $y, $w, $h) = @$map_info; 647 my ($hash, $x, $y, $w, $h) = @$map_info;
395 648
396 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;
397 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 651 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
398 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
399} 652}
400 653
401sub map_clear { 654sub map_clear {
402 my ($self) = @_; 655 my ($self) = @_;
403 656
… …
409} 662}
410 663
411sub bg_fetch { 664sub bg_fetch {
412 my ($self) = @_; 665 my ($self) = @_;
413 666
414 my $id; 667 my $tile;
415 668
416 do { 669 do {
417 $id = pop @{$self->{bg_fetch}} 670 $tile = pop @{$self->{bg_fetch}}
418 or return; 671 or return;
419 } while $self->{texture}[$id]; 672 } while $self->{texture}[$tile];
420 673
421 CFPlus::DB::get tilecache => $id, sub { 674 CFPlus::DB::get tilecache => $tile, sub {
422 my ($data) = @_; 675 my ($data) = @_;
423 676
424 return unless $self->{map}; # stop when destroyed 677 return unless $self->{map}; # stop when destroyed
425 678
426 $self->set_texture ($id => $data)
427 if defined $data; 679 if (defined $data) {
680 $self->have_tile ($tile, $data);
681 $self->{texture}[$tile]->upload;
682 }
428 683
429 $self->bg_fetch; 684 $self->bg_fetch;
430 }; 685 };
431} 686}
432 687
433sub load_map($$$) { 688sub load_map($$$) {
434 my ($self, $hash, $x, $y) = @_; 689 my ($self, $hash, $x, $y) = @_;
435 690
436 my $gen = $self->{map_change_gen}; 691 my $gen = $self->{map_change_gen};
437 692
438 CFPlus::DB::get $self->{mapcache} => $hash, sub { 693 my $cb = sub {
439 return unless $gen == $self->{map_change_gen}; 694 return unless $gen == $self->{map_change_gen};
440 695
441 my ($data) = @_; 696 my ($data) = @_;
442 697
443 if (defined $data) { 698 if (defined $data) {
699 $self->{map_cache_new}{$hash} = \$data;
700
444 $data = Compress::LZF::decompress $data; 701 my $data = Compress::LZF::decompress $data;
445 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
446 702
447 my $inprogress = @{ $self->{bg_fetch} || [] }; 703 my $inprogress = @{ $self->{bg_fetch} || [] };
448 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 704 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
449 $self->bg_fetch unless $inprogress; 705 $self->bg_fetch unless $inprogress;
450 } 706 }
451 }; 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 }
452} 714}
453 715
454# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 716# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
455# (server resource,s latency, bandwidth), so this hack is warranted. 717# (server resource,s latency, bandwidth), so this hack is warranted.
456# 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
… …
549 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 811 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
550 812
551 $self->flush_map; 813 $self->flush_map;
552 814
553 ++$self->{map_change_gen}; 815 ++$self->{map_change_gen};
816 $self->{map_cache_old} = delete $self->{map_cache_new};
554 817
555 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 818 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
556 819
557 my $mapmapw = $self->{mapmap}->{w}; 820 my $mapmapw = $self->{mapmap}->{w};
558 my $mapmaph = $self->{mapmap}->{h}; 821 my $mapmaph = $self->{mapmap}->{h};
… …
577} 840}
578 841
579sub face_find { 842sub face_find {
580 my ($self, $facenum, $face, $cb) = @_; 843 my ($self, $facenum, $face, $cb) = @_;
581 844
582 my $hash = "$face->{chksum},$face->{name}"; 845 if ($face->{type} == 0) { # FT_FACE
583
584 my $id = CFPlus::DB::get_tile_id_sync $hash; 846 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
585 847
586 $face->{id} = $id; 848 $face->{id} = $id;
587 $self->{faceid}[$facenum] = $id;
588
589 $self->{map}->set_tileid ($facenum => $id); 849 $self->{map}->set_tileid ($facenum => $id);
590 850
591 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 }
592} 859}
593 860
594sub face_update { 861sub face_update {
595 my ($self, $facenum, $face, $changed) = @_; 862 my ($self, $facenum, $face, $changed) = @_;
596 863
864 if ($face->{type} == 0) {
865 # image, FT_FACE
597 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 866 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
598 if $changed; 867 if $changed;
599 868
600 $self->set_texture ($face->{id} => delete $face->{image}); 869 $self->have_tile ($face->{id}, delete $face->{data});
870
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 }
601} 906}
602 907
603sub smooth_update { 908sub smooth_update {
604 my ($self, $facenum, $face) = @_; 909 my ($self, $facenum, $face) = @_;
605 910
606 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 911 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
607} 912}
608 913
609sub set_texture { 914sub have_tile {
610 my ($self, $id, $data) = @_; 915 my ($self, $tile, $data) = @_;
611 916
612 $self->{texture}[$id] = my $tex = 917 return unless $self->{map};
918
919 my $tex = $self->{texture}[$tile] ||=
613 new_from_image CFPlus::Texture 920 new CFPlus::Texture
921 tile => $tile,
922 image => $data, delete_image => 1,
614 $data, minify => 1, mipmap => 1; 923 minify => 1, mipmap => 1;
615 924
616 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 925 if (my $cbs = delete $self->{tile_cb}{$tile}) {
617 $self->{map_widget}->update; 926 $_->($tex) for @$cbs;
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)
618} 959}
619 960
620sub sound_play { 961sub sound_play {
621 my ($self, $x, $y, $soundnum, $type) = @_; 962 my ($self, $type, $face, $dx, $dy, $vol) = @_;
622 963
623 $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
624} 966}
625 967
626my $LAST_QUERY; # server is stupid, stupid, stupid 968my $LAST_QUERY; # server is stupid, stupid, stupid
627 969
628sub query { 970sub query {
… …
630 972
631 $prompt = $LAST_QUERY unless length $prompt; 973 $prompt = $LAST_QUERY unless length $prompt;
632 $LAST_QUERY = $prompt; 974 $LAST_QUERY = $prompt;
633 975
634 $self->{query}-> ($self, $flags, $prompt); 976 $self->{query}-> ($self, $flags, $prompt);
977}
978
979sub sanitise_xml($) {
980 local $_ = shift;
981
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 $_
635} 992}
636 993
637our %NAME_TO_COLOR = ( 994our %NAME_TO_COLOR = (
638 black => 0, 995 black => 0,
639 white => 1, 996 white => 1,
… …
667); 1024);
668 1025
669sub msg { 1026sub msg {
670 my ($self, $color, $type, $text, @extra) = @_; 1027 my ($self, $color, $type, $text, @extra) = @_;
671 1028
1029 $text = sanitise_xml $text;
1030
672 if (my $cb = $self->{cb_msg}{$type}) { 1031 if (my $cb = $self->{cb_msg}{$type}) {
673 $_->($self, $color, $type, $text, @extra) for values %$cb; 1032 $_->($self, $color, $type, $text, @extra) for values %$cb;
674 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { 1033 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
675 $type =~ s/-/_/g; 1034 $type =~ s/-/_/g;
676 $self->{$type} = $text; 1035 $self->{$type} = $text;
677 } else { 1036 } else {
678 $self->logprint ("msg: ", $text); 1037 $self->logprint ("msg: ", $text);
679 return if $color < 0; # negative color == ignore if not understood 1038 return if $color < 0; # negative color == ignore if not understood
680 1039
681 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1040 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
682 1041
683 ## 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
684 # no longer neecssary with TRT servers 1043 # no longer neecssary with TRT servers
685 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1044 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
686 1045
687 ::message ({ fg => $fg, markup => $_ }) 1046 ::message ({
1047 fg => $fg,
1048 markup => $_,
1049 type => $type,
1050 extra => [@extra],
1051 color_flags => $color
688 for split /\n/, $text; 1052 }) for split /\n/, $text;
689 1053
690 $self->{statusbox}->add ($text, 1054 $self->{statusbox}->add ($text,
691 group => $text, 1055 group => $text,
692 fg => $fg, 1056 fg => $fg,
693 timeout => $color >= 2 ? 180 : 10, 1057 timeout => $color >= 2 ? 180 : 10,
… …
749 $self->{map_widget}->clr_commands; 1113 $self->{map_widget}->clr_commands;
750 1114
751 ::stop_game (); 1115 ::stop_game ();
752} 1116}
753 1117
754sub image_info {
755 my ($self, $numfaces) = @_;
756
757 $self->{num_faces} = $numfaces;
758 $self->{face_prefetch} = [1 .. $numfaces];
759 $self->face_prefetch;
760}
761
762sub face_prefetch {
763 my ($self) = @_;
764
765 return unless $::CFG->{face_prefetch};
766
767 if ($self->{num_faces}) {
768 return if @{ $self->{send_queue} || [] };
769 my $todo = @{ $self->{face_prefetch} }
770 or return;
771
772 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
773
774 $self->send ("requestinfo image_sums $face $face");
775
776 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
777 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
778 } elsif (!exists $self->{num_faces}) {
779 $self->send ("requestinfo image_info");
780
781 $self->{num_faces} = 0;
782
783 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
784 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
785 }
786}
787
788sub update_floorbox { 1118sub update_floorbox {
789 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1119 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
790 return unless $::CONN; 1120 return unless $::CONN;
791 1121
792 $::FLOORBOX->clear; 1122 $::FLOORBOX->clear;
1123
1124 my @add;
793 1125
794 my $row; 1126 my $row;
795 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} }) {
796 if ($row < 6) { 1128 if ($row < 6) {
797 local $_->{face_widget}; # hack to force recreation of widget 1129 local $_->{face_widget}; # hack to force recreation of widget
798 local $_->{desc_widget}; # hack to force recreation of widget 1130 local $_->{desc_widget}; # hack to force recreation of widget
799 CFPlus::Item::update_widgets $_; 1131 CFPlus::Item::update_widgets $_;
800 1132
1133 push @add,
801 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1134 0, $row, $_->{face_widget},
802 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1135 1, $row, $_->{desc_widget};
803 1136
804 $row++; 1137 $row++;
805 } else { 1138 } else {
806 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1139 push @add, 1, $row, new CFPlus::UI::Button
807 text => "More...", 1140 text => "More...",
808 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1141 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
809 ); 1142 ;
810 last; 1143 last;
811 } 1144 }
812 } 1145 }
813 if ($::CONN->{open_container}) { 1146 if ($::CONN->{open_container}) {
814 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1147 push @add, 1, $row++, new CFPlus::UI::Button
815 text => "Close container", 1148 text => "Close container",
816 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1149 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
817 ); 1150 ;
818 } 1151 }
819 });
820 1152
1153 $::FLOORBOX->add_at (@add);
1154 });
1155
821 $::WANT_REFRESH++; 1156 $::WANT_REFRESH->start;
822} 1157}
823 1158
824sub set_opencont { 1159sub set_opencont {
825 my ($conn, $tag, $name) = @_; 1160 my ($conn, $tag, $name) = @_;
826 $conn->{open_container} = $tag; 1161 $conn->{open_container} = $tag;
827 update_floorbox; 1162 update_floorbox;
828 1163
829 $::INV_RIGHT_HB->clear (); 1164 $::INVR_HB->clear ();
830 $::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);
831 1166
832 if ($tag != 0) { # Floor isn't closable, is it? 1167 if ($tag != 0) { # Floor isn't closable, is it?
833 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1168 $::INVR_HB->add (new CFPlus::UI::Button
834 text => "Close container", 1169 text => "Close container",
835 tooltip => "Close the currently open container (if one is open)", 1170 tooltip => "Close the currently open container (if one is open)",
836 on_activate => sub { 1171 on_activate => sub {
837 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1172 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
838 if $tag != 0; 1173 if $tag != 0;
839 #if $CONN->{open_container} != 0;
840 0 1174 0
841 }, 1175 },
842 ); 1176 );
843 } 1177 }
844 1178
… …
943 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1277 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
944 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1278 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
945 . "map size $self->{mapw}×$self->{maph}\n" 1279 . "map size $self->{mapw}×$self->{maph}\n"
946 ); 1280 );
947 1281
948 ::setup_build_button ($self->{editor_support}->{builder_ui});
949} 1282}
950 1283
951sub logged_in { 1284sub logged_in {
952 my ($self) = @_; 1285 my ($self) = @_;
953 1286
954 $self->send_ext_req (cfplus_support => version => 1, sub { 1287 $self->send_ext_req (cfplus_support => version => 2, sub {
1288 my (%msg) = @_;
1289
955 $self->{cfplus_ext} = $_[0]{version}; 1290 $self->{cfplus_ext} = $msg{version};
956 $self->update_server_info; 1291 $self->update_server_info;
957 1292
958 if ($self->{cfplus_ext} >= 2) { 1293 if ($self->{cfplus_ext} >= 2) {
959 $self->send_ext_req ("editor_support", sub { 1294 $self->send_ext_req ("editor_support", sub {
960 $self->{editor_support} = $_[0]; 1295 $self->{editor_support} = { @_ };
961 $self->update_server_info; 1296 $self->update_server_info;
962 1297
963 0 1298 0
964 }); 1299 });
965 } 1300 }
… …
973 $self->send_command ("output-count $::CFG->{output_count}"); 1308 $self->send_command ("output-count $::CFG->{output_count}");
974 $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;
975 $self->send_command ("pickup $::CFG->{pickup}"); 1310 $self->send_command ("pickup $::CFG->{pickup}");
976} 1311}
977 1312
978sub buildat {
979 my ($self, $builditem, $x, $y) = @_;
980
981 if ($self->{cfplus_ext}) {
982 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
983 }
984}
985
986sub lookat { 1313sub lookat {
987 my ($self, $x, $y) = @_; 1314 my ($self, $x, $y) = @_;
988 1315
989 if ($self->{cfplus_ext}) { 1316 if ($self->{cfplus_ext}) {
990 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1317 $self->send_ext_req (lookat => $x, $y, sub {
991 my ($msg) = @_; 1318 my (%msg) = @_;
992 1319
993 if (exists $msg->{npc_dialog}) { 1320 if (exists $msg{npc_dialog}) {
994 # start npc chat dialog 1321 # start npc chat dialog
995 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1322 $self->{npc_dialog} = new CFPlus::NPCDialog::
996 dx => $x, 1323 token => $msg{npc_dialog},
997 dy => $y,
998 title => "$msg->{npc_dialog} (NPC)", 1324 title => "$msg{npc_dialog}[0] (NPC)",
999 conn => $self, 1325 conn => $self,
1000 ; 1326 ;
1001 } 1327 }
1002 }); 1328 });
1003 } 1329 }
… …
1010 1336
1011 (delete $self->{npc_dialog})->destroy 1337 (delete $self->{npc_dialog})->destroy
1012 if $self->{npc_dialog}; 1338 if $self->{npc_dialog};
1013 1339
1014 $self->SUPER::destroy; 1340 $self->SUPER::destroy;
1341
1342 %$self = ();
1015} 1343}
1016 1344
1017package CFPlus::NPCDialog; 1345package CFPlus::NPCDialog;
1018 1346
1019our @ISA = 'CFPlus::UI::Toplevel'; 1347our @ISA = 'CFPlus::UI::Toplevel';
… …
1066 on_activate => sub { $this->destroy; 1 }, 1394 on_activate => sub { $this->destroy; 1 },
1067 ; 1395 ;
1068 1396
1069 $self->update_options; 1397 $self->update_options;
1070 1398
1071 $self->{id} = $self->{conn}->send_ext_req ( 1399 $self->{id} = "npc-channel-" . $self->{conn}->token;
1072 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1400 $self->{conn}->connect_ext ($self->{id} => sub {
1073 sub { $this && $this->feed (@_) } 1401 $this->feed (@_) if $this;
1074 ); 1402 });
1403
1404 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1075 1405
1076 $self->{entry}->grab_focus; 1406 $self->{entry}->grab_focus;
1077 1407
1078 $self->{textview}->add_paragraph ({ 1408 $self->{textview}->add_paragraph ({
1079 fg => [1, 1, 0, 1], 1409 fg => [1, 1, 0, 1],
… …
1102 ); 1432 );
1103 } 1433 }
1104} 1434}
1105 1435
1106sub feed { 1436sub feed {
1107 my ($self, $msg) = @_; 1437 my ($self, $type, @arg) = @_;
1108 1438
1109 CFPlus::weaken $self; 1439 CFPlus::weaken $self;
1110 1440
1111 if ($msg->{msgtype} eq "reply") { 1441 if ($type eq "update") {
1442 my (%info) = @arg;
1443
1112 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1444 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1113 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1445 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1114
1115 my $text = "\n" . CFPlus::asxml $msg->{msg};
1116 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1117 my @link;
1118 $text =~ s{
1119 ($match)
1120 }{
1121 my $kw = $1;
1122
1123 push @link, new CFPlus::UI::Label
1124 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1125 can_hover => 1,
1126 can_events => 1,
1127 padding_x => 0,
1128 padding_y => 0,
1129 on_button_up => sub {
1130 $self->send ($kw);
1131 };
1132
1133 "\x{fffc}"
1134 }giex;
1135 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
1136 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1469 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1137 $self->{textview}->scroll_to_bottom; 1470 $self->{textview}->scroll_to_bottom;
1471 }
1472
1138 $self->update_options; 1473 $self->update_options;
1139 } else { 1474 } else {
1140 $self->destroy; 1475 $self->destroy;
1141 } 1476 }
1142 1477
… …
1147 my ($self, $msg) = @_; 1482 my ($self, $msg) = @_;
1148 1483
1149 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1484 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1150 $self->{textview}->scroll_to_bottom; 1485 $self->{textview}->scroll_to_bottom;
1151 1486
1152 $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);
1153} 1488}
1154 1489
1155sub destroy { 1490sub destroy {
1156 my ($self) = @_; 1491 my ($self) = @_;
1157 1492
1158 #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
1159 1494
1160 if ($self->{conn}) { 1495 if ($self->{conn}) {
1161 $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};
1162 delete $self->{conn}{npc_dialog}; 1497 delete $self->{conn}{npc_dialog};
1163 $self->{conn}->disconnect_ext ($self->{id}); 1498 $self->{conn}->disconnect_ext ($self->{id});
1164 } 1499 }
1165 1500
1166 $self->SUPER::destroy; 1501 $self->SUPER::destroy;

Diff Legend

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