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.121 by root, Sat Jul 14 13:08:40 2007 UTC vs.
Revision 1.124 by root, Fri Jul 20 16:32:04 2007 UTC

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

Diff Legend

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