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.129 by root, Mon Jul 23 23:37:57 2007 UTC vs.
Revision 1.146 by root, Mon Aug 6 05:06:33 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, 26 ywidget => 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 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 if (my $faces = $ev{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
74
75 if (defined $meta_json) {
76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
80 } else {
81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82 $self->ask_face ($face, -100 - $pri, undef, sub {
83 my $len = length $_[1];
84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
85
86 CFPlus::DB::write_file $path, $data, sub {
87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
96 });
97 }
98 }
99 }
100 }
101
102 if (my $play = $ev{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104 }
105 }); 56 });
106 57
107 $self->connect_ext (capabilities => sub { 58 $self->connect_ext (capabilities => sub {
108 my (%cap) = @_; 59 my (%cap) = @_;
60
61 #$self->send ("setup sound 0"); # we use a different protocol
62
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
109 67
110 if (my $ts = $cap{tileset}) { 68 if (my $ts = $cap{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) { 69 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default; 70 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3]; 71 $self->{tilesize} = $default->[3];
… …
121 } 79 }
122 }); 80 });
123 81
124 $self->{json_coder} 82 $self->{json_coder}
125 ->convert_blessed 83 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub { 84 ->filter_json_single_key_object (__w_ => sub {
127 $self->{widget}{$_[0]} 85 $self->{widget}{$_[0]}
128 }); 86 });
129 87
130 # widgetset new 88 # widgetset new
131 $self->connect_ext (ws_n => sub { 89 $self->connect_ext (ws_n => sub {
… …
227 or return; 185 or return;
228 186
229 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); 187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
230 }); 188 });
231 189
190 # message window
191 $self->connect_ext (channel_info => sub {
192 my ($info) = @_;
193 $self->{channels}->{$info->{id}} = $info;
194 $::MESSAGE_WINDOW->add_channel ($info);
195 });
196
232 # destroy widgets on logout 197 # destroy widgets on logout
233 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 198 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
234 for my $ws (values %{delete $self->{widgetset} || {}}) { 199 for my $ws (values %{delete $self->{widgetset} || {}}) {
235 $_->destroy 200 $_->destroy
236 for values %{delete $ws->{w} || {}}; 201 for values %{delete $ws->{w} || {}};
… …
261} 226}
262 227
263sub logprint { 228sub logprint {
264 my ($self, @a) = @_; 229 my ($self, @a) = @_;
265 230
266 $self->{log_fh} ||= do { 231 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
267 my $path = "$Crossfire::VARDIR/log.$self->{host}";
268
269 open my $fh, ">>:utf8", $path
270 or die "Couldn't open logfile $path: $!";
271
272 $fh->autoflush (1);
273
274 $fh;
275 };
276
277 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
278
279 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
280 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
281
282 print {$self->{log_fh}} "$ts ", @a, "\n";
283} 232}
284 233
285sub _stat_numdiff { 234sub _stat_numdiff {
286 my ($self, $name, $old, $new) = @_; 235 my ($self, $name, $old, $new) = @_;
287 236
… …
595 do { 544 do {
596 $id = pop @{$self->{bg_fetch}} 545 $id = pop @{$self->{bg_fetch}}
597 or return; 546 or return;
598 } while $self->{texture}[$id]; 547 } while $self->{texture}[$id];
599 548
600 CFPlus::DB::get tilecache => $id, sub { 549 CFPlus::DB::exists tilecache => $id, sub {
601 my ($data) = @_; 550 my ($exists) = @_;
602 551
603 return unless $self->{map}; # stop when destroyed 552 return unless $self->{map}; # stop when destroyed
604 553
605 $self->set_texture ($id => $data) 554 $self->have_tile ($id)
606 if defined $data; 555 if $exists;
607 556
608 $self->bg_fetch; 557 $self->bg_fetch;
609 }; 558 };
610} 559}
611 560
… …
756} 705}
757 706
758sub face_find { 707sub face_find {
759 my ($self, $facenum, $face, $cb) = @_; 708 my ($self, $facenum, $face, $cb) = @_;
760 709
761 my $hash = "$face->{chksum},$face->{name}"; 710 if ($face->{type} == 0) { # FT_FACE
762
763 my $id = CFPlus::DB::get_tile_id_sync $hash; 711 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
764 712
765 $face->{id} = $id; 713 $face->{id} = $id;
766 $self->{faceid}[$facenum] = $id; 714 $self->{faceid}[$facenum] = $id;
767 715
768 $self->{map}->set_tileid ($facenum => $id); 716 $self->{map}->set_tileid ($facenum => $id);
769 717
770 CFPlus::DB::get tilecache => $id, $cb; 718 CFPlus::DB::get tilecache => $id, $cb;
719
720 } 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;
723 }
771} 724}
772 725
773sub face_update { 726sub face_update {
774 my ($self, $facenum, $face, $changed) = @_; 727 my ($self, $facenum, $face, $changed) = @_;
775 728
729 if ($face->{type} == 0) { # FT_FACE
776 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 730 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
777 if $changed; 731 if $changed;
778 732
779 $self->set_texture ($face->{id} => delete $face->{image}); 733 $self->have_tile ($face->{id});
734
735 } elsif ($face->{type} & 1) { # split metadata
736 my $cb = sub { };
737
738 if ($face->{type} == 3) { # FT_MUSIC
739 $cb = sub {
740 $self->{music_meta}{$facenum} = $face;
741
742 ::message ({ markup => "downloaded song #$facenum" })
743 if $changed;
744
745 &::audio_music_push ($facenum);
746 };
747 } elsif ($face->{type} == 5) { # FT_SOUND
748 $cb = sub {
749 $self->{sound_meta}{$facenum} = $face;
750
751 ::message ({ markup => "downloaded sound #$facenum" })
752 if $changed;
753
754 &::audio_sound_push ($facenum);
755 };
756 }
757
758 if ($changed) { # new data
759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
760
761 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
762 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
763 $face->{meta} = $self->{json_coder}->decode ($meta_json);
764 ::add_license ($face);
765 $cb->();
766 };
767
768 } else {
769 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
770 ::add_license ($face);
771 $cb->();
772 }
773 }
780} 774}
781 775
782sub smooth_update { 776sub smooth_update {
783 my ($self, $facenum, $face) = @_; 777 my ($self, $facenum, $face) = @_;
784 778
785 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 779 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
786} 780}
787 781
788sub set_texture { 782sub have_tile {
789 my ($self, $id, $data) = @_; 783 my ($self, $tile) = @_;
790 784
791 return unless $self->{map}; 785 return unless $self->{map};
792 786
793 $self->{texture}[$id] = my $tex = 787 $self->{texture}[$tile] ||= my $tex =
794 new_from_image CFPlus::Texture 788 new CFPlus::Texture
795 $data, minify => 1, mipmap => 1; 789 tile => $tile, minify => 1, mipmap => 1, delay => 1;
796 790
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}) || []}; 791 $_->() for @{(delete $self->{face_cb}{$tile}) || []};
801} 792}
802 793
803sub connect_face_update { 794sub connect_face_update {
804 my ($self, $id, $cb) = @_; 795 my ($self, $id, $cb) = @_;
805 796
… …
811 @{$self->{face_cb}{$id}}; 802 @{$self->{face_cb}{$id}};
812 } 803 }
813} 804}
814 805
815sub sound_play { 806sub sound_play {
816 my ($self, $x, $y, $soundnum, $type) = @_; 807 my ($self, $type, $face, $dx, $dy, $vol) = @_;
817 808
818 $self->{sound_play}->($x, $y, $soundnum, $type); 809 &::audio_sound_play ($face, $dx, $dy, $vol)
810 unless $type & 1; # odd types are silent for future expansion
819} 811}
820 812
821my $LAST_QUERY; # server is stupid, stupid, stupid 813my $LAST_QUERY; # server is stupid, stupid, stupid
822 814
823sub query { 815sub query {
… …
888 $self->{$type} = $text; 880 $self->{$type} = $text;
889 } else { 881 } else {
890 $self->logprint ("msg: ", $text); 882 $self->logprint ("msg: ", $text);
891 return if $color < 0; # negative color == ignore if not understood 883 return if $color < 0; # negative color == ignore if not understood
892 884
893 my $fg = $CF_COLOR[$color % @CF_COLOR]; 885 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
894 886
895 ## try to create single paragraphs of multiple lines sent by the server 887 ## try to create single paragraphs of multiple lines sent by the server
896 # no longer neecssary with TRT servers 888 # no longer neecssary with TRT servers
897 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 889 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
898 890
899 ::message ({ fg => $fg, markup => $_ }) 891 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
900 for split /\n/, $text; 892 for split /\n/, $text;
901 893
902 $self->{statusbox}->add ($text, 894 $self->{statusbox}->add ($text,
903 group => $text, 895 group => $text,
904 fg => $fg, 896 fg => $fg,
… …
959 my ($self) = @_; 951 my ($self) = @_;
960 952
961 $self->{map_widget}->clr_commands; 953 $self->{map_widget}->clr_commands;
962 954
963 ::stop_game (); 955 ::stop_game ();
964}
965
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} 956}
999 957
1000sub update_floorbox { 958sub update_floorbox {
1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 959 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1002 return unless $::CONN; 960 return unless $::CONN;
… …
1160 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1118 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1161 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1119 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1162 . "map size $self->{mapw}×$self->{maph}\n" 1120 . "map size $self->{mapw}×$self->{maph}\n"
1163 ); 1121 );
1164 1122
1165 ::setup_build_button ($self->{editor_support}->{builder_ui});
1166} 1123}
1167 1124
1168sub logged_in { 1125sub logged_in {
1169 my ($self) = @_; 1126 my ($self) = @_;
1170 1127
… …
1190 1147
1191 $self->send_command ("output-sync $::CFG->{output_sync}"); 1148 $self->send_command ("output-sync $::CFG->{output_sync}");
1192 $self->send_command ("output-count $::CFG->{output_count}"); 1149 $self->send_command ("output-count $::CFG->{output_count}");
1193 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1150 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1194 $self->send_command ("pickup $::CFG->{pickup}"); 1151 $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} 1152}
1204 1153
1205sub lookat { 1154sub lookat {
1206 my ($self, $x, $y) = @_; 1155 my ($self, $x, $y) = @_;
1207 1156

Diff Legend

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