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.113 by root, Thu Jul 12 17:56:51 2007 UTC vs.
Revision 1.126 by root, Sun Jul 22 19:34:58 2007 UTC

57 57
58 my $faces = $ev->{faces}; 58 my $faces = $ev->{faces};
59 my @songs; 59 my @songs;
60 60
61 # request music from server if appropriate 61 # request music from server if appropriate
62 my $pri = -100; 62 if (my $faces = $ev->{faces}) {
63 for my $face (@$faces) { 63 for (@$faces) {
64 if (defined (my $chksum = $ev->{chksum}{$face})) { 64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum; 65 utf8::downgrade $chksum;
66 66
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 ::message ({ markup => "starting to download song #$face, check your output-rate setting if your connection gets laggy." }); 70 # check if already cached
71 $self->ask_face ($face, $pri, undef, sub {
72 my $num = $_[0];
73 my $len = length $_[1];
74 my ($meta, $data) = unpack "(w/a*)*", $_[1];
75
76 CFPlus::DB::write_file $chksum, $data, sub { };
77 CFPlus::DB::put resmap => $chksum => $meta, sub { }; 71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
78 74
75 if (defined $meta_json) {
79 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta); 76 my $meta = $self->{json_coder}->decode ($meta_json);
80 ::message ({ markup => "downloaded song #$face, size $len octets" }); 77 $meta->{path} = $path;
81 78 $self->{music_meta}{$chksum} = $meta;
82 &::audio_music_set ($self->{songs}); 79 &::audio_music_set ($self->{songs});
80 } else {
81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82 $self->ask_face ($face, -100 - $pri, undef, sub {
83 my $len = length $_[1];
84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
85
86 CFPlus::DB::write_file $path, $data, 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;
91
92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
96 });
97 }
83 }); 98 }
84 } 99 }
85
86 push @songs, $self->{music_map}{$face};
87 --$pri;
88 } 100 }
89 101
90 &::audio_music_set ($self->{songs} = \@songs); 102 if (my $play = $ev->{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104 }
91 }); 105 });
92 106
93 $self->connect_ext (event_capabilities => sub { 107 $self->connect_ext (event_capabilities => sub {
94 my ($cap) = @_; 108 my ($cap) = @_;
95 109
111 ->convert_blessed 125 ->convert_blessed
112 ->filter_json_single_key_object (__widget_ref__ => sub { 126 ->filter_json_single_key_object (__widget_ref__ => sub {
113 $self->{widget}{$_[0]} 127 $self->{widget}{$_[0]}
114 }); 128 });
115 129
130 # widgetset new
116 $self->connect_ext (ws_n => sub { 131 $self->connect_ext (ws_n => sub {
117 my ($arg) = @_; 132 my ($arg) = @_;
118 133
119 $self->{widgetset}{$arg{id}} = { 134 $self->{widgetset}{$arg{id}} = {
120 w => {}, 135 w => {},
121 }; 136 };
122 }); 137 });
123 138
139 # widgetset destroy
124 $self->connect_ext (ws_d => sub { 140 $self->connect_ext (ws_d => sub {
125 my ($arg) = @_; 141 my ($arg) = @_;
126 142
127 my $ws = delete $self->{widgetset}{$arg{id}} 143 my $ws = delete $self->{widgetset}{$arg{id}}
128 or return; 144 or return;
129 145
130 $_->destroy 146 $_->destroy
131 for values %{$ws->{w}}; 147 for values %{$ws->{w}};
132 }); 148 });
133 149
150 # widgetset destroy
134 $self->connect_ext (ws_c => sub { 151 $self->connect_ext (ws_c => sub {
135 my ($arg) = @_; 152 my ($arg) = @_;
136 153
137 my $args = $arg->{args} || {}; 154 my $args = $arg->{args} || {};
138 155
168 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";
169 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
170 } 187 }
171 }); 188 });
172 189
190 # widget call
173 $self->connect_ext (w_c => sub { 191 $self->connect_ext (w_c => sub {
174 my ($arg) = @_; 192 my ($arg) = @_;
175 193
176 my $w = $self->{widget}{$arg->{id}} 194 my $w = $self->{widget}{$arg->{id}}
177 or return; 195 or return;
184 } else { 202 } else {
185 $w->$m (@$a); 203 $w->$m (@$a);
186 } 204 }
187 }); 205 });
188 206
207 # widget set
189 $self->connect_ext (w_s => sub { 208 $self->connect_ext (w_s => sub {
190 my ($arg) = @_; 209 my ($arg) = @_;
191 210
192 my $w = $self->{widget}{$arg->{id}} 211 my $w = $self->{widget}{$arg->{id}}
193 or return; 212 or return;
194 213
195 $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 }
196 }); 220 });
197 221
222 # widget get
198 $self->connect_ext (w_g => sub { 223 $self->connect_ext (w_g => sub {
199 my ($arg) = @_; 224 my ($arg) = @_;
200 225
201 my $w = $self->{widget}{$arg->{id}} 226 my $w = $self->{widget}{$arg->{id}}
202 or return; 227 or return;
203 228
204 $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}}]);
205 }); 230 });
206 231
232 # destroy widgets on logout
207 $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 {
208 for my $ws (values %{delete $self->{widgetset} || {}}) { 234 for my $ws (values %{delete $self->{widgetset} || {}}) {
209 $_->destroy 235 $_->destroy
210 for values %{delete $ws->{w} || {}}; 236 for values %{delete $ws->{w} || {}};
211 } 237 }
424 my @skills = keys %{ $self->{skill_info} }; 450 my @skills = keys %{ $self->{skill_info} };
425 451
426 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 452 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
427 $sktbl->clear; 453 $sktbl->clear;
428 454
455 my @add;
456
457 push @add,
429 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 458 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
430 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 459 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
431 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 460 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
432 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 461 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
433 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 462 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
434 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 463 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
464 ;
435 465
436 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>";
437 467
438 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);
439 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);
467 } 497 }
468 498
469 1 499 1
470 }; 500 };
471 501
502 push @add,
472 $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
473 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),
474 $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
475 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),
476 $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,
477 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 ;
478 510
479 $x++ and ($x, $y) = (0, $y + 1); 511 $x++ and ($x, $y) = (0, $y + 1);
480 } 512 }
513
514 $sktbl->add_at (@add);
481 } 515 }
482 516
483 for (grep exists $stats->{$_}, @skills) { 517 for (grep exists $stats->{$_}, @skills) {
484 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 518 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
485 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 519 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
752} 786}
753 787
754sub set_texture { 788sub set_texture {
755 my ($self, $id, $data) = @_; 789 my ($self, $id, $data) = @_;
756 790
791 return unless $self->{map};
792
757 $self->{texture}[$id] = my $tex = 793 $self->{texture}[$id] = my $tex =
758 new_from_image CFPlus::Texture 794 new_from_image CFPlus::Texture
759 $data, minify => 1, mipmap => 1; 795 $data, minify => 1, mipmap => 1;
760 796
761 $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}});
762 $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 }
763} 813}
764 814
765sub sound_play { 815sub sound_play {
766 my ($self, $x, $y, $soundnum, $type) = @_; 816 my ($self, $x, $y, $soundnum, $type) = @_;
767 817
951 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
952 return unless $::CONN; 1002 return unless $::CONN;
953 1003
954 $::FLOORBOX->clear; 1004 $::FLOORBOX->clear;
955 1005
1006 my @add;
1007
956 my $row; 1008 my $row;
957 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} }) {
958 if ($row < 6) { 1010 if ($row < 6) {
959 local $_->{face_widget}; # hack to force recreation of widget 1011 local $_->{face_widget}; # hack to force recreation of widget
960 local $_->{desc_widget}; # hack to force recreation of widget 1012 local $_->{desc_widget}; # hack to force recreation of widget
961 CFPlus::Item::update_widgets $_; 1013 CFPlus::Item::update_widgets $_;
962 1014
1015 push @add,
963 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1016 0, $row, $_->{face_widget},
964 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1017 1, $row, $_->{desc_widget};
965 1018
966 $row++; 1019 $row++;
967 } else { 1020 } else {
968 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1021 push @add, 1, $row, new CFPlus::UI::Button
969 text => "More...", 1022 text => "More...",
970 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1023 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
971 ); 1024 ;
972 last; 1025 last;
973 } 1026 }
974 } 1027 }
975 if ($::CONN->{open_container}) { 1028 if ($::CONN->{open_container}) {
976 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1029 push @add, 1, $row++, new CFPlus::UI::Button
977 text => "Close container", 1030 text => "Close container",
978 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1031 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
979 ); 1032 ;
980 } 1033 }
1034
1035 $::FLOORBOX->add_at (@add);
981 }); 1036 });
982 1037
983 $::WANT_REFRESH++; 1038 $::WANT_REFRESH++;
984} 1039}
985 1040

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines