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.151 by root, Sun Aug 12 09:39:49 2007 UTC vs.
Revision 1.167 by root, Tue Aug 28 01:23:47 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 ywidget => 1,#d# 26 xwidget1 => 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 (__w_ => sub {
81 $self->{widget}{$_[0]} 56 $self->{widget}{$_[0]}
82 }); 57 });
83 58
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 $args->{$ev} = sub {
110 my $id = shift->{s_id};
111 $self->send_exti_msg (w_e => $id, $ev, \@_);
112
113 1
114 };
115 }
116
117 if (my $widget = eval {
118 local $SIG{__DIE__};
119 "CFPlus::UI::$class"->new (
120 %$args,
121 s_ws => $ws,
122 s_id => $id,
123 )
124 }
125 ) {
126 $self->{widget}{$id}
127 = $self->{widgetset}{$ws}{w}{$id}
128 = $widget;
129
130 $widget->connect (on_destroy => sub {
131 my ($widget) = @_;
132
133 delete $self->{widget}{$widget->{s_id}};
134 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
135 });
136 } else {
137 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
138 $self->send_exti_msg (w_e => $id, "destroy");
139 }
140 });
141
142 # widget call
143 $self->connect_ext (w_c => sub {
144 my ($id, $rid, $method, $args) = @_;
145
146 my $w = $self->{widget}{$id}
147 or return;
148
149 $args ||= [];
150
151 if ($rid) {
152 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
153 } else {
154 $w->$method (@$args);
155 }
156 });
157
158 # widget set
159 $self->connect_ext (w_s => sub {
160 my ($id, $attr) = @_;
161
162 my $w = $self->{widget}{$id}
163 or return;
164
165 for (my $i = 0; $i < $#$attr; $i += 2) {
166 my ($member, $value) = @$attr[$i, $i+1];
167 if (defined $value) {
168 $w->{$member} = $value;
169 } else {
170 delete $w->{$member};
171 }
172 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
173 }
174 });
175
176 # widget get
177 $self->connect_ext (w_g => sub {
178 my ($id, $rid, $attr) = @_;
179
180 my $w = $self->{widget}{$id}
181 or return;
182
183 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
184 });
185
186 # message window
187 $self->connect_ext (channel_info => sub {
188 my ($info) = @_;
189 $self->{channels}->{$info->{id}} = $info;
190 $::MESSAGE_WINDOW->add_channel ($info);
191 });
192
193 # destroy widgets on logout 59 # destroy widgets on logout
194 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 60 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
195 for my $ws (values %{delete $self->{widgetset} || {}}) { 61 for my $ws (values %{delete $self->{widgetset} || {}}) {
196 $_->destroy 62 $_->destroy
197 for values %{delete $ws->{w} || {}}; 63 for values %{delete $ws->{w} || {}};
… …
225 my ($self) = @_; 91 my ($self) = @_;
226 92
227 $self->send_exti_msg (fx_want => { 93 $self->send_exti_msg (fx_want => {
228 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC 94 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
229 5 => !!$::CFG->{audio_enable}, # FT_SOUND 95 5 => !!$::CFG->{audio_enable}, # FT_SOUND
96 6 => 1, # FT_RSRC
230 }); 97 });
231} 98}
99
100sub ext_capabilities {
101 my ($self, %cap) = @_;
102
103 #$self->send ("setup sound 0"); # we use a different protocol
104 $self->update_fx_want;
105
106 $self->send_exti_req (resource => "exp_table", sub {
107 my ($exp_table) = @_;
108
109 $self->register_face_handler ($exp_table, sub {
110 my ($face) = @_;
111
112 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
113 $_->() for values %{ $self->{on_exp_update} || {} };
114 });
115
116 ()
117 });
118
119 if (my $ts = $cap{tileset}) {
120 if (my ($default) = grep $_->[2] & 1, @$ts) {
121 $self->{tileset} = $default;
122 $self->{tilesize} = $default->[3];
123 $self->setup_req (tileset => $default->[0]);
124
125 my $w = int $self->{mapw} * 32 / $self->{tilesize};
126 my $h = int $self->{maph} * 32 / $self->{tilesize};
127
128 $self->setup_req (mapsize => "${w}x${h}");
129 }
130 }
131}
132
133sub ext_ambient_music {
134 my ($self, $songs) = @_;
135 &::audio_music_set_ambient ($songs);
136}
137
138#############################################################################
139
140sub widget_associate {
141 my ($self, $ws, $id, $widget) = @_;
142
143 if ($widget) {
144 $widget->{s_id} = $id;
145 $self->{widget}{$id} = $widget;
146
147 if ($ws) {
148 $widget->{s_ws} = $ws;
149 $self->{widgetset}{$ws}{w}{$id} = $widget;
150 }
151
152 $widget->connect (on_destroy => sub {
153 my ($widget) = @_;
154
155 delete $self->{widget}{$widget->{s_id}};
156 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
157 if exists $widget->{s_ws};
158 });
159
160 1
161 } else {
162 $self->send_exti_msg (w_e => $id, undef);
163
164 0
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 for my $ev (grep /^on_/, keys %$args) {
193 my $rid = $args->{$ev};
194 $args->{$ev} = sub {
195 my $id = shift->{s_id};
196 $self->send_exti_msg (w_e => $id, $rid, @_);
197
198 1
199 };
200 }
201
202 $self->widget_associate (
203 $ws, $id => scalar eval {
204 local $SIG{__DIE__};
205 "CFPlus::UI::$class"->new (%$args)
206 }
207 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
208}
209
210# widgetset associate
211sub ext_ws_a {
212 my ($self, %ass) = @_;
213
214 # everything that has a name, wether conceivably useful or not
215 my %wkw = (
216 root => $CFPlus::UI::ROOT,
217 tooltip => $CFPlus::UI::TOOLTIP,
218
219 mapwidget => $::MAPWIDGET,
220 buttonbar => $::BUTTONBAR,
221 metaserver => $::METASERVER,
222 buttonbar => $::BUTTONBAR,
223 login_button => $::LOGIN_BUTTON,
224 quit_dialog => $::QUIT_DIALOG,
225 host_entry => $::HOST_ENTRY,
226 metaserver => $::METASERVER,
227 server_info => $::SERVER_INFO,
228
229 setup_dialog => $::SETUP_DIALOG,
230 setup_notebook => $::SETUP_NOTEBOOK,
231 setup_server => $::SETUP_SERVER,
232 setup_keyboard => $::SETUP_KEYBOARD,
233
234 pl_notebook => $::PL_NOTEBOOK,
235 pl_window => $::PL_WINDOW,
236 inventory_page => $::INVENTORY_PAGE,
237 stats_page => $::STATS_PAGE,
238 skill_page => $::SKILL_PAGE,
239 spell_page => $::SPELL_PAGE,
240 spell_list => $::SPELL_LIST,
241
242 floorbox => $::FLOORBOX,
243 help_window => $::HELP_WINDOW,
244 message_window => $::MESSAGE_WINDOW,
245 statusbox => $::SDTATUSBOX,
246
247 inv => $::INV,
248 invr => $::INVR,
249 invr_hb => $::INVR_HB,
250 );
251
252 while (my ($id, $name) = each %ass) {
253 $self->widget_associate (undef, $id => $wkw{$name})
254 or warn "server failed to associate non-existent well-known widget $name\n";
255 }
256}
257
258# widget call
259sub ext_w_c {
260 my ($self, $id, $rid, $method, @args) = @_;
261
262 my $w = $self->{widget}{$id}
263 or return;
264
265 if ($rid) {
266 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
267 } else {
268 $w->$method (@args);
269 }
270}
271
272# widget set
273sub ext_w_s {
274 my ($self, $id, $attr) = @_;
275
276 my $w = $self->{widget}{$id}
277 or return;
278
279 for (my $i = 0; $i < $#$attr; $i += 2) {
280 my ($member, $value) = @$attr[$i, $i+1];
281 if (defined $value) {
282 $w->{$member} = $value;
283 } else {
284 delete $w->{$member};
285 }
286 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
287 }
288}
289
290# widget get
291sub ext_w_g {
292 my ($self, $id, $rid, $attr) = @_;
293
294 my $w = $self->{widget}{$id}
295 or return;
296
297 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
298}
299
300# message window
301sub ext_channel_info {
302 my ($self, $info) = @_;
303 $self->{channels}->{$info->{id}} = $info;
304 $::MESSAGE_WINDOW->add_channel ($info);
305}
306
307#############################################################################
232 308
233sub logprint { 309sub logprint {
234 my ($self, @a) = @_; 310 my ($self, @a) = @_;
235 311
236 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 312 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
… …
325 401
326 if ( 402 if (
327 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 403 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
328 ) { 404 ) {
329 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 405 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
330 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 406 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
331 } 407 }
332 408
333 $self->update_stats_window ($stats, $prev); 409 $self->update_stats_window ($stats, $prev);
334 410
335 $self->{prev_stats} = { %$stats }; 411 $self->{prev_stats} = { %$stats };
… …
374 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 450 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
375 $::GAUGES->{food} ->set_value ($fo, $fo_m); 451 $::GAUGES->{food} ->set_value ($fo, $fo_m);
376 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 452 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
377 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 453 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
378 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 454 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
455 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
379 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 456 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
380 my $title = $stats->{+CS_STAT_TITLE}; 457 my $title = $stats->{+CS_STAT_TITLE};
381 $title =~ s/^Player: //; 458 $title =~ s/^Player: //;
382 $::STATWIDS->{title} ->set_text ("Title: " . $title); 459 $::STATWIDS->{title} ->set_text ("Title: " . $title);
383 460
… …
401 for keys %RES_TBL; 478 for keys %RES_TBL;
402 479
403 my $sktbl = $::STATWIDS->{skill_tbl}; 480 my $sktbl = $::STATWIDS->{skill_tbl};
404 my @skills = keys %{ $self->{skill_info} }; 481 my @skills = keys %{ $self->{skill_info} };
405 482
406 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 483 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
484 map [$_, $self->{skill_info}{$_}],
485 grep exists $stats->{$_},
486 @skills;
487
488 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
489 $self->{stat_order} = join ",", map $_->[0], @order;
490
407 $sktbl->clear; 491 $sktbl->clear;
408 492
409 my @add; 493 my $sw = $self->{skillwid}{""} ||= [
410
411 push @add,
412 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 494 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
413 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 495 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
496 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
414 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 497 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
415 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 498 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
416 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 499 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
500 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
417 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 501 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
418 ; 502 ];
503
504 my @add = @$sw;
419 505
420 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 506 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
421 507
422 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 508 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
423 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 509 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
424 510
425 my ($x, $y) = (0, 1); 511 my ($x, $y) = (0, 1);
426 for ( 512 for (@order) {
427 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
428 map [$_, $self->{skill_info}{$_}],
429 grep exists $stats->{$_},
430 @skills
431 ) {
432 my ($idx, $name) = @$_; 513 my ($idx, $name) = @$_;
433 514
434 my $spell_cb = sub { 515 my $spell_cb = sub {
435 my ($widget, $ev) = @_; 516 my ($widget, $ev) = @_;
436 517
… …
451 } 532 }
452 533
453 1 534 1
454 }; 535 };
455 536
537 my $sw = $self->{skillwid}{$idx} ||= [
538 # exp
539 (new CFPlus::UI::Label
540 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
541
542 # level
543 (new CFPlus::UI::Label
544 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
545
546 # progress
547 (new CFPlus::UI::ExperienceProgress),
548
549 # label
550 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
551 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
552 ];
553
456 push @add, 554 push @add,
457 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 555 $x * 4 + 0, $y, $sw->[0],
458 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 556 $x * 4 + 1, $y, $sw->[1],
459 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 557 $x * 4 + 2, $y, $sw->[2],
460 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 558 $x * 4 + 3, $y, $sw->[3],
461 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
462 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
463 ; 559 ;
464 560
465 $x++ and ($x, $y) = (0, $y + 1); 561 $x++ and ($x, $y) = (0, $y + 1);
466 } 562 }
467 563
468 $sktbl->add_at (@add); 564 $sktbl->add_at (@add);
469 } 565 }
470 566
471 for (grep exists $stats->{$_}, @skills) { 567 for (@order) {
472 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 568 my ($idx, $name) = @$_;
473 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 569 my $val = $stats->{$idx};
474 }
475}
476 570
477sub macro_send { 571 next if $prev->{$idx}[1] eq $val->[1];
478 my ($self, $macro) = @_;
479 572
480 for my $cmd (@{ $macro->{action} }) { 573 my $sw = $self->{skillwid}{$idx};
481 $self->send_command ($cmd); 574 $sw->[0]->set_text (::formsep ($val->[1]));
575 $sw->[1]->set_text ($val->[0] * 1);
576 $sw->[2]->set_value (@$val);
577
578 $::GAUGES->{sklprg}->set_label ("$name %d%%");
579 $::GAUGES->{sklprg}->set_value (@$val);
482 } 580 }
483} 581}
484 582
485sub user_send { 583sub user_send {
486 my ($self, $command) = @_; 584 my ($self, $command) = @_;
… …
488 $self->{record}->($command) 586 $self->{record}->($command)
489 if $self->{record}; 587 if $self->{record};
490 588
491 $self->logprint ("send: ", $command); 589 $self->logprint ("send: ", $command);
492 $self->send_command ($command); 590 $self->send_command ($command);
493 ::status ($command);
494} 591}
495 592
496sub record { 593sub record {
497 my ($self, $cb) = @_; 594 my ($self, $cb) = @_;
498 595
… …
520 $tex->upload; 617 $tex->upload;
521 } else { 618 } else {
522 $self->{delay}{$tile} = 1; 619 $self->{delay}{$tile} = 1;
523 620
524 # we assume the face is in-flight and will eventually come 621 # we assume the face is in-flight and will eventually come
525 push @{$self->{face_cb}{$tile}}, sub { 622 push @{$self->{tile_cb}{$tile}}, sub {
526 delete $self->{delay}{$tile}; 623 delete $self->{delay}{$tile};
527 $_[0]->upload; 624 $_[0]->upload;
528 }; 625 };
529 } 626 }
530 } 627 }
531 628
532 if ($delay) { 629 if ($delay) {
533 # delay the map drawing a tiny bit in the hope of getting the missing fetched 630 # delay the map drawing a tiny bit in the hope of getting the missing fetched
534 Event->timer (after => 0.03, cb => sub { 631 Event->timer (after => 0.03, cb => sub {
535 $_[0]->w->cancel; 632 $_[0]->w->cancel;
536 $self->{map_widget}->update; 633 $self->{map_widget}->update
634 if $self->{map_widget};
537 }); 635 });
538 } else { 636 } else {
539 $self->{map_widget}->update; 637 $self->{map_widget}->update;
540 } 638 }
541} 639}
… …
552 my $map_info = delete $self->{map_info} 650 my $map_info = delete $self->{map_info}
553 or return; 651 or return;
554 652
555 my ($hash, $x, $y, $w, $h) = @$map_info; 653 my ($hash, $x, $y, $w, $h) = @$map_info;
556 654
557 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 655 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
656 $self->{map_cache_new}{$hash} = \$data;
558 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 657 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
559 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
560} 658}
561 659
562sub map_clear { 660sub map_clear {
563 my ($self) = @_; 661 my ($self) = @_;
564 662
… …
570} 668}
571 669
572sub bg_fetch { 670sub bg_fetch {
573 my ($self) = @_; 671 my ($self) = @_;
574 672
575 my $id; 673 my $tile;
576 674
577 do { 675 do {
578 $id = pop @{$self->{bg_fetch}} 676 $tile = pop @{$self->{bg_fetch}}
579 or return; 677 or return;
580 } while $self->{texture}[$id]; 678 } while $self->{texture}[$tile];
581 679
582 CFPlus::DB::exists tilecache => $id, sub { 680 CFPlus::DB::get tilecache => $tile, sub {
583 my ($exists) = @_; 681 my ($data) = @_;
584 682
585 return unless $self->{map}; # stop when destroyed 683 return unless $self->{map}; # stop when destroyed
586 684
587 if ($exists) { 685 if (defined $data) {
588 $self->have_tile ($id); 686 $self->have_tile ($tile, $data);
589 $self->{texture}[$id]->upload; 687 $self->{texture}[$tile]->upload;
590 } 688 }
591 689
592 $self->bg_fetch; 690 $self->bg_fetch;
593 }; 691 };
594} 692}
… …
596sub load_map($$$) { 694sub load_map($$$) {
597 my ($self, $hash, $x, $y) = @_; 695 my ($self, $hash, $x, $y) = @_;
598 696
599 my $gen = $self->{map_change_gen}; 697 my $gen = $self->{map_change_gen};
600 698
601 CFPlus::DB::get $self->{mapcache} => $hash, sub { 699 my $cb = sub {
602 return unless $gen == $self->{map_change_gen}; 700 return unless $gen == $self->{map_change_gen};
603 701
604 my ($data) = @_; 702 my ($data) = @_;
605 703
606 if (defined $data) { 704 if (defined $data) {
705 $self->{map_cache_new}{$hash} = \$data;
706
607 $data = Compress::LZF::decompress $data; 707 my $data = Compress::LZF::decompress $data;
608 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
609 708
610 my $inprogress = @{ $self->{bg_fetch} || [] }; 709 my $inprogress = @{ $self->{bg_fetch} || [] };
611 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 710 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
612 $self->bg_fetch unless $inprogress; 711 $self->bg_fetch unless $inprogress;
613 } 712 }
614 }; 713 };
714
715 if (my $rdata = $self->{map_cache_old}{$hash}) {
716 $cb->($$rdata);
717 } else {
718 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
719 }
615} 720}
616 721
617# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 722# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
618# (server resource,s latency, bandwidth), so this hack is warranted. 723# (server resource,s latency, bandwidth), so this hack is warranted.
619# the right fix is to make real tiled maps with an overview file 724# the right fix is to make real tiled maps with an overview file
… …
712 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 817 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
713 818
714 $self->flush_map; 819 $self->flush_map;
715 820
716 ++$self->{map_change_gen}; 821 ++$self->{map_change_gen};
822 $self->{map_cache_old} = delete $self->{map_cache_new};
717 823
718 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 824 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
719 825
720 my $mapmapw = $self->{mapmap}->{w}; 826 my $mapmapw = $self->{mapmap}->{w};
721 my $mapmaph = $self->{mapmap}->{h}; 827 my $mapmaph = $self->{mapmap}->{h};
… …
743 my ($self, $facenum, $face, $cb) = @_; 849 my ($self, $facenum, $face, $cb) = @_;
744 850
745 if ($face->{type} == 0) { # FT_FACE 851 if ($face->{type} == 0) { # FT_FACE
746 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 852 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
747 853
748 $face->{id} = $id; 854 $face->{id} = $id;
749 $self->{faceid}[$facenum] = $id;
750
751 $self->{map}->set_tileid ($facenum => $id); 855 $self->{map}->set_tileid ($facenum => $id);
752 856
753 CFPlus::DB::get tilecache => $id, $cb; 857 CFPlus::DB::get tilecache => $id, $cb;
754 858
755 } elsif ($face->{type} & 1) { # with metadata 859 } elsif ($face->{type} & 1) { # with metadata
756 CFPlus::DB::get res_meta => $face->{name}, $cb; 860 CFPlus::DB::get res_meta => $face->{name}, $cb;
861
862 } else { # no metadata
863 CFPlus::DB::get res_data => $face->{name}, $cb;
757 } 864 }
758} 865}
759 866
760sub face_update { 867sub face_update {
761 my ($self, $facenum, $face, $changed) = @_; 868 my ($self, $facenum, $face, $changed) = @_;
762 869
763 if ($face->{type} == 0) { # FT_FACE 870 if ($face->{type} == 0) {
871 # image, FT_FACE
764 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 872 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
765 if $changed; 873 if $changed;
766 874
767 $self->have_tile ($face->{id}); 875 $self->have_tile ($face->{id}, delete $face->{data});
768 876
769 } elsif ($face->{type} & 1) { # split metadata 877 } elsif ($face->{type} & 1) {
878 # split metadata case, FT_MUSIC, FT_SOUND
770 if ($changed) { # new data 879 if ($changed) { # new data
771 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 880 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
772 $face->{meta} = $self->{json_coder}->decode ($meta_json); 881 $face->{data} = $meta;
773 882
774 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 883 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
775 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { }; 884 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
776 } else { 885 }
886
777 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 887 $face->{data} = $self->{json_coder}->decode ($face->{data});
778 }
779 888
780 ::add_license ($face); 889 ::add_license ($face);
781 890
782 if ($face->{type} == 3) { # FT_MUSIC 891 if ($face->{type} == 3) { # FT_MUSIC
783 $self->{music_meta}{$facenum} = $face;
784
785 ::message ({ markup => "downloaded song #$facenum" }) 892 ::message ({ markup => "downloaded song #$facenum" })
786 if $changed; 893 if $changed;
787 894
788 &::audio_music_push ($facenum); 895 &::audio_music_push ($facenum);
789 } elsif ($face->{type} == 5) { # FT_SOUND 896 } elsif ($face->{type} == 5) { # FT_SOUND
790 $self->{sound_meta}{$facenum} = $face;
791
792 ::message ({ markup => "downloaded sound #$facenum" }) 897 ::message ({ markup => "downloaded sound #$facenum" })
793 if $changed; 898 if $changed;
794 899
795 &::audio_sound_push ($facenum); 900 &::audio_sound_push ($facenum);
796 } 901 }
797 902
903 } else {
904 # flat resource case, FT_RSRC
905 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
906 if $changed;
907 }
908
909 if (my $cbs = $self->{face_cb}{$facenum}) {
910 $_->($face, $changed) for @$cbs;
798 } 911 }
799} 912}
800 913
801sub smooth_update { 914sub smooth_update {
802 my ($self, $facenum, $face) = @_; 915 my ($self, $facenum, $face) = @_;
803 916
804 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 917 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
805} 918}
806 919
807sub have_tile { 920sub have_tile {
808 my ($self, $tile) = @_; 921 my ($self, $tile, $data) = @_;
809 922
810 return unless $self->{map}; 923 return unless $self->{map};
811 924
812 my $tex = $self->{texture}[$tile] ||= 925 my $tex = $self->{texture}[$tile] ||=
813 new CFPlus::Texture 926 new CFPlus::Texture
814 tile => $tile, minify => 1, mipmap => 1, delay => 1; 927 tile => $tile,
928 image => $data, delete_image => 1,
929 minify => 1, mipmap => 1;
815 930
816 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []}; 931 if (my $cbs = delete $self->{tile_cb}{$tile}) {
932 $_->($tex) for @$cbs;
933 }
817} 934}
818 935
819sub connect_face_update { 936# call in non-void context registers a temporary
937# hook with handle, otherwise its permanent
938sub on_face_change {
820 my ($self, $id, $cb) = @_; 939 my ($self, $num, $cb) = @_;
821 940
822 push @{$self->{face_cb}{$id}}, $cb; 941 push @{$self->{face_cb}{$num}}, $cb;
823 942
943 defined wantarray
824 CFPlus::guard { 944 ? CFPlus::guard {
825 @{$self->{face_cb}{$id}} 945 @{$self->{face_cb}{$num}}
826 = grep $_ != $cb, 946 = grep $_ != $cb,
827 @{$self->{face_cb}{$id}}; 947 @{$self->{face_cb}{$num}};
828 } 948 }
949 : ()
950}
951
952# call in non-void context registers a temporary
953# hook with handle, otherwise its permanent
954sub register_face_handler {
955 my ($self, $num, $cb) = @_;
956
957 return unless $num;
958
959 # invoke if available right now
960 $cb->($self->{face}[$num], 0)
961 unless exists $self->{face}[$num]{loading};
962
963 # future changes
964 $self->on_face_change ($num => $cb)
829} 965}
830 966
831sub sound_play { 967sub sound_play {
832 my ($self, $type, $face, $dx, $dy, $vol) = @_; 968 my ($self, $type, $face, $dx, $dy, $vol) = @_;
833 969
… …
905 $self->{$type} = $text; 1041 $self->{$type} = $text;
906 } else { 1042 } else {
907 $self->logprint ("msg: ", $text); 1043 $self->logprint ("msg: ", $text);
908 return if $color < 0; # negative color == ignore if not understood 1044 return if $color < 0; # negative color == ignore if not understood
909 1045
910 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; 1046 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
911 1047
912 ## try to create single paragraphs of multiple lines sent by the server 1048 ## try to create single paragraphs of multiple lines sent by the server
913 # no longer neecssary with TRT servers 1049 # no longer neecssary with TRT servers
914 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1050 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
915 1051
916 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] }) 1052 ::message ({
1053 fg => $fg,
1054 markup => $_,
1055 type => $type,
1056 extra => [@extra],
1057 color_flags => $color
917 for split /\n/, $text; 1058 }) for split /\n/, $text;
918 1059
919 $self->{statusbox}->add ($text, 1060 $self->{statusbox}->add ($text,
920 group => $text, 1061 group => $text,
921 fg => $fg, 1062 fg => $fg,
922 timeout => $color >= 2 ? 180 : 10, 1063 timeout => $color >= 2 ? 180 : 10,
… …
1024sub set_opencont { 1165sub set_opencont {
1025 my ($conn, $tag, $name) = @_; 1166 my ($conn, $tag, $name) = @_;
1026 $conn->{open_container} = $tag; 1167 $conn->{open_container} = $tag;
1027 update_floorbox; 1168 update_floorbox;
1028 1169
1029 $::INV_RIGHT_HB->clear (); 1170 $::INVR_HB->clear ();
1030 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1171 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1031 1172
1032 if ($tag != 0) { # Floor isn't closable, is it? 1173 if ($tag != 0) { # Floor isn't closable, is it?
1033 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1174 $::INVR_HB->add (new CFPlus::UI::Button
1034 text => "Close container", 1175 text => "Close container",
1035 tooltip => "Close the currently open container (if one is open)", 1176 tooltip => "Close the currently open container (if one is open)",
1036 on_activate => sub { 1177 on_activate => sub {
1037 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1178 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1038 if $tag != 0; 1179 if $tag != 0;
1039 #if $CONN->{open_container} != 0;
1040 0 1180 0
1041 }, 1181 },
1042 ); 1182 );
1043 } 1183 }
1044 1184

Diff Legend

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