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.171 by root, Sat Sep 1 08:08:52 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 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
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 ("\fw" => sub {
85 $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 }
86 }); 63 });
87
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 64
197 # destroy widgets on logout 65 # destroy widgets on logout
198 $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 {
199 for my $ws (values %{delete $self->{widgetset} || {}}) { 67 for my $ws (values %{delete $self->{widgetset} || {}}) {
200 $_->destroy 68 $_->destroy
… …
222 # per server 90 # per server
223 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 91 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
224 92
225 $self 93 $self
226} 94}
95
96sub update_fx_want {
97 my ($self) = @_;
98
99 $self->send_exti_msg (fx_want => {
100 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
101 5 => !!$::CFG->{audio_enable}, # FT_SOUND
102 6 => 1, # FT_RSRC
103 });
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#############################################################################
227 297
228sub logprint { 298sub logprint {
229 my ($self, @a) = @_; 299 my ($self, @a) = @_;
230 300
231 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 301 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
… …
320 390
321 if ( 391 if (
322 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 392 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
323 ) { 393 ) {
324 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 394 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); 395 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
326 } 396 }
327 397
328 $self->update_stats_window ($stats, $prev); 398 $self->update_stats_window ($stats, $prev);
329 399
330 $self->{prev_stats} = { %$stats }; 400 $self->{prev_stats} = { %$stats };
… …
369 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 439 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
370 $::GAUGES->{food} ->set_value ($fo, $fo_m); 440 $::GAUGES->{food} ->set_value ($fo, $fo_m);
371 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 441 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
372 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 442 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
373 . " (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});
374 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 445 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
375 my $title = $stats->{+CS_STAT_TITLE}; 446 my $title = $stats->{+CS_STAT_TITLE};
376 $title =~ s/^Player: //; 447 $title =~ s/^Player: //;
377 $::STATWIDS->{title} ->set_text ("Title: " . $title); 448 $::STATWIDS->{title} ->set_text ("Title: " . $title);
378 449
… …
396 for keys %RES_TBL; 467 for keys %RES_TBL;
397 468
398 my $sktbl = $::STATWIDS->{skill_tbl}; 469 my $sktbl = $::STATWIDS->{skill_tbl};
399 my @skills = keys %{ $self->{skill_info} }; 470 my @skills = keys %{ $self->{skill_info} };
400 471
401 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
402 $sktbl->clear; 480 $sktbl->clear;
403 481
404 my @add; 482 my $sw = $self->{skillwid}{""} ||= [
405
406 push @add,
407 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 483 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
408 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),
409 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 486 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
410 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 487 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
411 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),
412 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 490 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
413 ; 491 ];
492
493 my @add = @$sw;
414 494
415 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>";
416 496
417 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);
418 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);
419 499
420 my ($x, $y) = (0, 1); 500 my ($x, $y) = (0, 1);
421 for ( 501 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) = @$_; 502 my ($idx, $name) = @$_;
428 503
429 my $spell_cb = sub { 504 my $spell_cb = sub {
430 my ($widget, $ev) = @_; 505 my ($widget, $ev) = @_;
431 506
… …
446 } 521 }
447 522
448 1 523 1
449 }; 524 };
450 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
451 push @add, 543 push @add,
452 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 544 $x * 4 + 0, $y, $sw->[0],
453 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 545 $x * 4 + 1, $y, $sw->[1],
454 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 546 $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), 547 $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 ; 548 ;
459 549
460 $x++ and ($x, $y) = (0, $y + 1); 550 $x++ and ($x, $y) = (0, $y + 1);
461 } 551 }
462 552
463 $sktbl->add_at (@add); 553 $sktbl->add_at (@add);
464 } 554 }
465 555
466 for (grep exists $stats->{$_}, @skills) { 556 for (@order) {
467 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 557 my ($idx, $name) = @$_;
468 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 558 my $val = $stats->{$idx};
469 }
470}
471 559
472sub macro_send { 560 next if $prev->{$idx}[1] eq $val->[1];
473 my ($self, $macro) = @_;
474 561
475 for my $cmd (@{ $macro->{action} }) { 562 my $sw = $self->{skillwid}{$idx};
476 $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);
477 } 569 }
478} 570}
479 571
480sub user_send { 572sub user_send {
481 my ($self, $command) = @_; 573 my ($self, $command) = @_;
… …
483 $self->{record}->($command) 575 $self->{record}->($command)
484 if $self->{record}; 576 if $self->{record};
485 577
486 $self->logprint ("send: ", $command); 578 $self->logprint ("send: ", $command);
487 $self->send_command ($command); 579 $self->send_command ($command);
488 ::status ($command);
489} 580}
490 581
491sub record { 582sub record {
492 my ($self, $cb) = @_; 583 my ($self, $cb) = @_;
493 584
… …
501} 592}
502 593
503sub feed_map1a { 594sub feed_map1a {
504 my ($self, $data) = @_; 595 my ($self, $data) = @_;
505 596
506 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 597 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
598 my $delay;
599
600 for my $tile (@$missing) {
601 next if $self->{delay}{$tile};
602
603 $delay = 1;
604
605 if (my $tex = $::CONN->{texture}[$tile]) {
606 $tex->upload;
607 } else {
608 $self->{delay}{$tile} = 1;
609
610 # we assume the face is in-flight and will eventually come
611 push @{$self->{tile_cb}{$tile}}, sub {
612 delete $self->{delay}{$tile};
613 $_[0]->upload;
614 };
615 }
616 }
617
618 if ($delay) {
619 # delay the map drawing a tiny bit in the hope of getting the missing fetched
620 Event->timer (after => 0.03, cb => sub {
621 $_[0]->w->cancel;
622 $self->{map_widget}->update
623 if $self->{map_widget};
624 });
625 } else {
507 $self->{map_widget}->update; 626 $self->{map_widget}->update;
627 }
508} 628}
509 629
510sub magicmap { 630sub magicmap {
511 my ($self, $w, $h, $x, $y, $data) = @_; 631 my ($self, $w, $h, $x, $y, $data) = @_;
512 632
… …
519 my $map_info = delete $self->{map_info} 639 my $map_info = delete $self->{map_info}
520 or return; 640 or return;
521 641
522 my ($hash, $x, $y, $w, $h) = @$map_info; 642 my ($hash, $x, $y, $w, $h) = @$map_info;
523 643
524 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 644 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
645 $self->{map_cache_new}{$hash} = \$data;
525 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 646 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
526 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
527} 647}
528 648
529sub map_clear { 649sub map_clear {
530 my ($self) = @_; 650 my ($self) = @_;
531 651
… …
537} 657}
538 658
539sub bg_fetch { 659sub bg_fetch {
540 my ($self) = @_; 660 my ($self) = @_;
541 661
542 my $id; 662 my $tile;
543 663
544 do { 664 do {
545 $id = pop @{$self->{bg_fetch}} 665 $tile = pop @{$self->{bg_fetch}}
546 or return; 666 or return;
547 } while $self->{texture}[$id]; 667 } while $self->{texture}[$tile];
548 668
549 CFPlus::DB::exists tilecache => $id, sub { 669 CFPlus::DB::get tilecache => $tile, sub {
550 my ($exists) = @_; 670 my ($data) = @_;
551 671
552 return unless $self->{map}; # stop when destroyed 672 return unless $self->{map}; # stop when destroyed
553 673
674 if (defined $data) {
554 $self->have_tile ($id) 675 $self->have_tile ($tile, $data);
555 if $exists; 676 $self->{texture}[$tile]->upload;
677 }
556 678
557 $self->bg_fetch; 679 $self->bg_fetch;
558 }; 680 };
559} 681}
560 682
561sub load_map($$$) { 683sub load_map($$$) {
562 my ($self, $hash, $x, $y) = @_; 684 my ($self, $hash, $x, $y) = @_;
563 685
564 my $gen = $self->{map_change_gen}; 686 my $gen = $self->{map_change_gen};
565 687
566 CFPlus::DB::get $self->{mapcache} => $hash, sub { 688 my $cb = sub {
567 return unless $gen == $self->{map_change_gen}; 689 return unless $gen == $self->{map_change_gen};
568 690
569 my ($data) = @_; 691 my ($data) = @_;
570 692
571 if (defined $data) { 693 if (defined $data) {
694 $self->{map_cache_new}{$hash} = \$data;
695
572 $data = Compress::LZF::decompress $data; 696 my $data = Compress::LZF::decompress $data;
573 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
574 697
575 my $inprogress = @{ $self->{bg_fetch} || [] }; 698 my $inprogress = @{ $self->{bg_fetch} || [] };
576 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 699 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
577 $self->bg_fetch unless $inprogress; 700 $self->bg_fetch unless $inprogress;
578 } 701 }
579 }; 702 };
703
704 if (my $rdata = $self->{map_cache_old}{$hash}) {
705 $cb->($$rdata);
706 } else {
707 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
708 }
580} 709}
581 710
582# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 711# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
583# (server resource,s latency, bandwidth), so this hack is warranted. 712# (server resource,s latency, bandwidth), so this hack is warranted.
584# the right fix is to make real tiled maps with an overview file 713# the right fix is to make real tiled maps with an overview file
… …
677 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 806 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
678 807
679 $self->flush_map; 808 $self->flush_map;
680 809
681 ++$self->{map_change_gen}; 810 ++$self->{map_change_gen};
811 $self->{map_cache_old} = delete $self->{map_cache_new};
682 812
683 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 813 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
684 814
685 my $mapmapw = $self->{mapmap}->{w}; 815 my $mapmapw = $self->{mapmap}->{w};
686 my $mapmaph = $self->{mapmap}->{h}; 816 my $mapmaph = $self->{mapmap}->{h};
… …
708 my ($self, $facenum, $face, $cb) = @_; 838 my ($self, $facenum, $face, $cb) = @_;
709 839
710 if ($face->{type} == 0) { # FT_FACE 840 if ($face->{type} == 0) { # FT_FACE
711 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 841 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
712 842
713 $face->{id} = $id; 843 $face->{id} = $id;
714 $self->{faceid}[$facenum] = $id;
715
716 $self->{map}->set_tileid ($facenum => $id); 844 $self->{map}->set_tileid ($facenum => $id);
717 845
718 CFPlus::DB::get tilecache => $id, $cb; 846 CFPlus::DB::get tilecache => $id, $cb;
719 847
720 } elsif ($face->{type} & 1) { # with metadata 848 } 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; 849 CFPlus::DB::get res_meta => $face->{name}, $cb;
850
851 } else { # no metadata
852 CFPlus::DB::get res_data => $face->{name}, $cb;
723 } 853 }
724} 854}
725 855
726sub face_update { 856sub face_update {
727 my ($self, $facenum, $face, $changed) = @_; 857 my ($self, $facenum, $face, $changed) = @_;
728 858
729 if ($face->{type} == 0) { # FT_FACE 859 if ($face->{type} == 0) {
860 # image, FT_FACE
730 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 861 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
731 if $changed; 862 if $changed;
732 863
733 $self->have_tile ($face->{id}); 864 $self->have_tile ($face->{id}, delete $face->{data});
734 865
735 } elsif ($face->{type} & 1) { # split metadata 866 } elsif ($face->{type} & 1) {
736 my $cb = sub { }; 867 # split metadata case, FT_MUSIC, FT_SOUND
868 if ($changed) { # new data
869 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
870 $face->{data} = $meta;
871
872 # rely on strict ordering here and also on later fetch
873 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
874 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
875 }
876
877 $face->{data} = $self->{json_coder}->decode ($face->{data});
878 ::add_license ($face);
879 ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
880 if $changed;
737 881
738 if ($face->{type} == 3) { # FT_MUSIC 882 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); 883 &::audio_music_push ($facenum);
746 };
747 } elsif ($face->{type} == 5) { # FT_SOUND 884 } 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); 885 &::audio_sound_push ($facenum);
755 }; 886 }
756 }
757 887
758 if ($changed) { # new data 888 } else {
759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 889 # flat resource case, FT_RSRC
760
761 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 890 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
762 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { 891 if $changed;
763 $face->{meta} = $self->{json_coder}->decode ($meta_json); 892 }
764 ::add_license ($face);
765 $cb->();
766 };
767 893
768 } else { 894 if (my $cbs = $self->{face_cb}{$facenum}) {
769 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 895 $_->($face, $changed) for @$cbs;
770 ::add_license ($face);
771 $cb->();
772 }
773 } 896 }
774} 897}
775 898
776sub smooth_update { 899sub smooth_update {
777 my ($self, $facenum, $face) = @_; 900 my ($self, $facenum, $face) = @_;
778 901
779 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 902 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
780} 903}
781 904
782sub have_tile { 905sub have_tile {
783 my ($self, $tile) = @_; 906 my ($self, $tile, $data) = @_;
784 907
785 return unless $self->{map}; 908 return unless $self->{map};
786 909
787 $self->{texture}[$tile] ||= my $tex = 910 my $tex = $self->{texture}[$tile] ||=
788 new CFPlus::Texture 911 new CFPlus::Texture
789 tile => $tile, minify => 1, mipmap => 1, delay => 1; 912 tile => $tile,
913 image => $data, delete_image => 1,
914 minify => 1, mipmap => 1;
790 915
791 $_->() for @{(delete $self->{face_cb}{$tile}) || []}; 916 if (my $cbs = delete $self->{tile_cb}{$tile}) {
917 $_->($tex) for @$cbs;
918 }
792} 919}
793 920
794sub connect_face_update { 921# call in non-void context registers a temporary
922# hook with handle, otherwise its permanent
923sub on_face_change {
795 my ($self, $id, $cb) = @_; 924 my ($self, $num, $cb) = @_;
796 925
797 push @{$self->{face_cb}{$id}}, $cb; 926 push @{$self->{face_cb}{$num}}, $cb;
798 927
928 defined wantarray
799 CFPlus::guard { 929 ? CFPlus::guard {
800 @{$self->{face_cb}{$id}} 930 @{$self->{face_cb}{$num}}
801 = grep $_ != $cb, 931 = grep $_ != $cb,
802 @{$self->{face_cb}{$id}}; 932 @{$self->{face_cb}{$num}};
803 } 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)
804} 950}
805 951
806sub sound_play { 952sub sound_play {
807 my ($self, $type, $face, $dx, $dy, $vol) = @_; 953 my ($self, $type, $face, $dx, $dy, $vol) = @_;
808 954
… …
880 $self->{$type} = $text; 1026 $self->{$type} = $text;
881 } else { 1027 } else {
882 $self->logprint ("msg: ", $text); 1028 $self->logprint ("msg: ", $text);
883 return if $color < 0; # negative color == ignore if not understood 1029 return if $color < 0; # negative color == ignore if not understood
884 1030
885 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; 1031 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
886 1032
887 ## try to create single paragraphs of multiple lines sent by the server 1033 ## try to create single paragraphs of multiple lines sent by the server
888 # no longer neecssary with TRT servers 1034 # no longer neecssary with TRT servers
889 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1035 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
890 1036
891 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
892 for split /\n/, $text; 1037 for (split /\n/, $text) {
1038 ::message ({
1039 fg => $fg,
1040 markup => $_,
1041 type => $type,
1042 extra => [@extra],
1043 color_flags => $color, #d# ugly, kill
1044 });
1045
1046 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1047 # actually, this is an ugly design. _we_ should control the channels,
1048 # not some random other widget, as the channels are clearly protocol-specific.
1049 # then we could also react to flags such as CLEAR without resorting to
1050 # hacks such as color_flags, above.
1051 }
893 1052
894 $self->{statusbox}->add ($text, 1053 $self->{statusbox}->add ($text,
895 group => $text, 1054 group => $text,
896 fg => $fg, 1055 fg => $fg,
897 timeout => $color >= 2 ? 180 : 10, 1056 timeout => $color >= 2 ? 180 : 10,
… …
991 } 1150 }
992 1151
993 $::FLOORBOX->add_at (@add); 1152 $::FLOORBOX->add_at (@add);
994 }); 1153 });
995 1154
996 $::WANT_REFRESH++; 1155 $::WANT_REFRESH->start;
997} 1156}
998 1157
999sub set_opencont { 1158sub set_opencont {
1000 my ($conn, $tag, $name) = @_; 1159 my ($conn, $tag, $name) = @_;
1001 $conn->{open_container} = $tag; 1160 $conn->{open_container} = $tag;
1002 update_floorbox; 1161 update_floorbox;
1003 1162
1004 $::INV_RIGHT_HB->clear (); 1163 $::INVR_HB->clear ();
1005 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1164 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1006 1165
1007 if ($tag != 0) { # Floor isn't closable, is it? 1166 if ($tag != 0) { # Floor isn't closable, is it?
1008 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1167 $::INVR_HB->add (new CFPlus::UI::Button
1009 text => "Close container", 1168 text => "Close container",
1010 tooltip => "Close the currently open container (if one is open)", 1169 tooltip => "Close the currently open container (if one is open)",
1011 on_activate => sub { 1170 on_activate => sub {
1012 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1171 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1013 if $tag != 0; 1172 if $tag != 0;
1014 #if $CONN->{open_container} != 0;
1015 0 1173 0
1016 }, 1174 },
1017 ); 1175 );
1018 } 1176 }
1019 1177

Diff Legend

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