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.119 by root, Sat Jul 14 12:05:53 2007 UTC vs.
Revision 1.124 by root, Fri Jul 20 16:32:04 2007 UTC

… …
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 "res-metadata" => $chksum, sub { 71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_; 72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
73 74
74 if (defined $meta_json) { 75 if (defined $meta_json) {
75 my $meta = $self->{json_coder}->decode ($meta_json); 76 my $meta = $self->{json_coder}->decode ($meta_json);
76 $meta->{path} = CFPlus::DB::path_of_res $chksum; 77 $meta->{path} = $path;
77 $self->{music_meta}{$chksum} = $meta; 78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
78 } else { 80 } else {
79 ::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." });
80 $self->ask_face ($face, -100 - $pri, undef, sub { 82 $self->ask_face ($face, -100 - $pri, undef, sub {
81 my $len = length $_[1]; 83 my $len = length $_[1];
82 my ($meta_json, $data) = unpack "(w/a*)*", $_[1]; 84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
83 85
84 my $meta = $self->{json_coder}->decode ($meta_json);
85 $meta->{path} = CFPlus::DB::path_of_res $chksum;
86 $self->{music_meta}{$chksum} = $meta;
87
88 CFPlus::DB::write_file $meta->{path}, $data, sub { }; 86 CFPlus::DB::write_file $path, $data, sub {
89 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, 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;
90 91
91 ::message ({ markup => "downloaded song #$face, size $len octets" }); 92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
92 }); 96 });
93 } 97 }
94
95 &::audio_music_set ($self->{songs});
96 } 98 }
97 } 99 }
98 } 100 }
99 101
100 if (my $play = $ev->{play}) { 102 if (my $play = $ev->{play}) {
… …
123 ->convert_blessed 125 ->convert_blessed
124 ->filter_json_single_key_object (__widget_ref__ => sub { 126 ->filter_json_single_key_object (__widget_ref__ => sub {
125 $self->{widget}{$_[0]} 127 $self->{widget}{$_[0]}
126 }); 128 });
127 129
130 # widgetset new
128 $self->connect_ext (ws_n => sub { 131 $self->connect_ext (ws_n => sub {
129 my ($arg) = @_; 132 my ($arg) = @_;
130 133
131 $self->{widgetset}{$arg{id}} = { 134 $self->{widgetset}{$arg{id}} = {
132 w => {}, 135 w => {},
133 }; 136 };
134 }); 137 });
135 138
139 # widgetset destroy
136 $self->connect_ext (ws_d => sub { 140 $self->connect_ext (ws_d => sub {
137 my ($arg) = @_; 141 my ($arg) = @_;
138 142
139 my $ws = delete $self->{widgetset}{$arg{id}} 143 my $ws = delete $self->{widgetset}{$arg{id}}
140 or return; 144 or return;
141 145
142 $_->destroy 146 $_->destroy
143 for values %{$ws->{w}}; 147 for values %{$ws->{w}};
144 }); 148 });
145 149
150 # widgetset destroy
146 $self->connect_ext (ws_c => sub { 151 $self->connect_ext (ws_c => sub {
147 my ($arg) = @_; 152 my ($arg) = @_;
148 153
149 my $args = $arg->{args} || {}; 154 my $args = $arg->{args} || {};
150 155
… …
180 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";
181 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
182 } 187 }
183 }); 188 });
184 189
190 # widget call
185 $self->connect_ext (w_c => sub { 191 $self->connect_ext (w_c => sub {
186 my ($arg) = @_; 192 my ($arg) = @_;
187 193
188 my $w = $self->{widget}{$arg->{id}} 194 my $w = $self->{widget}{$arg->{id}}
189 or return; 195 or return;
… …
196 } else { 202 } else {
197 $w->$m (@$a); 203 $w->$m (@$a);
198 } 204 }
199 }); 205 });
200 206
207 # widget set
201 $self->connect_ext (w_s => sub { 208 $self->connect_ext (w_s => sub {
202 my ($arg) = @_; 209 my ($arg) = @_;
203 210
204 my $w = $self->{widget}{$arg->{id}} 211 my $w = $self->{widget}{$arg->{id}}
205 or return; 212 or return;
206 213
207 $w->{$arg->{name}} = $arg->{value}; 214 $w->{$arg->{name}} = $arg->{value};
208 }); 215 });
209 216
217 # widget get
210 $self->connect_ext (w_g => sub { 218 $self->connect_ext (w_g => sub {
211 my ($arg) = @_; 219 my ($arg) = @_;
212 220
213 my $w = $self->{widget}{$arg->{id}} 221 my $w = $self->{widget}{$arg->{id}}
214 or return; 222 or return;
215 223
216 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 224 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
217 }); 225 });
218 226
227 # destroy widgets on logout
219 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 228 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
220 for my $ws (values %{delete $self->{widgetset} || {}}) { 229 for my $ws (values %{delete $self->{widgetset} || {}}) {
221 $_->destroy 230 $_->destroy
222 for values %{delete $ws->{w} || {}}; 231 for values %{delete $ws->{w} || {}};
223 } 232 }
… …
436 my @skills = keys %{ $self->{skill_info} }; 445 my @skills = keys %{ $self->{skill_info} };
437 446
438 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 447 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
439 $sktbl->clear; 448 $sktbl->clear;
440 449
450 my @add;
451
452 push @add,
441 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 453 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
442 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 454 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
443 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 455 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
444 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 456 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
445 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 457 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
446 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 458 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
459 ;
447 460
448 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 461 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
449 462
450 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 463 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
451 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 464 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
479 } 492 }
480 493
481 1 494 1
482 }; 495 };
483 496
497 push @add,
484 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 498 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
485 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 499 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
486 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 500 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
487 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 501 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
488 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 502 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
489 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 503 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
504 ;
490 505
491 $x++ and ($x, $y) = (0, $y + 1); 506 $x++ and ($x, $y) = (0, $y + 1);
492 } 507 }
508
509 $sktbl->add_at (@add);
493 } 510 }
494 511
495 for (grep exists $stats->{$_}, @skills) { 512 for (grep exists $stats->{$_}, @skills) {
496 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 513 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
497 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 514 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
772 new_from_image CFPlus::Texture 789 new_from_image CFPlus::Texture
773 $data, minify => 1, mipmap => 1; 790 $data, minify => 1, mipmap => 1;
774 791
775 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 792 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
776 $self->{map_widget}->update; 793 $self->{map_widget}->update;
794
795 $_->() for @{(delete $self->{face_cb}{$id}) || []};
796}
797
798sub connect_face_update {
799 my ($self, $id, $cb) = @_;
800
801 push @{$self->{face_cb}{$id}}, $cb;
802
803 CFPlus::guard {
804 @{$self->{face_cb}{$id}}
805 = grep $_ != $cb,
806 @{$self->{face_cb}{$id}};
807 }
777} 808}
778 809
779sub sound_play { 810sub sound_play {
780 my ($self, $x, $y, $soundnum, $type) = @_; 811 my ($self, $x, $y, $soundnum, $type) = @_;
781 812
… …
965 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 996 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
966 return unless $::CONN; 997 return unless $::CONN;
967 998
968 $::FLOORBOX->clear; 999 $::FLOORBOX->clear;
969 1000
1001 my @add;
1002
970 my $row; 1003 my $row;
971 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1004 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
972 if ($row < 6) { 1005 if ($row < 6) {
973 local $_->{face_widget}; # hack to force recreation of widget 1006 local $_->{face_widget}; # hack to force recreation of widget
974 local $_->{desc_widget}; # hack to force recreation of widget 1007 local $_->{desc_widget}; # hack to force recreation of widget
975 CFPlus::Item::update_widgets $_; 1008 CFPlus::Item::update_widgets $_;
976 1009
1010 push @add,
977 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1011 0, $row, $_->{face_widget},
978 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1012 1, $row, $_->{desc_widget};
979 1013
980 $row++; 1014 $row++;
981 } else { 1015 } else {
982 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1016 push @add, 1, $row, new CFPlus::UI::Button
983 text => "More...", 1017 text => "More...",
984 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1018 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
985 ); 1019 ;
986 last; 1020 last;
987 } 1021 }
988 } 1022 }
989 if ($::CONN->{open_container}) { 1023 if ($::CONN->{open_container}) {
990 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1024 push @add, 1, $row++, new CFPlus::UI::Button
991 text => "Close container", 1025 text => "Close container",
992 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1026 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
993 ); 1027 ;
994 } 1028 }
1029
1030 $::FLOORBOX->add_at (@add);
995 }); 1031 });
996 1032
997 $::WANT_REFRESH++; 1033 $::WANT_REFRESH++;
998} 1034}
999 1035

Diff Legend

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