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.118 by root, Fri Jul 13 15:44:48 2007 UTC vs.
Revision 1.126 by root, Sun Jul 22 19:34:58 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 my $attr = $arg->{attr};
215
216 for (my $i = 0; $i < $#$attr; $i += 2) {
217 $w->{$attr->[$i]} = $attr->[$i+1];
218 $w->{parent}->realloc if $attr->[$i] =~ /^c_/ && $w->{visible};#d# really?
219 }
203 }); 220 });
204 221
222 # widget get
205 $self->connect_ext (w_g => sub { 223 $self->connect_ext (w_g => sub {
206 my ($arg) = @_; 224 my ($arg) = @_;
207 225
208 my $w = $self->{widget}{$arg->{id}} 226 my $w = $self->{widget}{$arg->{id}}
209 or return; 227 or return;
210 228
211 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 229 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{attr}}]);
212 }); 230 });
213 231
232 # destroy widgets on logout
214 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 233 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
215 for my $ws (values %{delete $self->{widgetset} || {}}) { 234 for my $ws (values %{delete $self->{widgetset} || {}}) {
216 $_->destroy 235 $_->destroy
217 for values %{delete $ws->{w} || {}}; 236 for values %{delete $ws->{w} || {}};
218 } 237 }
… …
431 my @skills = keys %{ $self->{skill_info} }; 450 my @skills = keys %{ $self->{skill_info} };
432 451
433 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 452 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
434 $sktbl->clear; 453 $sktbl->clear;
435 454
455 my @add;
456
457 push @add,
436 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 458 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
437 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 459 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
438 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 460 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
439 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 461 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
440 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 462 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
441 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 463 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
464 ;
442 465
443 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 466 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
444 467
445 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 468 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); 469 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
474 } 497 }
475 498
476 1 499 1
477 }; 500 };
478 501
502 push @add,
479 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 503 $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); 504 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 505 $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); 506 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, 507 $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); 508 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
509 ;
485 510
486 $x++ and ($x, $y) = (0, $y + 1); 511 $x++ and ($x, $y) = (0, $y + 1);
487 } 512 }
513
514 $sktbl->add_at (@add);
488 } 515 }
489 516
490 for (grep exists $stats->{$_}, @skills) { 517 for (grep exists $stats->{$_}, @skills) {
491 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 518 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
492 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 519 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
767 new_from_image CFPlus::Texture 794 new_from_image CFPlus::Texture
768 $data, minify => 1, mipmap => 1; 795 $data, minify => 1, mipmap => 1;
769 796
770 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 797 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
771 $self->{map_widget}->update; 798 $self->{map_widget}->update;
799
800 $_->() for @{(delete $self->{face_cb}{$id}) || []};
801}
802
803sub connect_face_update {
804 my ($self, $id, $cb) = @_;
805
806 push @{$self->{face_cb}{$id}}, $cb;
807
808 CFPlus::guard {
809 @{$self->{face_cb}{$id}}
810 = grep $_ != $cb,
811 @{$self->{face_cb}{$id}};
812 }
772} 813}
773 814
774sub sound_play { 815sub sound_play {
775 my ($self, $x, $y, $soundnum, $type) = @_; 816 my ($self, $x, $y, $soundnum, $type) = @_;
776 817
… …
960 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
961 return unless $::CONN; 1002 return unless $::CONN;
962 1003
963 $::FLOORBOX->clear; 1004 $::FLOORBOX->clear;
964 1005
1006 my @add;
1007
965 my $row; 1008 my $row;
966 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1009 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
967 if ($row < 6) { 1010 if ($row < 6) {
968 local $_->{face_widget}; # hack to force recreation of widget 1011 local $_->{face_widget}; # hack to force recreation of widget
969 local $_->{desc_widget}; # hack to force recreation of widget 1012 local $_->{desc_widget}; # hack to force recreation of widget
970 CFPlus::Item::update_widgets $_; 1013 CFPlus::Item::update_widgets $_;
971 1014
1015 push @add,
972 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1016 0, $row, $_->{face_widget},
973 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1017 1, $row, $_->{desc_widget};
974 1018
975 $row++; 1019 $row++;
976 } else { 1020 } else {
977 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1021 push @add, 1, $row, new CFPlus::UI::Button
978 text => "More...", 1022 text => "More...",
979 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1023 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
980 ); 1024 ;
981 last; 1025 last;
982 } 1026 }
983 } 1027 }
984 if ($::CONN->{open_container}) { 1028 if ($::CONN->{open_container}) {
985 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1029 push @add, 1, $row++, new CFPlus::UI::Button
986 text => "Close container", 1030 text => "Close container",
987 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1031 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
988 ); 1032 ;
989 } 1033 }
1034
1035 $::FLOORBOX->add_at (@add);
990 }); 1036 });
991 1037
992 $::WANT_REFRESH++; 1038 $::WANT_REFRESH++;
993} 1039}
994 1040

Diff Legend

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