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

Diff Legend

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