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.154 by elmex, Tue Aug 14 13:25:25 2007 UTC

… …
21 21
22 my $self = $class->SUPER::new (%arg, 22 my $self = $class->SUPER::new (%arg,
23 setup_req => { 23 setup_req => {
24 extmap => 1, 24 extmap => 1,
25 excmd => 1, 25 excmd => 1,
26 ywidget => 1,#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
55 if (my $ts = $cap->{tileset}) { 64 if (my $ts = $cap{tileset}) {
56 if (my ($default) = grep $_->[2] & 1, @$ts) { 65 if (my ($default) = grep $_->[2] & 1, @$ts) {
57 $self->{tileset} = $default; 66 $self->{tileset} = $default;
58 $self->{tilesize} = $default->[3]; 67 $self->{tilesize} = $default->[3];
59 $self->setup_req (tileset => $default->[0]); 68 $self->setup_req (tileset => $default->[0]);
60 69
… …
64 $self->setup_req (mapsize => "${w}x${h}"); 73 $self->setup_req (mapsize => "${w}x${h}");
65 } 74 }
66 } 75 }
67 }); 76 });
68 77
78 $self->{json_coder}
79 ->convert_blessed
80 ->filter_json_single_key_object (__w_ => sub {
81 $self->{widget}{$_[0]}
82 });
83
84 # widgetset new
85 $self->connect_ext (ws_n => sub {
86 my ($id) = @_;
87
88 $self->{widgetset}{$id} = {
89 w => {},
90 };
91 });
92
93 # widgetset destroy
94 $self->connect_ext (ws_d => sub {
95 my ($id) = @_;
96
97 my $ws = delete $self->{widgetset}{$id}
98 or return;
99
100 $_->destroy
101 for values %{$ws->{w}};
102 });
103
104 # widgetset create
105 $self->connect_ext (ws_c => sub {
106 my ($ws, $id, $class, $args) = @_;
107
108 for my $ev (grep /^on_/, keys %$args) {
109 $args->{$ev} = sub {
110 my $id = shift->{s_id};
111 $self->send_exti_msg (w_e => $id, $ev, \@_);
112
113 1
114 };
115 }
116
117 if (my $widget = eval {
118 local $SIG{__DIE__};
119 "CFPlus::UI::$class"->new (
120 %$args,
121 s_ws => $ws,
122 s_id => $id,
123 )
124 }
125 ) {
126 $self->{widget}{$id}
127 = $self->{widgetset}{$ws}{w}{$id}
128 = $widget;
129
130 $widget->connect (on_destroy => sub {
131 my ($widget) = @_;
132
133 delete $self->{widget}{$widget->{s_id}};
134 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
135 });
136 } else {
137 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
138 $self->send_exti_msg (w_e => $id, "destroy");
139 }
140 });
141
142 # widget call
143 $self->connect_ext (w_c => sub {
144 my ($id, $rid, $method, $args) = @_;
145
146 my $w = $self->{widget}{$id}
147 or return;
148
149 $args ||= [];
150
151 if ($rid) {
152 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
153 } else {
154 $w->$method (@$args);
155 }
156 });
157
158 # widget set
159 $self->connect_ext (w_s => sub {
160 my ($id, $attr) = @_;
161
162 my $w = $self->{widget}{$id}
163 or return;
164
165 for (my $i = 0; $i < $#$attr; $i += 2) {
166 my ($member, $value) = @$attr[$i, $i+1];
167 if (defined $value) {
168 $w->{$member} = $value;
169 } else {
170 delete $w->{$member};
171 }
172 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
173 }
174 });
175
176 # widget get
177 $self->connect_ext (w_g => sub {
178 my ($id, $rid, $attr) = @_;
179
180 my $w = $self->{widget}{$id}
181 or return;
182
183 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
184 });
185
186 # message window
187 $self->connect_ext (channel_info => sub {
188 my ($info) = @_;
189 $self->{channels}->{$info->{id}} = $info;
190 $::MESSAGE_WINDOW->add_channel ($info);
191 });
192
193 # destroy widgets on logout
194 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
195 for my $ws (values %{delete $self->{widgetset} || {}}) {
196 $_->destroy
197 for values %{delete $ws->{w} || {}};
198 }
199 });
200
69 $self->{map_widget}->add_command (@$_) 201 $self->{map_widget}->add_command (@$_)
70 for @cmd_help; 202 for @cmd_help;
71 203
72 { 204 {
73 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 205 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
… …
87 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 219 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
88 220
89 $self 221 $self
90} 222}
91 223
224sub update_fx_want {
225 my ($self) = @_;
226
227 $self->send_exti_msg (fx_want => {
228 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
229 5 => !!$::CFG->{audio_enable}, # FT_SOUND
230 });
231}
232
92sub logprint { 233sub logprint {
93 my ($self, @a) = @_; 234 my ($self, @a) = @_;
94 235
95 $self->{log_fh} ||= do { 236 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} 237}
113 238
114sub _stat_numdiff { 239sub _stat_numdiff {
115 my ($self, $name, $old, $new) = @_; 240 my ($self, $name, $old, $new) = @_;
116 241
… …
279 my @skills = keys %{ $self->{skill_info} }; 404 my @skills = keys %{ $self->{skill_info} };
280 405
281 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 406 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
282 $sktbl->clear; 407 $sktbl->clear;
283 408
409 my @add;
410
411 push @add,
284 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 412 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
285 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 413 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
286 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 414 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
287 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 415 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
288 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 416 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
289 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 417 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
418 ;
290 419
291 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 420 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
292 421
293 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 422 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); 423 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
322 } 451 }
323 452
324 1 453 1
325 }; 454 };
326 455
456 push @add,
327 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 457 $x * 3 + 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); 458 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 459 $x * 3 + 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); 460 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, 461 $x * 3 + 2, $y, (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); 462 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
463 ;
333 464
334 $x++ and ($x, $y) = (0, $y + 1); 465 $x++ and ($x, $y) = (0, $y + 1);
335 } 466 }
467
468 $sktbl->add_at (@add);
336 } 469 }
337 470
338 for (grep exists $stats->{$_}, @skills) { 471 for (grep exists $stats->{$_}, @skills) {
339 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 472 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
340 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 473 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
373} 506}
374 507
375sub feed_map1a { 508sub feed_map1a {
376 my ($self, $data) = @_; 509 my ($self, $data) = @_;
377 510
378 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 511 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
512 my $delay;
513
514 for my $tile (@$missing) {
515 next if $self->{delay}{$tile};
516
517 $delay = 1;
518
519 if (my $tex = $::CONN->{texture}[$tile]) {
520 $tex->upload;
521 } else {
522 $self->{delay}{$tile} = 1;
523
524 # we assume the face is in-flight and will eventually come
525 push @{$self->{face_cb}{$tile}}, sub {
526 delete $self->{delay}{$tile};
527 $_[0]->upload;
528 };
529 }
530 }
531
532 if ($delay) {
533 # delay the map drawing a tiny bit in the hope of getting the missing fetched
534 Event->timer (after => 0.03, cb => sub {
535 $_[0]->w->cancel;
536 $self->{map_widget}->update;
537 });
538 } else {
379 $self->{map_widget}->update; 539 $self->{map_widget}->update;
540 }
380} 541}
381 542
382sub magicmap { 543sub magicmap {
383 my ($self, $w, $h, $x, $y, $data) = @_; 544 my ($self, $w, $h, $x, $y, $data) = @_;
384 545
… …
391 my $map_info = delete $self->{map_info} 552 my $map_info = delete $self->{map_info}
392 or return; 553 or return;
393 554
394 my ($hash, $x, $y, $w, $h) = @$map_info; 555 my ($hash, $x, $y, $w, $h) = @$map_info;
395 556
396 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 557 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
558 $self->{map_cache_new}{$hash} = \$data;
397 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 559 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
398 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
399} 560}
400 561
401sub map_clear { 562sub map_clear {
402 my ($self) = @_; 563 my ($self) = @_;
403 564
… …
416 do { 577 do {
417 $id = pop @{$self->{bg_fetch}} 578 $id = pop @{$self->{bg_fetch}}
418 or return; 579 or return;
419 } while $self->{texture}[$id]; 580 } while $self->{texture}[$id];
420 581
421 CFPlus::DB::get tilecache => $id, sub { 582 CFPlus::DB::exists tilecache => $id, sub {
422 my ($data) = @_; 583 my ($exists) = @_;
423 584
424 return unless $self->{map}; # stop when destroyed 585 return unless $self->{map}; # stop when destroyed
425 586
426 $self->set_texture ($id => $data) 587 if ($exists) {
427 if defined $data; 588 $self->have_tile ($id);
589 $self->{texture}[$id]->upload;
590 }
428 591
429 $self->bg_fetch; 592 $self->bg_fetch;
430 }; 593 };
431} 594}
432 595
433sub load_map($$$) { 596sub load_map($$$) {
434 my ($self, $hash, $x, $y) = @_; 597 my ($self, $hash, $x, $y) = @_;
435 598
436 my $gen = $self->{map_change_gen}; 599 my $gen = $self->{map_change_gen};
437 600
438 CFPlus::DB::get $self->{mapcache} => $hash, sub { 601 my $cb = sub {
439 return unless $gen == $self->{map_change_gen}; 602 return unless $gen == $self->{map_change_gen};
440 603
441 my ($data) = @_; 604 my ($data) = @_;
442 605
443 if (defined $data) { 606 if (defined $data) {
607 $self->{map_cache_new}{$hash} = \$data;
608
444 $data = Compress::LZF::decompress $data; 609 my $data = Compress::LZF::decompress $data;
445 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
446 610
447 my $inprogress = @{ $self->{bg_fetch} || [] }; 611 my $inprogress = @{ $self->{bg_fetch} || [] };
448 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 612 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
449 $self->bg_fetch unless $inprogress; 613 $self->bg_fetch unless $inprogress;
450 } 614 }
451 }; 615 };
616
617 if (my $rdata = $self->{map_cache_old}{$hash}) {
618 $cb->($$rdata);
619 } else {
620 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
621 }
452} 622}
453 623
454# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 624# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
455# (server resource,s latency, bandwidth), so this hack is warranted. 625# (server resource,s latency, bandwidth), so this hack is warranted.
456# the right fix is to make real tiled maps with an overview file 626# the right fix is to make real tiled maps with an overview file
… …
549 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 719 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
550 720
551 $self->flush_map; 721 $self->flush_map;
552 722
553 ++$self->{map_change_gen}; 723 ++$self->{map_change_gen};
724 $self->{map_cache_old} = delete $self->{map_cache_new};
554 725
555 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 726 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
556 727
557 my $mapmapw = $self->{mapmap}->{w}; 728 my $mapmapw = $self->{mapmap}->{w};
558 my $mapmaph = $self->{mapmap}->{h}; 729 my $mapmaph = $self->{mapmap}->{h};
… …
577} 748}
578 749
579sub face_find { 750sub face_find {
580 my ($self, $facenum, $face, $cb) = @_; 751 my ($self, $facenum, $face, $cb) = @_;
581 752
582 my $hash = "$face->{chksum},$face->{name}"; 753 if ($face->{type} == 0) { # FT_FACE
583
584 my $id = CFPlus::DB::get_tile_id_sync $hash; 754 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
585 755
586 $face->{id} = $id; 756 $face->{id} = $id;
587 $self->{faceid}[$facenum] = $id; 757 $self->{faceid}[$facenum] = $id;
588 758
589 $self->{map}->set_tileid ($facenum => $id); 759 $self->{map}->set_tileid ($facenum => $id);
590 760
591 CFPlus::DB::get tilecache => $id, $cb; 761 CFPlus::DB::get tilecache => $id, $cb;
762
763 } elsif ($face->{type} & 1) { # with metadata
764 CFPlus::DB::get res_meta => $face->{name}, $cb;
765 }
592} 766}
593 767
594sub face_update { 768sub face_update {
595 my ($self, $facenum, $face, $changed) = @_; 769 my ($self, $facenum, $face, $changed) = @_;
596 770
771 if ($face->{type} == 0) { # FT_FACE
597 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 772 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
598 if $changed; 773 if $changed;
599 774
600 $self->set_texture ($face->{id} => delete $face->{image}); 775 $self->have_tile ($face->{id});
776
777 } elsif ($face->{type} & 1) { # split metadata
778 if ($changed) { # new data
779 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
780 $face->{meta} = $self->{json_coder}->decode ($meta_json);
781
782 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
783 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
784 } else {
785 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
786 }
787
788 ::add_license ($face);
789
790 if ($face->{type} == 3) { # FT_MUSIC
791 $self->{music_meta}{$facenum} = $face;
792
793 ::message ({ markup => "downloaded song #$facenum" })
794 if $changed;
795
796 &::audio_music_push ($facenum);
797 } elsif ($face->{type} == 5) { # FT_SOUND
798 $self->{sound_meta}{$facenum} = $face;
799
800 ::message ({ markup => "downloaded sound #$facenum" })
801 if $changed;
802
803 &::audio_sound_push ($facenum);
804 }
805
806 }
601} 807}
602 808
603sub smooth_update { 809sub smooth_update {
604 my ($self, $facenum, $face) = @_; 810 my ($self, $facenum, $face) = @_;
605 811
606 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 812 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
607} 813}
608 814
609sub set_texture { 815sub have_tile {
816 my ($self, $tile) = @_;
817
818 return unless $self->{map};
819
820 my $tex = $self->{texture}[$tile] ||=
821 new CFPlus::Texture
822 tile => $tile, minify => 1, mipmap => 1, delay => 1;
823
824 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
825}
826
827sub connect_face_update {
610 my ($self, $id, $data) = @_; 828 my ($self, $id, $cb) = @_;
611 829
612 $self->{texture}[$id] = my $tex = 830 push @{$self->{face_cb}{$id}}, $cb;
613 new_from_image CFPlus::Texture
614 $data, minify => 1, mipmap => 1;
615 831
616 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 832 CFPlus::guard {
617 $self->{map_widget}->update; 833 @{$self->{face_cb}{$id}}
834 = grep $_ != $cb,
835 @{$self->{face_cb}{$id}};
836 }
618} 837}
619 838
620sub sound_play { 839sub sound_play {
621 my ($self, $x, $y, $soundnum, $type) = @_; 840 my ($self, $type, $face, $dx, $dy, $vol) = @_;
622 841
623 $self->{sound_play}->($x, $y, $soundnum, $type); 842 &::audio_sound_play ($face, $dx, $dy, $vol)
843 unless $type & 1; # odd types are silent for future expansion
624} 844}
625 845
626my $LAST_QUERY; # server is stupid, stupid, stupid 846my $LAST_QUERY; # server is stupid, stupid, stupid
627 847
628sub query { 848sub query {
… …
630 850
631 $prompt = $LAST_QUERY unless length $prompt; 851 $prompt = $LAST_QUERY unless length $prompt;
632 $LAST_QUERY = $prompt; 852 $LAST_QUERY = $prompt;
633 853
634 $self->{query}-> ($self, $flags, $prompt); 854 $self->{query}-> ($self, $flags, $prompt);
855}
856
857sub sanitise_xml($) {
858 local $_ = shift;
859
860 # we now weed out all tags we do not support
861 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
862 # now all entities
863 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
864
865 # handle some elements
866 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
867 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
868
869 $_
635} 870}
636 871
637our %NAME_TO_COLOR = ( 872our %NAME_TO_COLOR = (
638 black => 0, 873 black => 0,
639 white => 1, 874 white => 1,
… …
667); 902);
668 903
669sub msg { 904sub msg {
670 my ($self, $color, $type, $text, @extra) = @_; 905 my ($self, $color, $type, $text, @extra) = @_;
671 906
907 $text = sanitise_xml $text;
908
672 if (my $cb = $self->{cb_msg}{$type}) { 909 if (my $cb = $self->{cb_msg}{$type}) {
673 $_->($self, $color, $type, $text, @extra) for values %$cb; 910 $_->($self, $color, $type, $text, @extra) for values %$cb;
674 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { 911 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
675 $type =~ s/-/_/g; 912 $type =~ s/-/_/g;
676 $self->{$type} = $text; 913 $self->{$type} = $text;
677 } else { 914 } else {
678 $self->logprint ("msg: ", $text); 915 $self->logprint ("msg: ", $text);
679 return if $color < 0; # negative color == ignore if not understood 916 return if $color < 0; # negative color == ignore if not understood
680 917
681 my $fg = $CF_COLOR[$color % @CF_COLOR]; 918 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
682 919
683 ## try to create single paragraphs of multiple lines sent by the server 920 ## try to create single paragraphs of multiple lines sent by the server
684 # no longer neecssary with TRT servers 921 # no longer neecssary with TRT servers
685 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 922 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
686 923
687 ::message ({ fg => $fg, markup => $_ }) 924 ::message ({
925 fg => $fg,
926 markup => $_,
927 type => $type,
928 extra => [@extra],
929 color_flags => $color
688 for split /\n/, $text; 930 }) for split /\n/, $text;
689 931
690 $self->{statusbox}->add ($text, 932 $self->{statusbox}->add ($text,
691 group => $text, 933 group => $text,
692 fg => $fg, 934 fg => $fg,
693 timeout => $color >= 2 ? 180 : 10, 935 timeout => $color >= 2 ? 180 : 10,
… …
749 $self->{map_widget}->clr_commands; 991 $self->{map_widget}->clr_commands;
750 992
751 ::stop_game (); 993 ::stop_game ();
752} 994}
753 995
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 { 996sub update_floorbox {
789 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 997 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
790 return unless $::CONN; 998 return unless $::CONN;
791 999
792 $::FLOORBOX->clear; 1000 $::FLOORBOX->clear;
1001
1002 my @add;
793 1003
794 my $row; 1004 my $row;
795 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1005 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
796 if ($row < 6) { 1006 if ($row < 6) {
797 local $_->{face_widget}; # hack to force recreation of widget 1007 local $_->{face_widget}; # hack to force recreation of widget
798 local $_->{desc_widget}; # hack to force recreation of widget 1008 local $_->{desc_widget}; # hack to force recreation of widget
799 CFPlus::Item::update_widgets $_; 1009 CFPlus::Item::update_widgets $_;
800 1010
1011 push @add,
801 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1012 0, $row, $_->{face_widget},
802 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1013 1, $row, $_->{desc_widget};
803 1014
804 $row++; 1015 $row++;
805 } else { 1016 } else {
806 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1017 push @add, 1, $row, new CFPlus::UI::Button
807 text => "More...", 1018 text => "More...",
808 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1019 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
809 ); 1020 ;
810 last; 1021 last;
811 } 1022 }
812 } 1023 }
813 if ($::CONN->{open_container}) { 1024 if ($::CONN->{open_container}) {
814 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1025 push @add, 1, $row++, new CFPlus::UI::Button
815 text => "Close container", 1026 text => "Close container",
816 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1027 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
817 ); 1028 ;
818 } 1029 }
819 });
820 1030
1031 $::FLOORBOX->add_at (@add);
1032 });
1033
821 $::WANT_REFRESH++; 1034 $::WANT_REFRESH->start;
822} 1035}
823 1036
824sub set_opencont { 1037sub set_opencont {
825 my ($conn, $tag, $name) = @_; 1038 my ($conn, $tag, $name) = @_;
826 $conn->{open_container} = $tag; 1039 $conn->{open_container} = $tag;
… …
943 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1156 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
944 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1157 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
945 . "map size $self->{mapw}×$self->{maph}\n" 1158 . "map size $self->{mapw}×$self->{maph}\n"
946 ); 1159 );
947 1160
948 ::setup_build_button ($self->{editor_support}->{builder_ui});
949} 1161}
950 1162
951sub logged_in { 1163sub logged_in {
952 my ($self) = @_; 1164 my ($self) = @_;
953 1165
954 $self->send_ext_req (cfplus_support => version => 1, sub { 1166 $self->send_ext_req (cfplus_support => version => 2, sub {
1167 my (%msg) = @_;
1168
955 $self->{cfplus_ext} = $_[0]{version}; 1169 $self->{cfplus_ext} = $msg{version};
956 $self->update_server_info; 1170 $self->update_server_info;
957 1171
958 if ($self->{cfplus_ext} >= 2) { 1172 if ($self->{cfplus_ext} >= 2) {
959 $self->send_ext_req ("editor_support", sub { 1173 $self->send_ext_req ("editor_support", sub {
960 $self->{editor_support} = $_[0]; 1174 $self->{editor_support} = { @_ };
961 $self->update_server_info; 1175 $self->update_server_info;
962 1176
963 0 1177 0
964 }); 1178 });
965 } 1179 }
… …
973 $self->send_command ("output-count $::CFG->{output_count}"); 1187 $self->send_command ("output-count $::CFG->{output_count}");
974 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1188 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
975 $self->send_command ("pickup $::CFG->{pickup}"); 1189 $self->send_command ("pickup $::CFG->{pickup}");
976} 1190}
977 1191
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 { 1192sub lookat {
987 my ($self, $x, $y) = @_; 1193 my ($self, $x, $y) = @_;
988 1194
989 if ($self->{cfplus_ext}) { 1195 if ($self->{cfplus_ext}) {
990 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1196 $self->send_ext_req (lookat => $x, $y, sub {
991 my ($msg) = @_; 1197 my (%msg) = @_;
992 1198
993 if (exists $msg->{npc_dialog}) { 1199 if (exists $msg{npc_dialog}) {
994 # start npc chat dialog 1200 # start npc chat dialog
995 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1201 $self->{npc_dialog} = new CFPlus::NPCDialog::
996 dx => $x, 1202 token => $msg{npc_dialog},
997 dy => $y,
998 title => "$msg->{npc_dialog} (NPC)", 1203 title => "$msg{npc_dialog}[0] (NPC)",
999 conn => $self, 1204 conn => $self,
1000 ; 1205 ;
1001 } 1206 }
1002 }); 1207 });
1003 } 1208 }
… …
1010 1215
1011 (delete $self->{npc_dialog})->destroy 1216 (delete $self->{npc_dialog})->destroy
1012 if $self->{npc_dialog}; 1217 if $self->{npc_dialog};
1013 1218
1014 $self->SUPER::destroy; 1219 $self->SUPER::destroy;
1220
1221 %$self = ();
1015} 1222}
1016 1223
1017package CFPlus::NPCDialog; 1224package CFPlus::NPCDialog;
1018 1225
1019our @ISA = 'CFPlus::UI::Toplevel'; 1226our @ISA = 'CFPlus::UI::Toplevel';
… …
1066 on_activate => sub { $this->destroy; 1 }, 1273 on_activate => sub { $this->destroy; 1 },
1067 ; 1274 ;
1068 1275
1069 $self->update_options; 1276 $self->update_options;
1070 1277
1071 $self->{id} = $self->{conn}->send_ext_req ( 1278 $self->{id} = "npc-channel-" . $self->{conn}->token;
1072 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1279 $self->{conn}->connect_ext ($self->{id} => sub {
1073 sub { $this && $this->feed (@_) } 1280 $this->feed (@_) if $this;
1074 ); 1281 });
1282
1283 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1075 1284
1076 $self->{entry}->grab_focus; 1285 $self->{entry}->grab_focus;
1077 1286
1078 $self->{textview}->add_paragraph ({ 1287 $self->{textview}->add_paragraph ({
1079 fg => [1, 1, 0, 1], 1288 fg => [1, 1, 0, 1],
… …
1102 ); 1311 );
1103 } 1312 }
1104} 1313}
1105 1314
1106sub feed { 1315sub feed {
1107 my ($self, $msg) = @_; 1316 my ($self, $type, @arg) = @_;
1108 1317
1109 CFPlus::weaken $self; 1318 CFPlus::weaken $self;
1110 1319
1111 if ($msg->{msgtype} eq "reply") { 1320 if ($type eq "update") {
1321 my (%info) = @arg;
1322
1112 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1323 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1113 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1324 $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 1325
1326 if (exists $info{msg}) {
1327 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1328 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1329 my @link;
1330 $text =~ s{
1331 ($match)
1332 }{
1333 my $kw = $1;
1334
1335 push @link, new CFPlus::UI::Label
1336 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1337 can_hover => 1,
1338 can_events => 1,
1339 padding_x => 0,
1340 padding_y => 0,
1341 on_button_up => sub {
1342 $self->send ($kw);
1343 };
1344
1345 "\x{fffc}"
1346 }giex;
1347
1136 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1348 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1137 $self->{textview}->scroll_to_bottom; 1349 $self->{textview}->scroll_to_bottom;
1350 }
1351
1138 $self->update_options; 1352 $self->update_options;
1139 } else { 1353 } else {
1140 $self->destroy; 1354 $self->destroy;
1141 } 1355 }
1142 1356
… …
1147 my ($self, $msg) = @_; 1361 my ($self, $msg) = @_;
1148 1362
1149 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1363 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1150 $self->{textview}->scroll_to_bottom; 1364 $self->{textview}->scroll_to_bottom;
1151 1365
1152 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1366 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1153} 1367}
1154 1368
1155sub destroy { 1369sub destroy {
1156 my ($self) = @_; 1370 my ($self) = @_;
1157 1371
1158 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1372 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1159 1373
1160 if ($self->{conn}) { 1374 if ($self->{conn}) {
1161 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1375 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1162 delete $self->{conn}{npc_dialog}; 1376 delete $self->{conn}{npc_dialog};
1163 $self->{conn}->disconnect_ext ($self->{id}); 1377 $self->{conn}->disconnect_ext ($self->{id});
1164 } 1378 }
1165 1379
1166 $self->SUPER::destroy; 1380 $self->SUPER::destroy;

Diff Legend

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