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.137 by root, Sat Jul 28 00:45:28 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];
… …
121 } 81 }
122 }); 82 });
123 83
124 $self->{json_coder} 84 $self->{json_coder}
125 ->convert_blessed 85 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub { 86 ->filter_json_single_key_object (__w_ => sub {
127 $self->{widget}{$_[0]} 87 $self->{widget}{$_[0]}
128 }); 88 });
129 89
130 # widgetset new 90 # widgetset new
131 $self->connect_ext (ws_n => sub { 91 $self->connect_ext (ws_n => sub {
132 my ($arg) = @_; 92 my ($id) = @_;
133 93
134 $self->{widgetset}{$arg{id}} = { 94 $self->{widgetset}{$id} = {
135 w => {}, 95 w => {},
136 }; 96 };
137 }); 97 });
138 98
139 # widgetset destroy 99 # widgetset destroy
140 $self->connect_ext (ws_d => sub { 100 $self->connect_ext (ws_d => sub {
141 my ($arg) = @_; 101 my ($id) = @_;
142 102
143 my $ws = delete $self->{widgetset}{$arg{id}} 103 my $ws = delete $self->{widgetset}{$id}
144 or return; 104 or return;
145 105
146 $_->destroy 106 $_->destroy
147 for values %{$ws->{w}}; 107 for values %{$ws->{w}};
148 }); 108 });
149 109
150 # widgetset destroy 110 # widgetset create
151 $self->connect_ext (ws_c => sub { 111 $self->connect_ext (ws_c => sub {
152 my ($arg) = @_; 112 my ($ws, $id, $class, $args) = @_;
153
154 my $args = $arg->{args} || {};
155 113
156 for my $ev (grep /^on_/, keys %$args) { 114 for my $ev (grep /^on_/, keys %$args) {
157 $args->{$ev} = sub { 115 $args->{$ev} = sub {
158 my $id = shift->{s_id}; 116 my $id = shift->{s_id};
159 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 117 $self->send_exti_msg (w_e => $id, $ev, \@_);
160 118
161 1 119 1
162 }; 120 };
163 } 121 }
164 122
165 if (my $widget = eval { 123 if (my $widget = eval {
166 local $SIG{__DIE__}; 124 local $SIG{__DIE__};
167 "CFPlus::UI::$arg->{class}"->new ( 125 "CFPlus::UI::$class"->new (
168 %$args, 126 %$args,
169 s_ws => $arg->{ws}, 127 s_ws => $ws,
170 s_id => $arg->{id}, 128 s_id => $id,
171 ) 129 )
172 } 130 }
173 ) { 131 ) {
174 $self->{widget}{$arg->{id}} 132 $self->{widget}{$id}
175 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 133 = $self->{widgetset}{$ws}{w}{$id}
176 = $widget; 134 = $widget;
177 135
178 $widget->connect (on_destroy => sub { 136 $widget->connect (on_destroy => sub {
179 my ($widget) = @_; 137 my ($widget) = @_;
180 138
181 delete $self->{widget}{$widget->{s_id}}; 139 delete $self->{widget}{$widget->{s_id}};
182 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 140 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
183 }); 141 });
184 } else { 142 } else {
185 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 143 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 144 $self->send_exti_msg (w_e => $id, "destroy");
187 } 145 }
188 }); 146 });
189 147
190 # widget call 148 # widget call
191 $self->connect_ext (w_c => sub { 149 $self->connect_ext (w_c => sub {
192 my ($arg) = @_; 150 my ($id, $rid, $method, $args) = @_;
193 151
194 my $w = $self->{widget}{$arg->{id}} 152 my $w = $self->{widget}{$id}
195 or return; 153 or return;
196 my $m = $arg->{name};
197 154
198 my $a = $arg->{args} || []; 155 $args ||= [];
199 156
200 if (exists $arg->{rid}) { 157 if ($rid) {
201 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); 158 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
202 } else { 159 } else {
203 $w->$m (@$a); 160 $w->$method (@$args);
204 } 161 }
205 }); 162 });
206 163
207 # widget set 164 # widget set
208 $self->connect_ext (w_s => sub { 165 $self->connect_ext (w_s => sub {
209 my ($arg) = @_; 166 my ($id, $attr) = @_;
210 167
211 my $w = $self->{widget}{$arg->{id}} 168 my $w = $self->{widget}{$id}
212 or return; 169 or return;
213
214 my $attr = $arg->{attr};
215 170
216 for (my $i = 0; $i < $#$attr; $i += 2) { 171 for (my $i = 0; $i < $#$attr; $i += 2) {
217 my ($member, $value) = @$attr[$i, $i+1]; 172 my ($member, $value) = @$attr[$i, $i+1];
218 if (defined $value) { 173 if (defined $value) {
219 $w->{$member} = $value; 174 $w->{$member} = $value;
… …
224 } 179 }
225 }); 180 });
226 181
227 # widget get 182 # widget get
228 $self->connect_ext (w_g => sub { 183 $self->connect_ext (w_g => sub {
229 my ($arg) = @_; 184 my ($id, $rid, $attr) = @_;
230 185
231 my $w = $self->{widget}{$arg->{id}} 186 my $w = $self->{widget}{$id}
232 or return; 187 or return;
233 188
234 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{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);
235 }); 197 });
236 198
237 # destroy widgets on logout 199 # destroy widgets on logout
238 $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 {
239 for my $ws (values %{delete $self->{widgetset} || {}}) { 201 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
761} 723}
762 724
763sub face_find { 725sub face_find {
764 my ($self, $facenum, $face, $cb) = @_; 726 my ($self, $facenum, $face, $cb) = @_;
765 727
766 my $hash = "$face->{chksum},$face->{name}"; 728 if ($face->{type} == 0) { # FT_FACE
767
768 my $id = CFPlus::DB::get_tile_id_sync $hash; 729 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
769 730
770 $face->{id} = $id; 731 $face->{id} = $id;
771 $self->{faceid}[$facenum] = $id; 732 $self->{faceid}[$facenum] = $id;
772 733
773 $self->{map}->set_tileid ($facenum => $id); 734 $self->{map}->set_tileid ($facenum => $id);
774 735
775 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 }
776} 742}
777 743
778sub face_update { 744sub face_update {
779 my ($self, $facenum, $face, $changed) = @_; 745 my ($self, $facenum, $face, $changed) = @_;
780 746
747 if ($face->{type} == 0) { # FT_FACE
781 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 748 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
782 if $changed; 749 if $changed;
783 750
784 $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
756 if ($face->{type} == 3) { # FT_MUSIC
757 $cb = sub {
758 $self->{music_meta}{$facenum} = $face;
759
760 ::message ({ markup => "downloaded song #$facenum" })
761 if $changed;
762
763 &::audio_music_set ($self->{songs});
764 };
765 }
766
767 if ($changed) { # new data
768 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
769 my $path = CFPlus::DB::path_of_res $face->{name};
770
771 CFPlus::DB::write_file $path, $data, sub {
772 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
773 $face->{meta} = $self->{json_coder}->decode ($meta_json);
774 $face->{path} = $path;
775
776 $cb->();
777 };
778 };
779 } else {
780 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
781 $cb->();
782 }
783 }
785} 784}
786 785
787sub smooth_update { 786sub smooth_update {
788 my ($self, $facenum, $face) = @_; 787 my ($self, $facenum, $face) = @_;
789 788
… …
817 } 816 }
818} 817}
819 818
820sub sound_play { 819sub sound_play {
821 my ($self, $x, $y, $soundnum, $type) = @_; 820 my ($self, $x, $y, $soundnum, $type) = @_;
821 warn "sound play <@_>\n";#d#
822 822
823 $self->{sound_play}->($x, $y, $soundnum, $type); 823 #$self->{sound_play}->($x, $y, $soundnum, $type);
824} 824}
825 825
826my $LAST_QUERY; # server is stupid, stupid, stupid 826my $LAST_QUERY; # server is stupid, stupid, stupid
827 827
828sub query { 828sub query {
… …
899 899
900 ## try to create single paragraphs of multiple lines sent by the server 900 ## try to create single paragraphs of multiple lines sent by the server
901 # no longer neecssary with TRT servers 901 # no longer neecssary with TRT servers
902 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 902 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
903 903
904 ::message ({ fg => $fg, markup => $_ }) 904 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
905 for split /\n/, $text; 905 for split /\n/, $text;
906 906
907 $self->{statusbox}->add ($text, 907 $self->{statusbox}->add ($text,
908 group => $text, 908 group => $text,
909 fg => $fg, 909 fg => $fg,
… …
1165 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1165 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1166 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1166 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1167 . "map size $self->{mapw}×$self->{maph}\n" 1167 . "map size $self->{mapw}×$self->{maph}\n"
1168 ); 1168 );
1169 1169
1170 ::setup_build_button ($self->{editor_support}->{builder_ui});
1171} 1170}
1172 1171
1173sub logged_in { 1172sub logged_in {
1174 my ($self) = @_; 1173 my ($self) = @_;
1175 1174
… …
1195 1194
1196 $self->send_command ("output-sync $::CFG->{output_sync}"); 1195 $self->send_command ("output-sync $::CFG->{output_sync}");
1197 $self->send_command ("output-count $::CFG->{output_count}"); 1196 $self->send_command ("output-count $::CFG->{output_count}");
1198 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1197 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1199 $self->send_command ("pickup $::CFG->{pickup}"); 1198 $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} 1199}
1209 1200
1210sub lookat { 1201sub lookat {
1211 my ($self, $x, $y) = @_; 1202 my ($self, $x, $y) = @_;
1212 1203

Diff Legend

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