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.142 by root, Tue Jul 31 00:50:04 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
56 &::audio_music_set_ambient ($self->{songs} = $ev->{ambient}) 55 &::audio_music_set_ambient ($songs);
57 if $ev->{ambient};
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 ("setup sound 0"); # we use a different protocol 61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want;
64 63
65 $self->send_exti_msg (fx_want => { 64 $self->send_exti_req (resource => "exp_table", sub {
66 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC 65 my ($exp_table) = @_;
67 5 => !!$::CFG->{audio_enable}, # FT_SOUND 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 ()
68 }); 75 });
69 76
70 if (my $ts = $cap{tileset}) { 77 if (my $ts = $cap{tileset}) {
71 if (my ($default) = grep $_->[2] & 1, @$ts) { 78 if (my ($default) = grep $_->[2] & 1, @$ts) {
72 $self->{tileset} = $default; 79 $self->{tileset} = $default;
… …
110 # widgetset create 117 # widgetset create
111 $self->connect_ext (ws_c => sub { 118 $self->connect_ext (ws_c => sub {
112 my ($ws, $id, $class, $args) = @_; 119 my ($ws, $id, $class, $args) = @_;
113 120
114 for my $ev (grep /^on_/, keys %$args) { 121 for my $ev (grep /^on_/, keys %$args) {
122 my $rid = $args->{$ev};
115 $args->{$ev} = sub { 123 $args->{$ev} = sub {
116 my $id = shift->{s_id}; 124 my $id = shift->{s_id};
117 $self->send_exti_msg (w_e => $id, $ev, \@_); 125 $self->send_exti_msg (w_e => $id, $rid, @_);
118 126
119 1 127 1
120 }; 128 };
121 } 129 }
122 130
123 if (my $widget = eval { 131 $self->widget_associate (
132 $ws, $id => scalar eval {
124 local $SIG{__DIE__}; 133 local $SIG{__DIE__};
125 "CFPlus::UI::$class"->new ( 134 "CFPlus::UI::$class"->new (%$args)
126 %$args,
127 s_ws => $ws,
128 s_id => $id,
129 )
130 } 135 }
131 ) {
132 $self->{widget}{$id}
133 = $self->{widgetset}{$ws}{w}{$id}
134 = $widget;
135
136 $widget->connect (on_destroy => sub {
137 my ($widget) = @_;
138
139 delete $self->{widget}{$widget->{s_id}};
140 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
141 });
142 } else {
143 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";
144 $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";
145 } 184 }
146 }); 185 });
147 186
148 # widget call 187 # widget call
149 $self->connect_ext (w_c => sub { 188 $self->connect_ext (w_c => sub {
150 my ($id, $rid, $method, $args) = @_; 189 my ($id, $rid, $method, @args) = @_;
151 190
152 my $w = $self->{widget}{$id} 191 my $w = $self->{widget}{$id}
153 or return; 192 or return;
154 193
155 $args ||= [];
156
157 if ($rid) { 194 if ($rid) {
158 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]); 195 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
159 } else { 196 } else {
160 $w->$method (@$args); 197 $w->$method (@args);
161 } 198 }
162 }); 199 });
163 200
164 # widget set 201 # widget set
165 $self->connect_ext (w_s => sub { 202 $self->connect_ext (w_s => sub {
… …
225 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 262 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
226 263
227 $self 264 $self
228} 265}
229 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
230sub logprint { 305sub logprint {
231 my ($self, @a) = @_; 306 my ($self, @a) = @_;
232 307
233 $self->{log_fh} ||= do { 308 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
234 my $path = "$Crossfire::VARDIR/log.$self->{host}";
235
236 open my $fh, ">>:utf8", $path
237 or die "Couldn't open logfile $path: $!";
238
239 $fh->autoflush (1);
240
241 $fh;
242 };
243
244 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
245
246 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
247 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
248
249 print {$self->{log_fh}} "$ts ", @a, "\n";
250} 309}
251 310
252sub _stat_numdiff { 311sub _stat_numdiff {
253 my ($self, $name, $old, $new) = @_; 312 my ($self, $name, $old, $new) = @_;
254 313
… …
387 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 446 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
388 $::GAUGES->{food} ->set_value ($fo, $fo_m); 447 $::GAUGES->{food} ->set_value ($fo, $fo_m);
389 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 448 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
390 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 449 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
391 . " (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});
392 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 452 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
393 my $title = $stats->{+CS_STAT_TITLE}; 453 my $title = $stats->{+CS_STAT_TITLE};
394 $title =~ s/^Player: //; 454 $title =~ s/^Player: //;
395 $::STATWIDS->{title} ->set_text ("Title: " . $title); 455 $::STATWIDS->{title} ->set_text ("Title: " . $title);
396 456
… …
417 my @skills = keys %{ $self->{skill_info} }; 477 my @skills = keys %{ $self->{skill_info} };
418 478
419 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 479 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
420 $sktbl->clear; 480 $sktbl->clear;
421 481
422 my @add; 482 my $sw = $self->{skillwid}{""} ||= [
423
424 push @add,
425 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 483 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
426 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),
427 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 486 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
428 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 487 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
429 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),
430 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 490 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
431 ; 491 ];
492
493 my @add = @$sw;
432 494
433 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>";
434 496
435 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);
436 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);
… …
464 } 526 }
465 527
466 1 528 1
467 }; 529 };
468 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
469 push @add, 548 push @add,
470 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 549 $x * 4 + 0, $y, $sw->[0],
471 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 550 $x * 4 + 1, $y, $sw->[1],
472 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 551 $x * 4 + 2, $y, $sw->[2],
473 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],
474 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
475 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
476 ; 553 ;
477 554
478 $x++ and ($x, $y) = (0, $y + 1); 555 $x++ and ($x, $y) = (0, $y + 1);
479 } 556 }
480 557
481 $sktbl->add_at (@add); 558 $sktbl->add_at (@add);
482 } 559 }
483 560
484 for (grep exists $stats->{$_}, @skills) { 561 for (grep exists $stats->{$_}, @skills) {
562 my $sw = $self->{skillwid}{$_};
485 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 563 $sw->[0]->set_text (::formsep ($stats->{$_}[1]));
486 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 564 $sw->[1]->set_text ($stats->{$_}[0] * 1);
565 $sw->[2]->set_value (@{$stats->{$_}});
487 } 566 }
488} 567}
489 568
490sub macro_send { 569sub macro_send {
491 my ($self, $macro) = @_; 570 my ($self, $macro) = @_;
… …
519} 598}
520 599
521sub feed_map1a { 600sub feed_map1a {
522 my ($self, $data) = @_; 601 my ($self, $data) = @_;
523 602
524 $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 {
525 $self->{map_widget}->update; 631 $self->{map_widget}->update;
632 }
526} 633}
527 634
528sub magicmap { 635sub magicmap {
529 my ($self, $w, $h, $x, $y, $data) = @_; 636 my ($self, $w, $h, $x, $y, $data) = @_;
530 637
… …
537 my $map_info = delete $self->{map_info} 644 my $map_info = delete $self->{map_info}
538 or return; 645 or return;
539 646
540 my ($hash, $x, $y, $w, $h) = @$map_info; 647 my ($hash, $x, $y, $w, $h) = @$map_info;
541 648
542 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;
543 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 651 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
544 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
545} 652}
546 653
547sub map_clear { 654sub map_clear {
548 my ($self) = @_; 655 my ($self) = @_;
549 656
… …
555} 662}
556 663
557sub bg_fetch { 664sub bg_fetch {
558 my ($self) = @_; 665 my ($self) = @_;
559 666
560 my $id; 667 my $tile;
561 668
562 do { 669 do {
563 $id = pop @{$self->{bg_fetch}} 670 $tile = pop @{$self->{bg_fetch}}
564 or return; 671 or return;
565 } while $self->{texture}[$id]; 672 } while $self->{texture}[$tile];
566 673
567 CFPlus::DB::get tilecache => $id, sub { 674 CFPlus::DB::get tilecache => $tile, sub {
568 my ($data) = @_; 675 my ($data) = @_;
569 676
570 return unless $self->{map}; # stop when destroyed 677 return unless $self->{map}; # stop when destroyed
571 678
572 $self->set_texture ($id => $data)
573 if defined $data; 679 if (defined $data) {
680 $self->have_tile ($tile, $data);
681 $self->{texture}[$tile]->upload;
682 }
574 683
575 $self->bg_fetch; 684 $self->bg_fetch;
576 }; 685 };
577} 686}
578 687
579sub load_map($$$) { 688sub load_map($$$) {
580 my ($self, $hash, $x, $y) = @_; 689 my ($self, $hash, $x, $y) = @_;
581 690
582 my $gen = $self->{map_change_gen}; 691 my $gen = $self->{map_change_gen};
583 692
584 CFPlus::DB::get $self->{mapcache} => $hash, sub { 693 my $cb = sub {
585 return unless $gen == $self->{map_change_gen}; 694 return unless $gen == $self->{map_change_gen};
586 695
587 my ($data) = @_; 696 my ($data) = @_;
588 697
589 if (defined $data) { 698 if (defined $data) {
699 $self->{map_cache_new}{$hash} = \$data;
700
590 $data = Compress::LZF::decompress $data; 701 my $data = Compress::LZF::decompress $data;
591 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
592 702
593 my $inprogress = @{ $self->{bg_fetch} || [] }; 703 my $inprogress = @{ $self->{bg_fetch} || [] };
594 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 704 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
595 $self->bg_fetch unless $inprogress; 705 $self->bg_fetch unless $inprogress;
596 } 706 }
597 }; 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 }
598} 714}
599 715
600# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 716# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
601# (server resource,s latency, bandwidth), so this hack is warranted. 717# (server resource,s latency, bandwidth), so this hack is warranted.
602# 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
… …
695 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 811 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
696 812
697 $self->flush_map; 813 $self->flush_map;
698 814
699 ++$self->{map_change_gen}; 815 ++$self->{map_change_gen};
816 $self->{map_cache_old} = delete $self->{map_cache_new};
700 817
701 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 818 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
702 819
703 my $mapmapw = $self->{mapmap}->{w}; 820 my $mapmapw = $self->{mapmap}->{w};
704 my $mapmaph = $self->{mapmap}->{h}; 821 my $mapmaph = $self->{mapmap}->{h};
… …
726 my ($self, $facenum, $face, $cb) = @_; 843 my ($self, $facenum, $face, $cb) = @_;
727 844
728 if ($face->{type} == 0) { # FT_FACE 845 if ($face->{type} == 0) { # FT_FACE
729 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 846 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
730 847
731 $face->{id} = $id; 848 $face->{id} = $id;
732 $self->{faceid}[$facenum] = $id;
733
734 $self->{map}->set_tileid ($facenum => $id); 849 $self->{map}->set_tileid ($facenum => $id);
735 850
736 CFPlus::DB::get tilecache => $id, $cb; 851 CFPlus::DB::get tilecache => $id, $cb;
737 852
738 } elsif ($face->{type} & 1) { # with metadata 853 } elsif ($face->{type} & 1) { # with metadata
739 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
740 CFPlus::DB::get res_meta => $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;
741 } 858 }
742} 859}
743 860
744sub face_update { 861sub face_update {
745 my ($self, $facenum, $face, $changed) = @_; 862 my ($self, $facenum, $face, $changed) = @_;
746 863
747 if ($face->{type} == 0) { # FT_FACE 864 if ($face->{type} == 0) {
865 # image, FT_FACE
748 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 866 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
749 if $changed; 867 if $changed;
750 868
751 $self->set_texture ($face->{id} => delete $face->{data}); 869 $self->have_tile ($face->{id}, delete $face->{data});
752 870
753 } elsif ($face->{type} & 1) { # split metadata 871 } elsif ($face->{type} & 1) {
754 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);
755 884
756 if ($face->{type} == 3) { # FT_MUSIC 885 if ($face->{type} == 3) { # FT_MUSIC
757 $cb = sub {
758 $self->{music_meta}{$facenum} = $face;
759
760 ::message ({ markup => "downloaded song #$facenum" }) 886 ::message ({ markup => "downloaded song #$facenum" })
761 if $changed; 887 if $changed;
762 888
763 &::audio_music_set_ambient ($self->{songs}); 889 &::audio_music_push ($facenum);
764 };
765 } elsif ($face->{type} == 5) { # FT_SOUND 890 } elsif ($face->{type} == 5) { # FT_SOUND
766 $cb = sub {
767 $self->{sound_meta}{$facenum} = $face;
768
769 ::message ({ markup => "downloaded sound #$facenum" }) 891 ::message ({ markup => "downloaded sound #$facenum" })
770 if $changed; 892 if $changed;
771 893
772 &::audio_sound_push ($facenum); 894 &::audio_sound_push ($facenum);
773 }; 895 }
774 }
775 896
776 if ($changed) { # new data 897 } else {
777 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 898 # flat resource case, FT_RSRC
778
779 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 899 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
780 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { 900 if $changed;
781 $face->{meta} = $self->{json_coder}->decode ($meta_json); 901 }
782 $cb->();
783 };
784 902
785 } else { 903 if (my $cbs = $self->{face_cb}{$facenum}) {
786 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 904 $_->($face, $changed) for @$cbs;
787 $cb->();
788 }
789 } 905 }
790} 906}
791 907
792sub smooth_update { 908sub smooth_update {
793 my ($self, $facenum, $face) = @_; 909 my ($self, $facenum, $face) = @_;
794 910
795 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 911 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
796} 912}
797 913
798sub set_texture { 914sub have_tile {
799 my ($self, $id, $data) = @_; 915 my ($self, $tile, $data) = @_;
800 916
801 return unless $self->{map}; 917 return unless $self->{map};
802 918
803 $self->{texture}[$id] = my $tex = 919 my $tex = $self->{texture}[$tile] ||=
804 new_from_image CFPlus::Texture 920 new CFPlus::Texture
921 tile => $tile,
922 image => $data, delete_image => 1,
805 $data, minify => 1, mipmap => 1; 923 minify => 1, mipmap => 1;
806 924
807 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 925 if (my $cbs = delete $self->{tile_cb}{$tile}) {
808 $self->{map_widget}->update; 926 $_->($tex) for @$cbs;
809 927 }
810 $_->() for @{(delete $self->{face_cb}{$id}) || []};
811} 928}
812 929
813sub connect_face_update { 930# call in non-void context registers a temporary
931# hook with handle, otherwise its permanent
932sub on_face_change {
814 my ($self, $id, $cb) = @_; 933 my ($self, $num, $cb) = @_;
815 934
816 push @{$self->{face_cb}{$id}}, $cb; 935 push @{$self->{face_cb}{$num}}, $cb;
817 936
937 defined wantarray
818 CFPlus::guard { 938 ? CFPlus::guard {
819 @{$self->{face_cb}{$id}} 939 @{$self->{face_cb}{$num}}
820 = grep $_ != $cb, 940 = grep $_ != $cb,
821 @{$self->{face_cb}{$id}}; 941 @{$self->{face_cb}{$num}};
822 } 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)
823} 959}
824 960
825sub sound_play { 961sub sound_play {
826 my ($self, $type, $face, $dx, $dy, $vol) = @_; 962 my ($self, $type, $face, $dx, $dy, $vol) = @_;
827 963
… …
899 $self->{$type} = $text; 1035 $self->{$type} = $text;
900 } else { 1036 } else {
901 $self->logprint ("msg: ", $text); 1037 $self->logprint ("msg: ", $text);
902 return if $color < 0; # negative color == ignore if not understood 1038 return if $color < 0; # negative color == ignore if not understood
903 1039
904 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; 1040 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
905 1041
906 ## 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
907 # no longer neecssary with TRT servers 1043 # no longer neecssary with TRT servers
908 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1044 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
909 1045
910 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] }) 1046 ::message ({
1047 fg => $fg,
1048 markup => $_,
1049 type => $type,
1050 extra => [@extra],
1051 color_flags => $color
911 for split /\n/, $text; 1052 }) for split /\n/, $text;
912 1053
913 $self->{statusbox}->add ($text, 1054 $self->{statusbox}->add ($text,
914 group => $text, 1055 group => $text,
915 fg => $fg, 1056 fg => $fg,
916 timeout => $color >= 2 ? 180 : 10, 1057 timeout => $color >= 2 ? 180 : 10,
… …
1010 } 1151 }
1011 1152
1012 $::FLOORBOX->add_at (@add); 1153 $::FLOORBOX->add_at (@add);
1013 }); 1154 });
1014 1155
1015 $::WANT_REFRESH++; 1156 $::WANT_REFRESH->start;
1016} 1157}
1017 1158
1018sub set_opencont { 1159sub set_opencont {
1019 my ($conn, $tag, $name) = @_; 1160 my ($conn, $tag, $name) = @_;
1020 $conn->{open_container} = $tag; 1161 $conn->{open_container} = $tag;
1021 update_floorbox; 1162 update_floorbox;
1022 1163
1023 $::INV_RIGHT_HB->clear (); 1164 $::INVR_HB->clear ();
1024 $::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);
1025 1166
1026 if ($tag != 0) { # Floor isn't closable, is it? 1167 if ($tag != 0) { # Floor isn't closable, is it?
1027 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1168 $::INVR_HB->add (new CFPlus::UI::Button
1028 text => "Close container", 1169 text => "Close container",
1029 tooltip => "Close the currently open container (if one is open)", 1170 tooltip => "Close the currently open container (if one is open)",
1030 on_activate => sub { 1171 on_activate => sub {
1031 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1172 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1032 if $tag != 0; 1173 if $tag != 0;
1033 #if $CONN->{open_container} != 0;
1034 0 1174 0
1035 }, 1175 },
1036 ); 1176 );
1037 } 1177 }
1038 1178

Diff Legend

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