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.146 by root, Mon Aug 6 05:06:33 2007 UTC vs.
Revision 1.168 by root, Thu Aug 30 07:08:17 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
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67
68 if (my $ts = $cap{tileset}) {
69 if (my ($default) = grep $_->[2] & 1, @$ts) {
70 $self->{tileset} = $default;
71 $self->{tilesize} = $default->[3];
72 $self->setup_req (tileset => $default->[0]);
73
74 my $w = int $self->{mapw} * 32 / $self->{tilesize};
75 my $h = int $self->{maph} * 32 / $self->{tilesize};
76
77 $self->setup_req (mapsize => "${w}x${h}");
78 }
79 }
80 });
81
82 $self->{json_coder} 53 $self->{json_coder}
83 ->convert_blessed 54 ->convert_blessed
84 ->filter_json_single_key_object (__w_ => sub { 55 ->filter_json_single_key_object (__w_ => sub {
85 $self->{widget}{$_[0]} 56 $self->{widget}{$_[0]}
86 }); 57 });
87 58
88 # widgetset new
89 $self->connect_ext (ws_n => sub {
90 my ($id) = @_;
91
92 $self->{widgetset}{$id} = {
93 w => {},
94 };
95 });
96
97 # widgetset destroy
98 $self->connect_ext (ws_d => sub {
99 my ($id) = @_;
100
101 my $ws = delete $self->{widgetset}{$id}
102 or return;
103
104 $_->destroy
105 for values %{$ws->{w}};
106 });
107
108 # widgetset create
109 $self->connect_ext (ws_c => sub {
110 my ($ws, $id, $class, $args) = @_;
111
112 for my $ev (grep /^on_/, keys %$args) {
113 $args->{$ev} = sub {
114 my $id = shift->{s_id};
115 $self->send_exti_msg (w_e => $id, $ev, \@_);
116
117 1
118 };
119 }
120
121 if (my $widget = eval {
122 local $SIG{__DIE__};
123 "CFPlus::UI::$class"->new (
124 %$args,
125 s_ws => $ws,
126 s_id => $id,
127 )
128 }
129 ) {
130 $self->{widget}{$id}
131 = $self->{widgetset}{$ws}{w}{$id}
132 = $widget;
133
134 $widget->connect (on_destroy => sub {
135 my ($widget) = @_;
136
137 delete $self->{widget}{$widget->{s_id}};
138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
139 });
140 } else {
141 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
142 $self->send_exti_msg (w_e => $id, "destroy");
143 }
144 });
145
146 # widget call
147 $self->connect_ext (w_c => sub {
148 my ($id, $rid, $method, $args) = @_;
149
150 my $w = $self->{widget}{$id}
151 or return;
152
153 $args ||= [];
154
155 if ($rid) {
156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
157 } else {
158 $w->$method (@$args);
159 }
160 });
161
162 # widget set
163 $self->connect_ext (w_s => sub {
164 my ($id, $attr) = @_;
165
166 my $w = $self->{widget}{$id}
167 or return;
168
169 for (my $i = 0; $i < $#$attr; $i += 2) {
170 my ($member, $value) = @$attr[$i, $i+1];
171 if (defined $value) {
172 $w->{$member} = $value;
173 } else {
174 delete $w->{$member};
175 }
176 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
177 }
178 });
179
180 # widget get
181 $self->connect_ext (w_g => sub {
182 my ($id, $rid, $attr) = @_;
183
184 my $w = $self->{widget}{$id}
185 or return;
186
187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 });
189
190 # message window
191 $self->connect_ext (channel_info => sub {
192 my ($info) = @_;
193 $self->{channels}->{$info->{id}} = $info;
194 $::MESSAGE_WINDOW->add_channel ($info);
195 });
196
197 # destroy widgets on logout 59 # destroy widgets on logout
198 $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 {
199 for my $ws (values %{delete $self->{widgetset} || {}}) { 61 for my $ws (values %{delete $self->{widgetset} || {}}) {
200 $_->destroy 62 $_->destroy
201 for values %{delete $ws->{w} || {}}; 63 for values %{delete $ws->{w} || {}};
… …
222 # per server 84 # per server
223 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 85 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
224 86
225 $self 87 $self
226} 88}
89
90sub update_fx_want {
91 my ($self) = @_;
92
93 $self->send_exti_msg (fx_want => {
94 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
95 5 => !!$::CFG->{audio_enable}, # FT_SOUND
96 6 => 1, # FT_RSRC
97 });
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#############################################################################
227 308
228sub logprint { 309sub logprint {
229 my ($self, @a) = @_; 310 my ($self, @a) = @_;
230 311
231 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 312 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
… …
320 401
321 if ( 402 if (
322 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 403 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
323 ) { 404 ) {
324 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 405 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
325 $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);
326 } 407 }
327 408
328 $self->update_stats_window ($stats, $prev); 409 $self->update_stats_window ($stats, $prev);
329 410
330 $self->{prev_stats} = { %$stats }; 411 $self->{prev_stats} = { %$stats };
… …
369 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 450 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
370 $::GAUGES->{food} ->set_value ($fo, $fo_m); 451 $::GAUGES->{food} ->set_value ($fo, $fo_m);
371 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 452 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
372 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 453 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
373 . " (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});
374 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 456 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
375 my $title = $stats->{+CS_STAT_TITLE}; 457 my $title = $stats->{+CS_STAT_TITLE};
376 $title =~ s/^Player: //; 458 $title =~ s/^Player: //;
377 $::STATWIDS->{title} ->set_text ("Title: " . $title); 459 $::STATWIDS->{title} ->set_text ("Title: " . $title);
378 460
… …
396 for keys %RES_TBL; 478 for keys %RES_TBL;
397 479
398 my $sktbl = $::STATWIDS->{skill_tbl}; 480 my $sktbl = $::STATWIDS->{skill_tbl};
399 my @skills = keys %{ $self->{skill_info} }; 481 my @skills = keys %{ $self->{skill_info} };
400 482
401 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
402 $sktbl->clear; 491 $sktbl->clear;
403 492
404 my @add; 493 my $sw = $self->{skillwid}{""} ||= [
405
406 push @add,
407 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 494 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
408 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),
409 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 497 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
410 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 498 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
411 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),
412 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 501 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
413 ; 502 ];
503
504 my @add = @$sw;
414 505
415 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>";
416 507
417 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);
418 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);
419 510
420 my ($x, $y) = (0, 1); 511 my ($x, $y) = (0, 1);
421 for ( 512 for (@order) {
422 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
423 map [$_, $self->{skill_info}{$_}],
424 grep exists $stats->{$_},
425 @skills
426 ) {
427 my ($idx, $name) = @$_; 513 my ($idx, $name) = @$_;
428 514
429 my $spell_cb = sub { 515 my $spell_cb = sub {
430 my ($widget, $ev) = @_; 516 my ($widget, $ev) = @_;
431 517
… …
446 } 532 }
447 533
448 1 534 1
449 }; 535 };
450 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
451 push @add, 554 push @add,
452 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 555 $x * 4 + 0, $y, $sw->[0],
453 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 556 $x * 4 + 1, $y, $sw->[1],
454 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 557 $x * 4 + 2, $y, $sw->[2],
455 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],
456 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
457 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
458 ; 559 ;
459 560
460 $x++ and ($x, $y) = (0, $y + 1); 561 $x++ and ($x, $y) = (0, $y + 1);
461 } 562 }
462 563
463 $sktbl->add_at (@add); 564 $sktbl->add_at (@add);
464 } 565 }
465 566
466 for (grep exists $stats->{$_}, @skills) { 567 for (@order) {
467 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 568 my ($idx, $name) = @$_;
468 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 569 my $val = $stats->{$idx};
469 }
470}
471 570
472sub macro_send { 571 next if $prev->{$idx}[1] eq $val->[1];
473 my ($self, $macro) = @_;
474 572
475 for my $cmd (@{ $macro->{action} }) { 573 my $sw = $self->{skillwid}{$idx};
476 $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);
477 } 580 }
478} 581}
479 582
480sub user_send { 583sub user_send {
481 my ($self, $command) = @_; 584 my ($self, $command) = @_;
… …
483 $self->{record}->($command) 586 $self->{record}->($command)
484 if $self->{record}; 587 if $self->{record};
485 588
486 $self->logprint ("send: ", $command); 589 $self->logprint ("send: ", $command);
487 $self->send_command ($command); 590 $self->send_command ($command);
488 ::status ($command);
489} 591}
490 592
491sub record { 593sub record {
492 my ($self, $cb) = @_; 594 my ($self, $cb) = @_;
493 595
… …
501} 603}
502 604
503sub feed_map1a { 605sub feed_map1a {
504 my ($self, $data) = @_; 606 my ($self, $data) = @_;
505 607
506 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 608 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
609 my $delay;
610
611 for my $tile (@$missing) {
612 next if $self->{delay}{$tile};
613
614 $delay = 1;
615
616 if (my $tex = $::CONN->{texture}[$tile]) {
617 $tex->upload;
618 } else {
619 $self->{delay}{$tile} = 1;
620
621 # we assume the face is in-flight and will eventually come
622 push @{$self->{tile_cb}{$tile}}, sub {
623 delete $self->{delay}{$tile};
624 $_[0]->upload;
625 };
626 }
627 }
628
629 if ($delay) {
630 # delay the map drawing a tiny bit in the hope of getting the missing fetched
631 Event->timer (after => 0.03, cb => sub {
632 $_[0]->w->cancel;
633 $self->{map_widget}->update
634 if $self->{map_widget};
635 });
636 } else {
507 $self->{map_widget}->update; 637 $self->{map_widget}->update;
638 }
508} 639}
509 640
510sub magicmap { 641sub magicmap {
511 my ($self, $w, $h, $x, $y, $data) = @_; 642 my ($self, $w, $h, $x, $y, $data) = @_;
512 643
… …
519 my $map_info = delete $self->{map_info} 650 my $map_info = delete $self->{map_info}
520 or return; 651 or return;
521 652
522 my ($hash, $x, $y, $w, $h) = @$map_info; 653 my ($hash, $x, $y, $w, $h) = @$map_info;
523 654
524 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;
525 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 657 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
526 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
527} 658}
528 659
529sub map_clear { 660sub map_clear {
530 my ($self) = @_; 661 my ($self) = @_;
531 662
… …
537} 668}
538 669
539sub bg_fetch { 670sub bg_fetch {
540 my ($self) = @_; 671 my ($self) = @_;
541 672
542 my $id; 673 my $tile;
543 674
544 do { 675 do {
545 $id = pop @{$self->{bg_fetch}} 676 $tile = pop @{$self->{bg_fetch}}
546 or return; 677 or return;
547 } while $self->{texture}[$id]; 678 } while $self->{texture}[$tile];
548 679
549 CFPlus::DB::exists tilecache => $id, sub { 680 CFPlus::DB::get tilecache => $tile, sub {
550 my ($exists) = @_; 681 my ($data) = @_;
551 682
552 return unless $self->{map}; # stop when destroyed 683 return unless $self->{map}; # stop when destroyed
553 684
685 if (defined $data) {
554 $self->have_tile ($id) 686 $self->have_tile ($tile, $data);
555 if $exists; 687 $self->{texture}[$tile]->upload;
688 }
556 689
557 $self->bg_fetch; 690 $self->bg_fetch;
558 }; 691 };
559} 692}
560 693
561sub load_map($$$) { 694sub load_map($$$) {
562 my ($self, $hash, $x, $y) = @_; 695 my ($self, $hash, $x, $y) = @_;
563 696
564 my $gen = $self->{map_change_gen}; 697 my $gen = $self->{map_change_gen};
565 698
566 CFPlus::DB::get $self->{mapcache} => $hash, sub { 699 my $cb = sub {
567 return unless $gen == $self->{map_change_gen}; 700 return unless $gen == $self->{map_change_gen};
568 701
569 my ($data) = @_; 702 my ($data) = @_;
570 703
571 if (defined $data) { 704 if (defined $data) {
705 $self->{map_cache_new}{$hash} = \$data;
706
572 $data = Compress::LZF::decompress $data; 707 my $data = Compress::LZF::decompress $data;
573 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
574 708
575 my $inprogress = @{ $self->{bg_fetch} || [] }; 709 my $inprogress = @{ $self->{bg_fetch} || [] };
576 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 710 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
577 $self->bg_fetch unless $inprogress; 711 $self->bg_fetch unless $inprogress;
578 } 712 }
579 }; 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 }
580} 720}
581 721
582# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 722# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
583# (server resource,s latency, bandwidth), so this hack is warranted. 723# (server resource,s latency, bandwidth), so this hack is warranted.
584# 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
… …
677 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 817 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
678 818
679 $self->flush_map; 819 $self->flush_map;
680 820
681 ++$self->{map_change_gen}; 821 ++$self->{map_change_gen};
822 $self->{map_cache_old} = delete $self->{map_cache_new};
682 823
683 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 824 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
684 825
685 my $mapmapw = $self->{mapmap}->{w}; 826 my $mapmapw = $self->{mapmap}->{w};
686 my $mapmaph = $self->{mapmap}->{h}; 827 my $mapmaph = $self->{mapmap}->{h};
… …
708 my ($self, $facenum, $face, $cb) = @_; 849 my ($self, $facenum, $face, $cb) = @_;
709 850
710 if ($face->{type} == 0) { # FT_FACE 851 if ($face->{type} == 0) { # FT_FACE
711 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 852 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
712 853
713 $face->{id} = $id; 854 $face->{id} = $id;
714 $self->{faceid}[$facenum] = $id;
715
716 $self->{map}->set_tileid ($facenum => $id); 855 $self->{map}->set_tileid ($facenum => $id);
717 856
718 CFPlus::DB::get tilecache => $id, $cb; 857 CFPlus::DB::get tilecache => $id, $cb;
719 858
720 } elsif ($face->{type} & 1) { # with metadata 859 } elsif ($face->{type} & 1) { # with metadata
721 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
722 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;
723 } 864 }
724} 865}
725 866
726sub face_update { 867sub face_update {
727 my ($self, $facenum, $face, $changed) = @_; 868 my ($self, $facenum, $face, $changed) = @_;
728 869
729 if ($face->{type} == 0) { # FT_FACE 870 if ($face->{type} == 0) {
871 # image, FT_FACE
730 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 872 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
731 if $changed; 873 if $changed;
732 874
733 $self->have_tile ($face->{id}); 875 $self->have_tile ($face->{id}, delete $face->{data});
734 876
735 } elsif ($face->{type} & 1) { # split metadata 877 } elsif ($face->{type} & 1) {
736 my $cb = sub { }; 878 # split metadata case, FT_MUSIC, FT_SOUND
879 if ($changed) { # new data
880 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
881 $face->{data} = $meta;
882
883 # rely on strict ordering here and also on later fetch
884 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
885 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
886 }
887
888 $face->{data} = $self->{json_coder}->decode ($face->{data});
889 ::add_license ($face);
890 ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
891 if $changed;
737 892
738 if ($face->{type} == 3) { # FT_MUSIC 893 if ($face->{type} == 3) { # FT_MUSIC
739 $cb = sub {
740 $self->{music_meta}{$facenum} = $face;
741
742 ::message ({ markup => "downloaded song #$facenum" })
743 if $changed;
744
745 &::audio_music_push ($facenum); 894 &::audio_music_push ($facenum);
746 };
747 } elsif ($face->{type} == 5) { # FT_SOUND 895 } elsif ($face->{type} == 5) { # FT_SOUND
748 $cb = sub {
749 $self->{sound_meta}{$facenum} = $face;
750
751 ::message ({ markup => "downloaded sound #$facenum" })
752 if $changed;
753
754 &::audio_sound_push ($facenum); 896 &::audio_sound_push ($facenum);
755 }; 897 }
756 }
757 898
758 if ($changed) { # new data 899 } else {
759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 900 # flat resource case, FT_RSRC
760
761 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 901 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
762 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { 902 if $changed;
763 $face->{meta} = $self->{json_coder}->decode ($meta_json); 903 }
764 ::add_license ($face);
765 $cb->();
766 };
767 904
768 } else { 905 if (my $cbs = $self->{face_cb}{$facenum}) {
769 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 906 $_->($face, $changed) for @$cbs;
770 ::add_license ($face);
771 $cb->();
772 }
773 } 907 }
774} 908}
775 909
776sub smooth_update { 910sub smooth_update {
777 my ($self, $facenum, $face) = @_; 911 my ($self, $facenum, $face) = @_;
778 912
779 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 913 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
780} 914}
781 915
782sub have_tile { 916sub have_tile {
783 my ($self, $tile) = @_; 917 my ($self, $tile, $data) = @_;
784 918
785 return unless $self->{map}; 919 return unless $self->{map};
786 920
787 $self->{texture}[$tile] ||= my $tex = 921 my $tex = $self->{texture}[$tile] ||=
788 new CFPlus::Texture 922 new CFPlus::Texture
789 tile => $tile, minify => 1, mipmap => 1, delay => 1; 923 tile => $tile,
924 image => $data, delete_image => 1,
925 minify => 1, mipmap => 1;
790 926
791 $_->() for @{(delete $self->{face_cb}{$tile}) || []}; 927 if (my $cbs = delete $self->{tile_cb}{$tile}) {
928 $_->($tex) for @$cbs;
929 }
792} 930}
793 931
794sub connect_face_update { 932# call in non-void context registers a temporary
933# hook with handle, otherwise its permanent
934sub on_face_change {
795 my ($self, $id, $cb) = @_; 935 my ($self, $num, $cb) = @_;
796 936
797 push @{$self->{face_cb}{$id}}, $cb; 937 push @{$self->{face_cb}{$num}}, $cb;
798 938
939 defined wantarray
799 CFPlus::guard { 940 ? CFPlus::guard {
800 @{$self->{face_cb}{$id}} 941 @{$self->{face_cb}{$num}}
801 = grep $_ != $cb, 942 = grep $_ != $cb,
802 @{$self->{face_cb}{$id}}; 943 @{$self->{face_cb}{$num}};
803 } 944 }
945 : ()
946}
947
948# call in non-void context registers a temporary
949# hook with handle, otherwise its permanent
950sub register_face_handler {
951 my ($self, $num, $cb) = @_;
952
953 return unless $num;
954
955 # invoke if available right now
956 $cb->($self->{face}[$num], 0)
957 unless exists $self->{face}[$num]{loading};
958
959 # future changes
960 $self->on_face_change ($num => $cb)
804} 961}
805 962
806sub sound_play { 963sub sound_play {
807 my ($self, $type, $face, $dx, $dy, $vol) = @_; 964 my ($self, $type, $face, $dx, $dy, $vol) = @_;
808 965
… …
880 $self->{$type} = $text; 1037 $self->{$type} = $text;
881 } else { 1038 } else {
882 $self->logprint ("msg: ", $text); 1039 $self->logprint ("msg: ", $text);
883 return if $color < 0; # negative color == ignore if not understood 1040 return if $color < 0; # negative color == ignore if not understood
884 1041
885 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; 1042 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
886 1043
887 ## try to create single paragraphs of multiple lines sent by the server 1044 ## try to create single paragraphs of multiple lines sent by the server
888 # no longer neecssary with TRT servers 1045 # no longer neecssary with TRT servers
889 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1046 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
890 1047
891 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] }) 1048 ::message ({
1049 fg => $fg,
1050 markup => $_,
1051 type => $type,
1052 extra => [@extra],
1053 color_flags => $color
892 for split /\n/, $text; 1054 }) for split /\n/, $text;
893 1055
894 $self->{statusbox}->add ($text, 1056 $self->{statusbox}->add ($text,
895 group => $text, 1057 group => $text,
896 fg => $fg, 1058 fg => $fg,
897 timeout => $color >= 2 ? 180 : 10, 1059 timeout => $color >= 2 ? 180 : 10,
… …
991 } 1153 }
992 1154
993 $::FLOORBOX->add_at (@add); 1155 $::FLOORBOX->add_at (@add);
994 }); 1156 });
995 1157
996 $::WANT_REFRESH++; 1158 $::WANT_REFRESH->start;
997} 1159}
998 1160
999sub set_opencont { 1161sub set_opencont {
1000 my ($conn, $tag, $name) = @_; 1162 my ($conn, $tag, $name) = @_;
1001 $conn->{open_container} = $tag; 1163 $conn->{open_container} = $tag;
1002 update_floorbox; 1164 update_floorbox;
1003 1165
1004 $::INV_RIGHT_HB->clear (); 1166 $::INVR_HB->clear ();
1005 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1167 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1006 1168
1007 if ($tag != 0) { # Floor isn't closable, is it? 1169 if ($tag != 0) { # Floor isn't closable, is it?
1008 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1170 $::INVR_HB->add (new CFPlus::UI::Button
1009 text => "Close container", 1171 text => "Close container",
1010 tooltip => "Close the currently open container (if one is open)", 1172 tooltip => "Close the currently open container (if one is open)",
1011 on_activate => sub { 1173 on_activate => sub {
1012 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1174 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1013 if $tag != 0; 1175 if $tag != 0;
1014 #if $CONN->{open_container} != 0;
1015 0 1176 0
1016 }, 1177 },
1017 ); 1178 );
1018 } 1179 }
1019 1180

Diff Legend

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