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.128 by root, Mon Jul 23 21:03:26 2007 UTC vs.
Revision 1.158 by root, Tue Aug 21 11:23:04 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, 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 (music => sub { 53 $self->connect_ext (ambient_music => sub {
54 my (%ev) = @_; 54 my ($songs) = @_;
55 55 &::audio_music_set_ambient ($songs);
56 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 if (my $faces = $ev{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
74
75 if (defined $meta_json) {
76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
80 } else {
81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82 $self->ask_face ($face, -100 - $pri, undef, sub {
83 my $len = length $_[1];
84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
85
86 CFPlus::DB::write_file $path, $data, sub {
87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
96 });
97 }
98 }
99 }
100 }
101
102 if (my $play = $ev{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104 }
105 }); 56 });
106 57
107 $self->connect_ext (capabilities => sub { 58 $self->connect_ext (capabilities => sub {
108 my (%cap) = @_; 59 my (%cap) = @_;
60
61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want;
63
64 $self->send_exti_req (resource => "exp_table", sub {
65 my ($exp_table) = @_;
66
67 $self->register_face_handler ($exp_table, sub {
68 my ($face) = @_;
69
70 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
71 $_->() for values %{ $self->{on_exp_update} || {} };
72 });
73
74 ()
75 });
109 76
110 if (my $ts = $cap{tileset}) { 77 if (my $ts = $cap{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) { 78 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default; 79 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3]; 80 $self->{tilesize} = $default->[3];
… …
121 } 88 }
122 }); 89 });
123 90
124 $self->{json_coder} 91 $self->{json_coder}
125 ->convert_blessed 92 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub { 93 ->filter_json_single_key_object (__w_ => sub {
127 $self->{widget}{$_[0]} 94 $self->{widget}{$_[0]}
128 }); 95 });
129 96
130 # widgetset new 97 # widgetset new
131 $self->connect_ext (ws_n => sub { 98 $self->connect_ext (ws_n => sub {
132 my ($arg) = @_; 99 my ($id) = @_;
133 100
134 $self->{widgetset}{$arg{id}} = { 101 $self->{widgetset}{$id} = {
135 w => {}, 102 w => {},
136 }; 103 };
137 }); 104 });
138 105
139 # widgetset destroy 106 # widgetset destroy
140 $self->connect_ext (ws_d => sub { 107 $self->connect_ext (ws_d => sub {
141 my ($arg) = @_; 108 my ($id) = @_;
142 109
143 my $ws = delete $self->{widgetset}{$arg{id}} 110 my $ws = delete $self->{widgetset}{$id}
144 or return; 111 or return;
145 112
146 $_->destroy 113 $_->destroy
147 for values %{$ws->{w}}; 114 for values %{$ws->{w}};
148 }); 115 });
149 116
150 # widgetset destroy 117 # widgetset create
151 $self->connect_ext (ws_c => sub { 118 $self->connect_ext (ws_c => sub {
152 my ($arg) = @_; 119 my ($ws, $id, $class, $args) = @_;
153
154 my $args = $arg->{args} || {};
155 120
156 for my $ev (grep /^on_/, keys %$args) { 121 for my $ev (grep /^on_/, keys %$args) {
122 my $rid = $args->{$ev};
157 $args->{$ev} = sub { 123 $args->{$ev} = sub {
158 my $id = shift->{s_id}; 124 my $id = shift->{s_id};
159 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 125 $self->send_exti_msg (w_e => $id, $rid, @_);
160 126
161 1 127 1
162 }; 128 };
163 } 129 }
164 130
165 if (my $widget = eval { 131 $self->widget_associate (
132 $ws, $id => scalar eval {
166 local $SIG{__DIE__}; 133 local $SIG{__DIE__};
167 "CFPlus::UI::$arg->{class}"->new ( 134 "CFPlus::UI::$class"->new (%$args)
168 %$args,
169 s_ws => $arg->{ws},
170 s_id => $arg->{id},
171 )
172 } 135 }
173 ) {
174 $self->{widget}{$arg->{id}}
175 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
176 = $widget;
177
178 $widget->connect (on_destroy => sub {
179 my ($widget) = @_;
180
181 delete $self->{widget}{$widget->{s_id}};
182 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
183 });
184 } else {
185 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 136 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 137 });
138
139 # widgetset associate
140 $self->connect_ext (ws_a => sub {
141 my (%ass) = @_;
142
143 # everything that has a name, wether conceivably useful or not
144 my %wkw = (
145 root => $CFPlus::UI::ROOT,
146 tooltip => $CFPlus::UI::TOOLTIP,
147
148 mapwidget => $::MAPWIDGET,
149 buttonbar => $::BUTTONBAR,
150 metaserver => $::METASERVER,
151 buttonbar => $::BUTTONBAR,
152 login_button => $::LOGIN_BUTTON,
153 quit_dialog => $::QUIT_DIALOG,
154 host_entry => $::HOST_ENTRY,
155 metaserver => $::METASERVER,
156 server_info => $::SERVER_INFO,
157
158 setup_dialog => $::SETUP_DIALOG,
159 setup_notebook => $::SETUP_NOTEBOOK,
160 setup_server => $::SETUP_SERVER,
161 setup_keyboard => $::SETUP_KEYBOARD,
162
163 pl_notebook => $::PL_NOTEBOOK,
164 pl_window => $::PL_WINDOW,
165 inventory_page => $::INVENTORY_PAGE,
166 stats_page => $::STATS_PAGE,
167 skill_page => $::SKILL_PAGE,
168 spell_page => $::SPELL_PAGE,
169 spell_list => $::SPELL_LIST,
170
171 floorbox => $::FLOORBOX,
172 help_window => $::HELP_WINDOW,
173 message_window => $::MESSAGE_WINDOW,
174 statusbox => $::SDTATUSBOX,
175
176 inv => $::INV,
177 invr => $::INVR,
178 invr_hb => $::INVR_HB,
179 );
180
181 while (my ($id, $name) = each %ass) {
182 $self->widget_associate (undef, $id => $wkw{$name})
183 or warn "server failed to associate non-existent well-known widget $name\n";
187 } 184 }
188 }); 185 });
189 186
190 # widget call 187 # widget call
191 $self->connect_ext (w_c => sub { 188 $self->connect_ext (w_c => sub {
192 my ($arg) = @_; 189 my ($id, $rid, $method, @args) = @_;
193 190
194 my $w = $self->{widget}{$arg->{id}} 191 my $w = $self->{widget}{$id}
195 or return; 192 or return;
196 my $m = $arg->{name};
197 193
198 my $a = $arg->{args} || []; 194 if ($rid) {
199
200 if (exists $arg->{rid}) {
201 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); 195 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
202 } else { 196 } else {
203 $w->$m (@$a); 197 $w->$method (@args);
204 } 198 }
205 }); 199 });
206 200
207 # widget set 201 # widget set
208 $self->connect_ext (w_s => sub { 202 $self->connect_ext (w_s => sub {
209 my ($arg) = @_; 203 my ($id, $attr) = @_;
210 204
211 my $w = $self->{widget}{$arg->{id}} 205 my $w = $self->{widget}{$id}
212 or return; 206 or return;
213
214 my $attr = $arg->{attr};
215 207
216 for (my $i = 0; $i < $#$attr; $i += 2) { 208 for (my $i = 0; $i < $#$attr; $i += 2) {
217 my ($member, $value) = @$attr[$i, $i+1]; 209 my ($member, $value) = @$attr[$i, $i+1];
218 if (defined $value) { 210 if (defined $value) {
219 $w->{$member} = $value; 211 $w->{$member} = $value;
… …
224 } 216 }
225 }); 217 });
226 218
227 # widget get 219 # widget get
228 $self->connect_ext (w_g => sub { 220 $self->connect_ext (w_g => sub {
229 my ($arg) = @_; 221 my ($id, $rid, $attr) = @_;
230 222
231 my $w = $self->{widget}{$arg->{id}} 223 my $w = $self->{widget}{$id}
232 or return; 224 or return;
233 225
234 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{attr}}]); 226 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
227 });
228
229 # message window
230 $self->connect_ext (channel_info => sub {
231 my ($info) = @_;
232 $self->{channels}->{$info->{id}} = $info;
233 $::MESSAGE_WINDOW->add_channel ($info);
235 }); 234 });
236 235
237 # destroy widgets on logout 236 # destroy widgets on logout
238 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 237 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
239 for my $ws (values %{delete $self->{widgetset} || {}}) { 238 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
263 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 262 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
264 263
265 $self 264 $self
266} 265}
267 266
267sub widget_associate {
268 my ($self, $ws, $id, $widget) = @_;
269
270 if ($widget) {
271 $widget->{s_id} = $id;
272 $self->{widget}{$id} = $widget;
273
274 if ($ws) {
275 $widget->{s_ws} = $ws;
276 $self->{widgetset}{$ws}{w}{$id} = $widget;
277 }
278
279 $widget->connect (on_destroy => sub {
280 my ($widget) = @_;
281
282 delete $self->{widget}{$widget->{s_id}};
283 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
284 if exists $widget->{s_ws};
285 });
286
287 1
288 } else {
289 $self->send_exti_msg (w_e => $id, undef);
290
291 0
292 }
293}
294
295sub update_fx_want {
296 my ($self) = @_;
297
298 $self->send_exti_msg (fx_want => {
299 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
300 5 => !!$::CFG->{audio_enable}, # FT_SOUND
301 6 => 1, # FT_RSRC
302 });
303}
304
268sub logprint { 305sub logprint {
269 my ($self, @a) = @_; 306 my ($self, @a) = @_;
270 307
271 $self->{log_fh} ||= do { 308 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
272 my $path = "$Crossfire::VARDIR/log.$self->{host}";
273
274 open my $fh, ">>:utf8", $path
275 or die "Couldn't open logfile $path: $!";
276
277 $fh->autoflush (1);
278
279 $fh;
280 };
281
282 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
283
284 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
285 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
286
287 print {$self->{log_fh}} "$ts ", @a, "\n";
288} 309}
289 310
290sub _stat_numdiff { 311sub _stat_numdiff {
291 my ($self, $name, $old, $new) = @_; 312 my ($self, $name, $old, $new) = @_;
292 313
… …
425 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 446 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
426 $::GAUGES->{food} ->set_value ($fo, $fo_m); 447 $::GAUGES->{food} ->set_value ($fo, $fo_m);
427 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 448 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
428 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 449 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
429 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 450 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
451 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
430 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 452 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
431 my $title = $stats->{+CS_STAT_TITLE}; 453 my $title = $stats->{+CS_STAT_TITLE};
432 $title =~ s/^Player: //; 454 $title =~ s/^Player: //;
433 $::STATWIDS->{title} ->set_text ("Title: " . $title); 455 $::STATWIDS->{title} ->set_text ("Title: " . $title);
434 456
… …
455 my @skills = keys %{ $self->{skill_info} }; 477 my @skills = keys %{ $self->{skill_info} };
456 478
457 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 479 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
458 $sktbl->clear; 480 $sktbl->clear;
459 481
460 my @add; 482 my $sw = $self->{skillwid}{""} ||= [
461
462 push @add,
463 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 483 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
464 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),
465 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 486 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
466 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 487 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
467 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),
468 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 490 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
469 ; 491 ];
492
493 my @add = @$sw;
470 494
471 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>";
472 496
473 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);
474 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);
… …
502 } 526 }
503 527
504 1 528 1
505 }; 529 };
506 530
531 my $sw = $self->{skillwid}{$idx} ||= [
532 # exp
533 (new CFPlus::UI::Label
534 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
535
536 # level
537 (new CFPlus::UI::Label
538 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
539
540 # progress
541 (new CFPlus::UI::ExperienceProgress),
542
543 # label
544 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
545 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
546 ];
547
507 push @add, 548 push @add,
508 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 549 $x * 4 + 0, $y, $sw->[0],
509 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 550 $x * 4 + 1, $y, $sw->[1],
510 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 551 $x * 4 + 2, $y, $sw->[2],
511 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 552 $x * 4 + 3, $y, $sw->[3],
512 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
513 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
514 ; 553 ;
515 554
516 $x++ and ($x, $y) = (0, $y + 1); 555 $x++ and ($x, $y) = (0, $y + 1);
517 } 556 }
518 557
519 $sktbl->add_at (@add); 558 $sktbl->add_at (@add);
520 } 559 }
521 560
522 for (grep exists $stats->{$_}, @skills) { 561 for (grep exists $stats->{$_}, @skills) {
562 my $sw = $self->{skillwid}{$_};
523 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 563 $sw->[0]->set_text (::formsep ($stats->{$_}[1]));
524 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 564 $sw->[1]->set_text ($stats->{$_}[0] * 1);
565 $sw->[2]->set_value (@{$stats->{$_}});
525 } 566 }
526} 567}
527 568
528sub macro_send { 569sub macro_send {
529 my ($self, $macro) = @_; 570 my ($self, $macro) = @_;
… …
557} 598}
558 599
559sub feed_map1a { 600sub feed_map1a {
560 my ($self, $data) = @_; 601 my ($self, $data) = @_;
561 602
562 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 603 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
604 my $delay;
605
606 for my $tile (@$missing) {
607 next if $self->{delay}{$tile};
608
609 $delay = 1;
610
611 if (my $tex = $::CONN->{texture}[$tile]) {
612 $tex->upload;
613 } else {
614 $self->{delay}{$tile} = 1;
615
616 # we assume the face is in-flight and will eventually come
617 push @{$self->{tile_cb}{$tile}}, sub {
618 delete $self->{delay}{$tile};
619 $_[0]->upload;
620 };
621 }
622 }
623
624 if ($delay) {
625 # delay the map drawing a tiny bit in the hope of getting the missing fetched
626 Event->timer (after => 0.03, cb => sub {
627 $_[0]->w->cancel;
628 $self->{map_widget}->update;
629 });
630 } else {
563 $self->{map_widget}->update; 631 $self->{map_widget}->update;
632 }
564} 633}
565 634
566sub magicmap { 635sub magicmap {
567 my ($self, $w, $h, $x, $y, $data) = @_; 636 my ($self, $w, $h, $x, $y, $data) = @_;
568 637
… …
575 my $map_info = delete $self->{map_info} 644 my $map_info = delete $self->{map_info}
576 or return; 645 or return;
577 646
578 my ($hash, $x, $y, $w, $h) = @$map_info; 647 my ($hash, $x, $y, $w, $h) = @$map_info;
579 648
580 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 649 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
650 $self->{map_cache_new}{$hash} = \$data;
581 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 651 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
582 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
583} 652}
584 653
585sub map_clear { 654sub map_clear {
586 my ($self) = @_; 655 my ($self) = @_;
587 656
… …
593} 662}
594 663
595sub bg_fetch { 664sub bg_fetch {
596 my ($self) = @_; 665 my ($self) = @_;
597 666
598 my $id; 667 my $tile;
599 668
600 do { 669 do {
601 $id = pop @{$self->{bg_fetch}} 670 $tile = pop @{$self->{bg_fetch}}
602 or return; 671 or return;
603 } while $self->{texture}[$id]; 672 } while $self->{texture}[$tile];
604 673
605 CFPlus::DB::get tilecache => $id, sub { 674 CFPlus::DB::get tilecache => $tile, sub {
606 my ($data) = @_; 675 my ($data) = @_;
607 676
608 return unless $self->{map}; # stop when destroyed 677 return unless $self->{map}; # stop when destroyed
609 678
610 $self->set_texture ($id => $data)
611 if defined $data; 679 if (defined $data) {
680 $self->have_tile ($tile, $data);
681 $self->{texture}[$tile]->upload;
682 }
612 683
613 $self->bg_fetch; 684 $self->bg_fetch;
614 }; 685 };
615} 686}
616 687
617sub load_map($$$) { 688sub load_map($$$) {
618 my ($self, $hash, $x, $y) = @_; 689 my ($self, $hash, $x, $y) = @_;
619 690
620 my $gen = $self->{map_change_gen}; 691 my $gen = $self->{map_change_gen};
621 692
622 CFPlus::DB::get $self->{mapcache} => $hash, sub { 693 my $cb = sub {
623 return unless $gen == $self->{map_change_gen}; 694 return unless $gen == $self->{map_change_gen};
624 695
625 my ($data) = @_; 696 my ($data) = @_;
626 697
627 if (defined $data) { 698 if (defined $data) {
699 $self->{map_cache_new}{$hash} = \$data;
700
628 $data = Compress::LZF::decompress $data; 701 my $data = Compress::LZF::decompress $data;
629 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
630 702
631 my $inprogress = @{ $self->{bg_fetch} || [] }; 703 my $inprogress = @{ $self->{bg_fetch} || [] };
632 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 704 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
633 $self->bg_fetch unless $inprogress; 705 $self->bg_fetch unless $inprogress;
634 } 706 }
635 }; 707 };
708
709 if (my $rdata = $self->{map_cache_old}{$hash}) {
710 $cb->($$rdata);
711 } else {
712 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
713 }
636} 714}
637 715
638# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 716# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
639# (server resource,s latency, bandwidth), so this hack is warranted. 717# (server resource,s latency, bandwidth), so this hack is warranted.
640# the right fix is to make real tiled maps with an overview file 718# the right fix is to make real tiled maps with an overview file
… …
733 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 811 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
734 812
735 $self->flush_map; 813 $self->flush_map;
736 814
737 ++$self->{map_change_gen}; 815 ++$self->{map_change_gen};
816 $self->{map_cache_old} = delete $self->{map_cache_new};
738 817
739 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 818 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
740 819
741 my $mapmapw = $self->{mapmap}->{w}; 820 my $mapmapw = $self->{mapmap}->{w};
742 my $mapmaph = $self->{mapmap}->{h}; 821 my $mapmaph = $self->{mapmap}->{h};
… …
761} 840}
762 841
763sub face_find { 842sub face_find {
764 my ($self, $facenum, $face, $cb) = @_; 843 my ($self, $facenum, $face, $cb) = @_;
765 844
766 my $hash = "$face->{chksum},$face->{name}"; 845 if ($face->{type} == 0) { # FT_FACE
767
768 my $id = CFPlus::DB::get_tile_id_sync $hash; 846 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
769 847
770 $face->{id} = $id; 848 $face->{id} = $id;
771 $self->{faceid}[$facenum] = $id;
772
773 $self->{map}->set_tileid ($facenum => $id); 849 $self->{map}->set_tileid ($facenum => $id);
774 850
775 CFPlus::DB::get tilecache => $id, $cb; 851 CFPlus::DB::get tilecache => $id, $cb;
852
853 } elsif ($face->{type} & 1) { # with metadata
854 CFPlus::DB::get res_meta => $face->{name}, $cb;
855
856 } else { # no metadata
857 CFPlus::DB::get res_data => $face->{name}, $cb;
858 }
776} 859}
777 860
778sub face_update { 861sub face_update {
779 my ($self, $facenum, $face, $changed) = @_; 862 my ($self, $facenum, $face, $changed) = @_;
780 863
864 if ($face->{type} == 0) {
865 # image, FT_FACE
781 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 866 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
782 if $changed; 867 if $changed;
783 868
784 $self->set_texture ($face->{id} => delete $face->{image}); 869 $self->have_tile ($face->{id}, delete $face->{data});
870
871 } elsif ($face->{type} & 1) {
872 # split metadata case, FT_MUSIC, FT_SOUND
873 if ($changed) { # new data
874 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
875 $face->{data} = $meta;
876
877 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
878 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
879 }
880
881 $face->{data} = $self->{json_coder}->decode ($face->{data});
882
883 ::add_license ($face);
884
885 if ($face->{type} == 3) { # FT_MUSIC
886 ::message ({ markup => "downloaded song #$facenum" })
887 if $changed;
888
889 &::audio_music_push ($facenum);
890 } elsif ($face->{type} == 5) { # FT_SOUND
891 ::message ({ markup => "downloaded sound #$facenum" })
892 if $changed;
893
894 &::audio_sound_push ($facenum);
895 }
896
897 } else {
898 # flat resource case, FT_RSRC
899 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
900 if $changed;
901 }
902
903 if (my $cbs = $self->{face_cb}{$facenum}) {
904 $_->($face, $changed) for @$cbs;
905 }
785} 906}
786 907
787sub smooth_update { 908sub smooth_update {
788 my ($self, $facenum, $face) = @_; 909 my ($self, $facenum, $face) = @_;
789 910
790 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 911 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
791} 912}
792 913
793sub set_texture { 914sub have_tile {
794 my ($self, $id, $data) = @_; 915 my ($self, $tile, $data) = @_;
795 916
796 return unless $self->{map}; 917 return unless $self->{map};
797 918
798 $self->{texture}[$id] = my $tex = 919 my $tex = $self->{texture}[$tile] ||=
799 new_from_image CFPlus::Texture 920 new CFPlus::Texture
921 tile => $tile,
922 image => $data, delete_image => 1,
800 $data, minify => 1, mipmap => 1; 923 minify => 1, mipmap => 1;
801 924
802 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 925 if (my $cbs = delete $self->{tile_cb}{$tile}) {
803 $self->{map_widget}->update; 926 $_->($tex) for @$cbs;
804 927 }
805 $_->() for @{(delete $self->{face_cb}{$id}) || []};
806} 928}
807 929
808sub connect_face_update { 930# call in non-void context registers a temporary
931# hook with handle, otherwise its permanent
932sub on_face_change {
809 my ($self, $id, $cb) = @_; 933 my ($self, $num, $cb) = @_;
810 934
811 push @{$self->{face_cb}{$id}}, $cb; 935 push @{$self->{face_cb}{$num}}, $cb;
812 936
937 defined wantarray
813 CFPlus::guard { 938 ? CFPlus::guard {
814 @{$self->{face_cb}{$id}} 939 @{$self->{face_cb}{$num}}
815 = grep $_ != $cb, 940 = grep $_ != $cb,
816 @{$self->{face_cb}{$id}}; 941 @{$self->{face_cb}{$num}};
817 } 942 }
943 : ()
944}
945
946# call in non-void context registers a temporary
947# hook with handle, otherwise its permanent
948sub register_face_handler {
949 my ($self, $num, $cb) = @_;
950
951 return unless $num;
952
953 # invoke if available right now
954 $cb->($self->{face}[$num], 0)
955 unless exists $self->{face}[$num]{loading};
956
957 # future changes
958 $self->on_face_change ($num => $cb)
818} 959}
819 960
820sub sound_play { 961sub sound_play {
821 my ($self, $x, $y, $soundnum, $type) = @_; 962 my ($self, $type, $face, $dx, $dy, $vol) = @_;
822 963
823 $self->{sound_play}->($x, $y, $soundnum, $type); 964 &::audio_sound_play ($face, $dx, $dy, $vol)
965 unless $type & 1; # odd types are silent for future expansion
824} 966}
825 967
826my $LAST_QUERY; # server is stupid, stupid, stupid 968my $LAST_QUERY; # server is stupid, stupid, stupid
827 969
828sub query { 970sub query {
… …
893 $self->{$type} = $text; 1035 $self->{$type} = $text;
894 } else { 1036 } else {
895 $self->logprint ("msg: ", $text); 1037 $self->logprint ("msg: ", $text);
896 return if $color < 0; # negative color == ignore if not understood 1038 return if $color < 0; # negative color == ignore if not understood
897 1039
898 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1040 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
899 1041
900 ## try to create single paragraphs of multiple lines sent by the server 1042 ## try to create single paragraphs of multiple lines sent by the server
901 # no longer neecssary with TRT servers 1043 # no longer neecssary with TRT servers
902 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1044 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
903 1045
904 ::message ({ fg => $fg, markup => $_ }) 1046 ::message ({
1047 fg => $fg,
1048 markup => $_,
1049 type => $type,
1050 extra => [@extra],
1051 color_flags => $color
905 for split /\n/, $text; 1052 }) for split /\n/, $text;
906 1053
907 $self->{statusbox}->add ($text, 1054 $self->{statusbox}->add ($text,
908 group => $text, 1055 group => $text,
909 fg => $fg, 1056 fg => $fg,
910 timeout => $color >= 2 ? 180 : 10, 1057 timeout => $color >= 2 ? 180 : 10,
… …
966 $self->{map_widget}->clr_commands; 1113 $self->{map_widget}->clr_commands;
967 1114
968 ::stop_game (); 1115 ::stop_game ();
969} 1116}
970 1117
971sub image_info {
972 my ($self, $numfaces) = @_;
973
974 $self->{num_faces} = $numfaces;
975 $self->{face_prefetch} = [1 .. $numfaces];
976 $self->face_prefetch;
977}
978
979sub face_prefetch {
980 my ($self) = @_;
981
982 return unless $::CFG->{face_prefetch};
983
984 if ($self->{num_faces}) {
985 return if @{ $self->{send_queue} || [] };
986 my $todo = @{ $self->{face_prefetch} }
987 or return;
988
989 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
990
991 $self->send ("requestinfo image_sums $face $face");
992
993 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
994 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
995 } elsif (!exists $self->{num_faces}) {
996 $self->send ("requestinfo image_info");
997
998 $self->{num_faces} = 0;
999
1000 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
1001 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
1002 }
1003}
1004
1005sub update_floorbox { 1118sub update_floorbox {
1006 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1119 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1007 return unless $::CONN; 1120 return unless $::CONN;
1008 1121
1009 $::FLOORBOX->clear; 1122 $::FLOORBOX->clear;
… …
1038 } 1151 }
1039 1152
1040 $::FLOORBOX->add_at (@add); 1153 $::FLOORBOX->add_at (@add);
1041 }); 1154 });
1042 1155
1043 $::WANT_REFRESH++; 1156 $::WANT_REFRESH->start;
1044} 1157}
1045 1158
1046sub set_opencont { 1159sub set_opencont {
1047 my ($conn, $tag, $name) = @_; 1160 my ($conn, $tag, $name) = @_;
1048 $conn->{open_container} = $tag; 1161 $conn->{open_container} = $tag;
1049 update_floorbox; 1162 update_floorbox;
1050 1163
1051 $::INV_RIGHT_HB->clear (); 1164 $::INVR_HB->clear ();
1052 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1165 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1053 1166
1054 if ($tag != 0) { # Floor isn't closable, is it? 1167 if ($tag != 0) { # Floor isn't closable, is it?
1055 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1168 $::INVR_HB->add (new CFPlus::UI::Button
1056 text => "Close container", 1169 text => "Close container",
1057 tooltip => "Close the currently open container (if one is open)", 1170 tooltip => "Close the currently open container (if one is open)",
1058 on_activate => sub { 1171 on_activate => sub {
1059 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1172 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1060 if $tag != 0; 1173 if $tag != 0;
1061 #if $CONN->{open_container} != 0;
1062 0 1174 0
1063 }, 1175 },
1064 ); 1176 );
1065 } 1177 }
1066 1178
… …
1165 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1277 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1166 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1278 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1167 . "map size $self->{mapw}×$self->{maph}\n" 1279 . "map size $self->{mapw}×$self->{maph}\n"
1168 ); 1280 );
1169 1281
1170 ::setup_build_button ($self->{editor_support}->{builder_ui});
1171} 1282}
1172 1283
1173sub logged_in { 1284sub logged_in {
1174 my ($self) = @_; 1285 my ($self) = @_;
1175 1286
… …
1195 1306
1196 $self->send_command ("output-sync $::CFG->{output_sync}"); 1307 $self->send_command ("output-sync $::CFG->{output_sync}");
1197 $self->send_command ("output-count $::CFG->{output_count}"); 1308 $self->send_command ("output-count $::CFG->{output_count}");
1198 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1309 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1199 $self->send_command ("pickup $::CFG->{pickup}"); 1310 $self->send_command ("pickup $::CFG->{pickup}");
1200}
1201
1202sub buildat {
1203 my ($self, $builditem, $x, $y) = @_;
1204
1205 if ($self->{cfplus_ext}) {
1206 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1207 }
1208} 1311}
1209 1312
1210sub lookat { 1313sub lookat {
1211 my ($self, $x, $y) = @_; 1314 my ($self, $x, $y) = @_;
1212 1315

Diff Legend

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