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.117 by root, Fri Jul 13 05:31:31 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) = @_;
73
74 if (defined $meta) {
75 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
76 } else {
77 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
78 $self->ask_face ($face, -100 - $pri, undef, sub {
79 my $len = length $_[1];
80 my ($meta, $data) = unpack "(w/a*)*", $_[1];
81
82 CFPlus::DB::write_file $chksum, $data, sub { };
83 CFPlus::DB::put "res-metadata" => $chksum => $meta, sub { };
84
85 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
86 ::message ({ markup => "downloaded song #$face, size $len octets" });
87
88 &::audio_music_set ($self->{songs});
89 });
90 }
91 }
92 }
93 }
94
95 if (my $play = $ev->{play}) {
96 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
97 }
98 });
99
45 $self->connect_ext (event_capabilities => sub { 100 $self->connect_ext (event_capabilities => sub {
46 my ($cap) = @_; 101 my ($cap) = @_;
47 102
48 if (my $ts = $cap->{tileset}) { 103 if (my $ts = $cap->{tileset}) {
49 if (my ($default) = grep $_->[2] & 1, @$ts) { 104 if (my ($default) = grep $_->[2] & 1, @$ts) {
50 $self->{tileset} = $default; 105 $self->{tileset} = $default;
51 $self->{tilesize} = $default->[3]; 106 $self->{tilesize} = $default->[3];
52 $self->setup_req (tileset => $default->[0]); 107 $self->setup_req (tileset => $default->[0]);
53 108
54 my $w = int $self->{mapw} * 32 / $self->{tilesize}; 109 my $w = int $self->{mapw} * 32 / $self->{tilesize};
55 my $h = int $self->{maph} * 32 / $self->{tilesize}; 110 my $h = int $self->{maph} * 32 / $self->{tilesize};
56 111
57 $self->setup_req (mapsize => "${w}x${h}"); 112 $self->setup_req (mapsize => "${w}x${h}");
58 } 113 }
59 } 114 }
60 }); 115 });
61 116
117 $self->{json_coder}
118 ->convert_blessed
119 ->filter_json_single_key_object (__widget_ref__ => sub {
120 $self->{widget}{$_[0]}
121 });
122
123 $self->connect_ext (ws_n => sub {
124 my ($arg) = @_;
125
126 $self->{widgetset}{$arg{id}} = {
127 w => {},
128 };
129 });
130
131 $self->connect_ext (ws_d => sub {
132 my ($arg) = @_;
133
134 my $ws = delete $self->{widgetset}{$arg{id}}
135 or return;
136
137 $_->destroy
138 for values %{$ws->{w}};
139 });
140
141 $self->connect_ext (ws_c => sub {
142 my ($arg) = @_;
143
144 my $args = $arg->{args} || {};
145
146 for my $ev (grep /^on_/, keys %$args) {
147 $args->{$ev} = sub {
148 my $id = shift->{s_id};
149 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
150
151 1
152 };
153 }
154
155 if (my $widget = eval {
156 local $SIG{__DIE__};
157 "CFPlus::UI::$arg->{class}"->new (
158 %$args,
159 s_ws => $arg->{ws},
160 s_id => $arg->{id},
161 )
162 }
163 ) {
164 $self->{widget}{$arg->{id}}
165 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
166 = $widget;
167
168 $widget->connect (on_destroy => sub {
169 my ($widget) = @_;
170
171 delete $self->{widget}{$widget->{s_id}};
172 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
173 });
174 } else {
175 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
176 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
177 }
178 });
179
180 $self->connect_ext (w_c => sub {
181 my ($arg) = @_;
182
183 my $w = $self->{widget}{$arg->{id}}
184 or return;
185 my $m = $arg->{name};
186
187 my $a = $arg->{args} || [];
188
189 if (exists $arg->{rid}) {
190 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
191 } else {
192 $w->$m (@$a);
193 }
194 });
195
196 $self->connect_ext (w_s => sub {
197 my ($arg) = @_;
198
199 my $w = $self->{widget}{$arg->{id}}
200 or return;
201
202 $w->{$arg->{name}} = $arg->{value};
203 });
204
205 $self->connect_ext (w_g => sub {
206 my ($arg) = @_;
207
208 my $w = $self->{widget}{$arg->{id}}
209 or return;
210
211 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
212 });
213
214 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
215 for my $ws (values %{delete $self->{widgetset} || {}}) {
216 $_->destroy
217 for values %{delete $ws->{w} || {}};
218 }
219 });
220
62 $self->{map_widget}->add_command (@$_) 221 $self->{map_widget}->add_command (@$_)
63 for @cmd_help; 222 for @cmd_help;
64
65 $self->{noface} = new_from_file CFPlus::Texture
66 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
67 223
68 { 224 {
69 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 225 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
70 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 226 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
71 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 227 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
72 } 228 }
73 229
230 {
231 $self->{noface} = my $tex = new_from_file CFPlus::Texture
232 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
233 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
234 }
235
74 $self->{open_container} = 0; 236 $self->{open_container} = 0;
75 237
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 238 # per server
83 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 239 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
84 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
85 240
86 $self 241 $self
87} 242}
88 243
89sub logprint { 244sub logprint {
… …
246 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 401 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
247 $::GAUGES->{food} ->set_value ($fo, $fo_m); 402 $::GAUGES->{food} ->set_value ($fo, $fo_m);
248 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 403 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
249 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 404 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
250 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 405 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
251 my $rng = $stats->{+CS_STAT_RANGE}; 406 $::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}; 407 my $title = $stats->{+CS_STAT_TITLE};
255 $title =~ s/^Player: //; 408 $title =~ s/^Player: //;
256 $::STATWIDS->{title} ->set_text ("Title: " . $title); 409 $::STATWIDS->{title} ->set_text ("Title: " . $title);
257 410
258 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 411 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
391 or return; 544 or return;
392 545
393 my ($hash, $x, $y, $w, $h) = @$map_info; 546 my ($hash, $x, $y, $w, $h) = @$map_info;
394 547
395 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 548 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
396 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 549 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
397 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 550 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
398} 551}
399 552
400sub map_clear { 553sub map_clear {
401 my ($self) = @_; 554 my ($self) = @_;
… …
405 558
406 $self->{map}->clear; 559 $self->{map}->clear;
407 delete $self->{map_widget}{magicmap}; 560 delete $self->{map_widget}{magicmap};
408} 561}
409 562
563sub bg_fetch {
564 my ($self) = @_;
565
566 my $id;
567
568 do {
569 $id = pop @{$self->{bg_fetch}}
570 or return;
571 } while $self->{texture}[$id];
572
573 CFPlus::DB::get tilecache => $id, sub {
574 my ($data) = @_;
575
576 return unless $self->{map}; # stop when destroyed
577
578 $self->set_texture ($id => $data)
579 if defined $data;
580
581 $self->bg_fetch;
582 };
583}
410 584
411sub load_map($$$) { 585sub load_map($$$) {
412 my ($self, $hash, $x, $y) = @_; 586 my ($self, $hash, $x, $y) = @_;
413 587
414 if (defined (my $data = $self->{mapcache}->get ($hash))) { 588 my $gen = $self->{map_change_gen};
589
590 CFPlus::DB::get $self->{mapcache} => $hash, sub {
591 return unless $gen == $self->{map_change_gen};
592
593 my ($data) = @_;
594
595 if (defined $data) {
415 $data = Compress::LZF::decompress $data; 596 $data = Compress::LZF::decompress $data;
416 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 597 #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 598
421 $self->set_texture ($id => $data); 599 my $inprogress = @{ $self->{bg_fetch} || [] };
600 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
601 $self->bg_fetch unless $inprogress;
422 } 602 }
423 } 603 };
424} 604}
425 605
426# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 606# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
427# (server resource,s latency, bandwidth), so this hack is warranted. 607# (server resource,s latency, bandwidth), so this hack is warranted.
428# the right fix is to make real tiled maps with an overview file 608# the right fix is to make real tiled maps with an overview file
… …
492 672
493 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 673 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
494 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 674 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
495 675
496 } else { 676 } else {
677 my $gen = $self->{map_change_gen};
497 $self->send_mapinfo ("spatial $path$tile", sub { 678 $self->send_mapinfo ("spatial $path$tile", sub {
679 return unless $gen == $self->{map_change_gen};
680
498 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 681 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
499 682
500 return if $mode ne "spatial"; 683 return if $mode ne "spatial";
501 684
502 $x += $self->{map}->ox; 685 $x += $self->{map}->ox;
… …
516 699
517sub map_change { 700sub map_change {
518 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 701 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
519 702
520 $self->flush_map; 703 $self->flush_map;
704
705 ++$self->{map_change_gen};
521 706
522 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 707 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
523 708
524 my $mapmapw = $self->{mapmap}->{w}; 709 my $mapmapw = $self->{mapmap}->{w};
525 my $mapmaph = $self->{mapmap}->{h}; 710 my $mapmaph = $self->{mapmap}->{h};
… …
542 $self->load_map ($hash, $x, $y); 727 $self->load_map ($hash, $x, $y);
543 $self->flood_fill (0, 0, 0, "", $hash, $flags); 728 $self->flood_fill (0, 0, 0, "", $hash, $flags);
544} 729}
545 730
546sub face_find { 731sub face_find {
547 my ($self, $facenum, $face) = @_; 732 my ($self, $facenum, $face, $cb) = @_;
548 733
549 my $hash = "$face->{chksum},$face->{name}"; 734 my $hash = "$face->{chksum},$face->{name}";
550 735
551 my $id = $self->{facemap}->get ($hash); 736 my $id = CFPlus::DB::get_tile_id_sync $hash;
552 737
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; 738 $face->{id} = $id;
576 $self->{map}->set_face ($facenum => $id);
577 $self->{faceid}[$facenum] = $id;#d# 739 $self->{faceid}[$facenum] = $id;
578 740
579 my $face = $self->{tilecache}->get ($id); 741 $self->{map}->set_tileid ($facenum => $id);
580 742
581 if ($face) { 743 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} 744}
590 745
591sub face_update { 746sub face_update {
592 my ($self, $facenum, $face, $changed) = @_; 747 my ($self, $facenum, $face, $changed) = @_;
593 748
594 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 749 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
750 if $changed;
595 751
596 $self->set_texture ($face->{id} => delete $face->{image}); 752 $self->set_texture ($face->{id} => delete $face->{image});
753}
754
755sub smooth_update {
756 my ($self, $facenum, $face) = @_;
757
758 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
597} 759}
598 760
599sub set_texture { 761sub set_texture {
600 my ($self, $id, $data) = @_; 762 my ($self, $id, $data) = @_;
601 763
602 $self->{texture}[$id] ||= do { 764 $self->{texture}[$id] = my $tex =
603 my $tex =
604 new_from_image CFPlus::Texture 765 new_from_image CFPlus::Texture
605 $data, minify => 1, mipmap => 1; 766 $data, minify => 1, mipmap => 1;
606 767
607 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 768 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
608 $self->{map_widget}->update; 769 $self->{map_widget}->update;
609
610 $tex
611 };
612} 770}
613 771
614sub sound_play { 772sub sound_play {
615 my ($self, $x, $y, $soundnum, $type) = @_; 773 my ($self, $x, $y, $soundnum, $type) = @_;
616 774
… …
626 $LAST_QUERY = $prompt; 784 $LAST_QUERY = $prompt;
627 785
628 $self->{query}-> ($self, $flags, $prompt); 786 $self->{query}-> ($self, $flags, $prompt);
629} 787}
630 788
631sub drawinfo { 789sub sanitise_xml($) {
632 my ($self, $color, $text) = @_; 790 local $_ = shift;
633 791
634 my @color = ( 792 # we now weed out all tags we do not support
793 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
794 # now all entities
795 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
796
797 # handle some elements
798 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
799 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
800
801 $_
802}
803
804our %NAME_TO_COLOR = (
805 black => 0,
806 white => 1,
807 darkblue => 2,
808 red => 3,
809 orange => 4,
810 lightblue => 5,
811 darkorange => 6,
812 green => 7,
813 darkgreen => 8,
814 grey => 9,
815 brown => 10,
816 yellow => 11,
817 tan => 12,
818);
819
820our @CF_COLOR = (
635 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 821 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
636 [1.00, 1.00, 1.00], 822 [1.00, 1.00, 1.00],
637 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 823 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
638 [1.00, 0.00, 0.00], 824 [1.00, 0.00, 0.00],
639 [1.00, 0.54, 0.00], 825 [1.00, 0.54, 0.00],
640 [0.11, 0.56, 1.00], 826 [0.11, 0.56, 1.00],
641 [0.93, 0.46, 0.00], 827 [0.93, 0.46, 0.00],
642 [0.18, 0.54, 0.34], 828 [0.18, 0.54, 0.34],
643 [0.56, 0.73, 0.56], 829 [0.56, 0.73, 0.56],
644 [0.80, 0.80, 0.80], 830 [0.80, 0.80, 0.80],
645 [0.75, 0.61, 0.20], 831 [0.75, 0.61, 0.20],
646 [0.99, 0.77, 0.26], 832 [0.99, 0.77, 0.26],
647 [0.74, 0.65, 0.41], 833 [0.74, 0.65, 0.41],
648 ); 834);
649 835
650 my $fg = $color[$color % @color]; 836sub msg {
837 my ($self, $color, $type, $text, @extra) = @_;
651 838
839 $text = sanitise_xml $text;
840
841 if (my $cb = $self->{cb_msg}{$type}) {
842 $_->($self, $color, $type, $text, @extra) for values %$cb;
843 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
844 $type =~ s/-/_/g;
845 $self->{$type} = $text;
846 } else {
652 $self->logprint ("info: ", $text); 847 $self->logprint ("msg: ", $text);
848 return if $color < 0; # negative color == ignore if not understood
653 849
850 my $fg = $CF_COLOR[$color % @CF_COLOR];
851
654 # try to create single paragraphs of multiple lines sent by the server 852 ## try to create single paragraphs of multiple lines sent by the server
853 # no longer neecssary with TRT servers
655 $text =~ s/(?<=\S)\n(?=\w)/ /g; 854 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
656 855
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 => $_ }) 856 ::message ({ fg => $fg, markup => $_ })
662 for split /\n/, $text; 857 for split /\n/, $text;
663 858
664 $self->{statusbox}->add ($text, 859 $self->{statusbox}->add ($text,
665 group => $text, 860 group => $text,
666 fg => $fg, 861 fg => $fg,
667 timeout => $color >= 2 ? 180 : 10, 862 timeout => $color >= 2 ? 180 : 10,
668 tooltip_font => $::FONT_FIXED, 863 tooltip_font => $::FONT_FIXED,
669 ); 864 );
670} 865 }
671
672sub drawextinfo {
673 my ($self, $color, $type, $subtype, $message) = @_;
674
675 $self->drawinfo ($color, $message);
676} 866}
677 867
678sub spell_add { 868sub spell_add {
679 my ($self, $spell) = @_; 869 my ($self, $spell) = @_;
680 870
… …
913 $::SERVER_INFO->set_markup ( 1103 $::SERVER_INFO->set_markup (
914 "server <tt>$self->{host}:$self->{port}</tt>\n" 1104 "server <tt>$self->{host}:$self->{port}</tt>\n"
915 . "protocol version <tt>$self->{version}</tt>\n" 1105 . "protocol version <tt>$self->{version}</tt>\n"
916 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1106 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
917 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1107 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1108 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
918 . "editing support $yesno[!!$self->{editor_support}]\n" 1109 . "editing support $yesno[!!$self->{editor_support}]\n"
919 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1110 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1111 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
920 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1112 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
921 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1113 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
922 . "map size $self->{mapw}×$self->{maph}\n" 1114 . "map size $self->{mapw}×$self->{maph}\n"
923 ); 1115 );
924 1116
… …
987 1179
988 (delete $self->{npc_dialog})->destroy 1180 (delete $self->{npc_dialog})->destroy
989 if $self->{npc_dialog}; 1181 if $self->{npc_dialog};
990 1182
991 $self->SUPER::destroy; 1183 $self->SUPER::destroy;
1184
1185 %$self = ();
992} 1186}
993 1187
994package CFPlus::NPCDialog; 1188package CFPlus::NPCDialog;
995 1189
996our @ISA = 'CFPlus::UI::Toplevel'; 1190our @ISA = 'CFPlus::UI::Toplevel';
… …
1087 1281
1088 if ($msg->{msgtype} eq "reply") { 1282 if ($msg->{msgtype} eq "reply") {
1089 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1283 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1090 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1284 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1091 1285
1092 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1286 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} }; 1287 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1094 my @link; 1288 my @link;
1095 $text =~ s{ 1289 $text =~ s{
1096 ($match) 1290 ($match)
1097 }{ 1291 }{

Diff Legend

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