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.146 by root, Mon Aug 6 05:06:33 2007 UTC vs.
Revision 1.157 by root, Tue Aug 21 02:39:17 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;
… …
57 57
58 $self->connect_ext (capabilities => sub { 58 $self->connect_ext (capabilities => sub {
59 my (%cap) = @_; 59 my (%cap) = @_;
60 60
61 #$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;
62 63
63 $self->send_exti_msg (fx_want => { 64 $self->send_exti_req (resource => "exp_table", sub {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC 65 my ($exp_table) = @_;
65 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 ()
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 {
… …
221 260
222 # per server 261 # per server
223 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 262 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
224 263
225 $self 264 $self
265}
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 });
226} 303}
227 304
228sub logprint { 305sub logprint {
229 my ($self, @a) = @_; 306 my ($self, @a) = @_;
230 307
… …
369 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 446 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
370 $::GAUGES->{food} ->set_value ($fo, $fo_m); 447 $::GAUGES->{food} ->set_value ($fo, $fo_m);
371 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 448 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
372 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 449 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
373 . " (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});
374 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 452 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
375 my $title = $stats->{+CS_STAT_TITLE}; 453 my $title = $stats->{+CS_STAT_TITLE};
376 $title =~ s/^Player: //; 454 $title =~ s/^Player: //;
377 $::STATWIDS->{title} ->set_text ("Title: " . $title); 455 $::STATWIDS->{title} ->set_text ("Title: " . $title);
378 456
… …
404 my @add; 482 my @add;
405 483
406 push @add, 484 push @add,
407 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 485 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
408 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 486 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
487 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
409 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 488 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
410 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 489 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
411 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 490 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
491 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
412 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 492 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
413 ; 493 ;
414 494
415 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>";
416 496
417 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);
… …
447 527
448 1 528 1
449 }; 529 };
450 530
451 push @add, 531 push @add,
452 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 532 $x * 4 + 0, $y, ($self->{stat_widget_exp}{$idx} ||= new CFPlus::UI::Label
453 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 533 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
454 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 534 $x * 4 + 1, $y, ($self->{stat_widget_lvl}{$idx} ||= new CFPlus::UI::Label
455 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 535 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
536 $x * 4 + 2, $y, ($self->{stat_widget_prg}{$idx} ||= new CFPlus::UI::ExperienceProgress),
456 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 537 $x * 4 + 3, $y, ($self->{stat_widget_lbl}{$idx} ||= new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
457 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), 538 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
458 ; 539 ;
459 540
460 $x++ and ($x, $y) = (0, $y + 1); 541 $x++ and ($x, $y) = (0, $y + 1);
461 } 542 }
… …
464 } 545 }
465 546
466 for (grep exists $stats->{$_}, @skills) { 547 for (grep exists $stats->{$_}, @skills) {
467 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 548 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
468 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 549 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
550 $self->{stat_widget_prg}{$_}->set_value (@{$stats->{$_}});
469 } 551 }
470} 552}
471 553
472sub macro_send { 554sub macro_send {
473 my ($self, $macro) = @_; 555 my ($self, $macro) = @_;
… …
501} 583}
502 584
503sub feed_map1a { 585sub feed_map1a {
504 my ($self, $data) = @_; 586 my ($self, $data) = @_;
505 587
506 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 588 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
589 my $delay;
590
591 for my $tile (@$missing) {
592 next if $self->{delay}{$tile};
593
594 $delay = 1;
595
596 if (my $tex = $::CONN->{texture}[$tile]) {
597 $tex->upload;
598 } else {
599 $self->{delay}{$tile} = 1;
600
601 # we assume the face is in-flight and will eventually come
602 push @{$self->{tile_cb}{$tile}}, sub {
603 delete $self->{delay}{$tile};
604 $_[0]->upload;
605 };
606 }
607 }
608
609 if ($delay) {
610 # delay the map drawing a tiny bit in the hope of getting the missing fetched
611 Event->timer (after => 0.03, cb => sub {
612 $_[0]->w->cancel;
613 $self->{map_widget}->update;
614 });
615 } else {
507 $self->{map_widget}->update; 616 $self->{map_widget}->update;
617 }
508} 618}
509 619
510sub magicmap { 620sub magicmap {
511 my ($self, $w, $h, $x, $y, $data) = @_; 621 my ($self, $w, $h, $x, $y, $data) = @_;
512 622
… …
519 my $map_info = delete $self->{map_info} 629 my $map_info = delete $self->{map_info}
520 or return; 630 or return;
521 631
522 my ($hash, $x, $y, $w, $h) = @$map_info; 632 my ($hash, $x, $y, $w, $h) = @$map_info;
523 633
524 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 634 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
635 $self->{map_cache_new}{$hash} = \$data;
525 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 636 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
526 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
527} 637}
528 638
529sub map_clear { 639sub map_clear {
530 my ($self) = @_; 640 my ($self) = @_;
531 641
… …
537} 647}
538 648
539sub bg_fetch { 649sub bg_fetch {
540 my ($self) = @_; 650 my ($self) = @_;
541 651
542 my $id; 652 my $tile;
543 653
544 do { 654 do {
545 $id = pop @{$self->{bg_fetch}} 655 $tile = pop @{$self->{bg_fetch}}
546 or return; 656 or return;
547 } while $self->{texture}[$id]; 657 } while $self->{texture}[$tile];
548 658
549 CFPlus::DB::exists tilecache => $id, sub { 659 CFPlus::DB::get tilecache => $tile, sub {
550 my ($exists) = @_; 660 my ($data) = @_;
551 661
552 return unless $self->{map}; # stop when destroyed 662 return unless $self->{map}; # stop when destroyed
553 663
664 if (defined $data) {
554 $self->have_tile ($id) 665 $self->have_tile ($tile, $data);
555 if $exists; 666 $self->{texture}[$tile]->upload;
667 }
556 668
557 $self->bg_fetch; 669 $self->bg_fetch;
558 }; 670 };
559} 671}
560 672
561sub load_map($$$) { 673sub load_map($$$) {
562 my ($self, $hash, $x, $y) = @_; 674 my ($self, $hash, $x, $y) = @_;
563 675
564 my $gen = $self->{map_change_gen}; 676 my $gen = $self->{map_change_gen};
565 677
566 CFPlus::DB::get $self->{mapcache} => $hash, sub { 678 my $cb = sub {
567 return unless $gen == $self->{map_change_gen}; 679 return unless $gen == $self->{map_change_gen};
568 680
569 my ($data) = @_; 681 my ($data) = @_;
570 682
571 if (defined $data) { 683 if (defined $data) {
684 $self->{map_cache_new}{$hash} = \$data;
685
572 $data = Compress::LZF::decompress $data; 686 my $data = Compress::LZF::decompress $data;
573 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
574 687
575 my $inprogress = @{ $self->{bg_fetch} || [] }; 688 my $inprogress = @{ $self->{bg_fetch} || [] };
576 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 689 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
577 $self->bg_fetch unless $inprogress; 690 $self->bg_fetch unless $inprogress;
578 } 691 }
579 }; 692 };
693
694 if (my $rdata = $self->{map_cache_old}{$hash}) {
695 $cb->($$rdata);
696 } else {
697 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
698 }
580} 699}
581 700
582# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 701# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
583# (server resource,s latency, bandwidth), so this hack is warranted. 702# (server resource,s latency, bandwidth), so this hack is warranted.
584# the right fix is to make real tiled maps with an overview file 703# the right fix is to make real tiled maps with an overview file
… …
677 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 796 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
678 797
679 $self->flush_map; 798 $self->flush_map;
680 799
681 ++$self->{map_change_gen}; 800 ++$self->{map_change_gen};
801 $self->{map_cache_old} = delete $self->{map_cache_new};
682 802
683 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 803 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
684 804
685 my $mapmapw = $self->{mapmap}->{w}; 805 my $mapmapw = $self->{mapmap}->{w};
686 my $mapmaph = $self->{mapmap}->{h}; 806 my $mapmaph = $self->{mapmap}->{h};
… …
708 my ($self, $facenum, $face, $cb) = @_; 828 my ($self, $facenum, $face, $cb) = @_;
709 829
710 if ($face->{type} == 0) { # FT_FACE 830 if ($face->{type} == 0) { # FT_FACE
711 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 831 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
712 832
713 $face->{id} = $id; 833 $face->{id} = $id;
714 $self->{faceid}[$facenum] = $id;
715
716 $self->{map}->set_tileid ($facenum => $id); 834 $self->{map}->set_tileid ($facenum => $id);
717 835
718 CFPlus::DB::get tilecache => $id, $cb; 836 CFPlus::DB::get tilecache => $id, $cb;
719 837
720 } elsif ($face->{type} & 1) { # with metadata 838 } elsif ($face->{type} & 1) { # with metadata
721 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
722 CFPlus::DB::get res_meta => $face->{name}, $cb; 839 CFPlus::DB::get res_meta => $face->{name}, $cb;
840
841 } else { # no metadata
842 CFPlus::DB::get res_data => $face->{name}, $cb;
723 } 843 }
724} 844}
725 845
726sub face_update { 846sub face_update {
727 my ($self, $facenum, $face, $changed) = @_; 847 my ($self, $facenum, $face, $changed) = @_;
728 848
729 if ($face->{type} == 0) { # FT_FACE 849 if ($face->{type} == 0) {
850 # image, FT_FACE
730 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 851 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
731 if $changed; 852 if $changed;
732 853
733 $self->have_tile ($face->{id}); 854 $self->have_tile ($face->{id}, delete $face->{data});
734 855
735 } elsif ($face->{type} & 1) { # split metadata 856 } elsif ($face->{type} & 1) {
736 my $cb = sub { }; 857 # split metadata case, FT_MUSIC, FT_SOUND
858 if ($changed) { # new data
859 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
860 $face->{data} = $meta;
861
862 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
863 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
864 }
865
866 $face->{data} = $self->{json_coder}->decode ($face->{data});
867
868 ::add_license ($face);
737 869
738 if ($face->{type} == 3) { # FT_MUSIC 870 if ($face->{type} == 3) { # FT_MUSIC
739 $cb = sub {
740 $self->{music_meta}{$facenum} = $face;
741
742 ::message ({ markup => "downloaded song #$facenum" }) 871 ::message ({ markup => "downloaded song #$facenum" })
743 if $changed; 872 if $changed;
744 873
745 &::audio_music_push ($facenum); 874 &::audio_music_push ($facenum);
746 };
747 } elsif ($face->{type} == 5) { # FT_SOUND 875 } elsif ($face->{type} == 5) { # FT_SOUND
748 $cb = sub {
749 $self->{sound_meta}{$facenum} = $face;
750
751 ::message ({ markup => "downloaded sound #$facenum" }) 876 ::message ({ markup => "downloaded sound #$facenum" })
752 if $changed; 877 if $changed;
753 878
754 &::audio_sound_push ($facenum); 879 &::audio_sound_push ($facenum);
755 }; 880 }
756 }
757 881
758 if ($changed) { # new data 882 } else {
759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 883 # flat resource case, FT_RSRC
760
761 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 884 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
762 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { 885 if $changed;
763 $face->{meta} = $self->{json_coder}->decode ($meta_json); 886 }
764 ::add_license ($face);
765 $cb->();
766 };
767 887
768 } else { 888 if (my $cbs = $self->{face_cb}{$facenum}) {
769 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 889 $_->($face, $changed) for @$cbs;
770 ::add_license ($face);
771 $cb->();
772 }
773 } 890 }
774} 891}
775 892
776sub smooth_update { 893sub smooth_update {
777 my ($self, $facenum, $face) = @_; 894 my ($self, $facenum, $face) = @_;
778 895
779 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 896 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
780} 897}
781 898
782sub have_tile { 899sub have_tile {
783 my ($self, $tile) = @_; 900 my ($self, $tile, $data) = @_;
784 901
785 return unless $self->{map}; 902 return unless $self->{map};
786 903
787 $self->{texture}[$tile] ||= my $tex = 904 my $tex = $self->{texture}[$tile] ||=
788 new CFPlus::Texture 905 new CFPlus::Texture
789 tile => $tile, minify => 1, mipmap => 1, delay => 1; 906 tile => $tile,
907 image => $data, delete_image => 1,
908 minify => 1, mipmap => 1;
790 909
791 $_->() for @{(delete $self->{face_cb}{$tile}) || []}; 910 if (my $cbs = delete $self->{tile_cb}{$tile}) {
911 $_->($tex) for @$cbs;
912 }
792} 913}
793 914
794sub connect_face_update { 915# call in non-void context registers a temporary
916# hook with handle, otherwise its permanent
917sub on_face_change {
795 my ($self, $id, $cb) = @_; 918 my ($self, $num, $cb) = @_;
796 919
797 push @{$self->{face_cb}{$id}}, $cb; 920 push @{$self->{face_cb}{$num}}, $cb;
798 921
922 defined wantarray
799 CFPlus::guard { 923 ? CFPlus::guard {
800 @{$self->{face_cb}{$id}} 924 @{$self->{face_cb}{$num}}
801 = grep $_ != $cb, 925 = grep $_ != $cb,
802 @{$self->{face_cb}{$id}}; 926 @{$self->{face_cb}{$num}};
803 } 927 }
928 : ()
929}
930
931# call in non-void context registers a temporary
932# hook with handle, otherwise its permanent
933sub register_face_handler {
934 my ($self, $num, $cb) = @_;
935
936 return unless $num;
937
938 # invoke if available right now
939 $cb->($self->{face}[$num], 0)
940 unless exists $self->{face}[$num]{loading};
941
942 # future changes
943 $self->on_face_change ($num => $cb)
804} 944}
805 945
806sub sound_play { 946sub sound_play {
807 my ($self, $type, $face, $dx, $dy, $vol) = @_; 947 my ($self, $type, $face, $dx, $dy, $vol) = @_;
808 948
… …
880 $self->{$type} = $text; 1020 $self->{$type} = $text;
881 } else { 1021 } else {
882 $self->logprint ("msg: ", $text); 1022 $self->logprint ("msg: ", $text);
883 return if $color < 0; # negative color == ignore if not understood 1023 return if $color < 0; # negative color == ignore if not understood
884 1024
885 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; 1025 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
886 1026
887 ## try to create single paragraphs of multiple lines sent by the server 1027 ## try to create single paragraphs of multiple lines sent by the server
888 # no longer neecssary with TRT servers 1028 # no longer neecssary with TRT servers
889 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1029 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
890 1030
891 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] }) 1031 ::message ({
1032 fg => $fg,
1033 markup => $_,
1034 type => $type,
1035 extra => [@extra],
1036 color_flags => $color
892 for split /\n/, $text; 1037 }) for split /\n/, $text;
893 1038
894 $self->{statusbox}->add ($text, 1039 $self->{statusbox}->add ($text,
895 group => $text, 1040 group => $text,
896 fg => $fg, 1041 fg => $fg,
897 timeout => $color >= 2 ? 180 : 10, 1042 timeout => $color >= 2 ? 180 : 10,
… …
991 } 1136 }
992 1137
993 $::FLOORBOX->add_at (@add); 1138 $::FLOORBOX->add_at (@add);
994 }); 1139 });
995 1140
996 $::WANT_REFRESH++; 1141 $::WANT_REFRESH->start;
997} 1142}
998 1143
999sub set_opencont { 1144sub set_opencont {
1000 my ($conn, $tag, $name) = @_; 1145 my ($conn, $tag, $name) = @_;
1001 $conn->{open_container} = $tag; 1146 $conn->{open_container} = $tag;
1002 update_floorbox; 1147 update_floorbox;
1003 1148
1004 $::INV_RIGHT_HB->clear (); 1149 $::INVR_HB->clear ();
1005 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1150 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1006 1151
1007 if ($tag != 0) { # Floor isn't closable, is it? 1152 if ($tag != 0) { # Floor isn't closable, is it?
1008 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1153 $::INVR_HB->add (new CFPlus::UI::Button
1009 text => "Close container", 1154 text => "Close container",
1010 tooltip => "Close the currently open container (if one is open)", 1155 tooltip => "Close the currently open container (if one is open)",
1011 on_activate => sub { 1156 on_activate => sub {
1012 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1157 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1013 if $tag != 0; 1158 if $tag != 0;
1014 #if $CONN->{open_container} != 0;
1015 0 1159 0
1016 }, 1160 },
1017 ); 1161 );
1018 } 1162 }
1019 1163

Diff Legend

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