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.121 by root, Sat Jul 14 13:08:40 2007 UTC vs.
Revision 1.153 by root, Mon Aug 13 14:24: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, 26 ywidget => 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 (event_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 (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
108 my ($cap) = @_; 59 my (%cap) = @_;
109 60
61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want;
63
110 if (my $ts = $cap->{tileset}) { 64 if (my $ts = $cap{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) { 65 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default; 66 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3]; 67 $self->{tilesize} = $default->[3];
114 $self->setup_req (tileset => $default->[0]); 68 $self->setup_req (tileset => $default->[0]);
115 69
… …
121 } 75 }
122 }); 76 });
123 77
124 $self->{json_coder} 78 $self->{json_coder}
125 ->convert_blessed 79 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub { 80 ->filter_json_single_key_object (__w_ => sub {
127 $self->{widget}{$_[0]} 81 $self->{widget}{$_[0]}
128 }); 82 });
129 83
84 # widgetset new
130 $self->connect_ext (ws_n => sub { 85 $self->connect_ext (ws_n => sub {
131 my ($arg) = @_; 86 my ($id) = @_;
132 87
133 $self->{widgetset}{$arg{id}} = { 88 $self->{widgetset}{$id} = {
134 w => {}, 89 w => {},
135 }; 90 };
136 }); 91 });
137 92
93 # widgetset destroy
138 $self->connect_ext (ws_d => sub { 94 $self->connect_ext (ws_d => sub {
139 my ($arg) = @_; 95 my ($id) = @_;
140 96
141 my $ws = delete $self->{widgetset}{$arg{id}} 97 my $ws = delete $self->{widgetset}{$id}
142 or return; 98 or return;
143 99
144 $_->destroy 100 $_->destroy
145 for values %{$ws->{w}}; 101 for values %{$ws->{w}};
146 }); 102 });
147 103
104 # widgetset create
148 $self->connect_ext (ws_c => sub { 105 $self->connect_ext (ws_c => sub {
149 my ($arg) = @_; 106 my ($ws, $id, $class, $args) = @_;
150
151 my $args = $arg->{args} || {};
152 107
153 for my $ev (grep /^on_/, keys %$args) { 108 for my $ev (grep /^on_/, keys %$args) {
154 $args->{$ev} = sub { 109 $args->{$ev} = sub {
155 my $id = shift->{s_id}; 110 my $id = shift->{s_id};
156 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 111 $self->send_exti_msg (w_e => $id, $ev, \@_);
157 112
158 1 113 1
159 }; 114 };
160 } 115 }
161 116
162 if (my $widget = eval { 117 if (my $widget = eval {
163 local $SIG{__DIE__}; 118 local $SIG{__DIE__};
164 "CFPlus::UI::$arg->{class}"->new ( 119 "CFPlus::UI::$class"->new (
165 %$args, 120 %$args,
166 s_ws => $arg->{ws}, 121 s_ws => $ws,
167 s_id => $arg->{id}, 122 s_id => $id,
168 ) 123 )
169 } 124 }
170 ) { 125 ) {
171 $self->{widget}{$arg->{id}} 126 $self->{widget}{$id}
172 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 127 = $self->{widgetset}{$ws}{w}{$id}
173 = $widget; 128 = $widget;
174 129
175 $widget->connect (on_destroy => sub { 130 $widget->connect (on_destroy => sub {
176 my ($widget) = @_; 131 my ($widget) = @_;
177 132
178 delete $self->{widget}{$widget->{s_id}}; 133 delete $self->{widget}{$widget->{s_id}};
179 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 134 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
180 }); 135 });
181 } else { 136 } else {
182 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 137 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
183 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 138 $self->send_exti_msg (w_e => $id, "destroy");
184 } 139 }
185 }); 140 });
186 141
142 # widget call
187 $self->connect_ext (w_c => sub { 143 $self->connect_ext (w_c => sub {
188 my ($arg) = @_; 144 my ($id, $rid, $method, $args) = @_;
189 145
190 my $w = $self->{widget}{$arg->{id}} 146 my $w = $self->{widget}{$id}
191 or return; 147 or return;
192 my $m = $arg->{name};
193 148
194 my $a = $arg->{args} || []; 149 $args ||= [];
195 150
196 if (exists $arg->{rid}) { 151 if ($rid) {
197 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); 152 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
198 } else { 153 } else {
199 $w->$m (@$a); 154 $w->$method (@$args);
200 } 155 }
201 }); 156 });
202 157
158 # widget set
203 $self->connect_ext (w_s => sub { 159 $self->connect_ext (w_s => sub {
204 my ($arg) = @_; 160 my ($id, $attr) = @_;
205 161
206 my $w = $self->{widget}{$arg->{id}} 162 my $w = $self->{widget}{$id}
207 or return; 163 or return;
208 164
209 $w->{$arg->{name}} = $arg->{value}; 165 for (my $i = 0; $i < $#$attr; $i += 2) {
166 my ($member, $value) = @$attr[$i, $i+1];
167 if (defined $value) {
168 $w->{$member} = $value;
169 } else {
170 delete $w->{$member};
171 }
172 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
173 }
210 }); 174 });
211 175
176 # widget get
212 $self->connect_ext (w_g => sub { 177 $self->connect_ext (w_g => sub {
213 my ($arg) = @_; 178 my ($id, $rid, $attr) = @_;
214 179
215 my $w = $self->{widget}{$arg->{id}} 180 my $w = $self->{widget}{$id}
216 or return; 181 or return;
217 182
218 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 183 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
219 }); 184 });
220 185
186 # message window
187 $self->connect_ext (channel_info => sub {
188 my ($info) = @_;
189 $self->{channels}->{$info->{id}} = $info;
190 $::MESSAGE_WINDOW->add_channel ($info);
191 });
192
193 # destroy widgets on logout
221 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 194 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
222 for my $ws (values %{delete $self->{widgetset} || {}}) { 195 for my $ws (values %{delete $self->{widgetset} || {}}) {
223 $_->destroy 196 $_->destroy
224 for values %{delete $ws->{w} || {}}; 197 for values %{delete $ws->{w} || {}};
225 } 198 }
… …
246 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 219 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
247 220
248 $self 221 $self
249} 222}
250 223
224sub update_fx_want {
225 my ($self) = @_;
226
227 $self->send_exti_msg (fx_want => {
228 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
229 5 => !!$::CFG->{audio_enable}, # FT_SOUND
230 });
231}
232
251sub logprint { 233sub logprint {
252 my ($self, @a) = @_; 234 my ($self, @a) = @_;
253 235
254 $self->{log_fh} ||= do { 236 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
255 my $path = "$Crossfire::VARDIR/log.$self->{host}";
256
257 open my $fh, ">>:utf8", $path
258 or die "Couldn't open logfile $path: $!";
259
260 $fh->autoflush (1);
261
262 $fh;
263 };
264
265 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
266
267 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
268 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
269
270 print {$self->{log_fh}} "$ts ", @a, "\n";
271} 237}
272 238
273sub _stat_numdiff { 239sub _stat_numdiff {
274 my ($self, $name, $old, $new) = @_; 240 my ($self, $name, $old, $new) = @_;
275 241
… …
438 my @skills = keys %{ $self->{skill_info} }; 404 my @skills = keys %{ $self->{skill_info} };
439 405
440 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 406 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
441 $sktbl->clear; 407 $sktbl->clear;
442 408
409 my @add;
410
411 push @add,
443 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 412 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
444 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 413 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
445 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 414 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
446 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 415 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
447 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 416 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
448 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 417 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
418 ;
449 419
450 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 420 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
451 421
452 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 422 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
453 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 423 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
481 } 451 }
482 452
483 1 453 1
484 }; 454 };
485 455
456 push @add,
486 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 457 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
487 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 458 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
488 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 459 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
489 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 460 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
490 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 461 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
491 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 462 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
463 ;
492 464
493 $x++ and ($x, $y) = (0, $y + 1); 465 $x++ and ($x, $y) = (0, $y + 1);
494 } 466 }
467
468 $sktbl->add_at (@add);
495 } 469 }
496 470
497 for (grep exists $stats->{$_}, @skills) { 471 for (grep exists $stats->{$_}, @skills) {
498 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 472 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
499 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 473 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
532} 506}
533 507
534sub feed_map1a { 508sub feed_map1a {
535 my ($self, $data) = @_; 509 my ($self, $data) = @_;
536 510
537 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 511 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
512 my $delay;
513
514 for my $tile (@$missing) {
515 next if $self->{delay}{$tile};
516
517 $delay = 1;
518
519 if (my $tex = $::CONN->{texture}[$tile]) {
520 $tex->upload;
521 } else {
522 $self->{delay}{$tile} = 1;
523
524 # we assume the face is in-flight and will eventually come
525 push @{$self->{face_cb}{$tile}}, sub {
526 delete $self->{delay}{$tile};
527 $_[0]->upload;
528 };
529 }
530 }
531
532 if ($delay) {
533 # delay the map drawing a tiny bit in the hope of getting the missing fetched
534 Event->timer (after => 0.03, cb => sub {
535 $_[0]->w->cancel;
536 $self->{map_widget}->update;
537 });
538 } else {
538 $self->{map_widget}->update; 539 $self->{map_widget}->update;
540 }
539} 541}
540 542
541sub magicmap { 543sub magicmap {
542 my ($self, $w, $h, $x, $y, $data) = @_; 544 my ($self, $w, $h, $x, $y, $data) = @_;
543 545
… …
550 my $map_info = delete $self->{map_info} 552 my $map_info = delete $self->{map_info}
551 or return; 553 or return;
552 554
553 my ($hash, $x, $y, $w, $h) = @$map_info; 555 my ($hash, $x, $y, $w, $h) = @$map_info;
554 556
555 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 557 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
558 $self->{map_cache_new}{$hash} = \$data;
556 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 559 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
557 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
558} 560}
559 561
560sub map_clear { 562sub map_clear {
561 my ($self) = @_; 563 my ($self) = @_;
562 564
… …
575 do { 577 do {
576 $id = pop @{$self->{bg_fetch}} 578 $id = pop @{$self->{bg_fetch}}
577 or return; 579 or return;
578 } while $self->{texture}[$id]; 580 } while $self->{texture}[$id];
579 581
580 CFPlus::DB::get tilecache => $id, sub { 582 CFPlus::DB::exists tilecache => $id, sub {
581 my ($data) = @_; 583 my ($exists) = @_;
582 584
583 return unless $self->{map}; # stop when destroyed 585 return unless $self->{map}; # stop when destroyed
584 586
585 $self->set_texture ($id => $data) 587 if ($exists) {
586 if defined $data; 588 $self->have_tile ($id);
589 $self->{texture}[$id]->upload;
590 }
587 591
588 $self->bg_fetch; 592 $self->bg_fetch;
589 }; 593 };
590} 594}
591 595
592sub load_map($$$) { 596sub load_map($$$) {
593 my ($self, $hash, $x, $y) = @_; 597 my ($self, $hash, $x, $y) = @_;
594 598
595 my $gen = $self->{map_change_gen}; 599 my $gen = $self->{map_change_gen};
596 600
597 CFPlus::DB::get $self->{mapcache} => $hash, sub { 601 my $cb = sub {
598 return unless $gen == $self->{map_change_gen}; 602 return unless $gen == $self->{map_change_gen};
599 603
600 my ($data) = @_; 604 my ($data) = @_;
601 605
602 if (defined $data) { 606 if (defined $data) {
607 $self->{map_cache_new}{$hash} = \$data;
608
603 $data = Compress::LZF::decompress $data; 609 my $data = Compress::LZF::decompress $data;
604 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
605 610
606 my $inprogress = @{ $self->{bg_fetch} || [] }; 611 my $inprogress = @{ $self->{bg_fetch} || [] };
607 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 612 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
608 $self->bg_fetch unless $inprogress; 613 $self->bg_fetch unless $inprogress;
609 } 614 }
610 }; 615 };
616
617 if (my $rdata = $self->{map_cache_old}{$hash}) {
618 $cb->($$rdata);
619 } else {
620 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
621 }
611} 622}
612 623
613# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 624# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
614# (server resource,s latency, bandwidth), so this hack is warranted. 625# (server resource,s latency, bandwidth), so this hack is warranted.
615# the right fix is to make real tiled maps with an overview file 626# the right fix is to make real tiled maps with an overview file
… …
708 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 719 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
709 720
710 $self->flush_map; 721 $self->flush_map;
711 722
712 ++$self->{map_change_gen}; 723 ++$self->{map_change_gen};
724 $self->{map_cache_old} = delete $self->{map_cache_new};
713 725
714 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 726 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
715 727
716 my $mapmapw = $self->{mapmap}->{w}; 728 my $mapmapw = $self->{mapmap}->{w};
717 my $mapmaph = $self->{mapmap}->{h}; 729 my $mapmaph = $self->{mapmap}->{h};
… …
736} 748}
737 749
738sub face_find { 750sub face_find {
739 my ($self, $facenum, $face, $cb) = @_; 751 my ($self, $facenum, $face, $cb) = @_;
740 752
741 my $hash = "$face->{chksum},$face->{name}"; 753 if ($face->{type} == 0) { # FT_FACE
742
743 my $id = CFPlus::DB::get_tile_id_sync $hash; 754 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
744 755
745 $face->{id} = $id; 756 $face->{id} = $id;
746 $self->{faceid}[$facenum] = $id; 757 $self->{faceid}[$facenum] = $id;
747 758
748 $self->{map}->set_tileid ($facenum => $id); 759 $self->{map}->set_tileid ($facenum => $id);
749 760
750 CFPlus::DB::get tilecache => $id, $cb; 761 CFPlus::DB::get tilecache => $id, $cb;
762
763 } elsif ($face->{type} & 1) { # with metadata
764 CFPlus::DB::get res_meta => $face->{name}, $cb;
765 }
751} 766}
752 767
753sub face_update { 768sub face_update {
754 my ($self, $facenum, $face, $changed) = @_; 769 my ($self, $facenum, $face, $changed) = @_;
755 770
771 if ($face->{type} == 0) { # FT_FACE
756 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 772 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
757 if $changed; 773 if $changed;
758 774
759 $self->set_texture ($face->{id} => delete $face->{image}); 775 $self->have_tile ($face->{id});
776
777 } elsif ($face->{type} & 1) { # split metadata
778 if ($changed) { # new data
779 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
780 $face->{meta} = $self->{json_coder}->decode ($meta_json);
781
782 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
783 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
784 } else {
785 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
786 }
787
788 ::add_license ($face);
789
790 if ($face->{type} == 3) { # FT_MUSIC
791 $self->{music_meta}{$facenum} = $face;
792
793 ::message ({ markup => "downloaded song #$facenum" })
794 if $changed;
795
796 &::audio_music_push ($facenum);
797 } elsif ($face->{type} == 5) { # FT_SOUND
798 $self->{sound_meta}{$facenum} = $face;
799
800 ::message ({ markup => "downloaded sound #$facenum" })
801 if $changed;
802
803 &::audio_sound_push ($facenum);
804 }
805
806 }
760} 807}
761 808
762sub smooth_update { 809sub smooth_update {
763 my ($self, $facenum, $face) = @_; 810 my ($self, $facenum, $face) = @_;
764 811
765 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 812 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
766} 813}
767 814
768sub set_texture { 815sub have_tile {
769 my ($self, $id, $data) = @_; 816 my ($self, $tile) = @_;
770 817
771 return unless $self->{map}; 818 return unless $self->{map};
772 819
773 $self->{texture}[$id] = my $tex = 820 my $tex = $self->{texture}[$tile] ||=
774 new_from_image CFPlus::Texture 821 new CFPlus::Texture
775 $data, minify => 1, mipmap => 1; 822 tile => $tile, minify => 1, mipmap => 1, delay => 1;
776 823
777 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 824 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
778 $self->{map_widget}->update; 825}
826
827sub connect_face_update {
828 my ($self, $id, $cb) = @_;
829
830 push @{$self->{face_cb}{$id}}, $cb;
831
832 CFPlus::guard {
833 @{$self->{face_cb}{$id}}
834 = grep $_ != $cb,
835 @{$self->{face_cb}{$id}};
836 }
779} 837}
780 838
781sub sound_play { 839sub sound_play {
782 my ($self, $x, $y, $soundnum, $type) = @_; 840 my ($self, $type, $face, $dx, $dy, $vol) = @_;
783 841
784 $self->{sound_play}->($x, $y, $soundnum, $type); 842 &::audio_sound_play ($face, $dx, $dy, $vol)
843 unless $type & 1; # odd types are silent for future expansion
785} 844}
786 845
787my $LAST_QUERY; # server is stupid, stupid, stupid 846my $LAST_QUERY; # server is stupid, stupid, stupid
788 847
789sub query { 848sub query {
… …
854 $self->{$type} = $text; 913 $self->{$type} = $text;
855 } else { 914 } else {
856 $self->logprint ("msg: ", $text); 915 $self->logprint ("msg: ", $text);
857 return if $color < 0; # negative color == ignore if not understood 916 return if $color < 0; # negative color == ignore if not understood
858 917
859 my $fg = $CF_COLOR[$color % @CF_COLOR]; 918 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
860 919
861 ## try to create single paragraphs of multiple lines sent by the server 920 ## try to create single paragraphs of multiple lines sent by the server
862 # no longer neecssary with TRT servers 921 # no longer neecssary with TRT servers
863 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 922 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
864 923
865 ::message ({ fg => $fg, markup => $_ }) 924 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
866 for split /\n/, $text; 925 for split /\n/, $text;
867 926
868 $self->{statusbox}->add ($text, 927 $self->{statusbox}->add ($text,
869 group => $text, 928 group => $text,
870 fg => $fg, 929 fg => $fg,
… …
927 $self->{map_widget}->clr_commands; 986 $self->{map_widget}->clr_commands;
928 987
929 ::stop_game (); 988 ::stop_game ();
930} 989}
931 990
932sub image_info {
933 my ($self, $numfaces) = @_;
934
935 $self->{num_faces} = $numfaces;
936 $self->{face_prefetch} = [1 .. $numfaces];
937 $self->face_prefetch;
938}
939
940sub face_prefetch {
941 my ($self) = @_;
942
943 return unless $::CFG->{face_prefetch};
944
945 if ($self->{num_faces}) {
946 return if @{ $self->{send_queue} || [] };
947 my $todo = @{ $self->{face_prefetch} }
948 or return;
949
950 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
951
952 $self->send ("requestinfo image_sums $face $face");
953
954 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
955 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
956 } elsif (!exists $self->{num_faces}) {
957 $self->send ("requestinfo image_info");
958
959 $self->{num_faces} = 0;
960
961 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
962 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
963 }
964}
965
966sub update_floorbox { 991sub update_floorbox {
967 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 992 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
968 return unless $::CONN; 993 return unless $::CONN;
969 994
970 $::FLOORBOX->clear; 995 $::FLOORBOX->clear;
996
997 my @add;
971 998
972 my $row; 999 my $row;
973 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1000 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
974 if ($row < 6) { 1001 if ($row < 6) {
975 local $_->{face_widget}; # hack to force recreation of widget 1002 local $_->{face_widget}; # hack to force recreation of widget
976 local $_->{desc_widget}; # hack to force recreation of widget 1003 local $_->{desc_widget}; # hack to force recreation of widget
977 CFPlus::Item::update_widgets $_; 1004 CFPlus::Item::update_widgets $_;
978 1005
1006 push @add,
979 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1007 0, $row, $_->{face_widget},
980 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1008 1, $row, $_->{desc_widget};
981 1009
982 $row++; 1010 $row++;
983 } else { 1011 } else {
984 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1012 push @add, 1, $row, new CFPlus::UI::Button
985 text => "More...", 1013 text => "More...",
986 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1014 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
987 ); 1015 ;
988 last; 1016 last;
989 } 1017 }
990 } 1018 }
991 if ($::CONN->{open_container}) { 1019 if ($::CONN->{open_container}) {
992 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1020 push @add, 1, $row++, new CFPlus::UI::Button
993 text => "Close container", 1021 text => "Close container",
994 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1022 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
995 ); 1023 ;
996 } 1024 }
997 });
998 1025
1026 $::FLOORBOX->add_at (@add);
1027 });
1028
999 $::WANT_REFRESH++; 1029 $::WANT_REFRESH->start;
1000} 1030}
1001 1031
1002sub set_opencont { 1032sub set_opencont {
1003 my ($conn, $tag, $name) = @_; 1033 my ($conn, $tag, $name) = @_;
1004 $conn->{open_container} = $tag; 1034 $conn->{open_container} = $tag;
… …
1121 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1151 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1122 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1152 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1123 . "map size $self->{mapw}×$self->{maph}\n" 1153 . "map size $self->{mapw}×$self->{maph}\n"
1124 ); 1154 );
1125 1155
1126 ::setup_build_button ($self->{editor_support}->{builder_ui});
1127} 1156}
1128 1157
1129sub logged_in { 1158sub logged_in {
1130 my ($self) = @_; 1159 my ($self) = @_;
1131 1160
1132 $self->send_ext_req (cfplus_support => version => 1, sub { 1161 $self->send_ext_req (cfplus_support => version => 2, sub {
1162 my (%msg) = @_;
1163
1133 $self->{cfplus_ext} = $_[0]{version}; 1164 $self->{cfplus_ext} = $msg{version};
1134 $self->update_server_info; 1165 $self->update_server_info;
1135 1166
1136 if ($self->{cfplus_ext} >= 2) { 1167 if ($self->{cfplus_ext} >= 2) {
1137 $self->send_ext_req ("editor_support", sub { 1168 $self->send_ext_req ("editor_support", sub {
1138 $self->{editor_support} = $_[0]; 1169 $self->{editor_support} = { @_ };
1139 $self->update_server_info; 1170 $self->update_server_info;
1140 1171
1141 0 1172 0
1142 }); 1173 });
1143 } 1174 }
… …
1151 $self->send_command ("output-count $::CFG->{output_count}"); 1182 $self->send_command ("output-count $::CFG->{output_count}");
1152 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1183 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1153 $self->send_command ("pickup $::CFG->{pickup}"); 1184 $self->send_command ("pickup $::CFG->{pickup}");
1154} 1185}
1155 1186
1156sub buildat {
1157 my ($self, $builditem, $x, $y) = @_;
1158
1159 if ($self->{cfplus_ext}) {
1160 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1161 }
1162}
1163
1164sub lookat { 1187sub lookat {
1165 my ($self, $x, $y) = @_; 1188 my ($self, $x, $y) = @_;
1166 1189
1167 if ($self->{cfplus_ext}) { 1190 if ($self->{cfplus_ext}) {
1168 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1191 $self->send_ext_req (lookat => $x, $y, sub {
1169 my ($msg) = @_; 1192 my (%msg) = @_;
1170 1193
1171 if (exists $msg->{npc_dialog}) { 1194 if (exists $msg{npc_dialog}) {
1172 # start npc chat dialog 1195 # start npc chat dialog
1173 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1196 $self->{npc_dialog} = new CFPlus::NPCDialog::
1174 dx => $x, 1197 token => $msg{npc_dialog},
1175 dy => $y,
1176 title => "$msg->{npc_dialog} (NPC)", 1198 title => "$msg{npc_dialog}[0] (NPC)",
1177 conn => $self, 1199 conn => $self,
1178 ; 1200 ;
1179 } 1201 }
1180 }); 1202 });
1181 } 1203 }
… …
1246 on_activate => sub { $this->destroy; 1 }, 1268 on_activate => sub { $this->destroy; 1 },
1247 ; 1269 ;
1248 1270
1249 $self->update_options; 1271 $self->update_options;
1250 1272
1251 $self->{id} = $self->{conn}->send_ext_req ( 1273 $self->{id} = "npc-channel-" . $self->{conn}->token;
1252 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1274 $self->{conn}->connect_ext ($self->{id} => sub {
1253 sub { $this && $this->feed (@_) } 1275 $this->feed (@_) if $this;
1254 ); 1276 });
1277
1278 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1255 1279
1256 $self->{entry}->grab_focus; 1280 $self->{entry}->grab_focus;
1257 1281
1258 $self->{textview}->add_paragraph ({ 1282 $self->{textview}->add_paragraph ({
1259 fg => [1, 1, 0, 1], 1283 fg => [1, 1, 0, 1],
… …
1282 ); 1306 );
1283 } 1307 }
1284} 1308}
1285 1309
1286sub feed { 1310sub feed {
1287 my ($self, $msg) = @_; 1311 my ($self, $type, @arg) = @_;
1288 1312
1289 CFPlus::weaken $self; 1313 CFPlus::weaken $self;
1290 1314
1291 if ($msg->{msgtype} eq "reply") { 1315 if ($type eq "update") {
1316 my (%info) = @arg;
1317
1292 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1318 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1293 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1319 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1294
1295 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1296 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1297 my @link;
1298 $text =~ s{
1299 ($match)
1300 }{
1301 my $kw = $1;
1302
1303 push @link, new CFPlus::UI::Label
1304 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1305 can_hover => 1,
1306 can_events => 1,
1307 padding_x => 0,
1308 padding_y => 0,
1309 on_button_up => sub {
1310 $self->send ($kw);
1311 };
1312
1313 "\x{fffc}"
1314 }giex;
1315 1320
1321 if (exists $info{msg}) {
1322 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1323 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1324 my @link;
1325 $text =~ s{
1326 ($match)
1327 }{
1328 my $kw = $1;
1329
1330 push @link, new CFPlus::UI::Label
1331 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1332 can_hover => 1,
1333 can_events => 1,
1334 padding_x => 0,
1335 padding_y => 0,
1336 on_button_up => sub {
1337 $self->send ($kw);
1338 };
1339
1340 "\x{fffc}"
1341 }giex;
1342
1316 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1343 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1317 $self->{textview}->scroll_to_bottom; 1344 $self->{textview}->scroll_to_bottom;
1345 }
1346
1318 $self->update_options; 1347 $self->update_options;
1319 } else { 1348 } else {
1320 $self->destroy; 1349 $self->destroy;
1321 } 1350 }
1322 1351
… …
1327 my ($self, $msg) = @_; 1356 my ($self, $msg) = @_;
1328 1357
1329 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1358 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1330 $self->{textview}->scroll_to_bottom; 1359 $self->{textview}->scroll_to_bottom;
1331 1360
1332 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1361 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1333} 1362}
1334 1363
1335sub destroy { 1364sub destroy {
1336 my ($self) = @_; 1365 my ($self) = @_;
1337 1366
1338 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1367 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1339 1368
1340 if ($self->{conn}) { 1369 if ($self->{conn}) {
1341 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1370 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1342 delete $self->{conn}{npc_dialog}; 1371 delete $self->{conn}{npc_dialog};
1343 $self->{conn}->disconnect_ext ($self->{id}); 1372 $self->{conn}->disconnect_ext ($self->{id});
1344 } 1373 }
1345 1374
1346 $self->SUPER::destroy; 1375 $self->SUPER::destroy;

Diff Legend

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