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.133 by elmex, Tue Jul 24 18:39:39 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 ywidget => 1,#d# 26 xwidget1 => 1,#d#
27 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
28 }, 28 },
29 ); 29 );
30 30
31 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
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 (music => sub { 53 $self->connect_ext (ambient_music => sub {
54 my ($ev) = @_; 54 my ($songs) = @_;
55 55 &::audio_music_set_ambient ($songs);
56 &::audio_music_set ($self->{songs} = $ev->{play})
57 if $ev->{play};
58 }); 56 });
59 57
60 $self->connect_ext (capabilities => sub { 58 $self->connect_ext (capabilities => sub {
61 my (%cap) = @_; 59 my (%cap) = @_;
62 60
63 $self->send_exti_msg (fx_want => { 61 #$self->send ("setup sound 0"); # we use a different protocol
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC 62 $self->update_fx_want;
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND 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 ()
66 }); 75 });
67 76
68 if (my $ts = $cap{tileset}) { 77 if (my $ts = $cap{tileset}) {
69 if (my ($default) = grep $_->[2] & 1, @$ts) { 78 if (my ($default) = grep $_->[2] & 1, @$ts) {
70 $self->{tileset} = $default; 79 $self->{tileset} = $default;
… …
108 # widgetset create 117 # widgetset create
109 $self->connect_ext (ws_c => sub { 118 $self->connect_ext (ws_c => sub {
110 my ($ws, $id, $class, $args) = @_; 119 my ($ws, $id, $class, $args) = @_;
111 120
112 for my $ev (grep /^on_/, keys %$args) { 121 for my $ev (grep /^on_/, keys %$args) {
122 my $rid = $args->{$ev};
113 $args->{$ev} = sub { 123 $args->{$ev} = sub {
114 my $id = shift->{s_id}; 124 my $id = shift->{s_id};
115 $self->send_exti_msg (w_e => $id, $ev, \@_); 125 $self->send_exti_msg (w_e => $id, $rid, @_);
116 126
117 1 127 1
118 }; 128 };
119 } 129 }
120 130
121 if (my $widget = eval { 131 $self->widget_associate (
132 $ws, $id => scalar eval {
122 local $SIG{__DIE__}; 133 local $SIG{__DIE__};
123 "CFPlus::UI::$class"->new ( 134 "CFPlus::UI::$class"->new (%$args)
124 %$args,
125 s_ws => $ws,
126 s_id => $id,
127 )
128 } 135 }
129 ) {
130 $self->{widget}{$id}
131 = $self->{widgetset}{$ws}{w}{$id}
132 = $widget;
133
134 $widget->connect (on_destroy => sub {
135 my ($widget) = @_;
136
137 delete $self->{widget}{$widget->{s_id}};
138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
139 });
140 } else {
141 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; 136 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
142 $self->send_exti_msg (w_e => $id, "destroy"); 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";
143 } 184 }
144 }); 185 });
145 186
146 # widget call 187 # widget call
147 $self->connect_ext (w_c => sub { 188 $self->connect_ext (w_c => sub {
148 my ($id, $rid, $method, $args) = @_; 189 my ($id, $rid, $method, @args) = @_;
149 190
150 my $w = $self->{widget}{$id} 191 my $w = $self->{widget}{$id}
151 or return; 192 or return;
152 193
153 $args ||= [];
154
155 if ($rid) { 194 if ($rid) {
156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]); 195 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
157 } else { 196 } else {
158 $w->$method (@$args); 197 $w->$method (@args);
159 } 198 }
160 }); 199 });
161 200
162 # widget set 201 # widget set
163 $self->connect_ext (w_s => sub { 202 $self->connect_ext (w_s => sub {
… …
187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); 226 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 }); 227 });
189 228
190 # message window 229 # message window
191 $self->connect_ext (channel_info => sub { 230 $self->connect_ext (channel_info => sub {
231 my ($info) = @_;
232 $self->{channels}->{$info->{id}} = $info;
192 $::MESSAGE_WINDOW->add_channel ($_[0]); 233 $::MESSAGE_WINDOW->add_channel ($info);
193 }); 234 });
194 235
195 # destroy widgets on logout 236 # destroy widgets on logout
196 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 237 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
197 for my $ws (values %{delete $self->{widgetset} || {}}) { 238 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
221 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 262 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
222 263
223 $self 264 $self
224} 265}
225 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
226sub logprint { 305sub logprint {
227 my ($self, @a) = @_; 306 my ($self, @a) = @_;
228 307
229 $self->{log_fh} ||= do { 308 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
230 my $path = "$Crossfire::VARDIR/log.$self->{host}";
231
232 open my $fh, ">>:utf8", $path
233 or die "Couldn't open logfile $path: $!";
234
235 $fh->autoflush (1);
236
237 $fh;
238 };
239
240 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
241
242 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
243 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
244
245 print {$self->{log_fh}} "$ts ", @a, "\n";
246} 309}
247 310
248sub _stat_numdiff { 311sub _stat_numdiff {
249 my ($self, $name, $old, $new) = @_; 312 my ($self, $name, $old, $new) = @_;
250 313
… …
383 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 446 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
384 $::GAUGES->{food} ->set_value ($fo, $fo_m); 447 $::GAUGES->{food} ->set_value ($fo, $fo_m);
385 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 448 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
386 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 449 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
387 . " (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});
388 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 452 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
389 my $title = $stats->{+CS_STAT_TITLE}; 453 my $title = $stats->{+CS_STAT_TITLE};
390 $title =~ s/^Player: //; 454 $title =~ s/^Player: //;
391 $::STATWIDS->{title} ->set_text ("Title: " . $title); 455 $::STATWIDS->{title} ->set_text ("Title: " . $title);
392 456
… …
413 my @skills = keys %{ $self->{skill_info} }; 477 my @skills = keys %{ $self->{skill_info} };
414 478
415 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 479 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
416 $sktbl->clear; 480 $sktbl->clear;
417 481
418 my @add; 482 my $sw = $self->{skillwid}{""} ||= [
419
420 push @add,
421 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 483 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
422 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),
423 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 486 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
424 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 487 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
425 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),
426 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 490 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
427 ; 491 ];
492
493 my @add = @$sw;
428 494
429 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>";
430 496
431 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);
432 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);
… …
460 } 526 }
461 527
462 1 528 1
463 }; 529 };
464 530
531 my $sw = $self->{skillwid}{$idx} ||= [
532 # exp
533 (new CFPlus::UI::Label
534 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
535
536 # level
537 (new CFPlus::UI::Label
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
544 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
545 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
546 ];
547
465 push @add, 548 push @add,
466 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 549 $x * 4 + 0, $y, $sw->[0],
467 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 550 $x * 4 + 1, $y, $sw->[1],
468 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 551 $x * 4 + 2, $y, $sw->[2],
469 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 552 $x * 4 + 3, $y, $sw->[3],
470 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
471 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
472 ; 553 ;
473 554
474 $x++ and ($x, $y) = (0, $y + 1); 555 $x++ and ($x, $y) = (0, $y + 1);
475 } 556 }
476 557
477 $sktbl->add_at (@add); 558 $sktbl->add_at (@add);
478 } 559 }
479 560
480 for (grep exists $stats->{$_}, @skills) { 561 for (grep exists $stats->{$_}, @skills) {
562 my $sw = $self->{skillwid}{$_};
481 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 563 $sw->[0]->set_text (::formsep ($stats->{$_}[1]));
482 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 564 $sw->[1]->set_text ($stats->{$_}[0] * 1);
565 $sw->[2]->set_value (@{$stats->{$_}});
483 } 566 }
484} 567}
485 568
486sub macro_send { 569sub macro_send {
487 my ($self, $macro) = @_; 570 my ($self, $macro) = @_;
… …
515} 598}
516 599
517sub feed_map1a { 600sub feed_map1a {
518 my ($self, $data) = @_; 601 my ($self, $data) = @_;
519 602
520 $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 {
521 $self->{map_widget}->update; 631 $self->{map_widget}->update;
632 }
522} 633}
523 634
524sub magicmap { 635sub magicmap {
525 my ($self, $w, $h, $x, $y, $data) = @_; 636 my ($self, $w, $h, $x, $y, $data) = @_;
526 637
… …
533 my $map_info = delete $self->{map_info} 644 my $map_info = delete $self->{map_info}
534 or return; 645 or return;
535 646
536 my ($hash, $x, $y, $w, $h) = @$map_info; 647 my ($hash, $x, $y, $w, $h) = @$map_info;
537 648
538 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;
539 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 651 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
540 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
541} 652}
542 653
543sub map_clear { 654sub map_clear {
544 my ($self) = @_; 655 my ($self) = @_;
545 656
… …
551} 662}
552 663
553sub bg_fetch { 664sub bg_fetch {
554 my ($self) = @_; 665 my ($self) = @_;
555 666
556 my $id; 667 my $tile;
557 668
558 do { 669 do {
559 $id = pop @{$self->{bg_fetch}} 670 $tile = pop @{$self->{bg_fetch}}
560 or return; 671 or return;
561 } while $self->{texture}[$id]; 672 } while $self->{texture}[$tile];
562 673
563 CFPlus::DB::get tilecache => $id, sub { 674 CFPlus::DB::get tilecache => $tile, sub {
564 my ($data) = @_; 675 my ($data) = @_;
565 676
566 return unless $self->{map}; # stop when destroyed 677 return unless $self->{map}; # stop when destroyed
567 678
568 $self->set_texture ($id => $data)
569 if defined $data; 679 if (defined $data) {
680 $self->have_tile ($tile, $data);
681 $self->{texture}[$tile]->upload;
682 }
570 683
571 $self->bg_fetch; 684 $self->bg_fetch;
572 }; 685 };
573} 686}
574 687
575sub load_map($$$) { 688sub load_map($$$) {
576 my ($self, $hash, $x, $y) = @_; 689 my ($self, $hash, $x, $y) = @_;
577 690
578 my $gen = $self->{map_change_gen}; 691 my $gen = $self->{map_change_gen};
579 692
580 CFPlus::DB::get $self->{mapcache} => $hash, sub { 693 my $cb = sub {
581 return unless $gen == $self->{map_change_gen}; 694 return unless $gen == $self->{map_change_gen};
582 695
583 my ($data) = @_; 696 my ($data) = @_;
584 697
585 if (defined $data) { 698 if (defined $data) {
699 $self->{map_cache_new}{$hash} = \$data;
700
586 $data = Compress::LZF::decompress $data; 701 my $data = Compress::LZF::decompress $data;
587 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
588 702
589 my $inprogress = @{ $self->{bg_fetch} || [] }; 703 my $inprogress = @{ $self->{bg_fetch} || [] };
590 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 704 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
591 $self->bg_fetch unless $inprogress; 705 $self->bg_fetch unless $inprogress;
592 } 706 }
593 }; 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 }
594} 714}
595 715
596# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 716# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
597# (server resource,s latency, bandwidth), so this hack is warranted. 717# (server resource,s latency, bandwidth), so this hack is warranted.
598# 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
… …
691 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 811 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
692 812
693 $self->flush_map; 813 $self->flush_map;
694 814
695 ++$self->{map_change_gen}; 815 ++$self->{map_change_gen};
816 $self->{map_cache_old} = delete $self->{map_cache_new};
696 817
697 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 818 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
698 819
699 my $mapmapw = $self->{mapmap}->{w}; 820 my $mapmapw = $self->{mapmap}->{w};
700 my $mapmaph = $self->{mapmap}->{h}; 821 my $mapmaph = $self->{mapmap}->{h};
… …
722 my ($self, $facenum, $face, $cb) = @_; 843 my ($self, $facenum, $face, $cb) = @_;
723 844
724 if ($face->{type} == 0) { # FT_FACE 845 if ($face->{type} == 0) { # FT_FACE
725 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 846 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
726 847
727 $face->{id} = $id; 848 $face->{id} = $id;
728 $self->{faceid}[$facenum] = $id;
729
730 $self->{map}->set_tileid ($facenum => $id); 849 $self->{map}->set_tileid ($facenum => $id);
731 850
732 CFPlus::DB::get tilecache => $id, $cb; 851 CFPlus::DB::get tilecache => $id, $cb;
733 852
734 } elsif ($face->{type} & 1) { # with metadata 853 } elsif ($face->{type} & 1) { # with metadata
735 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
736 CFPlus::DB::get "res-metadata" => $face->{name}, $cb; 854 CFPlus::DB::get res_meta => $face->{name}, $cb;
855
856 } else { # no metadata
857 CFPlus::DB::get res_data => $face->{name}, $cb;
737 } 858 }
738} 859}
739 860
740sub face_update { 861sub face_update {
741 my ($self, $facenum, $face, $changed) = @_; 862 my ($self, $facenum, $face, $changed) = @_;
742 863
743 if ($face->{type} == 0) { # FT_FACE 864 if ($face->{type} == 0) {
865 # image, FT_FACE
744 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 866 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
745 if $changed; 867 if $changed;
746 868
747 $self->set_texture ($face->{id} => delete $face->{data}); 869 $self->have_tile ($face->{id}, delete $face->{data});
748 870
749 } elsif ($face->{type} & 1) { # split metadata 871 } elsif ($face->{type} & 1) {
750 my $cb = sub { }; 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);
751 884
752 if ($face->{type} == 3) { # FT_MUSIC 885 if ($face->{type} == 3) { # FT_MUSIC
753 $cb = sub {
754 $self->{music_meta}{$facenum} = $face;
755
756 ::message ({ markup => "downloaded song #$facenum" }) 886 ::message ({ markup => "downloaded song #$facenum" })
757 if $changed; 887 if $changed;
758 888
759 &::audio_music_set ($self->{songs}); 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);
760 }; 895 }
761 }
762 896
763 if ($changed) { # new data
764 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
765 my $path = CFPlus::DB::path_of_res $face->{name};
766
767 CFPlus::DB::write_file $path, $data, sub {
768 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
769 $face->{meta} = $self->{json_coder}->decode ($meta_json);
770 $face->{path} = $path;
771
772 $cb->();
773 };
774 };
775 } else { 897 } else {
776 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 898 # flat resource case, FT_RSRC
777 $cb->(); 899 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
778 } 900 if $changed;
901 }
902
903 if (my $cbs = $self->{face_cb}{$facenum}) {
904 $_->($face, $changed) for @$cbs;
779 } 905 }
780} 906}
781 907
782sub smooth_update { 908sub smooth_update {
783 my ($self, $facenum, $face) = @_; 909 my ($self, $facenum, $face) = @_;
784 910
785 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 911 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
786} 912}
787 913
788sub set_texture { 914sub have_tile {
789 my ($self, $id, $data) = @_; 915 my ($self, $tile, $data) = @_;
790 916
791 return unless $self->{map}; 917 return unless $self->{map};
792 918
793 $self->{texture}[$id] = my $tex = 919 my $tex = $self->{texture}[$tile] ||=
794 new_from_image CFPlus::Texture 920 new CFPlus::Texture
921 tile => $tile,
922 image => $data, delete_image => 1,
795 $data, minify => 1, mipmap => 1; 923 minify => 1, mipmap => 1;
796 924
797 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 925 if (my $cbs = delete $self->{tile_cb}{$tile}) {
798 $self->{map_widget}->update; 926 $_->($tex) for @$cbs;
799 927 }
800 $_->() for @{(delete $self->{face_cb}{$id}) || []};
801} 928}
802 929
803sub connect_face_update { 930# call in non-void context registers a temporary
931# hook with handle, otherwise its permanent
932sub on_face_change {
804 my ($self, $id, $cb) = @_; 933 my ($self, $num, $cb) = @_;
805 934
806 push @{$self->{face_cb}{$id}}, $cb; 935 push @{$self->{face_cb}{$num}}, $cb;
807 936
937 defined wantarray
808 CFPlus::guard { 938 ? CFPlus::guard {
809 @{$self->{face_cb}{$id}} 939 @{$self->{face_cb}{$num}}
810 = grep $_ != $cb, 940 = grep $_ != $cb,
811 @{$self->{face_cb}{$id}}; 941 @{$self->{face_cb}{$num}};
812 } 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)
813} 959}
814 960
815sub sound_play { 961sub sound_play {
816 my ($self, $x, $y, $soundnum, $type) = @_; 962 my ($self, $type, $face, $dx, $dy, $vol) = @_;
817 963
818 $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
819} 966}
820 967
821my $LAST_QUERY; # server is stupid, stupid, stupid 968my $LAST_QUERY; # server is stupid, stupid, stupid
822 969
823sub query { 970sub query {
… …
888 $self->{$type} = $text; 1035 $self->{$type} = $text;
889 } else { 1036 } else {
890 $self->logprint ("msg: ", $text); 1037 $self->logprint ("msg: ", $text);
891 return if $color < 0; # negative color == ignore if not understood 1038 return if $color < 0; # negative color == ignore if not understood
892 1039
893 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1040 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
894 1041
895 ## 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
896 # no longer neecssary with TRT servers 1043 # no longer neecssary with TRT servers
897 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1044 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
898 1045
899 ::message ({ fg => $fg, markup => $_, type => $type }) 1046 ::message ({
1047 fg => $fg,
1048 markup => $_,
1049 type => $type,
1050 extra => [@extra],
1051 color_flags => $color
900 for split /\n/, $text; 1052 }) for split /\n/, $text;
901 1053
902 $self->{statusbox}->add ($text, 1054 $self->{statusbox}->add ($text,
903 group => $text, 1055 group => $text,
904 fg => $fg, 1056 fg => $fg,
905 timeout => $color >= 2 ? 180 : 10, 1057 timeout => $color >= 2 ? 180 : 10,
… …
961 $self->{map_widget}->clr_commands; 1113 $self->{map_widget}->clr_commands;
962 1114
963 ::stop_game (); 1115 ::stop_game ();
964} 1116}
965 1117
966sub image_info {
967 my ($self, $numfaces) = @_;
968
969 $self->{num_faces} = $numfaces;
970 $self->{face_prefetch} = [1 .. $numfaces];
971 $self->face_prefetch;
972}
973
974sub face_prefetch {
975 my ($self) = @_;
976
977 return unless $::CFG->{face_prefetch};
978
979 if ($self->{num_faces}) {
980 return if @{ $self->{send_queue} || [] };
981 my $todo = @{ $self->{face_prefetch} }
982 or return;
983
984 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
985
986 $self->send ("requestinfo image_sums $face $face");
987
988 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
989 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
990 } elsif (!exists $self->{num_faces}) {
991 $self->send ("requestinfo image_info");
992
993 $self->{num_faces} = 0;
994
995 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
996 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
997 }
998}
999
1000sub update_floorbox { 1118sub update_floorbox {
1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1119 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1002 return unless $::CONN; 1120 return unless $::CONN;
1003 1121
1004 $::FLOORBOX->clear; 1122 $::FLOORBOX->clear;
… …
1033 } 1151 }
1034 1152
1035 $::FLOORBOX->add_at (@add); 1153 $::FLOORBOX->add_at (@add);
1036 }); 1154 });
1037 1155
1038 $::WANT_REFRESH++; 1156 $::WANT_REFRESH->start;
1039} 1157}
1040 1158
1041sub set_opencont { 1159sub set_opencont {
1042 my ($conn, $tag, $name) = @_; 1160 my ($conn, $tag, $name) = @_;
1043 $conn->{open_container} = $tag; 1161 $conn->{open_container} = $tag;
1044 update_floorbox; 1162 update_floorbox;
1045 1163
1046 $::INV_RIGHT_HB->clear (); 1164 $::INVR_HB->clear ();
1047 $::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);
1048 1166
1049 if ($tag != 0) { # Floor isn't closable, is it? 1167 if ($tag != 0) { # Floor isn't closable, is it?
1050 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1168 $::INVR_HB->add (new CFPlus::UI::Button
1051 text => "Close container", 1169 text => "Close container",
1052 tooltip => "Close the currently open container (if one is open)", 1170 tooltip => "Close the currently open container (if one is open)",
1053 on_activate => sub { 1171 on_activate => sub {
1054 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1172 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1055 if $tag != 0; 1173 if $tag != 0;
1056 #if $CONN->{open_container} != 0;
1057 0 1174 0
1058 }, 1175 },
1059 ); 1176 );
1060 } 1177 }
1061 1178
… …
1160 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1277 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1161 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1278 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1162 . "map size $self->{mapw}×$self->{maph}\n" 1279 . "map size $self->{mapw}×$self->{maph}\n"
1163 ); 1280 );
1164 1281
1165 ::setup_build_button ($self->{editor_support}->{builder_ui});
1166} 1282}
1167 1283
1168sub logged_in { 1284sub logged_in {
1169 my ($self) = @_; 1285 my ($self) = @_;
1170 1286
… …
1190 1306
1191 $self->send_command ("output-sync $::CFG->{output_sync}"); 1307 $self->send_command ("output-sync $::CFG->{output_sync}");
1192 $self->send_command ("output-count $::CFG->{output_count}"); 1308 $self->send_command ("output-count $::CFG->{output_count}");
1193 $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;
1194 $self->send_command ("pickup $::CFG->{pickup}"); 1310 $self->send_command ("pickup $::CFG->{pickup}");
1195}
1196
1197sub buildat {
1198 my ($self, $builditem, $x, $y) = @_;
1199
1200 if ($self->{cfplus_ext}) {
1201 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1202 }
1203} 1311}
1204 1312
1205sub lookat { 1313sub lookat {
1206 my ($self, $x, $y) = @_; 1314 my ($self, $x, $y) = @_;
1207 1315

Diff Legend

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