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

Diff Legend

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