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.95 by root, Wed Apr 4 02:43:30 2007 UTC vs.
Revision 1.122 by root, Sun Jul 15 22:07:48 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::DB;
9use CFPlus::UI; 10use CFPlus::UI;
10use CFPlus::Pod; 11use CFPlus::Pod;
11use CFPlus::Macro; 12use CFPlus::Macro;
12use CFPlus::Item; 13use CFPlus::Item;
13 14
14use Crossfire::Protocol::Base 0.95; 15use Crossfire::Protocol::Base 0.95;
15 16
16use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
17 18
18sub new { 19sub new {
19 my $class = shift; 20 my ($class, %arg) = @_;
20 21
21 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 ywidget => 1,
27 %{$arg{setup_req} || {}},
28 },
29 );
22 30
23 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
24 32
25 my @cmd_help = map { 33 my @cmd_help = map {
26 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
37 for @args; 45 for @args;
38 46
39 map ["$cmd$_", $text], 47 map ["$cmd$_", $text],
40 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
41 @args 49 @args
42 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
43 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
44 52
53 $self->connect_ext (event_music => sub {
54 my ($ev) = @_;
55
56 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev->{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 if (my $faces = $ev->{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
74
75 if (defined $meta_json) {
76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
80 } else {
81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82 $self->ask_face ($face, -100 - $pri, undef, sub {
83 my $len = length $_[1];
84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
85
86 CFPlus::DB::write_file $path, $data, sub {
87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
96 });
97 }
98 }
99 }
100 }
101
102 if (my $play = $ev->{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104 }
105 });
106
45 $self->connect_ext (event_capabilities => sub { 107 $self->connect_ext (event_capabilities => sub {
46 my ($cap) = @_; 108 my ($cap) = @_;
47 109
48 if (my $ts = $cap->{tileset}) { 110 if (my $ts = $cap->{tileset}) {
49 if (my ($default) = grep $_->[2] & 1, @$ts) { 111 if (my ($default) = grep $_->[2] & 1, @$ts) {
50 $self->{tileset} = $default; 112 $self->{tileset} = $default;
51 $self->{tilesize} = $default->[3]; 113 $self->{tilesize} = $default->[3];
52 $self->setup_req (tileset => $default->[0]); 114 $self->setup_req (tileset => $default->[0]);
53 115
54 my $w = int $self->{mapw} * 32 / $self->{tilesize}; 116 my $w = int $self->{mapw} * 32 / $self->{tilesize};
55 my $h = int $self->{maph} * 32 / $self->{tilesize}; 117 my $h = int $self->{maph} * 32 / $self->{tilesize};
56 118
57 $self->setup_req (mapsize => "${w}x${h}"); 119 $self->setup_req (mapsize => "${w}x${h}");
58 } 120 }
59 } 121 }
60 }); 122 });
61 123
124 $self->{json_coder}
125 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub {
127 $self->{widget}{$_[0]}
128 });
129
130 $self->connect_ext (ws_n => sub {
131 my ($arg) = @_;
132
133 $self->{widgetset}{$arg{id}} = {
134 w => {},
135 };
136 });
137
138 $self->connect_ext (ws_d => sub {
139 my ($arg) = @_;
140
141 my $ws = delete $self->{widgetset}{$arg{id}}
142 or return;
143
144 $_->destroy
145 for values %{$ws->{w}};
146 });
147
148 $self->connect_ext (ws_c => sub {
149 my ($arg) = @_;
150
151 my $args = $arg->{args} || {};
152
153 for my $ev (grep /^on_/, keys %$args) {
154 $args->{$ev} = sub {
155 my $id = shift->{s_id};
156 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
157
158 1
159 };
160 }
161
162 if (my $widget = eval {
163 local $SIG{__DIE__};
164 "CFPlus::UI::$arg->{class}"->new (
165 %$args,
166 s_ws => $arg->{ws},
167 s_id => $arg->{id},
168 )
169 }
170 ) {
171 $self->{widget}{$arg->{id}}
172 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
173 = $widget;
174
175 $widget->connect (on_destroy => sub {
176 my ($widget) = @_;
177
178 delete $self->{widget}{$widget->{s_id}};
179 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
180 });
181 } else {
182 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
183 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
184 }
185 });
186
187 $self->connect_ext (w_c => sub {
188 my ($arg) = @_;
189
190 my $w = $self->{widget}{$arg->{id}}
191 or return;
192 my $m = $arg->{name};
193
194 my $a = $arg->{args} || [];
195
196 if (exists $arg->{rid}) {
197 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
198 } else {
199 $w->$m (@$a);
200 }
201 });
202
203 $self->connect_ext (w_s => sub {
204 my ($arg) = @_;
205
206 my $w = $self->{widget}{$arg->{id}}
207 or return;
208
209 $w->{$arg->{name}} = $arg->{value};
210 });
211
212 $self->connect_ext (w_g => sub {
213 my ($arg) = @_;
214
215 my $w = $self->{widget}{$arg->{id}}
216 or return;
217
218 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
219 });
220
221 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
222 for my $ws (values %{delete $self->{widgetset} || {}}) {
223 $_->destroy
224 for values %{delete $ws->{w} || {}};
225 }
226 });
227
62 $self->{map_widget}->add_command (@$_) 228 $self->{map_widget}->add_command (@$_)
63 for @cmd_help; 229 for @cmd_help;
64
65 $self->{noface} = new_from_file CFPlus::Texture
66 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
67 230
68 { 231 {
69 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 232 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
70 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 233 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
71 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 234 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
72 } 235 }
73 236
237 {
238 $self->{noface} = my $tex = new_from_file CFPlus::Texture
239 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
240 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
241 }
242
74 $self->{open_container} = 0; 243 $self->{open_container} = 0;
75 244
76 # "global"
77 $self->{tilecache} = CFPlus::db_table "tilecache"
78 or die "tilecache: unable to open database table";
79 $self->{facemap} = CFPlus::db_table "facemap"
80 or die "facemap: unable to open database table";
81
82 # per server 245 # per server
83 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 246 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
84 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
85 247
86 $self 248 $self
87} 249}
88 250
89sub logprint { 251sub logprint {
… …
246 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 408 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
247 $::GAUGES->{food} ->set_value ($fo, $fo_m); 409 $::GAUGES->{food} ->set_value ($fo, $fo_m);
248 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 410 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
249 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 411 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
250 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 412 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
251 my $rng = $stats->{+CS_STAT_RANGE}; 413 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
252 $rng =~ s/^Range: //; # thank you so much dear server
253 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
254 my $title = $stats->{+CS_STAT_TITLE}; 414 my $title = $stats->{+CS_STAT_TITLE};
255 $title =~ s/^Player: //; 415 $title =~ s/^Player: //;
256 $::STATWIDS->{title} ->set_text ("Title: " . $title); 416 $::STATWIDS->{title} ->set_text ("Title: " . $title);
257 417
258 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 418 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
391 or return; 551 or return;
392 552
393 my ($hash, $x, $y, $w, $h) = @$map_info; 553 my ($hash, $x, $y, $w, $h) = @$map_info;
394 554
395 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 555 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
396 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 556 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
397 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 557 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
398} 558}
399 559
400sub map_clear { 560sub map_clear {
401 my ($self) = @_; 561 my ($self) = @_;
… …
405 565
406 $self->{map}->clear; 566 $self->{map}->clear;
407 delete $self->{map_widget}{magicmap}; 567 delete $self->{map_widget}{magicmap};
408} 568}
409 569
570sub bg_fetch {
571 my ($self) = @_;
572
573 my $id;
574
575 do {
576 $id = pop @{$self->{bg_fetch}}
577 or return;
578 } while $self->{texture}[$id];
579
580 CFPlus::DB::get tilecache => $id, sub {
581 my ($data) = @_;
582
583 return unless $self->{map}; # stop when destroyed
584
585 $self->set_texture ($id => $data)
586 if defined $data;
587
588 $self->bg_fetch;
589 };
590}
410 591
411sub load_map($$$) { 592sub load_map($$$) {
412 my ($self, $hash, $x, $y) = @_; 593 my ($self, $hash, $x, $y) = @_;
413 594
414 if (defined (my $data = $self->{mapcache}->get ($hash))) { 595 my $gen = $self->{map_change_gen};
596
597 CFPlus::DB::get $self->{mapcache} => $hash, sub {
598 return unless $gen == $self->{map_change_gen};
599
600 my ($data) = @_;
601
602 if (defined $data) {
415 $data = Compress::LZF::decompress $data; 603 $data = Compress::LZF::decompress $data;
416 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 604 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
417 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
418 my $data = $self->{tilecache}->get ($id)
419 or next;
420 605
421 $self->set_texture ($id => $data); 606 my $inprogress = @{ $self->{bg_fetch} || [] };
607 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
608 $self->bg_fetch unless $inprogress;
422 } 609 }
423 } 610 };
424} 611}
425 612
426# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 613# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
427# (server resource,s latency, bandwidth), so this hack is warranted. 614# (server resource,s latency, bandwidth), so this hack is warranted.
428# the right fix is to make real tiled maps with an overview file 615# the right fix is to make real tiled maps with an overview file
… …
492 679
493 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 680 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
494 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 681 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
495 682
496 } else { 683 } else {
684 my $gen = $self->{map_change_gen};
497 $self->send_mapinfo ("spatial $path$tile", sub { 685 $self->send_mapinfo ("spatial $path$tile", sub {
686 return unless $gen == $self->{map_change_gen};
687
498 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 688 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
499 689
500 return if $mode ne "spatial"; 690 return if $mode ne "spatial";
501 691
502 $x += $self->{map}->ox; 692 $x += $self->{map}->ox;
… …
516 706
517sub map_change { 707sub map_change {
518 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 708 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
519 709
520 $self->flush_map; 710 $self->flush_map;
711
712 ++$self->{map_change_gen};
521 713
522 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 714 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
523 715
524 my $mapmapw = $self->{mapmap}->{w}; 716 my $mapmapw = $self->{mapmap}->{w};
525 my $mapmaph = $self->{mapmap}->{h}; 717 my $mapmaph = $self->{mapmap}->{h};
… …
542 $self->load_map ($hash, $x, $y); 734 $self->load_map ($hash, $x, $y);
543 $self->flood_fill (0, 0, 0, "", $hash, $flags); 735 $self->flood_fill (0, 0, 0, "", $hash, $flags);
544} 736}
545 737
546sub face_find { 738sub face_find {
547 my ($self, $facenum, $face) = @_; 739 my ($self, $facenum, $face, $cb) = @_;
548 740
549 my $hash = "$face->{chksum},$face->{name}"; 741 my $hash = "$face->{chksum},$face->{name}";
550 742
551 my $id = $self->{facemap}->get ($hash); 743 my $id = CFPlus::DB::get_tile_id_sync $hash;
552 744
553 unless ($id) {
554 # create new id for face
555 # I love transactions
556 for (1..100) {
557 my $txn = $CFPlus::DB_ENV->txn_begin;
558 my $status = $self->{facemap}->db_get (id => $id);
559 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
560 $id = ($id || 64) + 1;
561 if ($self->{facemap}->put (id => $id) == 0
562 && $self->{facemap}->put ($hash => $id) == 0) {
563 $txn->txn_commit;
564
565 goto gotid;
566 }
567 }
568 $txn->txn_abort;
569 }
570
571 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
572 }
573
574gotid:
575 $face->{id} = $id; 745 $face->{id} = $id;
576 $self->{map}->set_face ($facenum => $id);
577 $self->{faceid}[$facenum] = $id;#d# 746 $self->{faceid}[$facenum] = $id;
578 747
579 my $face = $self->{tilecache}->get ($id); 748 $self->{map}->set_tileid ($facenum => $id);
580 749
581 if ($face) { 750 CFPlus::DB::get tilecache => $id, $cb;
582 #$self->face_prefetch;
583 $face
584 } else {
585 my $tex = $self->{noface};
586 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
587 undef
588 };
589} 751}
590 752
591sub face_update { 753sub face_update {
592 my ($self, $facenum, $face, $changed) = @_; 754 my ($self, $facenum, $face, $changed) = @_;
593 755
594 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 756 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
757 if $changed;
595 758
596 $self->set_texture ($face->{id} => delete $face->{image}); 759 $self->set_texture ($face->{id} => delete $face->{image});
760}
761
762sub smooth_update {
763 my ($self, $facenum, $face) = @_;
764
765 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
597} 766}
598 767
599sub set_texture { 768sub set_texture {
600 my ($self, $id, $data) = @_; 769 my ($self, $id, $data) = @_;
601 770
771 return unless $self->{map};
772
602 $self->{texture}[$id] ||= do { 773 $self->{texture}[$id] = my $tex =
603 my $tex =
604 new_from_image CFPlus::Texture 774 new_from_image CFPlus::Texture
605 $data, minify => 1, mipmap => 1; 775 $data, minify => 1, mipmap => 1;
606 776
607 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 777 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
608 $self->{map_widget}->update; 778 $self->{map_widget}->update;
609 779
610 $tex 780 $_->() for @{(delete $self->{face_cb}{$id}) || []};
781}
782
783sub connect_face_update {
784 my ($self, $id, $cb) = @_;
785
786 push @{$self->{face_cb}{$id}}, $cb;
787
788 CFPlus::guard {
789 @{$self->{face_cb}{$id}}
790 = grep $_ != $cb,
791 @{$self->{face_cb}{$id}};
611 }; 792 }
612} 793}
613 794
614sub sound_play { 795sub sound_play {
615 my ($self, $x, $y, $soundnum, $type) = @_; 796 my ($self, $x, $y, $soundnum, $type) = @_;
616 797
… …
626 $LAST_QUERY = $prompt; 807 $LAST_QUERY = $prompt;
627 808
628 $self->{query}-> ($self, $flags, $prompt); 809 $self->{query}-> ($self, $flags, $prompt);
629} 810}
630 811
631sub drawinfo { 812sub sanitise_xml($) {
632 my ($self, $color, $text) = @_; 813 local $_ = shift;
633 814
634 my @color = ( 815 # we now weed out all tags we do not support
816 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
817 # now all entities
818 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
819
820 # handle some elements
821 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
822 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
823
824 $_
825}
826
827our %NAME_TO_COLOR = (
828 black => 0,
829 white => 1,
830 darkblue => 2,
831 red => 3,
832 orange => 4,
833 lightblue => 5,
834 darkorange => 6,
835 green => 7,
836 darkgreen => 8,
837 grey => 9,
838 brown => 10,
839 yellow => 11,
840 tan => 12,
841);
842
843our @CF_COLOR = (
635 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 844 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
636 [1.00, 1.00, 1.00], 845 [1.00, 1.00, 1.00],
637 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 846 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
638 [1.00, 0.00, 0.00], 847 [1.00, 0.00, 0.00],
639 [1.00, 0.54, 0.00], 848 [1.00, 0.54, 0.00],
640 [0.11, 0.56, 1.00], 849 [0.11, 0.56, 1.00],
641 [0.93, 0.46, 0.00], 850 [0.93, 0.46, 0.00],
642 [0.18, 0.54, 0.34], 851 [0.18, 0.54, 0.34],
643 [0.56, 0.73, 0.56], 852 [0.56, 0.73, 0.56],
644 [0.80, 0.80, 0.80], 853 [0.80, 0.80, 0.80],
645 [0.75, 0.61, 0.20], 854 [0.75, 0.61, 0.20],
646 [0.99, 0.77, 0.26], 855 [0.99, 0.77, 0.26],
647 [0.74, 0.65, 0.41], 856 [0.74, 0.65, 0.41],
648 ); 857);
649 858
650 my $fg = $color[$color % @color]; 859sub msg {
860 my ($self, $color, $type, $text, @extra) = @_;
651 861
862 $text = sanitise_xml $text;
863
864 if (my $cb = $self->{cb_msg}{$type}) {
865 $_->($self, $color, $type, $text, @extra) for values %$cb;
866 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
867 $type =~ s/-/_/g;
868 $self->{$type} = $text;
869 } else {
652 $self->logprint ("info: ", $text); 870 $self->logprint ("msg: ", $text);
871 return if $color < 0; # negative color == ignore if not understood
653 872
873 my $fg = $CF_COLOR[$color % @CF_COLOR];
874
654 # try to create single paragraphs of multiple lines sent by the server 875 ## try to create single paragraphs of multiple lines sent by the server
876 # no longer neecssary with TRT servers
655 $text =~ s/(?<=\S)\n(?=\w)/ /g; 877 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
656 878
657 $text = CFPlus::asxml $text;
658 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
659 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
660
661 ::message ({ fg => $fg, markup => $_ }) 879 ::message ({ fg => $fg, markup => $_ })
662 for split /\n/, $text; 880 for split /\n/, $text;
663 881
664 $self->{statusbox}->add ($text, 882 $self->{statusbox}->add ($text,
665 group => $text, 883 group => $text,
666 fg => $fg, 884 fg => $fg,
667 timeout => $color >= 2 ? 180 : 10, 885 timeout => $color >= 2 ? 180 : 10,
668 tooltip_font => $::FONT_FIXED, 886 tooltip_font => $::FONT_FIXED,
669 ); 887 );
670} 888 }
671
672sub drawextinfo {
673 my ($self, $color, $type, $subtype, $message) = @_;
674
675 $self->drawinfo ($color, $message);
676} 889}
677 890
678sub spell_add { 891sub spell_add {
679 my ($self, $spell) = @_; 892 my ($self, $spell) = @_;
680 893
… …
913 $::SERVER_INFO->set_markup ( 1126 $::SERVER_INFO->set_markup (
914 "server <tt>$self->{host}:$self->{port}</tt>\n" 1127 "server <tt>$self->{host}:$self->{port}</tt>\n"
915 . "protocol version <tt>$self->{version}</tt>\n" 1128 . "protocol version <tt>$self->{version}</tt>\n"
916 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1129 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
917 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1130 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1131 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
918 . "editing support $yesno[!!$self->{editor_support}]\n" 1132 . "editing support $yesno[!!$self->{editor_support}]\n"
919 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1133 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1134 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
920 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1135 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
921 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1136 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
922 . "map size $self->{mapw}×$self->{maph}\n" 1137 . "map size $self->{mapw}×$self->{maph}\n"
923 ); 1138 );
924 1139
… …
987 1202
988 (delete $self->{npc_dialog})->destroy 1203 (delete $self->{npc_dialog})->destroy
989 if $self->{npc_dialog}; 1204 if $self->{npc_dialog};
990 1205
991 $self->SUPER::destroy; 1206 $self->SUPER::destroy;
1207
1208 %$self = ();
992} 1209}
993 1210
994package CFPlus::NPCDialog; 1211package CFPlus::NPCDialog;
995 1212
996our @ISA = 'CFPlus::UI::Toplevel'; 1213our @ISA = 'CFPlus::UI::Toplevel';
… …
1087 1304
1088 if ($msg->{msgtype} eq "reply") { 1305 if ($msg->{msgtype} eq "reply") {
1089 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1306 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1090 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1307 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1091 1308
1092 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1309 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1093 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1310 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1094 my @link; 1311 my @link;
1095 $text =~ s{ 1312 $text =~ s{
1096 ($match) 1313 ($match)
1097 }{ 1314 }{

Diff Legend

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