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.107 by root, Sun Jun 24 03:46:46 2007 UTC vs.
Revision 1.157 by root, Tue Aug 21 02:39:17 2007 UTC

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

Diff Legend

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