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.128 by root, Mon Jul 23 21:03:26 2007 UTC vs.
Revision 1.147 by root, Thu Aug 9 03:40:01 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 $self->update_fx_want;
109 63
110 if (my $ts = $cap{tileset}) { 64 if (my $ts = $cap{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) { 65 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default; 66 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3]; 67 $self->{tilesize} = $default->[3];
… …
121 } 75 }
122 }); 76 });
123 77
124 $self->{json_coder} 78 $self->{json_coder}
125 ->convert_blessed 79 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub { 80 ->filter_json_single_key_object (__w_ => sub {
127 $self->{widget}{$_[0]} 81 $self->{widget}{$_[0]}
128 }); 82 });
129 83
130 # widgetset new 84 # widgetset new
131 $self->connect_ext (ws_n => sub { 85 $self->connect_ext (ws_n => sub {
132 my ($arg) = @_; 86 my ($id) = @_;
133 87
134 $self->{widgetset}{$arg{id}} = { 88 $self->{widgetset}{$id} = {
135 w => {}, 89 w => {},
136 }; 90 };
137 }); 91 });
138 92
139 # widgetset destroy 93 # widgetset destroy
140 $self->connect_ext (ws_d => sub { 94 $self->connect_ext (ws_d => sub {
141 my ($arg) = @_; 95 my ($id) = @_;
142 96
143 my $ws = delete $self->{widgetset}{$arg{id}} 97 my $ws = delete $self->{widgetset}{$id}
144 or return; 98 or return;
145 99
146 $_->destroy 100 $_->destroy
147 for values %{$ws->{w}}; 101 for values %{$ws->{w}};
148 }); 102 });
149 103
150 # widgetset destroy 104 # widgetset create
151 $self->connect_ext (ws_c => sub { 105 $self->connect_ext (ws_c => sub {
152 my ($arg) = @_; 106 my ($ws, $id, $class, $args) = @_;
153
154 my $args = $arg->{args} || {};
155 107
156 for my $ev (grep /^on_/, keys %$args) { 108 for my $ev (grep /^on_/, keys %$args) {
157 $args->{$ev} = sub { 109 $args->{$ev} = sub {
158 my $id = shift->{s_id}; 110 my $id = shift->{s_id};
159 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 111 $self->send_exti_msg (w_e => $id, $ev, \@_);
160 112
161 1 113 1
162 }; 114 };
163 } 115 }
164 116
165 if (my $widget = eval { 117 if (my $widget = eval {
166 local $SIG{__DIE__}; 118 local $SIG{__DIE__};
167 "CFPlus::UI::$arg->{class}"->new ( 119 "CFPlus::UI::$class"->new (
168 %$args, 120 %$args,
169 s_ws => $arg->{ws}, 121 s_ws => $ws,
170 s_id => $arg->{id}, 122 s_id => $id,
171 ) 123 )
172 } 124 }
173 ) { 125 ) {
174 $self->{widget}{$arg->{id}} 126 $self->{widget}{$id}
175 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 127 = $self->{widgetset}{$ws}{w}{$id}
176 = $widget; 128 = $widget;
177 129
178 $widget->connect (on_destroy => sub { 130 $widget->connect (on_destroy => sub {
179 my ($widget) = @_; 131 my ($widget) = @_;
180 132
181 delete $self->{widget}{$widget->{s_id}}; 133 delete $self->{widget}{$widget->{s_id}};
182 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 134 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
183 }); 135 });
184 } else { 136 } else {
185 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 137 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 138 $self->send_exti_msg (w_e => $id, "destroy");
187 } 139 }
188 }); 140 });
189 141
190 # widget call 142 # widget call
191 $self->connect_ext (w_c => sub { 143 $self->connect_ext (w_c => sub {
192 my ($arg) = @_; 144 my ($id, $rid, $method, $args) = @_;
193 145
194 my $w = $self->{widget}{$arg->{id}} 146 my $w = $self->{widget}{$id}
195 or return; 147 or return;
196 my $m = $arg->{name};
197 148
198 my $a = $arg->{args} || []; 149 $args ||= [];
199 150
200 if (exists $arg->{rid}) { 151 if ($rid) {
201 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); 152 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
202 } else { 153 } else {
203 $w->$m (@$a); 154 $w->$method (@$args);
204 } 155 }
205 }); 156 });
206 157
207 # widget set 158 # widget set
208 $self->connect_ext (w_s => sub { 159 $self->connect_ext (w_s => sub {
209 my ($arg) = @_; 160 my ($id, $attr) = @_;
210 161
211 my $w = $self->{widget}{$arg->{id}} 162 my $w = $self->{widget}{$id}
212 or return; 163 or return;
213
214 my $attr = $arg->{attr};
215 164
216 for (my $i = 0; $i < $#$attr; $i += 2) { 165 for (my $i = 0; $i < $#$attr; $i += 2) {
217 my ($member, $value) = @$attr[$i, $i+1]; 166 my ($member, $value) = @$attr[$i, $i+1];
218 if (defined $value) { 167 if (defined $value) {
219 $w->{$member} = $value; 168 $w->{$member} = $value;
… …
224 } 173 }
225 }); 174 });
226 175
227 # widget get 176 # widget get
228 $self->connect_ext (w_g => sub { 177 $self->connect_ext (w_g => sub {
229 my ($arg) = @_; 178 my ($id, $rid, $attr) = @_;
230 179
231 my $w = $self->{widget}{$arg->{id}} 180 my $w = $self->{widget}{$id}
232 or return; 181 or return;
233 182
234 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{attr}}]); 183 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
184 });
185
186 # message window
187 $self->connect_ext (channel_info => sub {
188 my ($info) = @_;
189 $self->{channels}->{$info->{id}} = $info;
190 $::MESSAGE_WINDOW->add_channel ($info);
235 }); 191 });
236 192
237 # destroy widgets on logout 193 # destroy widgets on logout
238 $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 {
239 for my $ws (values %{delete $self->{widgetset} || {}}) { 195 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
263 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 219 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
264 220
265 $self 221 $self
266} 222}
267 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
268sub logprint { 233sub logprint {
269 my ($self, @a) = @_; 234 my ($self, @a) = @_;
270 235
271 $self->{log_fh} ||= do { 236 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
272 my $path = "$Crossfire::VARDIR/log.$self->{host}";
273
274 open my $fh, ">>:utf8", $path
275 or die "Couldn't open logfile $path: $!";
276
277 $fh->autoflush (1);
278
279 $fh;
280 };
281
282 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
283
284 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
285 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
286
287 print {$self->{log_fh}} "$ts ", @a, "\n";
288} 237}
289 238
290sub _stat_numdiff { 239sub _stat_numdiff {
291 my ($self, $name, $old, $new) = @_; 240 my ($self, $name, $old, $new) = @_;
292 241
… …
600 do { 549 do {
601 $id = pop @{$self->{bg_fetch}} 550 $id = pop @{$self->{bg_fetch}}
602 or return; 551 or return;
603 } while $self->{texture}[$id]; 552 } while $self->{texture}[$id];
604 553
605 CFPlus::DB::get tilecache => $id, sub { 554 CFPlus::DB::exists tilecache => $id, sub {
606 my ($data) = @_; 555 my ($exists) = @_;
607 556
608 return unless $self->{map}; # stop when destroyed 557 return unless $self->{map}; # stop when destroyed
609 558
610 $self->set_texture ($id => $data) 559 $self->have_tile ($id)
611 if defined $data; 560 if $exists;
612 561
613 $self->bg_fetch; 562 $self->bg_fetch;
614 }; 563 };
615} 564}
616 565
… …
761} 710}
762 711
763sub face_find { 712sub face_find {
764 my ($self, $facenum, $face, $cb) = @_; 713 my ($self, $facenum, $face, $cb) = @_;
765 714
766 my $hash = "$face->{chksum},$face->{name}"; 715 if ($face->{type} == 0) { # FT_FACE
767
768 my $id = CFPlus::DB::get_tile_id_sync $hash; 716 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
769 717
770 $face->{id} = $id; 718 $face->{id} = $id;
771 $self->{faceid}[$facenum] = $id; 719 $self->{faceid}[$facenum] = $id;
772 720
773 $self->{map}->set_tileid ($facenum => $id); 721 $self->{map}->set_tileid ($facenum => $id);
774 722
775 CFPlus::DB::get tilecache => $id, $cb; 723 CFPlus::DB::get tilecache => $id, $cb;
724
725 } elsif ($face->{type} & 1) { # with metadata
726 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
727 CFPlus::DB::get res_meta => $face->{name}, $cb;
728 }
776} 729}
777 730
778sub face_update { 731sub face_update {
779 my ($self, $facenum, $face, $changed) = @_; 732 my ($self, $facenum, $face, $changed) = @_;
780 733
734 if ($face->{type} == 0) { # FT_FACE
781 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 735 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
782 if $changed; 736 if $changed;
783 737
784 $self->set_texture ($face->{id} => delete $face->{image}); 738 $self->have_tile ($face->{id});
739
740 } elsif ($face->{type} & 1) { # split metadata
741 if ($changed) { # new data
742 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
743 $face->{meta} = $self->{json_coder}->decode ($meta_json);
744
745 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
746 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
747 } else {
748 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
749 }
750
751 ::add_license ($face);
752
753 if ($face->{type} == 3) { # FT_MUSIC
754 $self->{music_meta}{$facenum} = $face;
755
756 ::message ({ markup => "downloaded song #$facenum" })
757 if $changed;
758
759 &::audio_music_push ($facenum);
760 } elsif ($face->{type} == 5) { # FT_SOUND
761 $self->{sound_meta}{$facenum} = $face;
762
763 ::message ({ markup => "downloaded sound #$facenum" })
764 if $changed;
765
766 &::audio_sound_push ($facenum);
767 }
768
769 }
785} 770}
786 771
787sub smooth_update { 772sub smooth_update {
788 my ($self, $facenum, $face) = @_; 773 my ($self, $facenum, $face) = @_;
789 774
790 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 775 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
791} 776}
792 777
793sub set_texture { 778sub have_tile {
794 my ($self, $id, $data) = @_; 779 my ($self, $tile) = @_;
795 780
796 return unless $self->{map}; 781 return unless $self->{map};
797 782
798 $self->{texture}[$id] = my $tex = 783 $self->{texture}[$tile] ||= my $tex =
799 new_from_image CFPlus::Texture 784 new CFPlus::Texture
800 $data, minify => 1, mipmap => 1; 785 tile => $tile, minify => 1, mipmap => 1, delay => 1;
801 786
802 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
803 $self->{map_widget}->update;
804
805 $_->() for @{(delete $self->{face_cb}{$id}) || []}; 787 $_->() for @{(delete $self->{face_cb}{$tile}) || []};
806} 788}
807 789
808sub connect_face_update { 790sub connect_face_update {
809 my ($self, $id, $cb) = @_; 791 my ($self, $id, $cb) = @_;
810 792
… …
816 @{$self->{face_cb}{$id}}; 798 @{$self->{face_cb}{$id}};
817 } 799 }
818} 800}
819 801
820sub sound_play { 802sub sound_play {
821 my ($self, $x, $y, $soundnum, $type) = @_; 803 my ($self, $type, $face, $dx, $dy, $vol) = @_;
822 804
823 $self->{sound_play}->($x, $y, $soundnum, $type); 805 &::audio_sound_play ($face, $dx, $dy, $vol)
806 unless $type & 1; # odd types are silent for future expansion
824} 807}
825 808
826my $LAST_QUERY; # server is stupid, stupid, stupid 809my $LAST_QUERY; # server is stupid, stupid, stupid
827 810
828sub query { 811sub query {
… …
893 $self->{$type} = $text; 876 $self->{$type} = $text;
894 } else { 877 } else {
895 $self->logprint ("msg: ", $text); 878 $self->logprint ("msg: ", $text);
896 return if $color < 0; # negative color == ignore if not understood 879 return if $color < 0; # negative color == ignore if not understood
897 880
898 my $fg = $CF_COLOR[$color % @CF_COLOR]; 881 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
899 882
900 ## try to create single paragraphs of multiple lines sent by the server 883 ## try to create single paragraphs of multiple lines sent by the server
901 # no longer neecssary with TRT servers 884 # no longer neecssary with TRT servers
902 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 885 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
903 886
904 ::message ({ fg => $fg, markup => $_ }) 887 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
905 for split /\n/, $text; 888 for split /\n/, $text;
906 889
907 $self->{statusbox}->add ($text, 890 $self->{statusbox}->add ($text,
908 group => $text, 891 group => $text,
909 fg => $fg, 892 fg => $fg,
… …
964 my ($self) = @_; 947 my ($self) = @_;
965 948
966 $self->{map_widget}->clr_commands; 949 $self->{map_widget}->clr_commands;
967 950
968 ::stop_game (); 951 ::stop_game ();
969}
970
971sub image_info {
972 my ($self, $numfaces) = @_;
973
974 $self->{num_faces} = $numfaces;
975 $self->{face_prefetch} = [1 .. $numfaces];
976 $self->face_prefetch;
977}
978
979sub face_prefetch {
980 my ($self) = @_;
981
982 return unless $::CFG->{face_prefetch};
983
984 if ($self->{num_faces}) {
985 return if @{ $self->{send_queue} || [] };
986 my $todo = @{ $self->{face_prefetch} }
987 or return;
988
989 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
990
991 $self->send ("requestinfo image_sums $face $face");
992
993 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
994 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
995 } elsif (!exists $self->{num_faces}) {
996 $self->send ("requestinfo image_info");
997
998 $self->{num_faces} = 0;
999
1000 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
1001 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
1002 }
1003} 952}
1004 953
1005sub update_floorbox { 954sub update_floorbox {
1006 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 955 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1007 return unless $::CONN; 956 return unless $::CONN;
… …
1165 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1114 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1166 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1115 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1167 . "map size $self->{mapw}×$self->{maph}\n" 1116 . "map size $self->{mapw}×$self->{maph}\n"
1168 ); 1117 );
1169 1118
1170 ::setup_build_button ($self->{editor_support}->{builder_ui});
1171} 1119}
1172 1120
1173sub logged_in { 1121sub logged_in {
1174 my ($self) = @_; 1122 my ($self) = @_;
1175 1123
… …
1195 1143
1196 $self->send_command ("output-sync $::CFG->{output_sync}"); 1144 $self->send_command ("output-sync $::CFG->{output_sync}");
1197 $self->send_command ("output-count $::CFG->{output_count}"); 1145 $self->send_command ("output-count $::CFG->{output_count}");
1198 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1146 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1199 $self->send_command ("pickup $::CFG->{pickup}"); 1147 $self->send_command ("pickup $::CFG->{pickup}");
1200}
1201
1202sub buildat {
1203 my ($self, $builditem, $x, $y) = @_;
1204
1205 if ($self->{cfplus_ext}) {
1206 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1207 }
1208} 1148}
1209 1149
1210sub lookat { 1150sub lookat {
1211 my ($self, $x, $y) = @_; 1151 my ($self, $x, $y) = @_;
1212 1152

Diff Legend

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