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.117 by root, Fri Jul 13 05:31:31 2007 UTC vs.
Revision 1.124 by root, Fri Jul 20 16:32:04 2007 UTC

… …
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 "res-metadata" => $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 "res-metadata" => $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 }
… …
118 ->convert_blessed 125 ->convert_blessed
119 ->filter_json_single_key_object (__widget_ref__ => sub { 126 ->filter_json_single_key_object (__widget_ref__ => sub {
120 $self->{widget}{$_[0]} 127 $self->{widget}{$_[0]}
121 }); 128 });
122 129
130 # widgetset new
123 $self->connect_ext (ws_n => sub { 131 $self->connect_ext (ws_n => sub {
124 my ($arg) = @_; 132 my ($arg) = @_;
125 133
126 $self->{widgetset}{$arg{id}} = { 134 $self->{widgetset}{$arg{id}} = {
127 w => {}, 135 w => {},
128 }; 136 };
129 }); 137 });
130 138
139 # widgetset destroy
131 $self->connect_ext (ws_d => sub { 140 $self->connect_ext (ws_d => sub {
132 my ($arg) = @_; 141 my ($arg) = @_;
133 142
134 my $ws = delete $self->{widgetset}{$arg{id}} 143 my $ws = delete $self->{widgetset}{$arg{id}}
135 or return; 144 or return;
136 145
137 $_->destroy 146 $_->destroy
138 for values %{$ws->{w}}; 147 for values %{$ws->{w}};
139 }); 148 });
140 149
150 # widgetset destroy
141 $self->connect_ext (ws_c => sub { 151 $self->connect_ext (ws_c => sub {
142 my ($arg) = @_; 152 my ($arg) = @_;
143 153
144 my $args = $arg->{args} || {}; 154 my $args = $arg->{args} || {};
145 155
… …
175 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";
176 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
177 } 187 }
178 }); 188 });
179 189
190 # widget call
180 $self->connect_ext (w_c => sub { 191 $self->connect_ext (w_c => sub {
181 my ($arg) = @_; 192 my ($arg) = @_;
182 193
183 my $w = $self->{widget}{$arg->{id}} 194 my $w = $self->{widget}{$arg->{id}}
184 or return; 195 or return;
… …
191 } else { 202 } else {
192 $w->$m (@$a); 203 $w->$m (@$a);
193 } 204 }
194 }); 205 });
195 206
207 # widget set
196 $self->connect_ext (w_s => sub { 208 $self->connect_ext (w_s => sub {
197 my ($arg) = @_; 209 my ($arg) = @_;
198 210
199 my $w = $self->{widget}{$arg->{id}} 211 my $w = $self->{widget}{$arg->{id}}
200 or return; 212 or return;
201 213
202 $w->{$arg->{name}} = $arg->{value}; 214 $w->{$arg->{name}} = $arg->{value};
203 }); 215 });
204 216
217 # widget get
205 $self->connect_ext (w_g => sub { 218 $self->connect_ext (w_g => sub {
206 my ($arg) = @_; 219 my ($arg) = @_;
207 220
208 my $w = $self->{widget}{$arg->{id}} 221 my $w = $self->{widget}{$arg->{id}}
209 or return; 222 or return;
210 223
211 $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}}]);
212 }); 225 });
213 226
227 # destroy widgets on logout
214 $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 {
215 for my $ws (values %{delete $self->{widgetset} || {}}) { 229 for my $ws (values %{delete $self->{widgetset} || {}}) {
216 $_->destroy 230 $_->destroy
217 for values %{delete $ws->{w} || {}}; 231 for values %{delete $ws->{w} || {}};
218 } 232 }
… …
431 my @skills = keys %{ $self->{skill_info} }; 445 my @skills = keys %{ $self->{skill_info} };
432 446
433 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 447 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
434 $sktbl->clear; 448 $sktbl->clear;
435 449
450 my @add;
451
452 push @add,
436 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 453 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
437 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 454 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
438 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 455 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
439 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 456 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
440 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 457 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
441 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 458 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
459 ;
442 460
443 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>";
444 462
445 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);
446 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);
… …
474 } 492 }
475 493
476 1 494 1
477 }; 495 };
478 496
497 push @add,
479 $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
480 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),
481 $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
482 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),
483 $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,
484 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 ;
485 505
486 $x++ and ($x, $y) = (0, $y + 1); 506 $x++ and ($x, $y) = (0, $y + 1);
487 } 507 }
508
509 $sktbl->add_at (@add);
488 } 510 }
489 511
490 for (grep exists $stats->{$_}, @skills) { 512 for (grep exists $stats->{$_}, @skills) {
491 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 513 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
492 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 514 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
759} 781}
760 782
761sub set_texture { 783sub set_texture {
762 my ($self, $id, $data) = @_; 784 my ($self, $id, $data) = @_;
763 785
786 return unless $self->{map};
787
764 $self->{texture}[$id] = my $tex = 788 $self->{texture}[$id] = my $tex =
765 new_from_image CFPlus::Texture 789 new_from_image CFPlus::Texture
766 $data, minify => 1, mipmap => 1; 790 $data, minify => 1, mipmap => 1;
767 791
768 $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}});
769 $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 }
770} 808}
771 809
772sub sound_play { 810sub sound_play {
773 my ($self, $x, $y, $soundnum, $type) = @_; 811 my ($self, $x, $y, $soundnum, $type) = @_;
774 812
… …
958 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 996 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
959 return unless $::CONN; 997 return unless $::CONN;
960 998
961 $::FLOORBOX->clear; 999 $::FLOORBOX->clear;
962 1000
1001 my @add;
1002
963 my $row; 1003 my $row;
964 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} }) {
965 if ($row < 6) { 1005 if ($row < 6) {
966 local $_->{face_widget}; # hack to force recreation of widget 1006 local $_->{face_widget}; # hack to force recreation of widget
967 local $_->{desc_widget}; # hack to force recreation of widget 1007 local $_->{desc_widget}; # hack to force recreation of widget
968 CFPlus::Item::update_widgets $_; 1008 CFPlus::Item::update_widgets $_;
969 1009
1010 push @add,
970 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1011 0, $row, $_->{face_widget},
971 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1012 1, $row, $_->{desc_widget};
972 1013
973 $row++; 1014 $row++;
974 } else { 1015 } else {
975 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1016 push @add, 1, $row, new CFPlus::UI::Button
976 text => "More...", 1017 text => "More...",
977 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1018 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
978 ); 1019 ;
979 last; 1020 last;
980 } 1021 }
981 } 1022 }
982 if ($::CONN->{open_container}) { 1023 if ($::CONN->{open_container}) {
983 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1024 push @add, 1, $row++, new CFPlus::UI::Button
984 text => "Close container", 1025 text => "Close container",
985 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1026 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
986 ); 1027 ;
987 } 1028 }
1029
1030 $::FLOORBOX->add_at (@add);
988 }); 1031 });
989 1032
990 $::WANT_REFRESH++; 1033 $::WANT_REFRESH++;
991} 1034}
992 1035

Diff Legend

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