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.119 by root, Sat Jul 14 12:05:53 2007 UTC vs.
Revision 1.155 by root, Fri Aug 17 21:18:01 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 (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
74 if (defined $meta_json) {
75 my $meta = $self->{json_coder}->decode ($meta_json);
76 $meta->{path} = CFPlus::DB::path_of_res $chksum;
77 $self->{music_meta}{$chksum} = $meta;
78 } else {
79 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
80 $self->ask_face ($face, -100 - $pri, undef, sub {
81 my $len = length $_[1];
82 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
83
84 my $meta = $self->{json_coder}->decode ($meta_json);
85 $meta->{path} = CFPlus::DB::path_of_res $chksum;
86 $self->{music_meta}{$chksum} = $meta;
87
88 CFPlus::DB::write_file $meta->{path}, $data, sub { };
89 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub { };
90
91 ::message ({ markup => "downloaded song #$face, size $len octets" });
92 });
93 }
94
95 &::audio_music_set ($self->{songs});
96 }
97 }
98 }
99
100 if (my $play = $ev->{play}) {
101 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
102 }
103 }); 56 });
104 57
105 $self->connect_ext (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
106 my ($cap) = @_; 59 my (%cap) = @_;
107 60
61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want;
63
108 if (my $ts = $cap->{tileset}) { 64 if (my $ts = $cap{tileset}) {
109 if (my ($default) = grep $_->[2] & 1, @$ts) { 65 if (my ($default) = grep $_->[2] & 1, @$ts) {
110 $self->{tileset} = $default; 66 $self->{tileset} = $default;
111 $self->{tilesize} = $default->[3]; 67 $self->{tilesize} = $default->[3];
112 $self->setup_req (tileset => $default->[0]); 68 $self->setup_req (tileset => $default->[0]);
113 69
… …
119 } 75 }
120 }); 76 });
121 77
122 $self->{json_coder} 78 $self->{json_coder}
123 ->convert_blessed 79 ->convert_blessed
124 ->filter_json_single_key_object (__widget_ref__ => sub { 80 ->filter_json_single_key_object (__w_ => sub {
125 $self->{widget}{$_[0]} 81 $self->{widget}{$_[0]}
126 }); 82 });
127 83
84 # widgetset new
128 $self->connect_ext (ws_n => sub { 85 $self->connect_ext (ws_n => sub {
129 my ($arg) = @_; 86 my ($id) = @_;
130 87
131 $self->{widgetset}{$arg{id}} = { 88 $self->{widgetset}{$id} = {
132 w => {}, 89 w => {},
133 }; 90 };
134 }); 91 });
135 92
93 # widgetset destroy
136 $self->connect_ext (ws_d => sub { 94 $self->connect_ext (ws_d => sub {
137 my ($arg) = @_; 95 my ($id) = @_;
138 96
139 my $ws = delete $self->{widgetset}{$arg{id}} 97 my $ws = delete $self->{widgetset}{$id}
140 or return; 98 or return;
141 99
142 $_->destroy 100 $_->destroy
143 for values %{$ws->{w}}; 101 for values %{$ws->{w}};
144 }); 102 });
145 103
104 # widgetset create
146 $self->connect_ext (ws_c => sub { 105 $self->connect_ext (ws_c => sub {
147 my ($arg) = @_; 106 my ($ws, $id, $class, $args) = @_;
148
149 my $args = $arg->{args} || {};
150 107
151 for my $ev (grep /^on_/, keys %$args) { 108 for my $ev (grep /^on_/, keys %$args) {
109 my $rid = $args->{$ev};
152 $args->{$ev} = sub { 110 $args->{$ev} = sub {
153 my $id = shift->{s_id}; 111 my $id = shift->{s_id};
154 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 112 $self->send_exti_msg (w_e => $id, $rid, @_);
155 113
156 1 114 1
157 }; 115 };
158 } 116 }
159 117
160 if (my $widget = eval { 118 $self->widget_associate (
119 $ws, $id => scalar eval {
161 local $SIG{__DIE__}; 120 local $SIG{__DIE__};
162 "CFPlus::UI::$arg->{class}"->new ( 121 "CFPlus::UI::$class"->new (%$args)
163 %$args,
164 s_ws => $arg->{ws},
165 s_id => $arg->{id},
166 )
167 } 122 }
123 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
124 });
125
126 # widgetset associate
127 $self->connect_ext (ws_a => sub {
128 my (%ass) = @_;
129
130 # everything that has a name, wether conceivably useful or not
131 my %wkw = (
132 root => $CFPlus::UI::ROOT,
133 tooltip => $CFPlus::UI::TOOLTIP,
134
135 mapwidget => $::MAPWIDGET,
136 buttonbar => $::BUTTONBAR,
137 metaserver => $::METASERVER,
138 buttonbar => $::BUTTONBAR,
139 login_button => $::LOGIN_BUTTON,
140 quit_dialog => $::QUIT_DIALOG,
141 host_entry => $::HOST_ENTRY,
142 metaserver => $::METASERVER,
143 server_info => $::SERVER_INFO,
144
145 setup_dialog => $::SETUP_DIALOG,
146 setup_notebook => $::SETUP_NOTEBOOK,
147 setup_server => $::SETUP_SERVER,
148 setup_keyboard => $::SETUP_KEYBOARD,
149
150 pl_notebook => $::PL_NOTEBOOK,
151 pl_window => $::PL_WINDOW,
152 inventory_page => $::INVENTORY_PAGE,
153 stats_page => $::STATS_PAGE,
154 skill_page => $::SKILL_PAGE,
155 spell_page => $::SPELL_PAGE,
156 spell_list => $::SPELL_LIST,
157
158 floorbox => $::FLOORBOX,
159 help_window => $::HELP_WINDOW,
160 message_window => $::MESSAGE_WINDOW,
161 statusbox => $::SDTATUSBOX,
162
163 inv => $::INV,
164 invr => $::INVR,
165 invr_hb => $::INVR_HB,
166
168 ) { 167 );
168
169 while (my ($id, $name) = each %ass) {
170 $self->widget_associate (undef, $id => $wkw{$name})
171 or warn "server failed to associate non-existent well-known widget $name\n";
172 }
173 });
174
175 # widget call
176 $self->connect_ext (w_c => sub {
177 my ($id, $rid, $method, @args) = @_;
178
169 $self->{widget}{$arg->{id}} 179 my $w = $self->{widget}{$id}
170 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 180 or return;
171 = $widget;
172 181
173 $widget->connect (on_destroy => sub { 182 if ($rid) {
174 my ($widget) = @_; 183 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
175
176 delete $self->{widget}{$widget->{s_id}};
177 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
178 });
179 } else { 184 } else {
180 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 185 $w->$method (@args);
181 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
182 } 186 }
183 }); 187 });
184 188
189 # widget set
185 $self->connect_ext (w_c => sub { 190 $self->connect_ext (w_s => sub {
186 my ($arg) = @_; 191 my ($id, $attr) = @_;
187 192
188 my $w = $self->{widget}{$arg->{id}} 193 my $w = $self->{widget}{$id}
189 or return; 194 or return;
190 my $m = $arg->{name};
191 195
192 my $a = $arg->{args} || []; 196 for (my $i = 0; $i < $#$attr; $i += 2) {
193 197 my ($member, $value) = @$attr[$i, $i+1];
194 if (exists $arg->{rid}) { 198 if (defined $value) {
195 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); 199 $w->{$member} = $value;
196 } else { 200 } else {
197 $w->$m (@$a); 201 delete $w->{$member};
198 } 202 }
203 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
204 }
199 }); 205 });
200 206
207 # widget get
201 $self->connect_ext (w_s => sub { 208 $self->connect_ext (w_g => sub {
202 my ($arg) = @_; 209 my ($id, $rid, $attr) = @_;
203 210
204 my $w = $self->{widget}{$arg->{id}} 211 my $w = $self->{widget}{$id}
205 or return; 212 or return;
206 213
207 $w->{$arg->{name}} = $arg->{value}; 214 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
208 }); 215 });
209 216
217 # message window
210 $self->connect_ext (w_g => sub { 218 $self->connect_ext (channel_info => sub {
211 my ($arg) = @_; 219 my ($info) = @_;
212 220 $self->{channels}->{$info->{id}} = $info;
213 my $w = $self->{widget}{$arg->{id}} 221 $::MESSAGE_WINDOW->add_channel ($info);
214 or return;
215
216 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
217 }); 222 });
218 223
224 # destroy widgets on logout
219 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 225 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
220 for my $ws (values %{delete $self->{widgetset} || {}}) { 226 for my $ws (values %{delete $self->{widgetset} || {}}) {
221 $_->destroy 227 $_->destroy
222 for values %{delete $ws->{w} || {}}; 228 for values %{delete $ws->{w} || {}};
223 } 229 }
… …
244 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 250 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
245 251
246 $self 252 $self
247} 253}
248 254
255sub widget_associate {
256 my ($self, $ws, $id, $widget) = @_;
257
258 if ($widget) {
259 $widget->{s_id} = $id;
260 $self->{widget}{$id} = $widget;
261
262 if ($ws) {
263 $widget->{s_ws} = $ws;
264 $self->{widgetset}{$ws}{w}{$id} = $widget;
265 }
266
267 $widget->connect (on_destroy => sub {
268 my ($widget) = @_;
269
270 delete $self->{widget}{$widget->{s_id}};
271 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
272 if exists $widget->{s_ws};
273 });
274
275 1
276 } else {
277 $self->send_exti_msg (w_e => $id, undef);
278
279 0
280 }
281}
282
283sub update_fx_want {
284 my ($self) = @_;
285
286 $self->send_exti_msg (fx_want => {
287 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
288 5 => !!$::CFG->{audio_enable}, # FT_SOUND
289 });
290}
291
249sub logprint { 292sub logprint {
250 my ($self, @a) = @_; 293 my ($self, @a) = @_;
251 294
252 $self->{log_fh} ||= do { 295 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
253 my $path = "$Crossfire::VARDIR/log.$self->{host}";
254
255 open my $fh, ">>:utf8", $path
256 or die "Couldn't open logfile $path: $!";
257
258 $fh->autoflush (1);
259
260 $fh;
261 };
262
263 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
264
265 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
266 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
267
268 print {$self->{log_fh}} "$ts ", @a, "\n";
269} 296}
270 297
271sub _stat_numdiff { 298sub _stat_numdiff {
272 my ($self, $name, $old, $new) = @_; 299 my ($self, $name, $old, $new) = @_;
273 300
… …
436 my @skills = keys %{ $self->{skill_info} }; 463 my @skills = keys %{ $self->{skill_info} };
437 464
438 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 465 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
439 $sktbl->clear; 466 $sktbl->clear;
440 467
468 my @add;
469
470 push @add,
441 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 471 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
442 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 472 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
443 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 473 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
444 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 474 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
445 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 475 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
446 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 476 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
477 ;
447 478
448 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 479 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
449 480
450 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 481 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
451 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 482 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
479 } 510 }
480 511
481 1 512 1
482 }; 513 };
483 514
515 push @add,
484 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 516 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
485 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 517 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
486 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 518 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
487 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 519 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
488 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 520 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
489 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 521 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
522 ;
490 523
491 $x++ and ($x, $y) = (0, $y + 1); 524 $x++ and ($x, $y) = (0, $y + 1);
492 } 525 }
526
527 $sktbl->add_at (@add);
493 } 528 }
494 529
495 for (grep exists $stats->{$_}, @skills) { 530 for (grep exists $stats->{$_}, @skills) {
496 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 531 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
497 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 532 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
530} 565}
531 566
532sub feed_map1a { 567sub feed_map1a {
533 my ($self, $data) = @_; 568 my ($self, $data) = @_;
534 569
535 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 570 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
571 my $delay;
572
573 for my $tile (@$missing) {
574 next if $self->{delay}{$tile};
575
576 $delay = 1;
577
578 if (my $tex = $::CONN->{texture}[$tile]) {
579 $tex->upload;
580 } else {
581 $self->{delay}{$tile} = 1;
582
583 # we assume the face is in-flight and will eventually come
584 push @{$self->{face_cb}{$tile}}, sub {
585 delete $self->{delay}{$tile};
586 $_[0]->upload;
587 };
588 }
589 }
590
591 if ($delay) {
592 # delay the map drawing a tiny bit in the hope of getting the missing fetched
593 Event->timer (after => 0.03, cb => sub {
594 $_[0]->w->cancel;
595 $self->{map_widget}->update;
596 });
597 } else {
536 $self->{map_widget}->update; 598 $self->{map_widget}->update;
599 }
537} 600}
538 601
539sub magicmap { 602sub magicmap {
540 my ($self, $w, $h, $x, $y, $data) = @_; 603 my ($self, $w, $h, $x, $y, $data) = @_;
541 604
… …
548 my $map_info = delete $self->{map_info} 611 my $map_info = delete $self->{map_info}
549 or return; 612 or return;
550 613
551 my ($hash, $x, $y, $w, $h) = @$map_info; 614 my ($hash, $x, $y, $w, $h) = @$map_info;
552 615
553 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 616 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
617 $self->{map_cache_new}{$hash} = \$data;
554 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 618 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
555 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
556} 619}
557 620
558sub map_clear { 621sub map_clear {
559 my ($self) = @_; 622 my ($self) = @_;
560 623
… …
573 do { 636 do {
574 $id = pop @{$self->{bg_fetch}} 637 $id = pop @{$self->{bg_fetch}}
575 or return; 638 or return;
576 } while $self->{texture}[$id]; 639 } while $self->{texture}[$id];
577 640
578 CFPlus::DB::get tilecache => $id, sub { 641 CFPlus::DB::exists tilecache => $id, sub {
579 my ($data) = @_; 642 my ($exists) = @_;
580 643
581 return unless $self->{map}; # stop when destroyed 644 return unless $self->{map}; # stop when destroyed
582 645
583 $self->set_texture ($id => $data) 646 if ($exists) {
584 if defined $data; 647 $self->have_tile ($id);
648 $self->{texture}[$id]->upload;
649 }
585 650
586 $self->bg_fetch; 651 $self->bg_fetch;
587 }; 652 };
588} 653}
589 654
590sub load_map($$$) { 655sub load_map($$$) {
591 my ($self, $hash, $x, $y) = @_; 656 my ($self, $hash, $x, $y) = @_;
592 657
593 my $gen = $self->{map_change_gen}; 658 my $gen = $self->{map_change_gen};
594 659
595 CFPlus::DB::get $self->{mapcache} => $hash, sub { 660 my $cb = sub {
596 return unless $gen == $self->{map_change_gen}; 661 return unless $gen == $self->{map_change_gen};
597 662
598 my ($data) = @_; 663 my ($data) = @_;
599 664
600 if (defined $data) { 665 if (defined $data) {
666 $self->{map_cache_new}{$hash} = \$data;
667
601 $data = Compress::LZF::decompress $data; 668 my $data = Compress::LZF::decompress $data;
602 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
603 669
604 my $inprogress = @{ $self->{bg_fetch} || [] }; 670 my $inprogress = @{ $self->{bg_fetch} || [] };
605 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 671 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
606 $self->bg_fetch unless $inprogress; 672 $self->bg_fetch unless $inprogress;
607 } 673 }
608 }; 674 };
675
676 if (my $rdata = $self->{map_cache_old}{$hash}) {
677 $cb->($$rdata);
678 } else {
679 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
680 }
609} 681}
610 682
611# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 683# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
612# (server resource,s latency, bandwidth), so this hack is warranted. 684# (server resource,s latency, bandwidth), so this hack is warranted.
613# the right fix is to make real tiled maps with an overview file 685# the right fix is to make real tiled maps with an overview file
… …
706 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 778 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
707 779
708 $self->flush_map; 780 $self->flush_map;
709 781
710 ++$self->{map_change_gen}; 782 ++$self->{map_change_gen};
783 $self->{map_cache_old} = delete $self->{map_cache_new};
711 784
712 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 785 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
713 786
714 my $mapmapw = $self->{mapmap}->{w}; 787 my $mapmapw = $self->{mapmap}->{w};
715 my $mapmaph = $self->{mapmap}->{h}; 788 my $mapmaph = $self->{mapmap}->{h};
… …
734} 807}
735 808
736sub face_find { 809sub face_find {
737 my ($self, $facenum, $face, $cb) = @_; 810 my ($self, $facenum, $face, $cb) = @_;
738 811
739 my $hash = "$face->{chksum},$face->{name}"; 812 if ($face->{type} == 0) { # FT_FACE
740
741 my $id = CFPlus::DB::get_tile_id_sync $hash; 813 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
742 814
743 $face->{id} = $id; 815 $face->{id} = $id;
744 $self->{faceid}[$facenum] = $id; 816 $self->{faceid}[$facenum] = $id;
745 817
746 $self->{map}->set_tileid ($facenum => $id); 818 $self->{map}->set_tileid ($facenum => $id);
747 819
748 CFPlus::DB::get tilecache => $id, $cb; 820 CFPlus::DB::get tilecache => $id, $cb;
821
822 } elsif ($face->{type} & 1) { # with metadata
823 CFPlus::DB::get res_meta => $face->{name}, $cb;
824 }
749} 825}
750 826
751sub face_update { 827sub face_update {
752 my ($self, $facenum, $face, $changed) = @_; 828 my ($self, $facenum, $face, $changed) = @_;
753 829
830 if ($face->{type} == 0) { # FT_FACE
754 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 831 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
755 if $changed; 832 if $changed;
756 833
757 $self->set_texture ($face->{id} => delete $face->{image}); 834 $self->have_tile ($face->{id});
835
836 } elsif ($face->{type} & 1) { # split metadata
837 if ($changed) { # new data
838 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
839 $face->{meta} = $self->{json_coder}->decode ($meta_json);
840
841 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
842 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
843 } else {
844 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
845 }
846
847 ::add_license ($face);
848
849 if ($face->{type} == 3) { # FT_MUSIC
850 $self->{music_meta}{$facenum} = $face;
851
852 ::message ({ markup => "downloaded song #$facenum" })
853 if $changed;
854
855 &::audio_music_push ($facenum);
856 } elsif ($face->{type} == 5) { # FT_SOUND
857 $self->{sound_meta}{$facenum} = $face;
858
859 ::message ({ markup => "downloaded sound #$facenum" })
860 if $changed;
861
862 &::audio_sound_push ($facenum);
863 }
864
865 }
758} 866}
759 867
760sub smooth_update { 868sub smooth_update {
761 my ($self, $facenum, $face) = @_; 869 my ($self, $facenum, $face) = @_;
762 870
763 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 871 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
764} 872}
765 873
766sub set_texture { 874sub have_tile {
767 my ($self, $id, $data) = @_; 875 my ($self, $tile) = @_;
768 876
769 return unless $self->{map}; 877 return unless $self->{map};
770 878
771 $self->{texture}[$id] = my $tex = 879 my $tex = $self->{texture}[$tile] ||=
772 new_from_image CFPlus::Texture 880 new CFPlus::Texture
773 $data, minify => 1, mipmap => 1; 881 tile => $tile, minify => 1, mipmap => 1, delay => 1;
774 882
775 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 883 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
776 $self->{map_widget}->update; 884}
885
886sub connect_face_update {
887 my ($self, $id, $cb) = @_;
888
889 push @{$self->{face_cb}{$id}}, $cb;
890
891 CFPlus::guard {
892 @{$self->{face_cb}{$id}}
893 = grep $_ != $cb,
894 @{$self->{face_cb}{$id}};
895 }
777} 896}
778 897
779sub sound_play { 898sub sound_play {
780 my ($self, $x, $y, $soundnum, $type) = @_; 899 my ($self, $type, $face, $dx, $dy, $vol) = @_;
781 900
782 $self->{sound_play}->($x, $y, $soundnum, $type); 901 &::audio_sound_play ($face, $dx, $dy, $vol)
902 unless $type & 1; # odd types are silent for future expansion
783} 903}
784 904
785my $LAST_QUERY; # server is stupid, stupid, stupid 905my $LAST_QUERY; # server is stupid, stupid, stupid
786 906
787sub query { 907sub query {
… …
852 $self->{$type} = $text; 972 $self->{$type} = $text;
853 } else { 973 } else {
854 $self->logprint ("msg: ", $text); 974 $self->logprint ("msg: ", $text);
855 return if $color < 0; # negative color == ignore if not understood 975 return if $color < 0; # negative color == ignore if not understood
856 976
857 my $fg = $CF_COLOR[$color % @CF_COLOR]; 977 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
858 978
859 ## try to create single paragraphs of multiple lines sent by the server 979 ## try to create single paragraphs of multiple lines sent by the server
860 # no longer neecssary with TRT servers 980 # no longer neecssary with TRT servers
861 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 981 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
862 982
863 ::message ({ fg => $fg, markup => $_ }) 983 ::message ({
984 fg => $fg,
985 markup => $_,
986 type => $type,
987 extra => [@extra],
988 color_flags => $color
864 for split /\n/, $text; 989 }) for split /\n/, $text;
865 990
866 $self->{statusbox}->add ($text, 991 $self->{statusbox}->add ($text,
867 group => $text, 992 group => $text,
868 fg => $fg, 993 fg => $fg,
869 timeout => $color >= 2 ? 180 : 10, 994 timeout => $color >= 2 ? 180 : 10,
… …
925 $self->{map_widget}->clr_commands; 1050 $self->{map_widget}->clr_commands;
926 1051
927 ::stop_game (); 1052 ::stop_game ();
928} 1053}
929 1054
930sub image_info {
931 my ($self, $numfaces) = @_;
932
933 $self->{num_faces} = $numfaces;
934 $self->{face_prefetch} = [1 .. $numfaces];
935 $self->face_prefetch;
936}
937
938sub face_prefetch {
939 my ($self) = @_;
940
941 return unless $::CFG->{face_prefetch};
942
943 if ($self->{num_faces}) {
944 return if @{ $self->{send_queue} || [] };
945 my $todo = @{ $self->{face_prefetch} }
946 or return;
947
948 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
949
950 $self->send ("requestinfo image_sums $face $face");
951
952 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
953 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
954 } elsif (!exists $self->{num_faces}) {
955 $self->send ("requestinfo image_info");
956
957 $self->{num_faces} = 0;
958
959 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
960 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
961 }
962}
963
964sub update_floorbox { 1055sub update_floorbox {
965 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1056 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
966 return unless $::CONN; 1057 return unless $::CONN;
967 1058
968 $::FLOORBOX->clear; 1059 $::FLOORBOX->clear;
1060
1061 my @add;
969 1062
970 my $row; 1063 my $row;
971 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1064 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
972 if ($row < 6) { 1065 if ($row < 6) {
973 local $_->{face_widget}; # hack to force recreation of widget 1066 local $_->{face_widget}; # hack to force recreation of widget
974 local $_->{desc_widget}; # hack to force recreation of widget 1067 local $_->{desc_widget}; # hack to force recreation of widget
975 CFPlus::Item::update_widgets $_; 1068 CFPlus::Item::update_widgets $_;
976 1069
1070 push @add,
977 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1071 0, $row, $_->{face_widget},
978 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1072 1, $row, $_->{desc_widget};
979 1073
980 $row++; 1074 $row++;
981 } else { 1075 } else {
982 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1076 push @add, 1, $row, new CFPlus::UI::Button
983 text => "More...", 1077 text => "More...",
984 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1078 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
985 ); 1079 ;
986 last; 1080 last;
987 } 1081 }
988 } 1082 }
989 if ($::CONN->{open_container}) { 1083 if ($::CONN->{open_container}) {
990 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1084 push @add, 1, $row++, new CFPlus::UI::Button
991 text => "Close container", 1085 text => "Close container",
992 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1086 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
993 ); 1087 ;
994 } 1088 }
995 });
996 1089
1090 $::FLOORBOX->add_at (@add);
1091 });
1092
997 $::WANT_REFRESH++; 1093 $::WANT_REFRESH->start;
998} 1094}
999 1095
1000sub set_opencont { 1096sub set_opencont {
1001 my ($conn, $tag, $name) = @_; 1097 my ($conn, $tag, $name) = @_;
1002 $conn->{open_container} = $tag; 1098 $conn->{open_container} = $tag;
1003 update_floorbox; 1099 update_floorbox;
1004 1100
1005 $::INV_RIGHT_HB->clear (); 1101 $::INVR_HB->clear ();
1006 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1102 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1007 1103
1008 if ($tag != 0) { # Floor isn't closable, is it? 1104 if ($tag != 0) { # Floor isn't closable, is it?
1009 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1105 $::INVR_HB->add (new CFPlus::UI::Button
1010 text => "Close container", 1106 text => "Close container",
1011 tooltip => "Close the currently open container (if one is open)", 1107 tooltip => "Close the currently open container (if one is open)",
1012 on_activate => sub { 1108 on_activate => sub {
1013 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1109 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1014 if $tag != 0; 1110 if $tag != 0;
1015 #if $CONN->{open_container} != 0;
1016 0 1111 0
1017 }, 1112 },
1018 ); 1113 );
1019 } 1114 }
1020 1115
… …
1119 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1214 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1120 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1215 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1121 . "map size $self->{mapw}×$self->{maph}\n" 1216 . "map size $self->{mapw}×$self->{maph}\n"
1122 ); 1217 );
1123 1218
1124 ::setup_build_button ($self->{editor_support}->{builder_ui});
1125} 1219}
1126 1220
1127sub logged_in { 1221sub logged_in {
1128 my ($self) = @_; 1222 my ($self) = @_;
1129 1223
1130 $self->send_ext_req (cfplus_support => version => 1, sub { 1224 $self->send_ext_req (cfplus_support => version => 2, sub {
1225 my (%msg) = @_;
1226
1131 $self->{cfplus_ext} = $_[0]{version}; 1227 $self->{cfplus_ext} = $msg{version};
1132 $self->update_server_info; 1228 $self->update_server_info;
1133 1229
1134 if ($self->{cfplus_ext} >= 2) { 1230 if ($self->{cfplus_ext} >= 2) {
1135 $self->send_ext_req ("editor_support", sub { 1231 $self->send_ext_req ("editor_support", sub {
1136 $self->{editor_support} = $_[0]; 1232 $self->{editor_support} = { @_ };
1137 $self->update_server_info; 1233 $self->update_server_info;
1138 1234
1139 0 1235 0
1140 }); 1236 });
1141 } 1237 }
… …
1149 $self->send_command ("output-count $::CFG->{output_count}"); 1245 $self->send_command ("output-count $::CFG->{output_count}");
1150 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1246 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1151 $self->send_command ("pickup $::CFG->{pickup}"); 1247 $self->send_command ("pickup $::CFG->{pickup}");
1152} 1248}
1153 1249
1154sub buildat {
1155 my ($self, $builditem, $x, $y) = @_;
1156
1157 if ($self->{cfplus_ext}) {
1158 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1159 }
1160}
1161
1162sub lookat { 1250sub lookat {
1163 my ($self, $x, $y) = @_; 1251 my ($self, $x, $y) = @_;
1164 1252
1165 if ($self->{cfplus_ext}) { 1253 if ($self->{cfplus_ext}) {
1166 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1254 $self->send_ext_req (lookat => $x, $y, sub {
1167 my ($msg) = @_; 1255 my (%msg) = @_;
1168 1256
1169 if (exists $msg->{npc_dialog}) { 1257 if (exists $msg{npc_dialog}) {
1170 # start npc chat dialog 1258 # start npc chat dialog
1171 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1259 $self->{npc_dialog} = new CFPlus::NPCDialog::
1172 dx => $x, 1260 token => $msg{npc_dialog},
1173 dy => $y,
1174 title => "$msg->{npc_dialog} (NPC)", 1261 title => "$msg{npc_dialog}[0] (NPC)",
1175 conn => $self, 1262 conn => $self,
1176 ; 1263 ;
1177 } 1264 }
1178 }); 1265 });
1179 } 1266 }
… …
1244 on_activate => sub { $this->destroy; 1 }, 1331 on_activate => sub { $this->destroy; 1 },
1245 ; 1332 ;
1246 1333
1247 $self->update_options; 1334 $self->update_options;
1248 1335
1249 $self->{id} = $self->{conn}->send_ext_req ( 1336 $self->{id} = "npc-channel-" . $self->{conn}->token;
1250 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1337 $self->{conn}->connect_ext ($self->{id} => sub {
1251 sub { $this && $this->feed (@_) } 1338 $this->feed (@_) if $this;
1252 ); 1339 });
1340
1341 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1253 1342
1254 $self->{entry}->grab_focus; 1343 $self->{entry}->grab_focus;
1255 1344
1256 $self->{textview}->add_paragraph ({ 1345 $self->{textview}->add_paragraph ({
1257 fg => [1, 1, 0, 1], 1346 fg => [1, 1, 0, 1],
… …
1280 ); 1369 );
1281 } 1370 }
1282} 1371}
1283 1372
1284sub feed { 1373sub feed {
1285 my ($self, $msg) = @_; 1374 my ($self, $type, @arg) = @_;
1286 1375
1287 CFPlus::weaken $self; 1376 CFPlus::weaken $self;
1288 1377
1289 if ($msg->{msgtype} eq "reply") { 1378 if ($type eq "update") {
1379 my (%info) = @arg;
1380
1290 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1381 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1291 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1382 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1292
1293 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1294 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1295 my @link;
1296 $text =~ s{
1297 ($match)
1298 }{
1299 my $kw = $1;
1300
1301 push @link, new CFPlus::UI::Label
1302 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1303 can_hover => 1,
1304 can_events => 1,
1305 padding_x => 0,
1306 padding_y => 0,
1307 on_button_up => sub {
1308 $self->send ($kw);
1309 };
1310
1311 "\x{fffc}"
1312 }giex;
1313 1383
1384 if (exists $info{msg}) {
1385 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1386 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1387 my @link;
1388 $text =~ s{
1389 ($match)
1390 }{
1391 my $kw = $1;
1392
1393 push @link, new CFPlus::UI::Label
1394 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1395 can_hover => 1,
1396 can_events => 1,
1397 padding_x => 0,
1398 padding_y => 0,
1399 on_button_up => sub {
1400 $self->send ($kw);
1401 };
1402
1403 "\x{fffc}"
1404 }giex;
1405
1314 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1406 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1315 $self->{textview}->scroll_to_bottom; 1407 $self->{textview}->scroll_to_bottom;
1408 }
1409
1316 $self->update_options; 1410 $self->update_options;
1317 } else { 1411 } else {
1318 $self->destroy; 1412 $self->destroy;
1319 } 1413 }
1320 1414
… …
1325 my ($self, $msg) = @_; 1419 my ($self, $msg) = @_;
1326 1420
1327 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1421 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1328 $self->{textview}->scroll_to_bottom; 1422 $self->{textview}->scroll_to_bottom;
1329 1423
1330 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1424 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1331} 1425}
1332 1426
1333sub destroy { 1427sub destroy {
1334 my ($self) = @_; 1428 my ($self) = @_;
1335 1429
1336 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1430 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1337 1431
1338 if ($self->{conn}) { 1432 if ($self->{conn}) {
1339 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1433 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1340 delete $self->{conn}{npc_dialog}; 1434 delete $self->{conn}{npc_dialog};
1341 $self->{conn}->disconnect_ext ($self->{id}); 1435 $self->{conn}->disconnect_ext ($self->{id});
1342 } 1436 }
1343 1437
1344 $self->SUPER::destroy; 1438 $self->SUPER::destroy;

Diff Legend

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