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.133 by elmex, Tue Jul 24 18:39:39 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_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 {
132 my ($arg) = @_; 90 my ($id) = @_;
133 91
134 $self->{widgetset}{$arg{id}} = { 92 $self->{widgetset}{$id} = {
135 w => {}, 93 w => {},
136 }; 94 };
137 }); 95 });
138 96
139 # widgetset destroy 97 # widgetset destroy
140 $self->connect_ext (ws_d => sub { 98 $self->connect_ext (ws_d => sub {
141 my ($arg) = @_; 99 my ($id) = @_;
142 100
143 my $ws = delete $self->{widgetset}{$arg{id}} 101 my $ws = delete $self->{widgetset}{$id}
144 or return; 102 or return;
145 103
146 $_->destroy 104 $_->destroy
147 for values %{$ws->{w}}; 105 for values %{$ws->{w}};
148 }); 106 });
149 107
150 # widgetset destroy 108 # widgetset create
151 $self->connect_ext (ws_c => sub { 109 $self->connect_ext (ws_c => sub {
152 my ($arg) = @_; 110 my ($ws, $id, $class, $args) = @_;
153
154 my $args = $arg->{args} || {};
155 111
156 for my $ev (grep /^on_/, keys %$args) { 112 for my $ev (grep /^on_/, keys %$args) {
157 $args->{$ev} = sub { 113 $args->{$ev} = sub {
158 my $id = shift->{s_id}; 114 my $id = shift->{s_id};
159 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 115 $self->send_exti_msg (w_e => $id, $ev, \@_);
160 116
161 1 117 1
162 }; 118 };
163 } 119 }
164 120
165 if (my $widget = eval { 121 if (my $widget = eval {
166 local $SIG{__DIE__}; 122 local $SIG{__DIE__};
167 "CFPlus::UI::$arg->{class}"->new ( 123 "CFPlus::UI::$class"->new (
168 %$args, 124 %$args,
169 s_ws => $arg->{ws}, 125 s_ws => $ws,
170 s_id => $arg->{id}, 126 s_id => $id,
171 ) 127 )
172 } 128 }
173 ) { 129 ) {
174 $self->{widget}{$arg->{id}} 130 $self->{widget}{$id}
175 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 131 = $self->{widgetset}{$ws}{w}{$id}
176 = $widget; 132 = $widget;
177 133
178 $widget->connect (on_destroy => sub { 134 $widget->connect (on_destroy => sub {
179 my ($widget) = @_; 135 my ($widget) = @_;
180 136
181 delete $self->{widget}{$widget->{s_id}}; 137 delete $self->{widget}{$widget->{s_id}};
182 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
183 }); 139 });
184 } else { 140 } else {
185 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 141 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 142 $self->send_exti_msg (w_e => $id, "destroy");
187 } 143 }
188 }); 144 });
189 145
190 # widget call 146 # widget call
191 $self->connect_ext (w_c => sub { 147 $self->connect_ext (w_c => sub {
192 my ($arg) = @_; 148 my ($id, $rid, $method, $args) = @_;
193 149
194 my $w = $self->{widget}{$arg->{id}} 150 my $w = $self->{widget}{$id}
195 or return; 151 or return;
196 my $m = $arg->{name};
197 152
198 my $a = $arg->{args} || []; 153 $args ||= [];
199 154
200 if (exists $arg->{rid}) { 155 if ($rid) {
201 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); 156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
202 } else { 157 } else {
203 $w->$m (@$a); 158 $w->$method (@$args);
204 } 159 }
205 }); 160 });
206 161
207 # widget set 162 # widget set
208 $self->connect_ext (w_s => sub { 163 $self->connect_ext (w_s => sub {
209 my ($arg) = @_; 164 my ($id, $attr) = @_;
210 165
211 my $w = $self->{widget}{$arg->{id}} 166 my $w = $self->{widget}{$id}
212 or return; 167 or return;
213
214 my $attr = $arg->{attr};
215 168
216 for (my $i = 0; $i < $#$attr; $i += 2) { 169 for (my $i = 0; $i < $#$attr; $i += 2) {
217 my ($member, $value) = @$attr[$i, $i+1]; 170 my ($member, $value) = @$attr[$i, $i+1];
218 if (defined $value) { 171 if (defined $value) {
219 $w->{$member} = $value; 172 $w->{$member} = $value;
… …
224 } 177 }
225 }); 178 });
226 179
227 # widget get 180 # widget get
228 $self->connect_ext (w_g => sub { 181 $self->connect_ext (w_g => sub {
229 my ($arg) = @_; 182 my ($id, $rid, $attr) = @_;
230 183
231 my $w = $self->{widget}{$arg->{id}} 184 my $w = $self->{widget}{$id}
232 or return; 185 or return;
233 186
234 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{attr}}]); 187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 });
189
190 # message window
191 $self->connect_ext (channel_info => sub {
192 $::MESSAGE_WINDOW->add_channel ($_[0]);
235 }); 193 });
236 194
237 # destroy widgets on logout 195 # destroy widgets on logout
238 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 196 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
239 for my $ws (values %{delete $self->{widgetset} || {}}) { 197 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
761} 719}
762 720
763sub face_find { 721sub face_find {
764 my ($self, $facenum, $face, $cb) = @_; 722 my ($self, $facenum, $face, $cb) = @_;
765 723
766 my $hash = "$face->{chksum},$face->{name}"; 724 if ($face->{type} == 0) { # FT_FACE
767
768 my $id = CFPlus::DB::get_tile_id_sync $hash; 725 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
769 726
770 $face->{id} = $id; 727 $face->{id} = $id;
771 $self->{faceid}[$facenum] = $id; 728 $self->{faceid}[$facenum] = $id;
772 729
773 $self->{map}->set_tileid ($facenum => $id); 730 $self->{map}->set_tileid ($facenum => $id);
774 731
775 CFPlus::DB::get tilecache => $id, $cb; 732 CFPlus::DB::get tilecache => $id, $cb;
733
734 } 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;
737 }
776} 738}
777 739
778sub face_update { 740sub face_update {
779 my ($self, $facenum, $face, $changed) = @_; 741 my ($self, $facenum, $face, $changed) = @_;
780 742
743 if ($face->{type} == 0) { # FT_FACE
781 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 744 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
782 if $changed; 745 if $changed;
783 746
784 $self->set_texture ($face->{id} => delete $face->{image}); 747 $self->set_texture ($face->{id} => delete $face->{data});
748
749 } 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
764 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);
770 $face->{path} = $path;
771
772 $cb->();
773 };
774 };
775 } else {
776 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
777 $cb->();
778 }
779 }
785} 780}
786 781
787sub smooth_update { 782sub smooth_update {
788 my ($self, $facenum, $face) = @_; 783 my ($self, $facenum, $face) = @_;
789 784
… …
899 894
900 ## try to create single paragraphs of multiple lines sent by the server 895 ## try to create single paragraphs of multiple lines sent by the server
901 # no longer neecssary with TRT servers 896 # no longer neecssary with TRT servers
902 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 897 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
903 898
904 ::message ({ fg => $fg, markup => $_ }) 899 ::message ({ fg => $fg, markup => $_, type => $type })
905 for split /\n/, $text; 900 for split /\n/, $text;
906 901
907 $self->{statusbox}->add ($text, 902 $self->{statusbox}->add ($text,
908 group => $text, 903 group => $text,
909 fg => $fg, 904 fg => $fg,

Diff Legend

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