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.130 by root, Tue Jul 24 00:28:07 2007 UTC vs.
Revision 1.139 by root, Sun Jul 29 18:22:34 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;
… …
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 (music => sub {
54 my (%ev) = @_; 54 my ($ev) = @_;
55 55
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]); 56 &::audio_music_set ($self->{songs} = $ev->{play})
104 } 57 if $ev->{play};
105 }); 58 });
106 59
107 $self->connect_ext (capabilities => sub { 60 $self->connect_ext (capabilities => sub {
108 my (%cap) = @_; 61 my (%cap) = @_;
62
63 #$self->send ("setup sound 0"); # we use a different protocol
64
65 $self->send_exti_msg (fx_want => {
66 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
67 5 => !!$::CFG->{audio_enable}, # FT_SOUND
68 });
109 69
110 if (my $ts = $cap{tileset}) { 70 if (my $ts = $cap{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) { 71 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default; 72 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3]; 73 $self->{tilesize} = $default->[3];
… …
225 185
226 my $w = $self->{widget}{$id} 186 my $w = $self->{widget}{$id}
227 or return; 187 or return;
228 188
229 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); 189 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
190 });
191
192 # message window
193 $self->connect_ext (channel_info => sub {
194 my ($info) = @_;
195 $self->{channels}->{$info->{id}} = $info;
196 $::MESSAGE_WINDOW->add_channel ($info);
230 }); 197 });
231 198
232 # destroy widgets on logout 199 # destroy widgets on logout
233 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 200 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
234 for my $ws (values %{delete $self->{widgetset} || {}}) { 201 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
756} 723}
757 724
758sub face_find { 725sub face_find {
759 my ($self, $facenum, $face, $cb) = @_; 726 my ($self, $facenum, $face, $cb) = @_;
760 727
761 my $hash = "$face->{chksum},$face->{name}"; 728 if ($face->{type} == 0) { # FT_FACE
762
763 my $id = CFPlus::DB::get_tile_id_sync $hash; 729 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
764 730
765 $face->{id} = $id; 731 $face->{id} = $id;
766 $self->{faceid}[$facenum] = $id; 732 $self->{faceid}[$facenum] = $id;
767 733
768 $self->{map}->set_tileid ($facenum => $id); 734 $self->{map}->set_tileid ($facenum => $id);
769 735
770 CFPlus::DB::get tilecache => $id, $cb; 736 CFPlus::DB::get tilecache => $id, $cb;
737
738 } 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-metadata" => $face->{name}, $cb;
741 }
771} 742}
772 743
773sub face_update { 744sub face_update {
774 my ($self, $facenum, $face, $changed) = @_; 745 my ($self, $facenum, $face, $changed) = @_;
775 746
747 if ($face->{type} == 0) { # FT_FACE
776 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 748 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
777 if $changed; 749 if $changed;
778 750
779 $self->set_texture ($face->{id} => delete $face->{image}); 751 $self->set_texture ($face->{id} => delete $face->{data});
752
753 } elsif ($face->{type} & 1) { # split metadata
754 my $cb = sub { };
755 my $path;
756
757 if ($face->{type} == 3) { # FT_MUSIC
758 # store externally
759 $path = CFPlus::DB::path_of_res $face->{name};
760
761 $cb = sub {
762 $self->{music_meta}{$facenum} = $face;
763
764 ::message ({ markup => "downloaded song #$facenum" })
765 if $changed;
766
767 &::audio_music_set ($self->{songs});
768 };
769 } elsif ($face->{type} == 5) { # FT_SOUND
770 $cb = sub {
771 $self->{sound_meta}{$facenum} = $face;
772
773 use Data::Dumper; warn Dumper $face;#d#
774 ::message ({ markup => "downloaded sound #$facenum" })
775 if $changed;
776 };
777 }
778
779
780 if ($changed) { # new data
781 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
782
783 my $put_cb = sub {
784 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
785 $face->{meta} = $self->{json_coder}->decode ($meta_json);
786 $face->{path} = $path;
787
788 $cb->();
789 };
790 };
791
792 if (defined $path) {
793 CFPlus::DB::write_file $path, $data, $put_cb;
794 } else {
795 CFPlus::DB::put "res-data" => $face->{name} => $data, $put_cb;
796 }
797 } else {
798 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
799 $face->{path} = $path;
800 $cb->();
801 }
802 }
780} 803}
781 804
782sub smooth_update { 805sub smooth_update {
783 my ($self, $facenum, $face) = @_; 806 my ($self, $facenum, $face) = @_;
784 807
… …
812 } 835 }
813} 836}
814 837
815sub sound_play { 838sub sound_play {
816 my ($self, $x, $y, $soundnum, $type) = @_; 839 my ($self, $x, $y, $soundnum, $type) = @_;
840 warn "sound play <@_>\n";#d#
817 841
818 $self->{sound_play}->($x, $y, $soundnum, $type); 842 #$self->{sound_play}->($x, $y, $soundnum, $type);
819} 843}
820 844
821my $LAST_QUERY; # server is stupid, stupid, stupid 845my $LAST_QUERY; # server is stupid, stupid, stupid
822 846
823sub query { 847sub query {
… …
888 $self->{$type} = $text; 912 $self->{$type} = $text;
889 } else { 913 } else {
890 $self->logprint ("msg: ", $text); 914 $self->logprint ("msg: ", $text);
891 return if $color < 0; # negative color == ignore if not understood 915 return if $color < 0; # negative color == ignore if not understood
892 916
893 my $fg = $CF_COLOR[$color % @CF_COLOR]; 917 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
894 918
895 ## try to create single paragraphs of multiple lines sent by the server 919 ## try to create single paragraphs of multiple lines sent by the server
896 # no longer neecssary with TRT servers 920 # no longer neecssary with TRT servers
897 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 921 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
898 922
899 ::message ({ fg => $fg, markup => $_ }) 923 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
900 for split /\n/, $text; 924 for split /\n/, $text;
901 925
902 $self->{statusbox}->add ($text, 926 $self->{statusbox}->add ($text,
903 group => $text, 927 group => $text,
904 fg => $fg, 928 fg => $fg,
… …
959 my ($self) = @_; 983 my ($self) = @_;
960 984
961 $self->{map_widget}->clr_commands; 985 $self->{map_widget}->clr_commands;
962 986
963 ::stop_game (); 987 ::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} 988}
999 989
1000sub update_floorbox { 990sub update_floorbox {
1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 991 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1002 return unless $::CONN; 992 return unless $::CONN;
… …
1160 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1150 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1161 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1151 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1162 . "map size $self->{mapw}×$self->{maph}\n" 1152 . "map size $self->{mapw}×$self->{maph}\n"
1163 ); 1153 );
1164 1154
1165 ::setup_build_button ($self->{editor_support}->{builder_ui});
1166} 1155}
1167 1156
1168sub logged_in { 1157sub logged_in {
1169 my ($self) = @_; 1158 my ($self) = @_;
1170 1159
… …
1190 1179
1191 $self->send_command ("output-sync $::CFG->{output_sync}"); 1180 $self->send_command ("output-sync $::CFG->{output_sync}");
1192 $self->send_command ("output-count $::CFG->{output_count}"); 1181 $self->send_command ("output-count $::CFG->{output_count}");
1193 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1182 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1194 $self->send_command ("pickup $::CFG->{pickup}"); 1183 $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} 1184}
1204 1185
1205sub lookat { 1186sub lookat {
1206 my ($self, $x, $y) = @_; 1187 my ($self, $x, $y) = @_;
1207 1188

Diff Legend

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