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.112 by root, Tue Jul 10 16:25:16 2007 UTC vs.
Revision 1.128 by root, Mon Jul 23 21:03:26 2007 UTC

… …
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 {
54 my (%ev) = @_;
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]);
104 }
105 });
106
53 $self->connect_ext (event_capabilities => sub { 107 $self->connect_ext (capabilities => sub {
54 my ($cap) = @_; 108 my (%cap) = @_;
55 109
56 if (my $ts = $cap->{tileset}) { 110 if (my $ts = $cap{tileset}) {
57 if (my ($default) = grep $_->[2] & 1, @$ts) { 111 if (my ($default) = grep $_->[2] & 1, @$ts) {
58 $self->{tileset} = $default; 112 $self->{tileset} = $default;
59 $self->{tilesize} = $default->[3]; 113 $self->{tilesize} = $default->[3];
60 $self->setup_req (tileset => $default->[0]); 114 $self->setup_req (tileset => $default->[0]);
61 115
… …
71 ->convert_blessed 125 ->convert_blessed
72 ->filter_json_single_key_object (__widget_ref__ => sub { 126 ->filter_json_single_key_object (__widget_ref__ => sub {
73 $self->{widget}{$_[0]} 127 $self->{widget}{$_[0]}
74 }); 128 });
75 129
130 # widgetset new
76 $self->connect_ext (ws_n => sub { 131 $self->connect_ext (ws_n => sub {
77 my ($arg) = @_; 132 my ($arg) = @_;
78 133
79 $self->{widgetset}{$arg{id}} = { 134 $self->{widgetset}{$arg{id}} = {
80 w => {}, 135 w => {},
81 }; 136 };
82 }); 137 });
83 138
139 # widgetset destroy
84 $self->connect_ext (ws_d => sub { 140 $self->connect_ext (ws_d => sub {
85 my ($arg) = @_; 141 my ($arg) = @_;
86 142
87 my $ws = delete $self->{widgetset}{$arg{id}} 143 my $ws = delete $self->{widgetset}{$arg{id}}
88 or return; 144 or return;
89 145
90 $_->destroy 146 $_->destroy
91 for values %{$ws->{w}}; 147 for values %{$ws->{w}};
92 }); 148 });
93 149
150 # widgetset destroy
94 $self->connect_ext (ws_c => sub { 151 $self->connect_ext (ws_c => sub {
95 my ($arg) = @_; 152 my ($arg) = @_;
96 153
97 my $args = $arg->{args} || {}; 154 my $args = $arg->{args} || {};
98 155
… …
128 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 185 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
129 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
130 } 187 }
131 }); 188 });
132 189
190 # widget call
133 $self->connect_ext (w_c => sub { 191 $self->connect_ext (w_c => sub {
134 my ($arg) = @_; 192 my ($arg) = @_;
135 193
136 my $w = $self->{widget}{$arg->{id}} 194 my $w = $self->{widget}{$arg->{id}}
137 or return; 195 or return;
… …
144 } else { 202 } else {
145 $w->$m (@$a); 203 $w->$m (@$a);
146 } 204 }
147 }); 205 });
148 206
207 # widget set
149 $self->connect_ext (w_s => sub { 208 $self->connect_ext (w_s => sub {
150 my ($arg) = @_; 209 my ($arg) = @_;
151 210
152 my $w = $self->{widget}{$arg->{id}} 211 my $w = $self->{widget}{$arg->{id}}
153 or return; 212 or return;
154 213
155 $w->{$arg->{name}} = $arg->{value}; 214 my $attr = $arg->{attr};
215
216 for (my $i = 0; $i < $#$attr; $i += 2) {
217 my ($member, $value) = @$attr[$i, $i+1];
218 if (defined $value) {
219 $w->{$member} = $value;
220 } else {
221 delete $w->{$member};
222 }
223 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
224 }
156 }); 225 });
157 226
227 # widget get
158 $self->connect_ext (w_g => sub { 228 $self->connect_ext (w_g => sub {
159 my ($arg) = @_; 229 my ($arg) = @_;
160 230
161 my $w = $self->{widget}{$arg->{id}} 231 my $w = $self->{widget}{$arg->{id}}
162 or return; 232 or return;
163 233
164 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 234 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{attr}}]);
165 }); 235 });
166 236
237 # destroy widgets on logout
167 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 238 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
168 for my $ws (values %{delete $self->{widgetset} || {}}) { 239 for my $ws (values %{delete $self->{widgetset} || {}}) {
169 $_->destroy 240 $_->destroy
170 for values %{delete $ws->{w} || {}}; 241 for values %{delete $ws->{w} || {}};
171 } 242 }
… …
384 my @skills = keys %{ $self->{skill_info} }; 455 my @skills = keys %{ $self->{skill_info} };
385 456
386 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 457 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
387 $sktbl->clear; 458 $sktbl->clear;
388 459
460 my @add;
461
462 push @add,
389 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 463 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
390 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 464 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
391 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 465 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
392 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 466 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
393 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 467 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
394 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 468 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
469 ;
395 470
396 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 471 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
397 472
398 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 473 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
399 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 474 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
427 } 502 }
428 503
429 1 504 1
430 }; 505 };
431 506
507 push @add,
432 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 508 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
433 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 509 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
434 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 510 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
435 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 511 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
436 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 512 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
437 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 513 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
514 ;
438 515
439 $x++ and ($x, $y) = (0, $y + 1); 516 $x++ and ($x, $y) = (0, $y + 1);
440 } 517 }
518
519 $sktbl->add_at (@add);
441 } 520 }
442 521
443 for (grep exists $stats->{$_}, @skills) { 522 for (grep exists $stats->{$_}, @skills) {
444 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 523 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
445 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 524 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
712} 791}
713 792
714sub set_texture { 793sub set_texture {
715 my ($self, $id, $data) = @_; 794 my ($self, $id, $data) = @_;
716 795
796 return unless $self->{map};
797
717 $self->{texture}[$id] = my $tex = 798 $self->{texture}[$id] = my $tex =
718 new_from_image CFPlus::Texture 799 new_from_image CFPlus::Texture
719 $data, minify => 1, mipmap => 1; 800 $data, minify => 1, mipmap => 1;
720 801
721 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 802 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
722 $self->{map_widget}->update; 803 $self->{map_widget}->update;
804
805 $_->() for @{(delete $self->{face_cb}{$id}) || []};
806}
807
808sub connect_face_update {
809 my ($self, $id, $cb) = @_;
810
811 push @{$self->{face_cb}{$id}}, $cb;
812
813 CFPlus::guard {
814 @{$self->{face_cb}{$id}}
815 = grep $_ != $cb,
816 @{$self->{face_cb}{$id}};
817 }
723} 818}
724 819
725sub sound_play { 820sub sound_play {
726 my ($self, $x, $y, $soundnum, $type) = @_; 821 my ($self, $x, $y, $soundnum, $type) = @_;
727 822
… …
911 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1006 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
912 return unless $::CONN; 1007 return unless $::CONN;
913 1008
914 $::FLOORBOX->clear; 1009 $::FLOORBOX->clear;
915 1010
1011 my @add;
1012
916 my $row; 1013 my $row;
917 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1014 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
918 if ($row < 6) { 1015 if ($row < 6) {
919 local $_->{face_widget}; # hack to force recreation of widget 1016 local $_->{face_widget}; # hack to force recreation of widget
920 local $_->{desc_widget}; # hack to force recreation of widget 1017 local $_->{desc_widget}; # hack to force recreation of widget
921 CFPlus::Item::update_widgets $_; 1018 CFPlus::Item::update_widgets $_;
922 1019
1020 push @add,
923 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1021 0, $row, $_->{face_widget},
924 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1022 1, $row, $_->{desc_widget};
925 1023
926 $row++; 1024 $row++;
927 } else { 1025 } else {
928 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1026 push @add, 1, $row, new CFPlus::UI::Button
929 text => "More...", 1027 text => "More...",
930 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1028 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
931 ); 1029 ;
932 last; 1030 last;
933 } 1031 }
934 } 1032 }
935 if ($::CONN->{open_container}) { 1033 if ($::CONN->{open_container}) {
936 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1034 push @add, 1, $row++, new CFPlus::UI::Button
937 text => "Close container", 1035 text => "Close container",
938 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1036 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
939 ); 1037 ;
940 } 1038 }
1039
1040 $::FLOORBOX->add_at (@add);
941 }); 1041 });
942 1042
943 $::WANT_REFRESH++; 1043 $::WANT_REFRESH++;
944} 1044}
945 1045
… …
1071} 1171}
1072 1172
1073sub logged_in { 1173sub logged_in {
1074 my ($self) = @_; 1174 my ($self) = @_;
1075 1175
1076 $self->send_ext_req (cfplus_support => version => 1, sub { 1176 $self->send_ext_req (cfplus_support => version => 2, sub {
1177 my (%msg) = @_;
1178
1077 $self->{cfplus_ext} = $_[0]{version}; 1179 $self->{cfplus_ext} = $msg{version};
1078 $self->update_server_info; 1180 $self->update_server_info;
1079 1181
1080 if ($self->{cfplus_ext} >= 2) { 1182 if ($self->{cfplus_ext} >= 2) {
1081 $self->send_ext_req ("editor_support", sub { 1183 $self->send_ext_req ("editor_support", sub {
1082 $self->{editor_support} = $_[0]; 1184 $self->{editor_support} = { @_ };
1083 $self->update_server_info; 1185 $self->update_server_info;
1084 1186
1085 0 1187 0
1086 }); 1188 });
1087 } 1189 }
… …
1107 1209
1108sub lookat { 1210sub lookat {
1109 my ($self, $x, $y) = @_; 1211 my ($self, $x, $y) = @_;
1110 1212
1111 if ($self->{cfplus_ext}) { 1213 if ($self->{cfplus_ext}) {
1112 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1214 $self->send_ext_req (lookat => $x, $y, sub {
1113 my ($msg) = @_; 1215 my (%msg) = @_;
1114 1216
1115 if (exists $msg->{npc_dialog}) { 1217 if (exists $msg{npc_dialog}) {
1116 # start npc chat dialog 1218 # start npc chat dialog
1117 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1219 $self->{npc_dialog} = new CFPlus::NPCDialog::
1118 dx => $x, 1220 token => $msg{npc_dialog},
1119 dy => $y,
1120 title => "$msg->{npc_dialog} (NPC)", 1221 title => "$msg{npc_dialog}[0] (NPC)",
1121 conn => $self, 1222 conn => $self,
1122 ; 1223 ;
1123 } 1224 }
1124 }); 1225 });
1125 } 1226 }
… …
1190 on_activate => sub { $this->destroy; 1 }, 1291 on_activate => sub { $this->destroy; 1 },
1191 ; 1292 ;
1192 1293
1193 $self->update_options; 1294 $self->update_options;
1194 1295
1195 $self->{id} = $self->{conn}->send_ext_req ( 1296 $self->{id} = "npc-channel-" . $self->{conn}->token;
1196 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1297 $self->{conn}->connect_ext ($self->{id} => sub {
1197 sub { $this && $this->feed (@_) } 1298 $this->feed (@_) if $this;
1198 ); 1299 });
1300
1301 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1199 1302
1200 $self->{entry}->grab_focus; 1303 $self->{entry}->grab_focus;
1201 1304
1202 $self->{textview}->add_paragraph ({ 1305 $self->{textview}->add_paragraph ({
1203 fg => [1, 1, 0, 1], 1306 fg => [1, 1, 0, 1],
… …
1226 ); 1329 );
1227 } 1330 }
1228} 1331}
1229 1332
1230sub feed { 1333sub feed {
1231 my ($self, $msg) = @_; 1334 my ($self, $type, @arg) = @_;
1232 1335
1233 CFPlus::weaken $self; 1336 CFPlus::weaken $self;
1234 1337
1235 if ($msg->{msgtype} eq "reply") { 1338 if ($type eq "update") {
1339 my (%info) = @arg;
1340
1236 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1341 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1237 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1342 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1238
1239 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1240 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1241 my @link;
1242 $text =~ s{
1243 ($match)
1244 }{
1245 my $kw = $1;
1246
1247 push @link, new CFPlus::UI::Label
1248 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1249 can_hover => 1,
1250 can_events => 1,
1251 padding_x => 0,
1252 padding_y => 0,
1253 on_button_up => sub {
1254 $self->send ($kw);
1255 };
1256
1257 "\x{fffc}"
1258 }giex;
1259 1343
1344 if (exists $info{msg}) {
1345 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1346 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1347 my @link;
1348 $text =~ s{
1349 ($match)
1350 }{
1351 my $kw = $1;
1352
1353 push @link, new CFPlus::UI::Label
1354 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1355 can_hover => 1,
1356 can_events => 1,
1357 padding_x => 0,
1358 padding_y => 0,
1359 on_button_up => sub {
1360 $self->send ($kw);
1361 };
1362
1363 "\x{fffc}"
1364 }giex;
1365
1260 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1366 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1261 $self->{textview}->scroll_to_bottom; 1367 $self->{textview}->scroll_to_bottom;
1368 }
1369
1262 $self->update_options; 1370 $self->update_options;
1263 } else { 1371 } else {
1264 $self->destroy; 1372 $self->destroy;
1265 } 1373 }
1266 1374
… …
1271 my ($self, $msg) = @_; 1379 my ($self, $msg) = @_;
1272 1380
1273 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1381 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1274 $self->{textview}->scroll_to_bottom; 1382 $self->{textview}->scroll_to_bottom;
1275 1383
1276 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1384 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1277} 1385}
1278 1386
1279sub destroy { 1387sub destroy {
1280 my ($self) = @_; 1388 my ($self) = @_;
1281 1389
1282 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1390 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1283 1391
1284 if ($self->{conn}) { 1392 if ($self->{conn}) {
1285 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1393 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1286 delete $self->{conn}{npc_dialog}; 1394 delete $self->{conn}{npc_dialog};
1287 $self->{conn}->disconnect_ext ($self->{id}); 1395 $self->{conn}->disconnect_ext ($self->{id});
1288 } 1396 }
1289 1397
1290 $self->SUPER::destroy; 1398 $self->SUPER::destroy;

Diff Legend

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