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.115 by root, Thu Jul 12 19:10:52 2007 UTC vs.
Revision 1.127 by root, Mon Jul 23 15:30:45 2007 UTC

… …
66 66
67 $chksum = unpack "H*", $chksum; 67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum; 68 $self->{music_map}{$face} = $chksum;
69 69
70 # check if already cached 70 # check if already cached
71 CFPlus::DB::get resmap => $chksum, sub { 71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta) = @_; 72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
73 74
74 if (defined $meta) { 75 if (defined $meta_json) {
75 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta); 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});
76 } else { 80 } else {
77 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." }); 81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
78 $self->ask_face ($face, -100 - $pri, undef, sub { 82 $self->ask_face ($face, -100 - $pri, undef, sub {
79 my $len = length $_[1]; 83 my $len = length $_[1];
80 my ($meta, $data) = unpack "(w/a*)*", $_[1]; 84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
81 85
82 CFPlus::DB::write_file $chksum, $data, sub { }; 86 CFPlus::DB::write_file $path, $data, sub {
83 CFPlus::DB::put resmap => $chksum => $meta, sub { }; 87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
84
85 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta); 88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
86 ::message ({ markup => "downloaded song #$face, size $len octets" }); 92 ::message ({ markup => "downloaded song #$face, size $len octets" });
87
88 &::audio_music_set ($self->{songs}); 93 &::audio_music_set ($self->{songs});
94 };
95 };
89 }); 96 });
90 } 97 }
91 } 98 }
92 } 99 }
93 } 100 }
94 101
95 if (my $play = $ev->{play}) { 102 if (my $play = $ev->{play}) {
96 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]); 103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
97 use Data::Dumper;
98 warn Dumper $self->{songs};#d#
99 } 104 }
100 }); 105 });
101 106
102 $self->connect_ext (event_capabilities => sub { 107 $self->connect_ext (event_capabilities => sub {
103 my ($cap) = @_; 108 my ($cap) = @_;
… …
120 ->convert_blessed 125 ->convert_blessed
121 ->filter_json_single_key_object (__widget_ref__ => sub { 126 ->filter_json_single_key_object (__widget_ref__ => sub {
122 $self->{widget}{$_[0]} 127 $self->{widget}{$_[0]}
123 }); 128 });
124 129
130 # widgetset new
125 $self->connect_ext (ws_n => sub { 131 $self->connect_ext (ws_n => sub {
126 my ($arg) = @_; 132 my ($arg) = @_;
127 133
128 $self->{widgetset}{$arg{id}} = { 134 $self->{widgetset}{$arg{id}} = {
129 w => {}, 135 w => {},
130 }; 136 };
131 }); 137 });
132 138
139 # widgetset destroy
133 $self->connect_ext (ws_d => sub { 140 $self->connect_ext (ws_d => sub {
134 my ($arg) = @_; 141 my ($arg) = @_;
135 142
136 my $ws = delete $self->{widgetset}{$arg{id}} 143 my $ws = delete $self->{widgetset}{$arg{id}}
137 or return; 144 or return;
138 145
139 $_->destroy 146 $_->destroy
140 for values %{$ws->{w}}; 147 for values %{$ws->{w}};
141 }); 148 });
142 149
150 # widgetset destroy
143 $self->connect_ext (ws_c => sub { 151 $self->connect_ext (ws_c => sub {
144 my ($arg) = @_; 152 my ($arg) = @_;
145 153
146 my $args = $arg->{args} || {}; 154 my $args = $arg->{args} || {};
147 155
… …
177 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";
178 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
179 } 187 }
180 }); 188 });
181 189
190 # widget call
182 $self->connect_ext (w_c => sub { 191 $self->connect_ext (w_c => sub {
183 my ($arg) = @_; 192 my ($arg) = @_;
184 193
185 my $w = $self->{widget}{$arg->{id}} 194 my $w = $self->{widget}{$arg->{id}}
186 or return; 195 or return;
… …
193 } else { 202 } else {
194 $w->$m (@$a); 203 $w->$m (@$a);
195 } 204 }
196 }); 205 });
197 206
207 # widget set
198 $self->connect_ext (w_s => sub { 208 $self->connect_ext (w_s => sub {
199 my ($arg) = @_; 209 my ($arg) = @_;
200 210
201 my $w = $self->{widget}{$arg->{id}} 211 my $w = $self->{widget}{$arg->{id}}
202 or return; 212 or return;
203 213
204 $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 }
205 }); 225 });
206 226
227 # widget get
207 $self->connect_ext (w_g => sub { 228 $self->connect_ext (w_g => sub {
208 my ($arg) = @_; 229 my ($arg) = @_;
209 230
210 my $w = $self->{widget}{$arg->{id}} 231 my $w = $self->{widget}{$arg->{id}}
211 or return; 232 or return;
212 233
213 $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}}]);
214 }); 235 });
215 236
237 # destroy widgets on logout
216 $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 {
217 for my $ws (values %{delete $self->{widgetset} || {}}) { 239 for my $ws (values %{delete $self->{widgetset} || {}}) {
218 $_->destroy 240 $_->destroy
219 for values %{delete $ws->{w} || {}}; 241 for values %{delete $ws->{w} || {}};
220 } 242 }
… …
433 my @skills = keys %{ $self->{skill_info} }; 455 my @skills = keys %{ $self->{skill_info} };
434 456
435 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 457 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
436 $sktbl->clear; 458 $sktbl->clear;
437 459
460 my @add;
461
462 push @add,
438 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 463 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
439 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 464 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
440 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 465 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
441 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 466 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
442 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 467 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
443 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 468 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
469 ;
444 470
445 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>";
446 472
447 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);
448 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);
… …
476 } 502 }
477 503
478 1 504 1
479 }; 505 };
480 506
507 push @add,
481 $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
482 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),
483 $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
484 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),
485 $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,
486 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 ;
487 515
488 $x++ and ($x, $y) = (0, $y + 1); 516 $x++ and ($x, $y) = (0, $y + 1);
489 } 517 }
518
519 $sktbl->add_at (@add);
490 } 520 }
491 521
492 for (grep exists $stats->{$_}, @skills) { 522 for (grep exists $stats->{$_}, @skills) {
493 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 523 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
494 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 524 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
761} 791}
762 792
763sub set_texture { 793sub set_texture {
764 my ($self, $id, $data) = @_; 794 my ($self, $id, $data) = @_;
765 795
796 return unless $self->{map};
797
766 $self->{texture}[$id] = my $tex = 798 $self->{texture}[$id] = my $tex =
767 new_from_image CFPlus::Texture 799 new_from_image CFPlus::Texture
768 $data, minify => 1, mipmap => 1; 800 $data, minify => 1, mipmap => 1;
769 801
770 $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}});
771 $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 }
772} 818}
773 819
774sub sound_play { 820sub sound_play {
775 my ($self, $x, $y, $soundnum, $type) = @_; 821 my ($self, $x, $y, $soundnum, $type) = @_;
776 822
… …
960 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1006 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
961 return unless $::CONN; 1007 return unless $::CONN;
962 1008
963 $::FLOORBOX->clear; 1009 $::FLOORBOX->clear;
964 1010
1011 my @add;
1012
965 my $row; 1013 my $row;
966 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} }) {
967 if ($row < 6) { 1015 if ($row < 6) {
968 local $_->{face_widget}; # hack to force recreation of widget 1016 local $_->{face_widget}; # hack to force recreation of widget
969 local $_->{desc_widget}; # hack to force recreation of widget 1017 local $_->{desc_widget}; # hack to force recreation of widget
970 CFPlus::Item::update_widgets $_; 1018 CFPlus::Item::update_widgets $_;
971 1019
1020 push @add,
972 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1021 0, $row, $_->{face_widget},
973 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1022 1, $row, $_->{desc_widget};
974 1023
975 $row++; 1024 $row++;
976 } else { 1025 } else {
977 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1026 push @add, 1, $row, new CFPlus::UI::Button
978 text => "More...", 1027 text => "More...",
979 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1028 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
980 ); 1029 ;
981 last; 1030 last;
982 } 1031 }
983 } 1032 }
984 if ($::CONN->{open_container}) { 1033 if ($::CONN->{open_container}) {
985 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1034 push @add, 1, $row++, new CFPlus::UI::Button
986 text => "Close container", 1035 text => "Close container",
987 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1036 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
988 ); 1037 ;
989 } 1038 }
1039
1040 $::FLOORBOX->add_at (@add);
990 }); 1041 });
991 1042
992 $::WANT_REFRESH++; 1043 $::WANT_REFRESH++;
993} 1044}
994 1045

Diff Legend

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