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.155 by root, Fri Aug 17 21:18:01 2007 UTC vs.
Revision 1.169 by root, Sat Sep 1 07:22:21 2007 UTC

… …
21 21
22 my $self = $class->SUPER::new (%arg, 22 my $self = $class->SUPER::new (%arg,
23 setup_req => { 23 setup_req => {
24 extmap => 1, 24 extmap => 1,
25 excmd => 1, 25 excmd => 1,
26 xwidget1 => 1,#d# 26 xwidget2 => 1,#d#
27 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
28 }, 28 },
29 ); 29 );
30 30
31 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
48 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
49 @args 49 @args
50 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
52 52
53 $self->connect_ext (ambient_music => sub {
54 my ($songs) = @_;
55 &::audio_music_set_ambient ($songs);
56 });
57
58 $self->connect_ext (capabilities => sub {
59 my (%cap) = @_;
60
61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want;
63
64 if (my $ts = $cap{tileset}) {
65 if (my ($default) = grep $_->[2] & 1, @$ts) {
66 $self->{tileset} = $default;
67 $self->{tilesize} = $default->[3];
68 $self->setup_req (tileset => $default->[0]);
69
70 my $w = int $self->{mapw} * 32 / $self->{tilesize};
71 my $h = int $self->{maph} * 32 / $self->{tilesize};
72
73 $self->setup_req (mapsize => "${w}x${h}");
74 }
75 }
76 });
77
78 $self->{json_coder} 53 $self->{json_coder}
79 ->convert_blessed 54 ->convert_blessed
80 ->filter_json_single_key_object (__w_ => sub { 55 ->filter_json_single_key_object ("\fw" => sub {
81 $self->{widget}{$_[0]} 56 $self->{widget}{$_[0]}
57 })
58 ->filter_json_single_key_object ("\fc" => sub {
59 my ($id) = @_;
60 sub {
61 $self->send_exti_msg (w_e => $id, @_);
62 }
82 }); 63 });
83
84 # widgetset new
85 $self->connect_ext (ws_n => sub {
86 my ($id) = @_;
87
88 $self->{widgetset}{$id} = {
89 w => {},
90 };
91 });
92
93 # widgetset destroy
94 $self->connect_ext (ws_d => sub {
95 my ($id) = @_;
96
97 my $ws = delete $self->{widgetset}{$id}
98 or return;
99
100 $_->destroy
101 for values %{$ws->{w}};
102 });
103
104 # widgetset create
105 $self->connect_ext (ws_c => sub {
106 my ($ws, $id, $class, $args) = @_;
107
108 for my $ev (grep /^on_/, keys %$args) {
109 my $rid = $args->{$ev};
110 $args->{$ev} = sub {
111 my $id = shift->{s_id};
112 $self->send_exti_msg (w_e => $id, $rid, @_);
113
114 1
115 };
116 }
117
118 $self->widget_associate (
119 $ws, $id => scalar eval {
120 local $SIG{__DIE__};
121 "CFPlus::UI::$class"->new (%$args)
122 }
123 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
124 });
125
126 # widgetset associate
127 $self->connect_ext (ws_a => sub {
128 my (%ass) = @_;
129
130 # everything that has a name, wether conceivably useful or not
131 my %wkw = (
132 root => $CFPlus::UI::ROOT,
133 tooltip => $CFPlus::UI::TOOLTIP,
134
135 mapwidget => $::MAPWIDGET,
136 buttonbar => $::BUTTONBAR,
137 metaserver => $::METASERVER,
138 buttonbar => $::BUTTONBAR,
139 login_button => $::LOGIN_BUTTON,
140 quit_dialog => $::QUIT_DIALOG,
141 host_entry => $::HOST_ENTRY,
142 metaserver => $::METASERVER,
143 server_info => $::SERVER_INFO,
144
145 setup_dialog => $::SETUP_DIALOG,
146 setup_notebook => $::SETUP_NOTEBOOK,
147 setup_server => $::SETUP_SERVER,
148 setup_keyboard => $::SETUP_KEYBOARD,
149
150 pl_notebook => $::PL_NOTEBOOK,
151 pl_window => $::PL_WINDOW,
152 inventory_page => $::INVENTORY_PAGE,
153 stats_page => $::STATS_PAGE,
154 skill_page => $::SKILL_PAGE,
155 spell_page => $::SPELL_PAGE,
156 spell_list => $::SPELL_LIST,
157
158 floorbox => $::FLOORBOX,
159 help_window => $::HELP_WINDOW,
160 message_window => $::MESSAGE_WINDOW,
161 statusbox => $::SDTATUSBOX,
162
163 inv => $::INV,
164 invr => $::INVR,
165 invr_hb => $::INVR_HB,
166
167 );
168
169 while (my ($id, $name) = each %ass) {
170 $self->widget_associate (undef, $id => $wkw{$name})
171 or warn "server failed to associate non-existent well-known widget $name\n";
172 }
173 });
174
175 # widget call
176 $self->connect_ext (w_c => sub {
177 my ($id, $rid, $method, @args) = @_;
178
179 my $w = $self->{widget}{$id}
180 or return;
181
182 if ($rid) {
183 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
184 } else {
185 $w->$method (@args);
186 }
187 });
188
189 # widget set
190 $self->connect_ext (w_s => sub {
191 my ($id, $attr) = @_;
192
193 my $w = $self->{widget}{$id}
194 or return;
195
196 for (my $i = 0; $i < $#$attr; $i += 2) {
197 my ($member, $value) = @$attr[$i, $i+1];
198 if (defined $value) {
199 $w->{$member} = $value;
200 } else {
201 delete $w->{$member};
202 }
203 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
204 }
205 });
206
207 # widget get
208 $self->connect_ext (w_g => sub {
209 my ($id, $rid, $attr) = @_;
210
211 my $w = $self->{widget}{$id}
212 or return;
213
214 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
215 });
216
217 # message window
218 $self->connect_ext (channel_info => sub {
219 my ($info) = @_;
220 $self->{channels}->{$info->{id}} = $info;
221 $::MESSAGE_WINDOW->add_channel ($info);
222 });
223 64
224 # destroy widgets on logout 65 # destroy widgets on logout
225 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 66 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
226 for my $ws (values %{delete $self->{widgetset} || {}}) { 67 for my $ws (values %{delete $self->{widgetset} || {}}) {
227 $_->destroy 68 $_->destroy
… …
250 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 91 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
251 92
252 $self 93 $self
253} 94}
254 95
255sub widget_associate {
256 my ($self, $ws, $id, $widget) = @_;
257
258 if ($widget) {
259 $widget->{s_id} = $id;
260 $self->{widget}{$id} = $widget;
261
262 if ($ws) {
263 $widget->{s_ws} = $ws;
264 $self->{widgetset}{$ws}{w}{$id} = $widget;
265 }
266
267 $widget->connect (on_destroy => sub {
268 my ($widget) = @_;
269
270 delete $self->{widget}{$widget->{s_id}};
271 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
272 if exists $widget->{s_ws};
273 });
274
275 1
276 } else {
277 $self->send_exti_msg (w_e => $id, undef);
278
279 0
280 }
281}
282
283sub update_fx_want { 96sub update_fx_want {
284 my ($self) = @_; 97 my ($self) = @_;
285 98
286 $self->send_exti_msg (fx_want => { 99 $self->send_exti_msg (fx_want => {
287 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC 100 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
288 5 => !!$::CFG->{audio_enable}, # FT_SOUND 101 5 => !!$::CFG->{audio_enable}, # FT_SOUND
102 6 => 1, # FT_RSRC
289 }); 103 });
290} 104}
105
106sub ext_capabilities {
107 my ($self, %cap) = @_;
108
109 #$self->send ("setup sound 0"); # we use a different protocol
110 $self->update_fx_want;
111
112 $self->send_exti_req (resource => "exp_table", sub {
113 my ($exp_table) = @_;
114
115 $self->register_face_handler ($exp_table, sub {
116 my ($face) = @_;
117
118 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
119 $_->() for values %{ $self->{on_exp_update} || {} };
120 });
121
122 ()
123 });
124
125 if (my $ts = $cap{tileset}) {
126 if (my ($default) = grep $_->[2] & 1, @$ts) {
127 $self->{tileset} = $default;
128 $self->{tilesize} = $default->[3];
129 $self->setup_req (tileset => $default->[0]);
130
131 my $w = int $self->{mapw} * 32 / $self->{tilesize};
132 my $h = int $self->{maph} * 32 / $self->{tilesize};
133
134 $self->setup_req (mapsize => "${w}x${h}");
135 }
136 }
137}
138
139sub ext_ambient_music {
140 my ($self, $songs) = @_;
141 &::audio_music_set_ambient ($songs);
142}
143
144#############################################################################
145
146sub widget_associate {
147 my ($self, $ws, $id, $widget) = @_;
148
149 $widget ||= new CFPlus::UI::Bin;
150
151 $widget->{s_id} = $id;
152 $self->{widget}{$id} = $widget;
153
154 if ($ws) {
155 $widget->{s_ws} = $ws;
156 $self->{widgetset}{$ws}{w}{$id} = $widget;
157 }
158
159 $widget->connect (on_destroy => sub {
160 my ($widget) = @_;
161
162 delete $self->{widget}{$widget->{s_id}};
163 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
164 if exists $widget->{s_ws};
165 });
166}
167
168# widgetset new
169sub ext_ws_n {
170 my ($self, $id) = @_;
171
172 $self->{widgetset}{$id} = {
173 w => {},
174 };
175}
176
177# widgetset destroy
178sub ext_ws_d {
179 my ($self, $id) = @_;
180
181 my $ws = delete $self->{widgetset}{$id}
182 or return;
183
184 $_->destroy
185 for values %{$ws->{w}};
186}
187
188# widgetset create
189sub ext_ws_c {
190 my ($self, $ws, $id, $class, $args) = @_;
191
192 $self->widget_associate (
193 $ws, $id => scalar eval {
194 local $SIG{__DIE__};
195 "CFPlus::UI::$class"->new (%$args)
196 }
197 );
198}
199
200# widgetset associate
201sub ext_ws_a {
202 my ($self, %ass) = @_;
203
204 # everything that has a name, wether conceivably useful or not
205 my %wkw = (
206 root => $CFPlus::UI::ROOT,
207 tooltip => $CFPlus::UI::TOOLTIP,
208
209 mapwidget => $::MAPWIDGET,
210 buttonbar => $::BUTTONBAR,
211 metaserver => $::METASERVER,
212 buttonbar => $::BUTTONBAR,
213 login_button => $::LOGIN_BUTTON,
214 quit_dialog => $::QUIT_DIALOG,
215 host_entry => $::HOST_ENTRY,
216 metaserver => $::METASERVER,
217 server_info => $::SERVER_INFO,
218
219 setup_dialog => $::SETUP_DIALOG,
220 setup_notebook => $::SETUP_NOTEBOOK,
221 setup_server => $::SETUP_SERVER,
222 setup_keyboard => $::SETUP_KEYBOARD,
223
224 pl_notebook => $::PL_NOTEBOOK,
225 pl_window => $::PL_WINDOW,
226 inventory_page => $::INVENTORY_PAGE,
227 stats_page => $::STATS_PAGE,
228 skill_page => $::SKILL_PAGE,
229 spell_page => $::SPELL_PAGE,
230 spell_list => $::SPELL_LIST,
231
232 floorbox => $::FLOORBOX,
233 help_window => $::HELP_WINDOW,
234 message_window => $::MESSAGE_WINDOW,
235 statusbox => $::SDTATUSBOX,
236
237 inv => $::INV,
238 invr => $::INVR,
239 invr_hb => $::INVR_HB,
240 );
241
242 while (my ($id, $name) = each %ass) {
243 $self->widget_associate (undef, $id => $wkw{$name});
244 }
245}
246
247# widget call
248sub ext_w_c {
249 my ($self, $id, $rcb, $method, @args) = @_;
250
251 my $w = $self->{widget}{$id}
252 or return;
253
254 if ($rcb) {
255 $rcb->($w->$method (@args));
256 } else {
257 $w->$method (@args);
258 }
259}
260
261# widget set
262sub ext_w_s {
263 my ($self, $id, $attr) = @_;
264
265 my $w = $self->{widget}{$id}
266 or return;
267
268 for (my $i = 0; $i < $#$attr; $i += 2) {
269 my ($member, $value) = @$attr[$i, $i+1];
270 if (defined $value) {
271 $w->{$member} = $value;
272 } else {
273 delete $w->{$member};
274 }
275 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
276 }
277}
278
279# widget get
280sub ext_w_g {
281 my ($self, $id, $rid, @attr) = @_;
282
283 my $w = $self->{widget}{$id}
284 or return;
285
286 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
287}
288
289# message window
290sub ext_channel_info {
291 my ($self, $info) = @_;
292 $self->{channels}->{$info->{id}} = $info;
293 $::MESSAGE_WINDOW->add_channel ($info);
294}
295
296#############################################################################
291 297
292sub logprint { 298sub logprint {
293 my ($self, @a) = @_; 299 my ($self, @a) = @_;
294 300
295 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 301 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
… …
384 390
385 if ( 391 if (
386 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 392 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
387 ) { 393 ) {
388 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 394 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
389 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 395 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
390 } 396 }
391 397
392 $self->update_stats_window ($stats, $prev); 398 $self->update_stats_window ($stats, $prev);
393 399
394 $self->{prev_stats} = { %$stats }; 400 $self->{prev_stats} = { %$stats };
… …
433 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 439 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
434 $::GAUGES->{food} ->set_value ($fo, $fo_m); 440 $::GAUGES->{food} ->set_value ($fo, $fo_m);
435 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 441 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
436 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 442 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
437 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 443 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
444 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
438 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 445 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
439 my $title = $stats->{+CS_STAT_TITLE}; 446 my $title = $stats->{+CS_STAT_TITLE};
440 $title =~ s/^Player: //; 447 $title =~ s/^Player: //;
441 $::STATWIDS->{title} ->set_text ("Title: " . $title); 448 $::STATWIDS->{title} ->set_text ("Title: " . $title);
442 449
… …
460 for keys %RES_TBL; 467 for keys %RES_TBL;
461 468
462 my $sktbl = $::STATWIDS->{skill_tbl}; 469 my $sktbl = $::STATWIDS->{skill_tbl};
463 my @skills = keys %{ $self->{skill_info} }; 470 my @skills = keys %{ $self->{skill_info} };
464 471
465 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 472 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
473 map [$_, $self->{skill_info}{$_}],
474 grep exists $stats->{$_},
475 @skills;
476
477 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
478 $self->{stat_order} = join ",", map $_->[0], @order;
479
466 $sktbl->clear; 480 $sktbl->clear;
467 481
468 my @add; 482 my $sw = $self->{skillwid}{""} ||= [
469
470 push @add,
471 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 483 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
472 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 484 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
485 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
473 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 486 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
474 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 487 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
475 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 488 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
489 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
476 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 490 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
477 ; 491 ];
492
493 my @add = @$sw;
478 494
479 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 495 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
480 496
481 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 497 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
482 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 498 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
483 499
484 my ($x, $y) = (0, 1); 500 my ($x, $y) = (0, 1);
485 for ( 501 for (@order) {
486 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
487 map [$_, $self->{skill_info}{$_}],
488 grep exists $stats->{$_},
489 @skills
490 ) {
491 my ($idx, $name) = @$_; 502 my ($idx, $name) = @$_;
492 503
493 my $spell_cb = sub { 504 my $spell_cb = sub {
494 my ($widget, $ev) = @_; 505 my ($widget, $ev) = @_;
495 506
… …
510 } 521 }
511 522
512 1 523 1
513 }; 524 };
514 525
526 my $sw = $self->{skillwid}{$idx} ||= [
527 # exp
528 (new CFPlus::UI::Label
529 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
530
531 # level
532 (new CFPlus::UI::Label
533 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
534
535 # progress
536 (new CFPlus::UI::ExperienceProgress),
537
538 # label
539 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
540 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
541 ];
542
515 push @add, 543 push @add,
516 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 544 $x * 4 + 0, $y, $sw->[0],
517 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 545 $x * 4 + 1, $y, $sw->[1],
518 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 546 $x * 4 + 2, $y, $sw->[2],
519 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 547 $x * 4 + 3, $y, $sw->[3],
520 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
521 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
522 ; 548 ;
523 549
524 $x++ and ($x, $y) = (0, $y + 1); 550 $x++ and ($x, $y) = (0, $y + 1);
525 } 551 }
526 552
527 $sktbl->add_at (@add); 553 $sktbl->add_at (@add);
528 } 554 }
529 555
530 for (grep exists $stats->{$_}, @skills) { 556 for (@order) {
531 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 557 my ($idx, $name) = @$_;
532 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 558 my $val = $stats->{$idx};
533 }
534}
535 559
536sub macro_send { 560 next if $prev->{$idx}[1] eq $val->[1];
537 my ($self, $macro) = @_;
538 561
539 for my $cmd (@{ $macro->{action} }) { 562 my $sw = $self->{skillwid}{$idx};
540 $self->send_command ($cmd); 563 $sw->[0]->set_text (::formsep ($val->[1]));
564 $sw->[1]->set_text ($val->[0] * 1);
565 $sw->[2]->set_value (@$val);
566
567 $::GAUGES->{sklprg}->set_label ("$name %d%%");
568 $::GAUGES->{sklprg}->set_value (@$val);
541 } 569 }
542} 570}
543 571
544sub user_send { 572sub user_send {
545 my ($self, $command) = @_; 573 my ($self, $command) = @_;
… …
547 $self->{record}->($command) 575 $self->{record}->($command)
548 if $self->{record}; 576 if $self->{record};
549 577
550 $self->logprint ("send: ", $command); 578 $self->logprint ("send: ", $command);
551 $self->send_command ($command); 579 $self->send_command ($command);
552 ::status ($command);
553} 580}
554 581
555sub record { 582sub record {
556 my ($self, $cb) = @_; 583 my ($self, $cb) = @_;
557 584
… …
579 $tex->upload; 606 $tex->upload;
580 } else { 607 } else {
581 $self->{delay}{$tile} = 1; 608 $self->{delay}{$tile} = 1;
582 609
583 # we assume the face is in-flight and will eventually come 610 # we assume the face is in-flight and will eventually come
584 push @{$self->{face_cb}{$tile}}, sub { 611 push @{$self->{tile_cb}{$tile}}, sub {
585 delete $self->{delay}{$tile}; 612 delete $self->{delay}{$tile};
586 $_[0]->upload; 613 $_[0]->upload;
587 }; 614 };
588 } 615 }
589 } 616 }
590 617
591 if ($delay) { 618 if ($delay) {
592 # delay the map drawing a tiny bit in the hope of getting the missing fetched 619 # delay the map drawing a tiny bit in the hope of getting the missing fetched
593 Event->timer (after => 0.03, cb => sub { 620 Event->timer (after => 0.03, cb => sub {
594 $_[0]->w->cancel; 621 $_[0]->w->cancel;
595 $self->{map_widget}->update; 622 $self->{map_widget}->update
623 if $self->{map_widget};
596 }); 624 });
597 } else { 625 } else {
598 $self->{map_widget}->update; 626 $self->{map_widget}->update;
599 } 627 }
600} 628}
… …
629} 657}
630 658
631sub bg_fetch { 659sub bg_fetch {
632 my ($self) = @_; 660 my ($self) = @_;
633 661
634 my $id; 662 my $tile;
635 663
636 do { 664 do {
637 $id = pop @{$self->{bg_fetch}} 665 $tile = pop @{$self->{bg_fetch}}
638 or return; 666 or return;
639 } while $self->{texture}[$id]; 667 } while $self->{texture}[$tile];
640 668
641 CFPlus::DB::exists tilecache => $id, sub { 669 CFPlus::DB::get tilecache => $tile, sub {
642 my ($exists) = @_; 670 my ($data) = @_;
643 671
644 return unless $self->{map}; # stop when destroyed 672 return unless $self->{map}; # stop when destroyed
645 673
646 if ($exists) { 674 if (defined $data) {
647 $self->have_tile ($id); 675 $self->have_tile ($tile, $data);
648 $self->{texture}[$id]->upload; 676 $self->{texture}[$tile]->upload;
649 } 677 }
650 678
651 $self->bg_fetch; 679 $self->bg_fetch;
652 }; 680 };
653} 681}
… …
810 my ($self, $facenum, $face, $cb) = @_; 838 my ($self, $facenum, $face, $cb) = @_;
811 839
812 if ($face->{type} == 0) { # FT_FACE 840 if ($face->{type} == 0) { # FT_FACE
813 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 841 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
814 842
815 $face->{id} = $id; 843 $face->{id} = $id;
816 $self->{faceid}[$facenum] = $id;
817
818 $self->{map}->set_tileid ($facenum => $id); 844 $self->{map}->set_tileid ($facenum => $id);
819 845
820 CFPlus::DB::get tilecache => $id, $cb; 846 CFPlus::DB::get tilecache => $id, $cb;
821 847
822 } elsif ($face->{type} & 1) { # with metadata 848 } elsif ($face->{type} & 1) { # with metadata
823 CFPlus::DB::get res_meta => $face->{name}, $cb; 849 CFPlus::DB::get res_meta => $face->{name}, $cb;
850
851 } else { # no metadata
852 CFPlus::DB::get res_data => $face->{name}, $cb;
824 } 853 }
825} 854}
826 855
827sub face_update { 856sub face_update {
828 my ($self, $facenum, $face, $changed) = @_; 857 my ($self, $facenum, $face, $changed) = @_;
829 858
830 if ($face->{type} == 0) { # FT_FACE 859 if ($face->{type} == 0) {
860 # image, FT_FACE
831 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 861 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
832 if $changed; 862 if $changed;
833 863
834 $self->have_tile ($face->{id}); 864 $self->have_tile ($face->{id}, delete $face->{data});
835 865
836 } elsif ($face->{type} & 1) { # split metadata 866 } elsif ($face->{type} & 1) {
867 # split metadata case, FT_MUSIC, FT_SOUND
837 if ($changed) { # new data 868 if ($changed) { # new data
838 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 869 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
839 $face->{meta} = $self->{json_coder}->decode ($meta_json); 870 $face->{data} = $meta;
840 871
872 # rely on strict ordering here and also on later fetch
841 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 873 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
842 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { }; 874 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
843 } else { 875 }
876
844 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 877 $face->{data} = $self->{json_coder}->decode ($face->{data});
845 }
846
847 ::add_license ($face); 878 ::add_license ($face);
879 ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
880 if $changed;
848 881
849 if ($face->{type} == 3) { # FT_MUSIC 882 if ($face->{type} == 3) { # FT_MUSIC
850 $self->{music_meta}{$facenum} = $face;
851
852 ::message ({ markup => "downloaded song #$facenum" })
853 if $changed;
854
855 &::audio_music_push ($facenum); 883 &::audio_music_push ($facenum);
856 } elsif ($face->{type} == 5) { # FT_SOUND 884 } elsif ($face->{type} == 5) { # FT_SOUND
857 $self->{sound_meta}{$facenum} = $face;
858
859 ::message ({ markup => "downloaded sound #$facenum" })
860 if $changed;
861
862 &::audio_sound_push ($facenum); 885 &::audio_sound_push ($facenum);
863 } 886 }
864 887
888 } else {
889 # flat resource case, FT_RSRC
890 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
891 if $changed;
892 }
893
894 if (my $cbs = $self->{face_cb}{$facenum}) {
895 $_->($face, $changed) for @$cbs;
865 } 896 }
866} 897}
867 898
868sub smooth_update { 899sub smooth_update {
869 my ($self, $facenum, $face) = @_; 900 my ($self, $facenum, $face) = @_;
870 901
871 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 902 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
872} 903}
873 904
874sub have_tile { 905sub have_tile {
875 my ($self, $tile) = @_; 906 my ($self, $tile, $data) = @_;
876 907
877 return unless $self->{map}; 908 return unless $self->{map};
878 909
879 my $tex = $self->{texture}[$tile] ||= 910 my $tex = $self->{texture}[$tile] ||=
880 new CFPlus::Texture 911 new CFPlus::Texture
881 tile => $tile, minify => 1, mipmap => 1, delay => 1; 912 tile => $tile,
913 image => $data, delete_image => 1,
914 minify => 1, mipmap => 1;
882 915
883 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []}; 916 if (my $cbs = delete $self->{tile_cb}{$tile}) {
917 $_->($tex) for @$cbs;
918 }
884} 919}
885 920
886sub connect_face_update { 921# call in non-void context registers a temporary
922# hook with handle, otherwise its permanent
923sub on_face_change {
887 my ($self, $id, $cb) = @_; 924 my ($self, $num, $cb) = @_;
888 925
889 push @{$self->{face_cb}{$id}}, $cb; 926 push @{$self->{face_cb}{$num}}, $cb;
890 927
928 defined wantarray
891 CFPlus::guard { 929 ? CFPlus::guard {
892 @{$self->{face_cb}{$id}} 930 @{$self->{face_cb}{$num}}
893 = grep $_ != $cb, 931 = grep $_ != $cb,
894 @{$self->{face_cb}{$id}}; 932 @{$self->{face_cb}{$num}};
895 } 933 }
934 : ()
935}
936
937# call in non-void context registers a temporary
938# hook with handle, otherwise its permanent
939sub register_face_handler {
940 my ($self, $num, $cb) = @_;
941
942 return unless $num;
943
944 # invoke if available right now
945 $cb->($self->{face}[$num], 0)
946 unless exists $self->{face}[$num]{loading};
947
948 # future changes
949 $self->on_face_change ($num => $cb)
896} 950}
897 951
898sub sound_play { 952sub sound_play {
899 my ($self, $type, $face, $dx, $dy, $vol) = @_; 953 my ($self, $type, $face, $dx, $dy, $vol) = @_;
900 954

Diff Legend

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