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.153 by root, Mon Aug 13 14:24:17 2007 UTC

… …
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
66 });
67 63
68 if (my $ts = $cap{tileset}) { 64 if (my $ts = $cap{tileset}) {
69 if (my ($default) = grep $_->[2] & 1, @$ts) { 65 if (my ($default) = grep $_->[2] & 1, @$ts) {
70 $self->{tileset} = $default; 66 $self->{tileset} = $default;
71 $self->{tilesize} = $default->[3]; 67 $self->{tilesize} = $default->[3];
… …
187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); 183 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 }); 184 });
189 185
190 # message window 186 # message window
191 $self->connect_ext (channel_info => sub { 187 $self->connect_ext (channel_info => sub {
188 my ($info) = @_;
189 $self->{channels}->{$info->{id}} = $info;
192 $::MESSAGE_WINDOW->add_channel ($_[0]); 190 $::MESSAGE_WINDOW->add_channel ($info);
193 }); 191 });
194 192
195 # destroy widgets on logout 193 # destroy widgets on logout
196 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 194 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
197 for my $ws (values %{delete $self->{widgetset} || {}}) { 195 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
221 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 219 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
222 220
223 $self 221 $self
224} 222}
225 223
224sub update_fx_want {
225 my ($self) = @_;
226
227 $self->send_exti_msg (fx_want => {
228 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
229 5 => !!$::CFG->{audio_enable}, # FT_SOUND
230 });
231}
232
226sub logprint { 233sub logprint {
227 my ($self, @a) = @_; 234 my ($self, @a) = @_;
228 235
229 $self->{log_fh} ||= do { 236 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} 237}
247 238
248sub _stat_numdiff { 239sub _stat_numdiff {
249 my ($self, $name, $old, $new) = @_; 240 my ($self, $name, $old, $new) = @_;
250 241
… …
515} 506}
516 507
517sub feed_map1a { 508sub feed_map1a {
518 my ($self, $data) = @_; 509 my ($self, $data) = @_;
519 510
520 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 511 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
512 my $delay;
513
514 for my $tile (@$missing) {
515 next if $self->{delay}{$tile};
516
517 $delay = 1;
518
519 if (my $tex = $::CONN->{texture}[$tile]) {
520 $tex->upload;
521 } else {
522 $self->{delay}{$tile} = 1;
523
524 # we assume the face is in-flight and will eventually come
525 push @{$self->{face_cb}{$tile}}, sub {
526 delete $self->{delay}{$tile};
527 $_[0]->upload;
528 };
529 }
530 }
531
532 if ($delay) {
533 # delay the map drawing a tiny bit in the hope of getting the missing fetched
534 Event->timer (after => 0.03, cb => sub {
535 $_[0]->w->cancel;
536 $self->{map_widget}->update;
537 });
538 } else {
521 $self->{map_widget}->update; 539 $self->{map_widget}->update;
540 }
522} 541}
523 542
524sub magicmap { 543sub magicmap {
525 my ($self, $w, $h, $x, $y, $data) = @_; 544 my ($self, $w, $h, $x, $y, $data) = @_;
526 545
… …
533 my $map_info = delete $self->{map_info} 552 my $map_info = delete $self->{map_info}
534 or return; 553 or return;
535 554
536 my ($hash, $x, $y, $w, $h) = @$map_info; 555 my ($hash, $x, $y, $w, $h) = @$map_info;
537 556
538 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 557 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
558 $self->{map_cache_new}{$hash} = \$data;
539 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 559 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
540 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
541} 560}
542 561
543sub map_clear { 562sub map_clear {
544 my ($self) = @_; 563 my ($self) = @_;
545 564
… …
558 do { 577 do {
559 $id = pop @{$self->{bg_fetch}} 578 $id = pop @{$self->{bg_fetch}}
560 or return; 579 or return;
561 } while $self->{texture}[$id]; 580 } while $self->{texture}[$id];
562 581
563 CFPlus::DB::get tilecache => $id, sub { 582 CFPlus::DB::exists tilecache => $id, sub {
564 my ($data) = @_; 583 my ($exists) = @_;
565 584
566 return unless $self->{map}; # stop when destroyed 585 return unless $self->{map}; # stop when destroyed
567 586
568 $self->set_texture ($id => $data) 587 if ($exists) {
569 if defined $data; 588 $self->have_tile ($id);
589 $self->{texture}[$id]->upload;
590 }
570 591
571 $self->bg_fetch; 592 $self->bg_fetch;
572 }; 593 };
573} 594}
574 595
575sub load_map($$$) { 596sub load_map($$$) {
576 my ($self, $hash, $x, $y) = @_; 597 my ($self, $hash, $x, $y) = @_;
577 598
578 my $gen = $self->{map_change_gen}; 599 my $gen = $self->{map_change_gen};
579 600
580 CFPlus::DB::get $self->{mapcache} => $hash, sub { 601 my $cb = sub {
581 return unless $gen == $self->{map_change_gen}; 602 return unless $gen == $self->{map_change_gen};
582 603
583 my ($data) = @_; 604 my ($data) = @_;
584 605
585 if (defined $data) { 606 if (defined $data) {
607 $self->{map_cache_new}{$hash} = \$data;
608
586 $data = Compress::LZF::decompress $data; 609 my $data = Compress::LZF::decompress $data;
587 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
588 610
589 my $inprogress = @{ $self->{bg_fetch} || [] }; 611 my $inprogress = @{ $self->{bg_fetch} || [] };
590 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 612 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
591 $self->bg_fetch unless $inprogress; 613 $self->bg_fetch unless $inprogress;
592 } 614 }
593 }; 615 };
616
617 if (my $rdata = $self->{map_cache_old}{$hash}) {
618 $cb->($$rdata);
619 } else {
620 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
621 }
594} 622}
595 623
596# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 624# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
597# (server resource,s latency, bandwidth), so this hack is warranted. 625# (server resource,s latency, bandwidth), so this hack is warranted.
598# the right fix is to make real tiled maps with an overview file 626# the right fix is to make real tiled maps with an overview file
… …
691 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 719 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
692 720
693 $self->flush_map; 721 $self->flush_map;
694 722
695 ++$self->{map_change_gen}; 723 ++$self->{map_change_gen};
724 $self->{map_cache_old} = delete $self->{map_cache_new};
696 725
697 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 726 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
698 727
699 my $mapmapw = $self->{mapmap}->{w}; 728 my $mapmapw = $self->{mapmap}->{w};
700 my $mapmaph = $self->{mapmap}->{h}; 729 my $mapmaph = $self->{mapmap}->{h};
… …
730 $self->{map}->set_tileid ($facenum => $id); 759 $self->{map}->set_tileid ($facenum => $id);
731 760
732 CFPlus::DB::get tilecache => $id, $cb; 761 CFPlus::DB::get tilecache => $id, $cb;
733 762
734 } elsif ($face->{type} & 1) { # with metadata 763 } 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; 764 CFPlus::DB::get res_meta => $face->{name}, $cb;
737 } 765 }
738} 766}
739 767
740sub face_update { 768sub face_update {
741 my ($self, $facenum, $face, $changed) = @_; 769 my ($self, $facenum, $face, $changed) = @_;
742 770
743 if ($face->{type} == 0) { # FT_FACE 771 if ($face->{type} == 0) { # FT_FACE
744 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 772 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
745 if $changed; 773 if $changed;
746 774
747 $self->set_texture ($face->{id} => delete $face->{data}); 775 $self->have_tile ($face->{id});
748 776
749 } elsif ($face->{type} & 1) { # split metadata 777 } elsif ($face->{type} & 1) { # split metadata
750 my $cb = sub { };
751
752 if ($face->{type} == 3) { # FT_MUSIC
753 $cb = sub {
754 $self->{music_meta}{$facenum} = $face;
755
756 ::message ({ markup => "downloaded song #$facenum" })
757 if $changed;
758
759 &::audio_music_set ($self->{songs});
760 };
761 }
762
763 if ($changed) { # new data 778 if ($changed) { # new data
764 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 779 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); 780 $face->{meta} = $self->{json_coder}->decode ($meta_json);
770 $face->{path} = $path;
771 781
772 $cb->(); 782 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
773 }; 783 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
774 };
775 } else { 784 } else {
776 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 785 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
777 $cb->();
778 } 786 }
787
788 ::add_license ($face);
789
790 if ($face->{type} == 3) { # FT_MUSIC
791 $self->{music_meta}{$facenum} = $face;
792
793 ::message ({ markup => "downloaded song #$facenum" })
794 if $changed;
795
796 &::audio_music_push ($facenum);
797 } elsif ($face->{type} == 5) { # FT_SOUND
798 $self->{sound_meta}{$facenum} = $face;
799
800 ::message ({ markup => "downloaded sound #$facenum" })
801 if $changed;
802
803 &::audio_sound_push ($facenum);
804 }
805
779 } 806 }
780} 807}
781 808
782sub smooth_update { 809sub smooth_update {
783 my ($self, $facenum, $face) = @_; 810 my ($self, $facenum, $face) = @_;
784 811
785 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 812 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
786} 813}
787 814
788sub set_texture { 815sub have_tile {
789 my ($self, $id, $data) = @_; 816 my ($self, $tile) = @_;
790 817
791 return unless $self->{map}; 818 return unless $self->{map};
792 819
793 $self->{texture}[$id] = my $tex = 820 my $tex = $self->{texture}[$tile] ||=
794 new_from_image CFPlus::Texture 821 new CFPlus::Texture
795 $data, minify => 1, mipmap => 1; 822 tile => $tile, minify => 1, mipmap => 1, delay => 1;
796 823
797 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
798 $self->{map_widget}->update;
799
800 $_->() for @{(delete $self->{face_cb}{$id}) || []}; 824 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
801} 825}
802 826
803sub connect_face_update { 827sub connect_face_update {
804 my ($self, $id, $cb) = @_; 828 my ($self, $id, $cb) = @_;
805 829
… …
811 @{$self->{face_cb}{$id}}; 835 @{$self->{face_cb}{$id}};
812 } 836 }
813} 837}
814 838
815sub sound_play { 839sub sound_play {
816 my ($self, $x, $y, $soundnum, $type) = @_; 840 my ($self, $type, $face, $dx, $dy, $vol) = @_;
817 841
818 $self->{sound_play}->($x, $y, $soundnum, $type); 842 &::audio_sound_play ($face, $dx, $dy, $vol)
843 unless $type & 1; # odd types are silent for future expansion
819} 844}
820 845
821my $LAST_QUERY; # server is stupid, stupid, stupid 846my $LAST_QUERY; # server is stupid, stupid, stupid
822 847
823sub query { 848sub query {
… …
888 $self->{$type} = $text; 913 $self->{$type} = $text;
889 } else { 914 } else {
890 $self->logprint ("msg: ", $text); 915 $self->logprint ("msg: ", $text);
891 return if $color < 0; # negative color == ignore if not understood 916 return if $color < 0; # negative color == ignore if not understood
892 917
893 my $fg = $CF_COLOR[$color % @CF_COLOR]; 918 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
894 919
895 ## try to create single paragraphs of multiple lines sent by the server 920 ## try to create single paragraphs of multiple lines sent by the server
896 # no longer neecssary with TRT servers 921 # no longer neecssary with TRT servers
897 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 922 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
898 923
899 ::message ({ fg => $fg, markup => $_, type => $type }) 924 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
900 for split /\n/, $text; 925 for split /\n/, $text;
901 926
902 $self->{statusbox}->add ($text, 927 $self->{statusbox}->add ($text,
903 group => $text, 928 group => $text,
904 fg => $fg, 929 fg => $fg,
… …
961 $self->{map_widget}->clr_commands; 986 $self->{map_widget}->clr_commands;
962 987
963 ::stop_game (); 988 ::stop_game ();
964} 989}
965 990
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 { 991sub update_floorbox {
1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 992 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1002 return unless $::CONN; 993 return unless $::CONN;
1003 994
1004 $::FLOORBOX->clear; 995 $::FLOORBOX->clear;
… …
1033 } 1024 }
1034 1025
1035 $::FLOORBOX->add_at (@add); 1026 $::FLOORBOX->add_at (@add);
1036 }); 1027 });
1037 1028
1038 $::WANT_REFRESH++; 1029 $::WANT_REFRESH->start;
1039} 1030}
1040 1031
1041sub set_opencont { 1032sub set_opencont {
1042 my ($conn, $tag, $name) = @_; 1033 my ($conn, $tag, $name) = @_;
1043 $conn->{open_container} = $tag; 1034 $conn->{open_container} = $tag;
… …
1160 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1151 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1161 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1152 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1162 . "map size $self->{mapw}×$self->{maph}\n" 1153 . "map size $self->{mapw}×$self->{maph}\n"
1163 ); 1154 );
1164 1155
1165 ::setup_build_button ($self->{editor_support}->{builder_ui});
1166} 1156}
1167 1157
1168sub logged_in { 1158sub logged_in {
1169 my ($self) = @_; 1159 my ($self) = @_;
1170 1160
… …
1190 1180
1191 $self->send_command ("output-sync $::CFG->{output_sync}"); 1181 $self->send_command ("output-sync $::CFG->{output_sync}");
1192 $self->send_command ("output-count $::CFG->{output_count}"); 1182 $self->send_command ("output-count $::CFG->{output_count}");
1193 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1183 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1194 $self->send_command ("pickup $::CFG->{pickup}"); 1184 $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} 1185}
1204 1186
1205sub lookat { 1187sub lookat {
1206 my ($self, $x, $y) = @_; 1188 my ($self, $x, $y) = @_;
1207 1189

Diff Legend

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