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.120 by root, Sat Jul 14 13:04:42 2007 UTC vs.
Revision 1.127 by root, Mon Jul 23 15:30:45 2007 UTC

… …
74 74
75 if (defined $meta_json) { 75 if (defined $meta_json) {
76 my $meta = $self->{json_coder}->decode ($meta_json); 76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path; 77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta; 78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
79 } else { 80 } else {
80 ::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." });
81 $self->ask_face ($face, -100 - $pri, undef, sub { 82 $self->ask_face ($face, -100 - $pri, undef, sub {
82 my $len = length $_[1]; 83 my $len = length $_[1];
83 my ($meta_json, $data) = unpack "(w/a*)*", $_[1]; 84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
… …
124 ->convert_blessed 125 ->convert_blessed
125 ->filter_json_single_key_object (__widget_ref__ => sub { 126 ->filter_json_single_key_object (__widget_ref__ => sub {
126 $self->{widget}{$_[0]} 127 $self->{widget}{$_[0]}
127 }); 128 });
128 129
130 # widgetset new
129 $self->connect_ext (ws_n => sub { 131 $self->connect_ext (ws_n => sub {
130 my ($arg) = @_; 132 my ($arg) = @_;
131 133
132 $self->{widgetset}{$arg{id}} = { 134 $self->{widgetset}{$arg{id}} = {
133 w => {}, 135 w => {},
134 }; 136 };
135 }); 137 });
136 138
139 # widgetset destroy
137 $self->connect_ext (ws_d => sub { 140 $self->connect_ext (ws_d => sub {
138 my ($arg) = @_; 141 my ($arg) = @_;
139 142
140 my $ws = delete $self->{widgetset}{$arg{id}} 143 my $ws = delete $self->{widgetset}{$arg{id}}
141 or return; 144 or return;
142 145
143 $_->destroy 146 $_->destroy
144 for values %{$ws->{w}}; 147 for values %{$ws->{w}};
145 }); 148 });
146 149
150 # widgetset destroy
147 $self->connect_ext (ws_c => sub { 151 $self->connect_ext (ws_c => sub {
148 my ($arg) = @_; 152 my ($arg) = @_;
149 153
150 my $args = $arg->{args} || {}; 154 my $args = $arg->{args} || {};
151 155
… …
181 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";
182 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
183 } 187 }
184 }); 188 });
185 189
190 # widget call
186 $self->connect_ext (w_c => sub { 191 $self->connect_ext (w_c => sub {
187 my ($arg) = @_; 192 my ($arg) = @_;
188 193
189 my $w = $self->{widget}{$arg->{id}} 194 my $w = $self->{widget}{$arg->{id}}
190 or return; 195 or return;
… …
197 } else { 202 } else {
198 $w->$m (@$a); 203 $w->$m (@$a);
199 } 204 }
200 }); 205 });
201 206
207 # widget set
202 $self->connect_ext (w_s => sub { 208 $self->connect_ext (w_s => sub {
203 my ($arg) = @_; 209 my ($arg) = @_;
204 210
205 my $w = $self->{widget}{$arg->{id}} 211 my $w = $self->{widget}{$arg->{id}}
206 or return; 212 or return;
207 213
208 $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 }
209 }); 225 });
210 226
227 # widget get
211 $self->connect_ext (w_g => sub { 228 $self->connect_ext (w_g => sub {
212 my ($arg) = @_; 229 my ($arg) = @_;
213 230
214 my $w = $self->{widget}{$arg->{id}} 231 my $w = $self->{widget}{$arg->{id}}
215 or return; 232 or return;
216 233
217 $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}}]);
218 }); 235 });
219 236
237 # destroy widgets on logout
220 $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 {
221 for my $ws (values %{delete $self->{widgetset} || {}}) { 239 for my $ws (values %{delete $self->{widgetset} || {}}) {
222 $_->destroy 240 $_->destroy
223 for values %{delete $ws->{w} || {}}; 241 for values %{delete $ws->{w} || {}};
224 } 242 }
… …
437 my @skills = keys %{ $self->{skill_info} }; 455 my @skills = keys %{ $self->{skill_info} };
438 456
439 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 457 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
440 $sktbl->clear; 458 $sktbl->clear;
441 459
460 my @add;
461
462 push @add,
442 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 463 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
443 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 464 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
444 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 465 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
445 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 466 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
446 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 467 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
447 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 468 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
469 ;
448 470
449 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>";
450 472
451 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);
452 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);
… …
480 } 502 }
481 503
482 1 504 1
483 }; 505 };
484 506
507 push @add,
485 $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
486 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),
487 $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
488 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),
489 $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,
490 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 ;
491 515
492 $x++ and ($x, $y) = (0, $y + 1); 516 $x++ and ($x, $y) = (0, $y + 1);
493 } 517 }
518
519 $sktbl->add_at (@add);
494 } 520 }
495 521
496 for (grep exists $stats->{$_}, @skills) { 522 for (grep exists $stats->{$_}, @skills) {
497 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 523 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
498 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 524 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
773 new_from_image CFPlus::Texture 799 new_from_image CFPlus::Texture
774 $data, minify => 1, mipmap => 1; 800 $data, minify => 1, mipmap => 1;
775 801
776 $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}});
777 $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 }
778} 818}
779 819
780sub sound_play { 820sub sound_play {
781 my ($self, $x, $y, $soundnum, $type) = @_; 821 my ($self, $x, $y, $soundnum, $type) = @_;
782 822
… …
966 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1006 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
967 return unless $::CONN; 1007 return unless $::CONN;
968 1008
969 $::FLOORBOX->clear; 1009 $::FLOORBOX->clear;
970 1010
1011 my @add;
1012
971 my $row; 1013 my $row;
972 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} }) {
973 if ($row < 6) { 1015 if ($row < 6) {
974 local $_->{face_widget}; # hack to force recreation of widget 1016 local $_->{face_widget}; # hack to force recreation of widget
975 local $_->{desc_widget}; # hack to force recreation of widget 1017 local $_->{desc_widget}; # hack to force recreation of widget
976 CFPlus::Item::update_widgets $_; 1018 CFPlus::Item::update_widgets $_;
977 1019
1020 push @add,
978 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1021 0, $row, $_->{face_widget},
979 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1022 1, $row, $_->{desc_widget};
980 1023
981 $row++; 1024 $row++;
982 } else { 1025 } else {
983 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1026 push @add, 1, $row, new CFPlus::UI::Button
984 text => "More...", 1027 text => "More...",
985 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1028 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
986 ); 1029 ;
987 last; 1030 last;
988 } 1031 }
989 } 1032 }
990 if ($::CONN->{open_container}) { 1033 if ($::CONN->{open_container}) {
991 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1034 push @add, 1, $row++, new CFPlus::UI::Button
992 text => "Close container", 1035 text => "Close container",
993 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1036 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
994 ); 1037 ;
995 } 1038 }
1039
1040 $::FLOORBOX->add_at (@add);
996 }); 1041 });
997 1042
998 $::WANT_REFRESH++; 1043 $::WANT_REFRESH++;
999} 1044}
1000 1045

Diff Legend

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