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.106 by root, Sun Apr 29 20:03:08 2007 UTC vs.
Revision 1.160 by root, Tue Aug 21 22:46:50 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 xwidget1 => 1,#d#
26 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
27 }, 28 },
28 ); 29 );
29 30
30 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
47 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
48 @args 49 @args
49 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
50 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
51 52
52 $self->connect_ext (event_capabilities => sub { 53 $self->{json_coder}
53 my ($cap) = @_; 54 ->convert_blessed
55 ->filter_json_single_key_object (__w_ => sub {
56 $self->{widget}{$_[0]}
57 });
54 58
55 if (my $ts = $cap->{tileset}) { 59 # destroy widgets on logout
56 if (my ($default) = grep $_->[2] & 1, @$ts) { 60 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
57 $self->{tileset} = $default; 61 for my $ws (values %{delete $self->{widgetset} || {}}) {
58 $self->{tilesize} = $default->[3]; 62 $_->destroy
59 $self->setup_req (tileset => $default->[0]); 63 for values %{delete $ws->{w} || {}};
60
61 my $w = int $self->{mapw} * 32 / $self->{tilesize};
62 my $h = int $self->{maph} * 32 / $self->{tilesize};
63
64 $self->setup_req (mapsize => "${w}x${h}");
65 }
66 } 64 }
67 }); 65 });
68 66
69 $self->{map_widget}->add_command (@$_) 67 $self->{map_widget}->add_command (@$_)
70 for @cmd_help; 68 for @cmd_help;
… …
87 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 85 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
88 86
89 $self 87 $self
90} 88}
91 89
90sub update_fx_want {
91 my ($self) = @_;
92
93 $self->send_exti_msg (fx_want => {
94 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
95 5 => !!$::CFG->{audio_enable}, # FT_SOUND
96 6 => 1, # FT_RSRC
97 });
98}
99
100sub ext_capabilities {
101 my ($self, %cap) = @_;
102
103 #$self->send ("setup sound 0"); # we use a different protocol
104 $self->update_fx_want;
105
106 $self->send_exti_req (resource => "exp_table", sub {
107 my ($exp_table) = @_;
108
109 $self->register_face_handler ($exp_table, sub {
110 my ($face) = @_;
111
112 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
113 $_->() for values %{ $self->{on_exp_update} || {} };
114 });
115
116 ()
117 });
118
119 if (my $ts = $cap{tileset}) {
120 if (my ($default) = grep $_->[2] & 1, @$ts) {
121 $self->{tileset} = $default;
122 $self->{tilesize} = $default->[3];
123 $self->setup_req (tileset => $default->[0]);
124
125 my $w = int $self->{mapw} * 32 / $self->{tilesize};
126 my $h = int $self->{maph} * 32 / $self->{tilesize};
127
128 $self->setup_req (mapsize => "${w}x${h}");
129 }
130 }
131}
132
133sub ext_ambient_music {
134 my ($self, $songs) = @_;
135 &::audio_music_set_ambient ($songs);
136}
137
138#############################################################################
139
140sub widget_associate {
141 my ($self, $ws, $id, $widget) = @_;
142
143 if ($widget) {
144 $widget->{s_id} = $id;
145 $self->{widget}{$id} = $widget;
146
147 if ($ws) {
148 $widget->{s_ws} = $ws;
149 $self->{widgetset}{$ws}{w}{$id} = $widget;
150 }
151
152 $widget->connect (on_destroy => sub {
153 my ($widget) = @_;
154
155 delete $self->{widget}{$widget->{s_id}};
156 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
157 if exists $widget->{s_ws};
158 });
159
160 1
161 } else {
162 $self->send_exti_msg (w_e => $id, undef);
163
164 0
165 }
166}
167
168# widgetset new
169sub ext_ws_n {
170 my ($self, $id) = @_;
171
172 $self->{widgetset}{$id} = {
173 w => {},
174 };
175}
176
177# widgetset destroy
178sub ext_ws_d {
179 my ($self, $id) = @_;
180
181 my $ws = delete $self->{widgetset}{$id}
182 or return;
183
184 $_->destroy
185 for values %{$ws->{w}};
186}
187
188# widgetset create
189sub ext_ws_c {
190 my ($self, $ws, $id, $class, $args) = @_;
191
192 for my $ev (grep /^on_/, keys %$args) {
193 my $rid = $args->{$ev};
194 $args->{$ev} = sub {
195 my $id = shift->{s_id};
196 $self->send_exti_msg (w_e => $id, $rid, @_);
197
198 1
199 };
200 }
201
202 $self->widget_associate (
203 $ws, $id => scalar eval {
204 local $SIG{__DIE__};
205 "CFPlus::UI::$class"->new (%$args)
206 }
207 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
208}
209
210# widgetset associate
211sub ext_ws_a {
212 my ($self, %ass) = @_;
213
214 # everything that has a name, wether conceivably useful or not
215 my %wkw = (
216 root => $CFPlus::UI::ROOT,
217 tooltip => $CFPlus::UI::TOOLTIP,
218
219 mapwidget => $::MAPWIDGET,
220 buttonbar => $::BUTTONBAR,
221 metaserver => $::METASERVER,
222 buttonbar => $::BUTTONBAR,
223 login_button => $::LOGIN_BUTTON,
224 quit_dialog => $::QUIT_DIALOG,
225 host_entry => $::HOST_ENTRY,
226 metaserver => $::METASERVER,
227 server_info => $::SERVER_INFO,
228
229 setup_dialog => $::SETUP_DIALOG,
230 setup_notebook => $::SETUP_NOTEBOOK,
231 setup_server => $::SETUP_SERVER,
232 setup_keyboard => $::SETUP_KEYBOARD,
233
234 pl_notebook => $::PL_NOTEBOOK,
235 pl_window => $::PL_WINDOW,
236 inventory_page => $::INVENTORY_PAGE,
237 stats_page => $::STATS_PAGE,
238 skill_page => $::SKILL_PAGE,
239 spell_page => $::SPELL_PAGE,
240 spell_list => $::SPELL_LIST,
241
242 floorbox => $::FLOORBOX,
243 help_window => $::HELP_WINDOW,
244 message_window => $::MESSAGE_WINDOW,
245 statusbox => $::SDTATUSBOX,
246
247 inv => $::INV,
248 invr => $::INVR,
249 invr_hb => $::INVR_HB,
250 );
251
252 while (my ($id, $name) = each %ass) {
253 $self->widget_associate (undef, $id => $wkw{$name})
254 or warn "server failed to associate non-existent well-known widget $name\n";
255 }
256}
257
258# widget call
259sub ext_w_c {
260 my ($self, $id, $rid, $method, @args) = @_;
261
262 my $w = $self->{widget}{$id}
263 or return;
264
265 if ($rid) {
266 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
267 } else {
268 $w->$method (@args);
269 }
270}
271
272# widget set
273sub ext_w_s {
274 my ($self, $id, $attr) = @_;
275
276 my $w = $self->{widget}{$id}
277 or return;
278
279 for (my $i = 0; $i < $#$attr; $i += 2) {
280 my ($member, $value) = @$attr[$i, $i+1];
281 if (defined $value) {
282 $w->{$member} = $value;
283 } else {
284 delete $w->{$member};
285 }
286 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
287 }
288}
289
290# widget get
291sub ext_w_g {
292 my ($self, $id, $rid, $attr) = @_;
293
294 my $w = $self->{widget}{$id}
295 or return;
296
297 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
298}
299
300# message window
301sub ext_channel_info {
302 my ($self, $info) = @_;
303 $self->{channels}->{$info->{id}} = $info;
304 $::MESSAGE_WINDOW->add_channel ($info);
305}
306
307#############################################################################
308
92sub logprint { 309sub logprint {
93 my ($self, @a) = @_; 310 my ($self, @a) = @_;
94 311
95 $self->{log_fh} ||= do { 312 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
96 my $path = "$Crossfire::VARDIR/log.$self->{host}";
97
98 open my $fh, ">>:utf8", $path
99 or die "Couldn't open logfile $path: $!";
100
101 $fh->autoflush (1);
102
103 $fh;
104 };
105
106 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
107
108 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
109 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
110
111 print {$self->{log_fh}} "$ts ", @a, "\n";
112} 313}
113 314
114sub _stat_numdiff { 315sub _stat_numdiff {
115 my ($self, $name, $old, $new) = @_; 316 my ($self, $name, $old, $new) = @_;
116 317
… …
249 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 450 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
250 $::GAUGES->{food} ->set_value ($fo, $fo_m); 451 $::GAUGES->{food} ->set_value ($fo, $fo_m);
251 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 452 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
252 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 453 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
253 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 454 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
455 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
254 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 456 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
255 my $title = $stats->{+CS_STAT_TITLE}; 457 my $title = $stats->{+CS_STAT_TITLE};
256 $title =~ s/^Player: //; 458 $title =~ s/^Player: //;
257 $::STATWIDS->{title} ->set_text ("Title: " . $title); 459 $::STATWIDS->{title} ->set_text ("Title: " . $title);
258 460
… …
279 my @skills = keys %{ $self->{skill_info} }; 481 my @skills = keys %{ $self->{skill_info} };
280 482
281 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 483 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
282 $sktbl->clear; 484 $sktbl->clear;
283 485
486 my $sw = $self->{skillwid}{""} ||= [
284 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 487 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
285 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 488 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
489 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
286 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 490 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
287 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 491 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
288 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 492 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
493 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
289 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 494 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
495 ];
496
497 my @add = @$sw;
290 498
291 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 499 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
292 500
293 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 501 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
294 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 502 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
322 } 530 }
323 531
324 1 532 1
325 }; 533 };
326 534
327 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 535 my $sw = $self->{skillwid}{$idx} ||= [
536 # exp
537 (new CFPlus::UI::Label
328 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 538 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
329 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 539
540 # level
541 (new CFPlus::UI::Label
330 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 542 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
543
544 # progress
545 (new CFPlus::UI::ExperienceProgress),
546
547 # label
331 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 548 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
332 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 549 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
550 ];
551
552 push @add,
553 $x * 4 + 0, $y, $sw->[0],
554 $x * 4 + 1, $y, $sw->[1],
555 $x * 4 + 2, $y, $sw->[2],
556 $x * 4 + 3, $y, $sw->[3],
557 ;
333 558
334 $x++ and ($x, $y) = (0, $y + 1); 559 $x++ and ($x, $y) = (0, $y + 1);
335 } 560 }
561
562 $sktbl->add_at (@add);
336 } 563 }
337 564
338 for (grep exists $stats->{$_}, @skills) { 565 for (grep exists $stats->{$_}, @skills) {
566 my $sw = $self->{skillwid}{$_};
339 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 567 $sw->[0]->set_text (::formsep ($stats->{$_}[1]));
340 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 568 $sw->[1]->set_text ($stats->{$_}[0] * 1);
569 $sw->[2]->set_value (@{$stats->{$_}});
341 } 570 }
342} 571}
343 572
344sub macro_send { 573sub macro_send {
345 my ($self, $macro) = @_; 574 my ($self, $macro) = @_;
… …
373} 602}
374 603
375sub feed_map1a { 604sub feed_map1a {
376 my ($self, $data) = @_; 605 my ($self, $data) = @_;
377 606
378 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 607 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
608 my $delay;
609
610 for my $tile (@$missing) {
611 next if $self->{delay}{$tile};
612
613 $delay = 1;
614
615 if (my $tex = $::CONN->{texture}[$tile]) {
616 $tex->upload;
617 } else {
618 $self->{delay}{$tile} = 1;
619
620 # we assume the face is in-flight and will eventually come
621 push @{$self->{tile_cb}{$tile}}, sub {
622 delete $self->{delay}{$tile};
623 $_[0]->upload;
624 };
625 }
626 }
627
628 if ($delay) {
629 # delay the map drawing a tiny bit in the hope of getting the missing fetched
630 Event->timer (after => 0.03, cb => sub {
631 $_[0]->w->cancel;
632 $self->{map_widget}->update;
633 });
634 } else {
379 $self->{map_widget}->update; 635 $self->{map_widget}->update;
636 }
380} 637}
381 638
382sub magicmap { 639sub magicmap {
383 my ($self, $w, $h, $x, $y, $data) = @_; 640 my ($self, $w, $h, $x, $y, $data) = @_;
384 641
… …
391 my $map_info = delete $self->{map_info} 648 my $map_info = delete $self->{map_info}
392 or return; 649 or return;
393 650
394 my ($hash, $x, $y, $w, $h) = @$map_info; 651 my ($hash, $x, $y, $w, $h) = @$map_info;
395 652
396 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 653 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
654 $self->{map_cache_new}{$hash} = \$data;
397 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 655 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
398 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
399} 656}
400 657
401sub map_clear { 658sub map_clear {
402 my ($self) = @_; 659 my ($self) = @_;
403 660
… …
409} 666}
410 667
411sub bg_fetch { 668sub bg_fetch {
412 my ($self) = @_; 669 my ($self) = @_;
413 670
414 my $id; 671 my $tile;
415 672
416 do { 673 do {
417 $id = pop @{$self->{bg_fetch}} 674 $tile = pop @{$self->{bg_fetch}}
418 or return; 675 or return;
419 } while $self->{texture}[$id]; 676 } while $self->{texture}[$tile];
420 677
421 CFPlus::DB::get tilecache => $id, sub { 678 CFPlus::DB::get tilecache => $tile, sub {
422 my ($data) = @_; 679 my ($data) = @_;
423 680
424 return unless $self->{map}; # stop when destroyed 681 return unless $self->{map}; # stop when destroyed
425 682
426 $self->set_texture ($id => $data)
427 if defined $data; 683 if (defined $data) {
684 $self->have_tile ($tile, $data);
685 $self->{texture}[$tile]->upload;
686 }
428 687
429 $self->bg_fetch; 688 $self->bg_fetch;
430 }; 689 };
431} 690}
432 691
433sub load_map($$$) { 692sub load_map($$$) {
434 my ($self, $hash, $x, $y) = @_; 693 my ($self, $hash, $x, $y) = @_;
435 694
436 my $gen = $self->{map_change_gen}; 695 my $gen = $self->{map_change_gen};
437 696
438 CFPlus::DB::get $self->{mapcache} => $hash, sub { 697 my $cb = sub {
439 return unless $gen == $self->{map_change_gen}; 698 return unless $gen == $self->{map_change_gen};
440 699
441 my ($data) = @_; 700 my ($data) = @_;
442 701
443 if (defined $data) { 702 if (defined $data) {
703 $self->{map_cache_new}{$hash} = \$data;
704
444 $data = Compress::LZF::decompress $data; 705 my $data = Compress::LZF::decompress $data;
445 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
446 706
447 my $inprogress = @{ $self->{bg_fetch} || [] }; 707 my $inprogress = @{ $self->{bg_fetch} || [] };
448 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 708 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
449 $self->bg_fetch unless $inprogress; 709 $self->bg_fetch unless $inprogress;
450 } 710 }
451 }; 711 };
712
713 if (my $rdata = $self->{map_cache_old}{$hash}) {
714 $cb->($$rdata);
715 } else {
716 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
717 }
452} 718}
453 719
454# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 720# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
455# (server resource,s latency, bandwidth), so this hack is warranted. 721# (server resource,s latency, bandwidth), so this hack is warranted.
456# the right fix is to make real tiled maps with an overview file 722# the right fix is to make real tiled maps with an overview file
… …
549 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 815 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
550 816
551 $self->flush_map; 817 $self->flush_map;
552 818
553 ++$self->{map_change_gen}; 819 ++$self->{map_change_gen};
820 $self->{map_cache_old} = delete $self->{map_cache_new};
554 821
555 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 822 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
556 823
557 my $mapmapw = $self->{mapmap}->{w}; 824 my $mapmapw = $self->{mapmap}->{w};
558 my $mapmaph = $self->{mapmap}->{h}; 825 my $mapmaph = $self->{mapmap}->{h};
… …
577} 844}
578 845
579sub face_find { 846sub face_find {
580 my ($self, $facenum, $face, $cb) = @_; 847 my ($self, $facenum, $face, $cb) = @_;
581 848
582 my $hash = "$face->{chksum},$face->{name}"; 849 if ($face->{type} == 0) { # FT_FACE
583
584 my $id = CFPlus::DB::get_tile_id_sync $hash; 850 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
585 851
586 $face->{id} = $id; 852 $face->{id} = $id;
587 $self->{faceid}[$facenum] = $id;
588
589 $self->{map}->set_tileid ($facenum => $id); 853 $self->{map}->set_tileid ($facenum => $id);
590 854
591 CFPlus::DB::get tilecache => $id, $cb; 855 CFPlus::DB::get tilecache => $id, $cb;
856
857 } elsif ($face->{type} & 1) { # with metadata
858 CFPlus::DB::get res_meta => $face->{name}, $cb;
859
860 } else { # no metadata
861 CFPlus::DB::get res_data => $face->{name}, $cb;
862 }
592} 863}
593 864
594sub face_update { 865sub face_update {
595 my ($self, $facenum, $face, $changed) = @_; 866 my ($self, $facenum, $face, $changed) = @_;
596 867
868 if ($face->{type} == 0) {
869 # image, FT_FACE
597 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 870 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
598 if $changed; 871 if $changed;
599 872
600 $self->set_texture ($face->{id} => delete $face->{image}); 873 $self->have_tile ($face->{id}, delete $face->{data});
874
875 } elsif ($face->{type} & 1) {
876 # split metadata case, FT_MUSIC, FT_SOUND
877 if ($changed) { # new data
878 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
879 $face->{data} = $meta;
880
881 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
882 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
883 }
884
885 $face->{data} = $self->{json_coder}->decode ($face->{data});
886
887 ::add_license ($face);
888
889 if ($face->{type} == 3) { # FT_MUSIC
890 ::message ({ markup => "downloaded song #$facenum" })
891 if $changed;
892
893 &::audio_music_push ($facenum);
894 } elsif ($face->{type} == 5) { # FT_SOUND
895 ::message ({ markup => "downloaded sound #$facenum" })
896 if $changed;
897
898 &::audio_sound_push ($facenum);
899 }
900
901 } else {
902 # flat resource case, FT_RSRC
903 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
904 if $changed;
905 }
906
907 if (my $cbs = $self->{face_cb}{$facenum}) {
908 $_->($face, $changed) for @$cbs;
909 }
601} 910}
602 911
603sub smooth_update { 912sub smooth_update {
604 my ($self, $facenum, $face) = @_; 913 my ($self, $facenum, $face) = @_;
605 914
606 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 915 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
607} 916}
608 917
609sub set_texture { 918sub have_tile {
610 my ($self, $id, $data) = @_; 919 my ($self, $tile, $data) = @_;
611 920
612 $self->{texture}[$id] = my $tex = 921 return unless $self->{map};
922
923 my $tex = $self->{texture}[$tile] ||=
613 new_from_image CFPlus::Texture 924 new CFPlus::Texture
925 tile => $tile,
926 image => $data, delete_image => 1,
614 $data, minify => 1, mipmap => 1; 927 minify => 1, mipmap => 1;
615 928
616 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 929 if (my $cbs = delete $self->{tile_cb}{$tile}) {
617 $self->{map_widget}->update; 930 $_->($tex) for @$cbs;
931 }
932}
933
934# call in non-void context registers a temporary
935# hook with handle, otherwise its permanent
936sub on_face_change {
937 my ($self, $num, $cb) = @_;
938
939 push @{$self->{face_cb}{$num}}, $cb;
940
941 defined wantarray
942 ? CFPlus::guard {
943 @{$self->{face_cb}{$num}}
944 = grep $_ != $cb,
945 @{$self->{face_cb}{$num}};
946 }
947 : ()
948}
949
950# call in non-void context registers a temporary
951# hook with handle, otherwise its permanent
952sub register_face_handler {
953 my ($self, $num, $cb) = @_;
954
955 return unless $num;
956
957 # invoke if available right now
958 $cb->($self->{face}[$num], 0)
959 unless exists $self->{face}[$num]{loading};
960
961 # future changes
962 $self->on_face_change ($num => $cb)
618} 963}
619 964
620sub sound_play { 965sub sound_play {
621 my ($self, $x, $y, $soundnum, $type) = @_; 966 my ($self, $type, $face, $dx, $dy, $vol) = @_;
622 967
623 $self->{sound_play}->($x, $y, $soundnum, $type); 968 &::audio_sound_play ($face, $dx, $dy, $vol)
969 unless $type & 1; # odd types are silent for future expansion
624} 970}
625 971
626my $LAST_QUERY; # server is stupid, stupid, stupid 972my $LAST_QUERY; # server is stupid, stupid, stupid
627 973
628sub query { 974sub query {
… …
630 976
631 $prompt = $LAST_QUERY unless length $prompt; 977 $prompt = $LAST_QUERY unless length $prompt;
632 $LAST_QUERY = $prompt; 978 $LAST_QUERY = $prompt;
633 979
634 $self->{query}-> ($self, $flags, $prompt); 980 $self->{query}-> ($self, $flags, $prompt);
981}
982
983sub sanitise_xml($) {
984 local $_ = shift;
985
986 # we now weed out all tags we do not support
987 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
988 # now all entities
989 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
990
991 # handle some elements
992 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
993 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
994
995 $_
635} 996}
636 997
637our %NAME_TO_COLOR = ( 998our %NAME_TO_COLOR = (
638 black => 0, 999 black => 0,
639 white => 1, 1000 white => 1,
… …
667); 1028);
668 1029
669sub msg { 1030sub msg {
670 my ($self, $color, $type, $text, @extra) = @_; 1031 my ($self, $color, $type, $text, @extra) = @_;
671 1032
1033 $text = sanitise_xml $text;
1034
672 if (my $cb = $self->{cb_msg}{$type}) { 1035 if (my $cb = $self->{cb_msg}{$type}) {
673 $_->($self, $color, $type, $text, @extra) for values %$cb; 1036 $_->($self, $color, $type, $text, @extra) for values %$cb;
674 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { 1037 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
675 $type =~ s/-/_/g; 1038 $type =~ s/-/_/g;
676 $self->{$type} = $text; 1039 $self->{$type} = $text;
677 } else { 1040 } else {
678 $self->logprint ("msg: ", $text); 1041 $self->logprint ("msg: ", $text);
679 return if $color < 0; # negative color == ignore if not understood 1042 return if $color < 0; # negative color == ignore if not understood
680 1043
681 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1044 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
682 1045
683 ## try to create single paragraphs of multiple lines sent by the server 1046 ## try to create single paragraphs of multiple lines sent by the server
684 # no longer neecssary with TRT servers 1047 # no longer neecssary with TRT servers
685 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1048 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
686 1049
687 ::message ({ fg => $fg, markup => $_ }) 1050 ::message ({
1051 fg => $fg,
1052 markup => $_,
1053 type => $type,
1054 extra => [@extra],
1055 color_flags => $color
688 for split /\n/, $text; 1056 }) for split /\n/, $text;
689 1057
690 $self->{statusbox}->add ($text, 1058 $self->{statusbox}->add ($text,
691 group => $text, 1059 group => $text,
692 fg => $fg, 1060 fg => $fg,
693 timeout => $color >= 2 ? 180 : 10, 1061 timeout => $color >= 2 ? 180 : 10,
… …
749 $self->{map_widget}->clr_commands; 1117 $self->{map_widget}->clr_commands;
750 1118
751 ::stop_game (); 1119 ::stop_game ();
752} 1120}
753 1121
754sub image_info {
755 my ($self, $numfaces) = @_;
756
757 $self->{num_faces} = $numfaces;
758 $self->{face_prefetch} = [1 .. $numfaces];
759 $self->face_prefetch;
760}
761
762sub face_prefetch {
763 my ($self) = @_;
764
765 return unless $::CFG->{face_prefetch};
766
767 if ($self->{num_faces}) {
768 return if @{ $self->{send_queue} || [] };
769 my $todo = @{ $self->{face_prefetch} }
770 or return;
771
772 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
773
774 $self->send ("requestinfo image_sums $face $face");
775
776 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
777 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
778 } elsif (!exists $self->{num_faces}) {
779 $self->send ("requestinfo image_info");
780
781 $self->{num_faces} = 0;
782
783 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
784 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
785 }
786}
787
788sub update_floorbox { 1122sub update_floorbox {
789 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1123 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
790 return unless $::CONN; 1124 return unless $::CONN;
791 1125
792 $::FLOORBOX->clear; 1126 $::FLOORBOX->clear;
1127
1128 my @add;
793 1129
794 my $row; 1130 my $row;
795 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1131 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
796 if ($row < 6) { 1132 if ($row < 6) {
797 local $_->{face_widget}; # hack to force recreation of widget 1133 local $_->{face_widget}; # hack to force recreation of widget
798 local $_->{desc_widget}; # hack to force recreation of widget 1134 local $_->{desc_widget}; # hack to force recreation of widget
799 CFPlus::Item::update_widgets $_; 1135 CFPlus::Item::update_widgets $_;
800 1136
1137 push @add,
801 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1138 0, $row, $_->{face_widget},
802 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1139 1, $row, $_->{desc_widget};
803 1140
804 $row++; 1141 $row++;
805 } else { 1142 } else {
806 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1143 push @add, 1, $row, new CFPlus::UI::Button
807 text => "More...", 1144 text => "More...",
808 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1145 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
809 ); 1146 ;
810 last; 1147 last;
811 } 1148 }
812 } 1149 }
813 if ($::CONN->{open_container}) { 1150 if ($::CONN->{open_container}) {
814 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1151 push @add, 1, $row++, new CFPlus::UI::Button
815 text => "Close container", 1152 text => "Close container",
816 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1153 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
817 ); 1154 ;
818 } 1155 }
1156
1157 $::FLOORBOX->add_at (@add);
819 }); 1158 });
820 1159
821 $::WANT_REFRESH++; 1160 $::WANT_REFRESH->start;
822} 1161}
823 1162
824sub set_opencont { 1163sub set_opencont {
825 my ($conn, $tag, $name) = @_; 1164 my ($conn, $tag, $name) = @_;
826 $conn->{open_container} = $tag; 1165 $conn->{open_container} = $tag;
827 update_floorbox; 1166 update_floorbox;
828 1167
829 $::INV_RIGHT_HB->clear (); 1168 $::INVR_HB->clear ();
830 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1169 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
831 1170
832 if ($tag != 0) { # Floor isn't closable, is it? 1171 if ($tag != 0) { # Floor isn't closable, is it?
833 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1172 $::INVR_HB->add (new CFPlus::UI::Button
834 text => "Close container", 1173 text => "Close container",
835 tooltip => "Close the currently open container (if one is open)", 1174 tooltip => "Close the currently open container (if one is open)",
836 on_activate => sub { 1175 on_activate => sub {
837 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1176 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
838 if $tag != 0; 1177 if $tag != 0;
839 #if $CONN->{open_container} != 0;
840 0 1178 0
841 }, 1179 },
842 ); 1180 );
843 } 1181 }
844 1182
… …
943 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1281 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
944 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1282 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
945 . "map size $self->{mapw}×$self->{maph}\n" 1283 . "map size $self->{mapw}×$self->{maph}\n"
946 ); 1284 );
947 1285
948 ::setup_build_button ($self->{editor_support}->{builder_ui});
949} 1286}
950 1287
951sub logged_in { 1288sub logged_in {
952 my ($self) = @_; 1289 my ($self) = @_;
953 1290
954 $self->send_ext_req (cfplus_support => version => 1, sub { 1291 $self->send_ext_req (cfplus_support => version => 2, sub {
1292 my (%msg) = @_;
1293
955 $self->{cfplus_ext} = $_[0]{version}; 1294 $self->{cfplus_ext} = $msg{version};
956 $self->update_server_info; 1295 $self->update_server_info;
957 1296
958 if ($self->{cfplus_ext} >= 2) { 1297 if ($self->{cfplus_ext} >= 2) {
959 $self->send_ext_req ("editor_support", sub { 1298 $self->send_ext_req ("editor_support", sub {
960 $self->{editor_support} = $_[0]; 1299 $self->{editor_support} = { @_ };
961 $self->update_server_info; 1300 $self->update_server_info;
962 1301
963 0 1302 0
964 }); 1303 });
965 } 1304 }
… …
973 $self->send_command ("output-count $::CFG->{output_count}"); 1312 $self->send_command ("output-count $::CFG->{output_count}");
974 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1313 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
975 $self->send_command ("pickup $::CFG->{pickup}"); 1314 $self->send_command ("pickup $::CFG->{pickup}");
976} 1315}
977 1316
978sub buildat {
979 my ($self, $builditem, $x, $y) = @_;
980
981 if ($self->{cfplus_ext}) {
982 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
983 }
984}
985
986sub lookat { 1317sub lookat {
987 my ($self, $x, $y) = @_; 1318 my ($self, $x, $y) = @_;
988 1319
989 if ($self->{cfplus_ext}) { 1320 if ($self->{cfplus_ext}) {
990 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1321 $self->send_ext_req (lookat => $x, $y, sub {
991 my ($msg) = @_; 1322 my (%msg) = @_;
992 1323
993 if (exists $msg->{npc_dialog}) { 1324 if (exists $msg{npc_dialog}) {
994 # start npc chat dialog 1325 # start npc chat dialog
995 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1326 $self->{npc_dialog} = new CFPlus::NPCDialog::
996 dx => $x, 1327 token => $msg{npc_dialog},
997 dy => $y,
998 title => "$msg->{npc_dialog} (NPC)", 1328 title => "$msg{npc_dialog}[0] (NPC)",
999 conn => $self, 1329 conn => $self,
1000 ; 1330 ;
1001 } 1331 }
1002 }); 1332 });
1003 } 1333 }
… …
1010 1340
1011 (delete $self->{npc_dialog})->destroy 1341 (delete $self->{npc_dialog})->destroy
1012 if $self->{npc_dialog}; 1342 if $self->{npc_dialog};
1013 1343
1014 $self->SUPER::destroy; 1344 $self->SUPER::destroy;
1345
1346 %$self = ();
1015} 1347}
1016 1348
1017package CFPlus::NPCDialog; 1349package CFPlus::NPCDialog;
1018 1350
1019our @ISA = 'CFPlus::UI::Toplevel'; 1351our @ISA = 'CFPlus::UI::Toplevel';
… …
1066 on_activate => sub { $this->destroy; 1 }, 1398 on_activate => sub { $this->destroy; 1 },
1067 ; 1399 ;
1068 1400
1069 $self->update_options; 1401 $self->update_options;
1070 1402
1071 $self->{id} = $self->{conn}->send_ext_req ( 1403 $self->{id} = "npc-channel-" . $self->{conn}->token;
1072 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1404 $self->{conn}->connect_ext ($self->{id} => sub {
1073 sub { $this && $this->feed (@_) } 1405 $this->feed (@_) if $this;
1074 ); 1406 });
1407
1408 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1075 1409
1076 $self->{entry}->grab_focus; 1410 $self->{entry}->grab_focus;
1077 1411
1078 $self->{textview}->add_paragraph ({ 1412 $self->{textview}->add_paragraph ({
1079 fg => [1, 1, 0, 1], 1413 fg => [1, 1, 0, 1],
… …
1102 ); 1436 );
1103 } 1437 }
1104} 1438}
1105 1439
1106sub feed { 1440sub feed {
1107 my ($self, $msg) = @_; 1441 my ($self, $type, @arg) = @_;
1108 1442
1109 CFPlus::weaken $self; 1443 CFPlus::weaken $self;
1110 1444
1111 if ($msg->{msgtype} eq "reply") { 1445 if ($type eq "update") {
1446 my (%info) = @arg;
1447
1112 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1448 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1113 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1449 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1114
1115 my $text = "\n" . CFPlus::asxml $msg->{msg};
1116 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1117 my @link;
1118 $text =~ s{
1119 ($match)
1120 }{
1121 my $kw = $1;
1122
1123 push @link, new CFPlus::UI::Label
1124 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1125 can_hover => 1,
1126 can_events => 1,
1127 padding_x => 0,
1128 padding_y => 0,
1129 on_button_up => sub {
1130 $self->send ($kw);
1131 };
1132
1133 "\x{fffc}"
1134 }giex;
1135 1450
1451 if (exists $info{msg}) {
1452 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1453 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1454 my @link;
1455 $text =~ s{
1456 ($match)
1457 }{
1458 my $kw = $1;
1459
1460 push @link, new CFPlus::UI::Label
1461 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1462 can_hover => 1,
1463 can_events => 1,
1464 padding_x => 0,
1465 padding_y => 0,
1466 on_button_up => sub {
1467 $self->send ($kw);
1468 };
1469
1470 "\x{fffc}"
1471 }giex;
1472
1136 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1473 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1137 $self->{textview}->scroll_to_bottom; 1474 $self->{textview}->scroll_to_bottom;
1475 }
1476
1138 $self->update_options; 1477 $self->update_options;
1139 } else { 1478 } else {
1140 $self->destroy; 1479 $self->destroy;
1141 } 1480 }
1142 1481
… …
1147 my ($self, $msg) = @_; 1486 my ($self, $msg) = @_;
1148 1487
1149 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1488 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1150 $self->{textview}->scroll_to_bottom; 1489 $self->{textview}->scroll_to_bottom;
1151 1490
1152 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1491 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1153} 1492}
1154 1493
1155sub destroy { 1494sub destroy {
1156 my ($self) = @_; 1495 my ($self) = @_;
1157 1496
1158 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1497 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1159 1498
1160 if ($self->{conn}) { 1499 if ($self->{conn}) {
1161 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1500 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1162 delete $self->{conn}{npc_dialog}; 1501 delete $self->{conn}{npc_dialog};
1163 $self->{conn}->disconnect_ext ($self->{id}); 1502 $self->{conn}->disconnect_ext ($self->{id});
1164 } 1503 }
1165 1504
1166 $self->SUPER::destroy; 1505 $self->SUPER::destroy;

Diff Legend

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