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.126 by root, Sun Jul 22 19:34:58 2007 UTC vs.
Revision 1.132 by root, Tue Jul 24 05:13:23 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 (event_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 (event_capabilities => sub { 60 $self->connect_ext (capabilities => sub {
108 my ($cap) = @_; 61 my (%cap) = @_;
109 62
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
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];
114 $self->setup_req (tileset => $default->[0]); 72 $self->setup_req (tileset => $default->[0]);
115 73
… …
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 168
214 my $attr = $arg->{attr};
215
216 for (my $i = 0; $i < $#$attr; $i += 2) { 169 for (my $i = 0; $i < $#$attr; $i += 2) {
217 $w->{$attr->[$i]} = $attr->[$i+1]; 170 my ($member, $value) = @$attr[$i, $i+1];
171 if (defined $value) {
172 $w->{$member} = $value;
173 } else {
174 delete $w->{$member};
175 }
218 $w->{parent}->realloc if $attr->[$i] =~ /^c_/ && $w->{visible};#d# really? 176 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
219 } 177 }
220 }); 178 });
221 179
222 # widget get 180 # widget get
223 $self->connect_ext (w_g => sub { 181 $self->connect_ext (w_g => sub {
224 my ($arg) = @_; 182 my ($id, $rid, $attr) = @_;
225 183
226 my $w = $self->{widget}{$arg->{id}} 184 my $w = $self->{widget}{$id}
227 or return; 185 or return;
228 186
229 $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]);
230 }); 188 });
231 189
232 # destroy widgets on logout 190 # destroy widgets on logout
233 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 191 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
234 for my $ws (values %{delete $self->{widgetset} || {}}) { 192 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
756} 714}
757 715
758sub face_find { 716sub face_find {
759 my ($self, $facenum, $face, $cb) = @_; 717 my ($self, $facenum, $face, $cb) = @_;
760 718
761 my $hash = "$face->{chksum},$face->{name}"; 719 if ($face->{type} == 0) { # FT_FACE
762
763 my $id = CFPlus::DB::get_tile_id_sync $hash; 720 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
764 721
765 $face->{id} = $id; 722 $face->{id} = $id;
766 $self->{faceid}[$facenum] = $id; 723 $self->{faceid}[$facenum] = $id;
767 724
768 $self->{map}->set_tileid ($facenum => $id); 725 $self->{map}->set_tileid ($facenum => $id);
769 726
770 CFPlus::DB::get tilecache => $id, $cb; 727 CFPlus::DB::get tilecache => $id, $cb;
728
729 } elsif ($face->{type} & 1) { # with metadata
730 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
731 CFPlus::DB::get "res-metadata" => $face->{name}, $cb;
732 }
771} 733}
772 734
773sub face_update { 735sub face_update {
774 my ($self, $facenum, $face, $changed) = @_; 736 my ($self, $facenum, $face, $changed) = @_;
775 737
738 if ($face->{type} == 0) { # FT_FACE
776 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 739 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
777 if $changed; 740 if $changed;
778 741
779 $self->set_texture ($face->{id} => delete $face->{image}); 742 $self->set_texture ($face->{id} => delete $face->{data});
743
744 } elsif ($face->{type} & 1) { # split metadata
745 my $cb = sub { };
746
747 if ($face->{type} == 3) { # FT_MUSIC
748 $cb = sub {
749 $self->{music_meta}{$facenum} = $face;
750
751 ::message ({ markup => "downloaded song #$facenum" })
752 if $changed;
753
754 &::audio_music_set ($self->{songs});
755 };
756 }
757
758 if ($changed) { # new data
759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
760 my $path = CFPlus::DB::path_of_res $face->{name};
761
762 CFPlus::DB::write_file $path, $data, sub {
763 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
764 $face->{meta} = $self->{json_coder}->decode ($meta_json);
765 $face->{path} = $path;
766
767 $cb->();
768 };
769 };
770 } else {
771 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
772 $cb->();
773 }
774 }
780} 775}
781 776
782sub smooth_update { 777sub smooth_update {
783 my ($self, $facenum, $face) = @_; 778 my ($self, $facenum, $face) = @_;
784 779
… …
1166} 1161}
1167 1162
1168sub logged_in { 1163sub logged_in {
1169 my ($self) = @_; 1164 my ($self) = @_;
1170 1165
1171 $self->send_ext_req (cfplus_support => version => 1, sub { 1166 $self->send_ext_req (cfplus_support => version => 2, sub {
1167 my (%msg) = @_;
1168
1172 $self->{cfplus_ext} = $_[0]{version}; 1169 $self->{cfplus_ext} = $msg{version};
1173 $self->update_server_info; 1170 $self->update_server_info;
1174 1171
1175 if ($self->{cfplus_ext} >= 2) { 1172 if ($self->{cfplus_ext} >= 2) {
1176 $self->send_ext_req ("editor_support", sub { 1173 $self->send_ext_req ("editor_support", sub {
1177 $self->{editor_support} = $_[0]; 1174 $self->{editor_support} = { @_ };
1178 $self->update_server_info; 1175 $self->update_server_info;
1179 1176
1180 0 1177 0
1181 }); 1178 });
1182 } 1179 }
… …
1202 1199
1203sub lookat { 1200sub lookat {
1204 my ($self, $x, $y) = @_; 1201 my ($self, $x, $y) = @_;
1205 1202
1206 if ($self->{cfplus_ext}) { 1203 if ($self->{cfplus_ext}) {
1207 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1204 $self->send_ext_req (lookat => $x, $y, sub {
1208 my ($msg) = @_; 1205 my (%msg) = @_;
1209 1206
1210 if (exists $msg->{npc_dialog}) { 1207 if (exists $msg{npc_dialog}) {
1211 # start npc chat dialog 1208 # start npc chat dialog
1212 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1209 $self->{npc_dialog} = new CFPlus::NPCDialog::
1213 dx => $x, 1210 token => $msg{npc_dialog},
1214 dy => $y,
1215 title => "$msg->{npc_dialog} (NPC)", 1211 title => "$msg{npc_dialog}[0] (NPC)",
1216 conn => $self, 1212 conn => $self,
1217 ; 1213 ;
1218 } 1214 }
1219 }); 1215 });
1220 } 1216 }
… …
1285 on_activate => sub { $this->destroy; 1 }, 1281 on_activate => sub { $this->destroy; 1 },
1286 ; 1282 ;
1287 1283
1288 $self->update_options; 1284 $self->update_options;
1289 1285
1290 $self->{id} = $self->{conn}->send_ext_req ( 1286 $self->{id} = "npc-channel-" . $self->{conn}->token;
1291 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1287 $self->{conn}->connect_ext ($self->{id} => sub {
1292 sub { $this && $this->feed (@_) } 1288 $this->feed (@_) if $this;
1293 ); 1289 });
1290
1291 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1294 1292
1295 $self->{entry}->grab_focus; 1293 $self->{entry}->grab_focus;
1296 1294
1297 $self->{textview}->add_paragraph ({ 1295 $self->{textview}->add_paragraph ({
1298 fg => [1, 1, 0, 1], 1296 fg => [1, 1, 0, 1],
… …
1321 ); 1319 );
1322 } 1320 }
1323} 1321}
1324 1322
1325sub feed { 1323sub feed {
1326 my ($self, $msg) = @_; 1324 my ($self, $type, @arg) = @_;
1327 1325
1328 CFPlus::weaken $self; 1326 CFPlus::weaken $self;
1329 1327
1330 if ($msg->{msgtype} eq "reply") { 1328 if ($type eq "update") {
1329 my (%info) = @arg;
1330
1331 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1331 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1332 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1332 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1333
1334 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1335 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1336 my @link;
1337 $text =~ s{
1338 ($match)
1339 }{
1340 my $kw = $1;
1341
1342 push @link, new CFPlus::UI::Label
1343 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1344 can_hover => 1,
1345 can_events => 1,
1346 padding_x => 0,
1347 padding_y => 0,
1348 on_button_up => sub {
1349 $self->send ($kw);
1350 };
1351
1352 "\x{fffc}"
1353 }giex;
1354 1333
1334 if (exists $info{msg}) {
1335 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1336 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1337 my @link;
1338 $text =~ s{
1339 ($match)
1340 }{
1341 my $kw = $1;
1342
1343 push @link, new CFPlus::UI::Label
1344 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1345 can_hover => 1,
1346 can_events => 1,
1347 padding_x => 0,
1348 padding_y => 0,
1349 on_button_up => sub {
1350 $self->send ($kw);
1351 };
1352
1353 "\x{fffc}"
1354 }giex;
1355
1355 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1356 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1356 $self->{textview}->scroll_to_bottom; 1357 $self->{textview}->scroll_to_bottom;
1358 }
1359
1357 $self->update_options; 1360 $self->update_options;
1358 } else { 1361 } else {
1359 $self->destroy; 1362 $self->destroy;
1360 } 1363 }
1361 1364
… …
1366 my ($self, $msg) = @_; 1369 my ($self, $msg) = @_;
1367 1370
1368 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1371 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1369 $self->{textview}->scroll_to_bottom; 1372 $self->{textview}->scroll_to_bottom;
1370 1373
1371 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1374 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1372} 1375}
1373 1376
1374sub destroy { 1377sub destroy {
1375 my ($self) = @_; 1378 my ($self) = @_;
1376 1379
1377 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1380 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1378 1381
1379 if ($self->{conn}) { 1382 if ($self->{conn}) {
1380 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1383 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1381 delete $self->{conn}{npc_dialog}; 1384 delete $self->{conn}{npc_dialog};
1382 $self->{conn}->disconnect_ext ($self->{id}); 1385 $self->{conn}->disconnect_ext ($self->{id});
1383 } 1386 }
1384 1387
1385 $self->SUPER::destroy; 1388 $self->SUPER::destroy;

Diff Legend

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