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.108 by root, Sun Jun 24 04:11:22 2007 UTC vs.
Revision 1.161 by root, Wed Aug 22 16:52:34 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 if $self->{map_widget};
634 });
635 } else {
379 $self->{map_widget}->update; 636 $self->{map_widget}->update;
637 }
380} 638}
381 639
382sub magicmap { 640sub magicmap {
383 my ($self, $w, $h, $x, $y, $data) = @_; 641 my ($self, $w, $h, $x, $y, $data) = @_;
384 642
… …
391 my $map_info = delete $self->{map_info} 649 my $map_info = delete $self->{map_info}
392 or return; 650 or return;
393 651
394 my ($hash, $x, $y, $w, $h) = @$map_info; 652 my ($hash, $x, $y, $w, $h) = @$map_info;
395 653
396 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 654 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
655 $self->{map_cache_new}{$hash} = \$data;
397 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 656 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
398 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
399} 657}
400 658
401sub map_clear { 659sub map_clear {
402 my ($self) = @_; 660 my ($self) = @_;
403 661
… …
409} 667}
410 668
411sub bg_fetch { 669sub bg_fetch {
412 my ($self) = @_; 670 my ($self) = @_;
413 671
414 my $id; 672 my $tile;
415 673
416 do { 674 do {
417 $id = pop @{$self->{bg_fetch}} 675 $tile = pop @{$self->{bg_fetch}}
418 or return; 676 or return;
419 } while $self->{texture}[$id]; 677 } while $self->{texture}[$tile];
420 678
421 CFPlus::DB::get tilecache => $id, sub { 679 CFPlus::DB::get tilecache => $tile, sub {
422 my ($data) = @_; 680 my ($data) = @_;
423 681
424 return unless $self->{map}; # stop when destroyed 682 return unless $self->{map}; # stop when destroyed
425 683
426 $self->set_texture ($id => $data)
427 if defined $data; 684 if (defined $data) {
685 $self->have_tile ($tile, $data);
686 $self->{texture}[$tile]->upload;
687 }
428 688
429 $self->bg_fetch; 689 $self->bg_fetch;
430 }; 690 };
431} 691}
432 692
433sub load_map($$$) { 693sub load_map($$$) {
434 my ($self, $hash, $x, $y) = @_; 694 my ($self, $hash, $x, $y) = @_;
435 695
436 my $gen = $self->{map_change_gen}; 696 my $gen = $self->{map_change_gen};
437 697
438 CFPlus::DB::get $self->{mapcache} => $hash, sub { 698 my $cb = sub {
439 return unless $gen == $self->{map_change_gen}; 699 return unless $gen == $self->{map_change_gen};
440 700
441 my ($data) = @_; 701 my ($data) = @_;
442 702
443 if (defined $data) { 703 if (defined $data) {
704 $self->{map_cache_new}{$hash} = \$data;
705
444 $data = Compress::LZF::decompress $data; 706 my $data = Compress::LZF::decompress $data;
445 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
446 707
447 my $inprogress = @{ $self->{bg_fetch} || [] }; 708 my $inprogress = @{ $self->{bg_fetch} || [] };
448 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 709 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
449 $self->bg_fetch unless $inprogress; 710 $self->bg_fetch unless $inprogress;
450 } 711 }
451 }; 712 };
713
714 if (my $rdata = $self->{map_cache_old}{$hash}) {
715 $cb->($$rdata);
716 } else {
717 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
718 }
452} 719}
453 720
454# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 721# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
455# (server resource,s latency, bandwidth), so this hack is warranted. 722# (server resource,s latency, bandwidth), so this hack is warranted.
456# the right fix is to make real tiled maps with an overview file 723# the right fix is to make real tiled maps with an overview file
… …
549 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 816 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
550 817
551 $self->flush_map; 818 $self->flush_map;
552 819
553 ++$self->{map_change_gen}; 820 ++$self->{map_change_gen};
821 $self->{map_cache_old} = delete $self->{map_cache_new};
554 822
555 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 823 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
556 824
557 my $mapmapw = $self->{mapmap}->{w}; 825 my $mapmapw = $self->{mapmap}->{w};
558 my $mapmaph = $self->{mapmap}->{h}; 826 my $mapmaph = $self->{mapmap}->{h};
… …
577} 845}
578 846
579sub face_find { 847sub face_find {
580 my ($self, $facenum, $face, $cb) = @_; 848 my ($self, $facenum, $face, $cb) = @_;
581 849
582 my $hash = "$face->{chksum},$face->{name}"; 850 if ($face->{type} == 0) { # FT_FACE
583
584 my $id = CFPlus::DB::get_tile_id_sync $hash; 851 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
585 852
586 $face->{id} = $id; 853 $face->{id} = $id;
587 $self->{faceid}[$facenum] = $id;
588
589 $self->{map}->set_tileid ($facenum => $id); 854 $self->{map}->set_tileid ($facenum => $id);
590 855
591 CFPlus::DB::get tilecache => $id, $cb; 856 CFPlus::DB::get tilecache => $id, $cb;
857
858 } elsif ($face->{type} & 1) { # with metadata
859 CFPlus::DB::get res_meta => $face->{name}, $cb;
860
861 } else { # no metadata
862 CFPlus::DB::get res_data => $face->{name}, $cb;
863 }
592} 864}
593 865
594sub face_update { 866sub face_update {
595 my ($self, $facenum, $face, $changed) = @_; 867 my ($self, $facenum, $face, $changed) = @_;
596 868
869 if ($face->{type} == 0) {
870 # image, FT_FACE
597 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 871 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
598 if $changed; 872 if $changed;
599 873
600 $self->set_texture ($face->{id} => delete $face->{image}); 874 $self->have_tile ($face->{id}, delete $face->{data});
875
876 } elsif ($face->{type} & 1) {
877 # split metadata case, FT_MUSIC, FT_SOUND
878 if ($changed) { # new data
879 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
880 $face->{data} = $meta;
881
882 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
883 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
884 }
885
886 $face->{data} = $self->{json_coder}->decode ($face->{data});
887
888 ::add_license ($face);
889
890 if ($face->{type} == 3) { # FT_MUSIC
891 ::message ({ markup => "downloaded song #$facenum" })
892 if $changed;
893
894 &::audio_music_push ($facenum);
895 } elsif ($face->{type} == 5) { # FT_SOUND
896 ::message ({ markup => "downloaded sound #$facenum" })
897 if $changed;
898
899 &::audio_sound_push ($facenum);
900 }
901
902 } else {
903 # flat resource case, FT_RSRC
904 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
905 if $changed;
906 }
907
908 if (my $cbs = $self->{face_cb}{$facenum}) {
909 $_->($face, $changed) for @$cbs;
910 }
601} 911}
602 912
603sub smooth_update { 913sub smooth_update {
604 my ($self, $facenum, $face) = @_; 914 my ($self, $facenum, $face) = @_;
605 915
606 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 916 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
607} 917}
608 918
609sub set_texture { 919sub have_tile {
610 my ($self, $id, $data) = @_; 920 my ($self, $tile, $data) = @_;
611 921
612 $self->{texture}[$id] = my $tex = 922 return unless $self->{map};
923
924 my $tex = $self->{texture}[$tile] ||=
613 new_from_image CFPlus::Texture 925 new CFPlus::Texture
926 tile => $tile,
927 image => $data, delete_image => 1,
614 $data, minify => 1, mipmap => 1; 928 minify => 1, mipmap => 1;
615 929
616 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 930 if (my $cbs = delete $self->{tile_cb}{$tile}) {
617 $self->{map_widget}->update; 931 $_->($tex) for @$cbs;
932 }
933}
934
935# call in non-void context registers a temporary
936# hook with handle, otherwise its permanent
937sub on_face_change {
938 my ($self, $num, $cb) = @_;
939
940 push @{$self->{face_cb}{$num}}, $cb;
941
942 defined wantarray
943 ? CFPlus::guard {
944 @{$self->{face_cb}{$num}}
945 = grep $_ != $cb,
946 @{$self->{face_cb}{$num}};
947 }
948 : ()
949}
950
951# call in non-void context registers a temporary
952# hook with handle, otherwise its permanent
953sub register_face_handler {
954 my ($self, $num, $cb) = @_;
955
956 return unless $num;
957
958 # invoke if available right now
959 $cb->($self->{face}[$num], 0)
960 unless exists $self->{face}[$num]{loading};
961
962 # future changes
963 $self->on_face_change ($num => $cb)
618} 964}
619 965
620sub sound_play { 966sub sound_play {
621 my ($self, $x, $y, $soundnum, $type) = @_; 967 my ($self, $type, $face, $dx, $dy, $vol) = @_;
622 968
623 $self->{sound_play}->($x, $y, $soundnum, $type); 969 &::audio_sound_play ($face, $dx, $dy, $vol)
970 unless $type & 1; # odd types are silent for future expansion
624} 971}
625 972
626my $LAST_QUERY; # server is stupid, stupid, stupid 973my $LAST_QUERY; # server is stupid, stupid, stupid
627 974
628sub query { 975sub query {
… …
693 $self->{$type} = $text; 1040 $self->{$type} = $text;
694 } else { 1041 } else {
695 $self->logprint ("msg: ", $text); 1042 $self->logprint ("msg: ", $text);
696 return if $color < 0; # negative color == ignore if not understood 1043 return if $color < 0; # negative color == ignore if not understood
697 1044
698 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1045 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
699 1046
700 ## try to create single paragraphs of multiple lines sent by the server 1047 ## try to create single paragraphs of multiple lines sent by the server
701 # no longer neecssary with TRT servers 1048 # no longer neecssary with TRT servers
702 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1049 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
703 1050
704 ::message ({ fg => $fg, markup => $_ }) 1051 ::message ({
1052 fg => $fg,
1053 markup => $_,
1054 type => $type,
1055 extra => [@extra],
1056 color_flags => $color
705 for split /\n/, $text; 1057 }) for split /\n/, $text;
706 1058
707 $self->{statusbox}->add ($text, 1059 $self->{statusbox}->add ($text,
708 group => $text, 1060 group => $text,
709 fg => $fg, 1061 fg => $fg,
710 timeout => $color >= 2 ? 180 : 10, 1062 timeout => $color >= 2 ? 180 : 10,
… …
766 $self->{map_widget}->clr_commands; 1118 $self->{map_widget}->clr_commands;
767 1119
768 ::stop_game (); 1120 ::stop_game ();
769} 1121}
770 1122
771sub image_info {
772 my ($self, $numfaces) = @_;
773
774 $self->{num_faces} = $numfaces;
775 $self->{face_prefetch} = [1 .. $numfaces];
776 $self->face_prefetch;
777}
778
779sub face_prefetch {
780 my ($self) = @_;
781
782 return unless $::CFG->{face_prefetch};
783
784 if ($self->{num_faces}) {
785 return if @{ $self->{send_queue} || [] };
786 my $todo = @{ $self->{face_prefetch} }
787 or return;
788
789 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
790
791 $self->send ("requestinfo image_sums $face $face");
792
793 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
794 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
795 } elsif (!exists $self->{num_faces}) {
796 $self->send ("requestinfo image_info");
797
798 $self->{num_faces} = 0;
799
800 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
801 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
802 }
803}
804
805sub update_floorbox { 1123sub update_floorbox {
806 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1124 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
807 return unless $::CONN; 1125 return unless $::CONN;
808 1126
809 $::FLOORBOX->clear; 1127 $::FLOORBOX->clear;
1128
1129 my @add;
810 1130
811 my $row; 1131 my $row;
812 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1132 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
813 if ($row < 6) { 1133 if ($row < 6) {
814 local $_->{face_widget}; # hack to force recreation of widget 1134 local $_->{face_widget}; # hack to force recreation of widget
815 local $_->{desc_widget}; # hack to force recreation of widget 1135 local $_->{desc_widget}; # hack to force recreation of widget
816 CFPlus::Item::update_widgets $_; 1136 CFPlus::Item::update_widgets $_;
817 1137
1138 push @add,
818 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1139 0, $row, $_->{face_widget},
819 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1140 1, $row, $_->{desc_widget};
820 1141
821 $row++; 1142 $row++;
822 } else { 1143 } else {
823 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1144 push @add, 1, $row, new CFPlus::UI::Button
824 text => "More...", 1145 text => "More...",
825 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1146 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
826 ); 1147 ;
827 last; 1148 last;
828 } 1149 }
829 } 1150 }
830 if ($::CONN->{open_container}) { 1151 if ($::CONN->{open_container}) {
831 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1152 push @add, 1, $row++, new CFPlus::UI::Button
832 text => "Close container", 1153 text => "Close container",
833 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1154 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
834 ); 1155 ;
835 } 1156 }
1157
1158 $::FLOORBOX->add_at (@add);
836 }); 1159 });
837 1160
838 $::WANT_REFRESH++; 1161 $::WANT_REFRESH->start;
839} 1162}
840 1163
841sub set_opencont { 1164sub set_opencont {
842 my ($conn, $tag, $name) = @_; 1165 my ($conn, $tag, $name) = @_;
843 $conn->{open_container} = $tag; 1166 $conn->{open_container} = $tag;
844 update_floorbox; 1167 update_floorbox;
845 1168
846 $::INV_RIGHT_HB->clear (); 1169 $::INVR_HB->clear ();
847 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1170 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
848 1171
849 if ($tag != 0) { # Floor isn't closable, is it? 1172 if ($tag != 0) { # Floor isn't closable, is it?
850 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1173 $::INVR_HB->add (new CFPlus::UI::Button
851 text => "Close container", 1174 text => "Close container",
852 tooltip => "Close the currently open container (if one is open)", 1175 tooltip => "Close the currently open container (if one is open)",
853 on_activate => sub { 1176 on_activate => sub {
854 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1177 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
855 if $tag != 0; 1178 if $tag != 0;
856 #if $CONN->{open_container} != 0;
857 0 1179 0
858 }, 1180 },
859 ); 1181 );
860 } 1182 }
861 1183
… …
960 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1282 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
961 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1283 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
962 . "map size $self->{mapw}×$self->{maph}\n" 1284 . "map size $self->{mapw}×$self->{maph}\n"
963 ); 1285 );
964 1286
965 ::setup_build_button ($self->{editor_support}->{builder_ui});
966} 1287}
967 1288
968sub logged_in { 1289sub logged_in {
969 my ($self) = @_; 1290 my ($self) = @_;
970 1291
971 $self->send_ext_req (cfplus_support => version => 1, sub { 1292 $self->send_ext_req (cfplus_support => version => 2, sub {
1293 my (%msg) = @_;
1294
972 $self->{cfplus_ext} = $_[0]{version}; 1295 $self->{cfplus_ext} = $msg{version};
973 $self->update_server_info; 1296 $self->update_server_info;
974 1297
975 if ($self->{cfplus_ext} >= 2) { 1298 if ($self->{cfplus_ext} >= 2) {
976 $self->send_ext_req ("editor_support", sub { 1299 $self->send_ext_req ("editor_support", sub {
977 $self->{editor_support} = $_[0]; 1300 $self->{editor_support} = { @_ };
978 $self->update_server_info; 1301 $self->update_server_info;
979 1302
980 0 1303 0
981 }); 1304 });
982 } 1305 }
… …
990 $self->send_command ("output-count $::CFG->{output_count}"); 1313 $self->send_command ("output-count $::CFG->{output_count}");
991 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1314 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
992 $self->send_command ("pickup $::CFG->{pickup}"); 1315 $self->send_command ("pickup $::CFG->{pickup}");
993} 1316}
994 1317
995sub buildat {
996 my ($self, $builditem, $x, $y) = @_;
997
998 if ($self->{cfplus_ext}) {
999 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1000 }
1001}
1002
1003sub lookat { 1318sub lookat {
1004 my ($self, $x, $y) = @_; 1319 my ($self, $x, $y) = @_;
1005 1320
1006 if ($self->{cfplus_ext}) { 1321 if ($self->{cfplus_ext}) {
1007 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1322 $self->send_ext_req (lookat => $x, $y, sub {
1008 my ($msg) = @_; 1323 my (%msg) = @_;
1009 1324
1010 if (exists $msg->{npc_dialog}) { 1325 if (exists $msg{npc_dialog}) {
1011 # start npc chat dialog 1326 # start npc chat dialog
1012 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1327 $self->{npc_dialog} = new CFPlus::NPCDialog::
1013 dx => $x, 1328 token => $msg{npc_dialog},
1014 dy => $y,
1015 title => "$msg->{npc_dialog} (NPC)", 1329 title => "$msg{npc_dialog}[0] (NPC)",
1016 conn => $self, 1330 conn => $self,
1017 ; 1331 ;
1018 } 1332 }
1019 }); 1333 });
1020 } 1334 }
… …
1027 1341
1028 (delete $self->{npc_dialog})->destroy 1342 (delete $self->{npc_dialog})->destroy
1029 if $self->{npc_dialog}; 1343 if $self->{npc_dialog};
1030 1344
1031 $self->SUPER::destroy; 1345 $self->SUPER::destroy;
1346
1347 %$self = ();
1032} 1348}
1033 1349
1034package CFPlus::NPCDialog; 1350package CFPlus::NPCDialog;
1035 1351
1036our @ISA = 'CFPlus::UI::Toplevel'; 1352our @ISA = 'CFPlus::UI::Toplevel';
… …
1083 on_activate => sub { $this->destroy; 1 }, 1399 on_activate => sub { $this->destroy; 1 },
1084 ; 1400 ;
1085 1401
1086 $self->update_options; 1402 $self->update_options;
1087 1403
1088 $self->{id} = $self->{conn}->send_ext_req ( 1404 $self->{id} = "npc-channel-" . $self->{conn}->token;
1089 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1405 $self->{conn}->connect_ext ($self->{id} => sub {
1090 sub { $this && $this->feed (@_) } 1406 $this->feed (@_) if $this;
1091 ); 1407 });
1408
1409 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1092 1410
1093 $self->{entry}->grab_focus; 1411 $self->{entry}->grab_focus;
1094 1412
1095 $self->{textview}->add_paragraph ({ 1413 $self->{textview}->add_paragraph ({
1096 fg => [1, 1, 0, 1], 1414 fg => [1, 1, 0, 1],
… …
1119 ); 1437 );
1120 } 1438 }
1121} 1439}
1122 1440
1123sub feed { 1441sub feed {
1124 my ($self, $msg) = @_; 1442 my ($self, $type, @arg) = @_;
1125 1443
1126 CFPlus::weaken $self; 1444 CFPlus::weaken $self;
1127 1445
1128 if ($msg->{msgtype} eq "reply") { 1446 if ($type eq "update") {
1447 my (%info) = @arg;
1448
1129 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1449 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1130 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1450 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1131
1132 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1133 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1134 my @link;
1135 $text =~ s{
1136 ($match)
1137 }{
1138 my $kw = $1;
1139
1140 push @link, new CFPlus::UI::Label
1141 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1142 can_hover => 1,
1143 can_events => 1,
1144 padding_x => 0,
1145 padding_y => 0,
1146 on_button_up => sub {
1147 $self->send ($kw);
1148 };
1149
1150 "\x{fffc}"
1151 }giex;
1152 1451
1452 if (exists $info{msg}) {
1453 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1454 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1455 my @link;
1456 $text =~ s{
1457 ($match)
1458 }{
1459 my $kw = $1;
1460
1461 push @link, new CFPlus::UI::Label
1462 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1463 can_hover => 1,
1464 can_events => 1,
1465 padding_x => 0,
1466 padding_y => 0,
1467 on_button_up => sub {
1468 $self->send ($kw);
1469 };
1470
1471 "\x{fffc}"
1472 }giex;
1473
1153 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1474 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1154 $self->{textview}->scroll_to_bottom; 1475 $self->{textview}->scroll_to_bottom;
1476 }
1477
1155 $self->update_options; 1478 $self->update_options;
1156 } else { 1479 } else {
1157 $self->destroy; 1480 $self->destroy;
1158 } 1481 }
1159 1482
… …
1164 my ($self, $msg) = @_; 1487 my ($self, $msg) = @_;
1165 1488
1166 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1489 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1167 $self->{textview}->scroll_to_bottom; 1490 $self->{textview}->scroll_to_bottom;
1168 1491
1169 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1492 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1170} 1493}
1171 1494
1172sub destroy { 1495sub destroy {
1173 my ($self) = @_; 1496 my ($self) = @_;
1174 1497
1175 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1498 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1176 1499
1177 if ($self->{conn}) { 1500 if ($self->{conn}) {
1178 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1501 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1179 delete $self->{conn}{npc_dialog}; 1502 delete $self->{conn}{npc_dialog};
1180 $self->{conn}->disconnect_ext ($self->{id}); 1503 $self->{conn}->disconnect_ext ($self->{id});
1181 } 1504 }
1182 1505
1183 $self->SUPER::destroy; 1506 $self->SUPER::destroy;

Diff Legend

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