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.124 by root, Fri Jul 20 16:32:04 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;
… …
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 ("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 });
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];
114 $self->setup_req (tileset => $default->[0]); 74 $self->setup_req (tileset => $default->[0]);
115 75
… …
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 170
214 $w->{$arg->{name}} = $arg->{value}; 171 for (my $i = 0; $i < $#$attr; $i += 2) {
172 my ($member, $value) = @$attr[$i, $i+1];
173 if (defined $value) {
174 $w->{$member} = $value;
175 } else {
176 delete $w->{$member};
177 }
178 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
179 }
215 }); 180 });
216 181
217 # widget get 182 # widget get
218 $self->connect_ext (w_g => sub { 183 $self->connect_ext (w_g => sub {
219 my ($arg) = @_; 184 my ($id, $rid, $attr) = @_;
220 185
221 my $w = $self->{widget}{$arg->{id}} 186 my $w = $self->{widget}{$id}
222 or return; 187 or return;
223 188
224 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 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);
225 }); 197 });
226 198
227 # destroy widgets on logout 199 # destroy widgets on logout
228 $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 {
229 for my $ws (values %{delete $self->{widgetset} || {}}) { 201 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
751} 723}
752 724
753sub face_find { 725sub face_find {
754 my ($self, $facenum, $face, $cb) = @_; 726 my ($self, $facenum, $face, $cb) = @_;
755 727
756 my $hash = "$face->{chksum},$face->{name}"; 728 if ($face->{type} == 0) { # FT_FACE
757
758 my $id = CFPlus::DB::get_tile_id_sync $hash; 729 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
759 730
760 $face->{id} = $id; 731 $face->{id} = $id;
761 $self->{faceid}[$facenum] = $id; 732 $self->{faceid}[$facenum] = $id;
762 733
763 $self->{map}->set_tileid ($facenum => $id); 734 $self->{map}->set_tileid ($facenum => $id);
764 735
765 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 }
766} 742}
767 743
768sub face_update { 744sub face_update {
769 my ($self, $facenum, $face, $changed) = @_; 745 my ($self, $facenum, $face, $changed) = @_;
770 746
747 if ($face->{type} == 0) { # FT_FACE
771 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 748 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
772 if $changed; 749 if $changed;
773 750
774 $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 }
775} 784}
776 785
777sub smooth_update { 786sub smooth_update {
778 my ($self, $facenum, $face) = @_; 787 my ($self, $facenum, $face) = @_;
779 788
… …
807 } 816 }
808} 817}
809 818
810sub sound_play { 819sub sound_play {
811 my ($self, $x, $y, $soundnum, $type) = @_; 820 my ($self, $x, $y, $soundnum, $type) = @_;
821 warn "sound play <@_>\n";#d#
812 822
813 $self->{sound_play}->($x, $y, $soundnum, $type); 823 #$self->{sound_play}->($x, $y, $soundnum, $type);
814} 824}
815 825
816my $LAST_QUERY; # server is stupid, stupid, stupid 826my $LAST_QUERY; # server is stupid, stupid, stupid
817 827
818sub query { 828sub query {
… …
889 899
890 ## 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
891 # no longer neecssary with TRT servers 901 # no longer neecssary with TRT servers
892 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 902 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
893 903
894 ::message ({ fg => $fg, markup => $_ }) 904 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
895 for split /\n/, $text; 905 for split /\n/, $text;
896 906
897 $self->{statusbox}->add ($text, 907 $self->{statusbox}->add ($text,
898 group => $text, 908 group => $text,
899 fg => $fg, 909 fg => $fg,
… …
1155 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1165 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1156 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1166 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1157 . "map size $self->{mapw}×$self->{maph}\n" 1167 . "map size $self->{mapw}×$self->{maph}\n"
1158 ); 1168 );
1159 1169
1160 ::setup_build_button ($self->{editor_support}->{builder_ui});
1161} 1170}
1162 1171
1163sub logged_in { 1172sub logged_in {
1164 my ($self) = @_; 1173 my ($self) = @_;
1165 1174
1166 $self->send_ext_req (cfplus_support => version => 1, sub { 1175 $self->send_ext_req (cfplus_support => version => 2, sub {
1176 my (%msg) = @_;
1177
1167 $self->{cfplus_ext} = $_[0]{version}; 1178 $self->{cfplus_ext} = $msg{version};
1168 $self->update_server_info; 1179 $self->update_server_info;
1169 1180
1170 if ($self->{cfplus_ext} >= 2) { 1181 if ($self->{cfplus_ext} >= 2) {
1171 $self->send_ext_req ("editor_support", sub { 1182 $self->send_ext_req ("editor_support", sub {
1172 $self->{editor_support} = $_[0]; 1183 $self->{editor_support} = { @_ };
1173 $self->update_server_info; 1184 $self->update_server_info;
1174 1185
1175 0 1186 0
1176 }); 1187 });
1177 } 1188 }
… …
1185 $self->send_command ("output-count $::CFG->{output_count}"); 1196 $self->send_command ("output-count $::CFG->{output_count}");
1186 $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;
1187 $self->send_command ("pickup $::CFG->{pickup}"); 1198 $self->send_command ("pickup $::CFG->{pickup}");
1188} 1199}
1189 1200
1190sub buildat {
1191 my ($self, $builditem, $x, $y) = @_;
1192
1193 if ($self->{cfplus_ext}) {
1194 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1195 }
1196}
1197
1198sub lookat { 1201sub lookat {
1199 my ($self, $x, $y) = @_; 1202 my ($self, $x, $y) = @_;
1200 1203
1201 if ($self->{cfplus_ext}) { 1204 if ($self->{cfplus_ext}) {
1202 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1205 $self->send_ext_req (lookat => $x, $y, sub {
1203 my ($msg) = @_; 1206 my (%msg) = @_;
1204 1207
1205 if (exists $msg->{npc_dialog}) { 1208 if (exists $msg{npc_dialog}) {
1206 # start npc chat dialog 1209 # start npc chat dialog
1207 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1210 $self->{npc_dialog} = new CFPlus::NPCDialog::
1208 dx => $x, 1211 token => $msg{npc_dialog},
1209 dy => $y,
1210 title => "$msg->{npc_dialog} (NPC)", 1212 title => "$msg{npc_dialog}[0] (NPC)",
1211 conn => $self, 1213 conn => $self,
1212 ; 1214 ;
1213 } 1215 }
1214 }); 1216 });
1215 } 1217 }
… …
1280 on_activate => sub { $this->destroy; 1 }, 1282 on_activate => sub { $this->destroy; 1 },
1281 ; 1283 ;
1282 1284
1283 $self->update_options; 1285 $self->update_options;
1284 1286
1285 $self->{id} = $self->{conn}->send_ext_req ( 1287 $self->{id} = "npc-channel-" . $self->{conn}->token;
1286 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1288 $self->{conn}->connect_ext ($self->{id} => sub {
1287 sub { $this && $this->feed (@_) } 1289 $this->feed (@_) if $this;
1288 ); 1290 });
1291
1292 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1289 1293
1290 $self->{entry}->grab_focus; 1294 $self->{entry}->grab_focus;
1291 1295
1292 $self->{textview}->add_paragraph ({ 1296 $self->{textview}->add_paragraph ({
1293 fg => [1, 1, 0, 1], 1297 fg => [1, 1, 0, 1],
… …
1316 ); 1320 );
1317 } 1321 }
1318} 1322}
1319 1323
1320sub feed { 1324sub feed {
1321 my ($self, $msg) = @_; 1325 my ($self, $type, @arg) = @_;
1322 1326
1323 CFPlus::weaken $self; 1327 CFPlus::weaken $self;
1324 1328
1325 if ($msg->{msgtype} eq "reply") { 1329 if ($type eq "update") {
1330 my (%info) = @arg;
1331
1326 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1332 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1327 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1333 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1328
1329 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1330 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1331 my @link;
1332 $text =~ s{
1333 ($match)
1334 }{
1335 my $kw = $1;
1336
1337 push @link, new CFPlus::UI::Label
1338 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1339 can_hover => 1,
1340 can_events => 1,
1341 padding_x => 0,
1342 padding_y => 0,
1343 on_button_up => sub {
1344 $self->send ($kw);
1345 };
1346
1347 "\x{fffc}"
1348 }giex;
1349 1334
1335 if (exists $info{msg}) {
1336 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1337 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1338 my @link;
1339 $text =~ s{
1340 ($match)
1341 }{
1342 my $kw = $1;
1343
1344 push @link, new CFPlus::UI::Label
1345 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1346 can_hover => 1,
1347 can_events => 1,
1348 padding_x => 0,
1349 padding_y => 0,
1350 on_button_up => sub {
1351 $self->send ($kw);
1352 };
1353
1354 "\x{fffc}"
1355 }giex;
1356
1350 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1357 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1351 $self->{textview}->scroll_to_bottom; 1358 $self->{textview}->scroll_to_bottom;
1359 }
1360
1352 $self->update_options; 1361 $self->update_options;
1353 } else { 1362 } else {
1354 $self->destroy; 1363 $self->destroy;
1355 } 1364 }
1356 1365
… …
1361 my ($self, $msg) = @_; 1370 my ($self, $msg) = @_;
1362 1371
1363 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1372 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1364 $self->{textview}->scroll_to_bottom; 1373 $self->{textview}->scroll_to_bottom;
1365 1374
1366 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1375 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1367} 1376}
1368 1377
1369sub destroy { 1378sub destroy {
1370 my ($self) = @_; 1379 my ($self) = @_;
1371 1380
1372 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1381 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1373 1382
1374 if ($self->{conn}) { 1383 if ($self->{conn}) {
1375 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1384 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1376 delete $self->{conn}{npc_dialog}; 1385 delete $self->{conn}{npc_dialog};
1377 $self->{conn}->disconnect_ext ($self->{id}); 1386 $self->{conn}->disconnect_ext ($self->{id});
1378 } 1387 }
1379 1388
1380 $self->SUPER::destroy; 1389 $self->SUPER::destroy;

Diff Legend

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