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.94 by root, Fri Mar 16 02:33:49 2007 UTC vs.
Revision 1.120 by root, Sat Jul 14 13:04:42 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 } else {
80 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
81 $self->ask_face ($face, -100 - $pri, undef, sub {
82 my $len = length $_[1];
83 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
84
85 CFPlus::DB::write_file $path, $data, sub {
86 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
87 my $meta = $self->{json_coder}->decode ($meta_json);
88 $meta->{path} = $path;
89 $self->{music_meta}{$chksum} = $meta;
90
91 ::message ({ markup => "downloaded song #$face, size $len octets" });
92 &::audio_music_set ($self->{songs});
93 };
94 };
95 });
96 }
97 }
98 }
99 }
100
101 if (my $play = $ev->{play}) {
102 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
103 }
104 });
105
106 $self->connect_ext (event_capabilities => sub {
107 my ($cap) = @_;
108
109 if (my $ts = $cap->{tileset}) {
110 if (my ($default) = grep $_->[2] & 1, @$ts) {
111 $self->{tileset} = $default;
112 $self->{tilesize} = $default->[3];
113 $self->setup_req (tileset => $default->[0]);
114
115 my $w = int $self->{mapw} * 32 / $self->{tilesize};
116 my $h = int $self->{maph} * 32 / $self->{tilesize};
117
118 $self->setup_req (mapsize => "${w}x${h}");
119 }
120 }
121 });
122
123 $self->{json_coder}
124 ->convert_blessed
125 ->filter_json_single_key_object (__widget_ref__ => sub {
126 $self->{widget}{$_[0]}
127 });
128
129 $self->connect_ext (ws_n => sub {
130 my ($arg) = @_;
131
132 $self->{widgetset}{$arg{id}} = {
133 w => {},
134 };
135 });
136
137 $self->connect_ext (ws_d => sub {
138 my ($arg) = @_;
139
140 my $ws = delete $self->{widgetset}{$arg{id}}
141 or return;
142
143 $_->destroy
144 for values %{$ws->{w}};
145 });
146
147 $self->connect_ext (ws_c => sub {
148 my ($arg) = @_;
149
150 my $args = $arg->{args} || {};
151
152 for my $ev (grep /^on_/, keys %$args) {
153 $args->{$ev} = sub {
154 my $id = shift->{s_id};
155 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
156
157 1
158 };
159 }
160
161 if (my $widget = eval {
162 local $SIG{__DIE__};
163 "CFPlus::UI::$arg->{class}"->new (
164 %$args,
165 s_ws => $arg->{ws},
166 s_id => $arg->{id},
167 )
168 }
169 ) {
170 $self->{widget}{$arg->{id}}
171 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
172 = $widget;
173
174 $widget->connect (on_destroy => sub {
175 my ($widget) = @_;
176
177 delete $self->{widget}{$widget->{s_id}};
178 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
179 });
180 } else {
181 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
182 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
183 }
184 });
185
186 $self->connect_ext (w_c => sub {
187 my ($arg) = @_;
188
189 my $w = $self->{widget}{$arg->{id}}
190 or return;
191 my $m = $arg->{name};
192
193 my $a = $arg->{args} || [];
194
195 if (exists $arg->{rid}) {
196 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
197 } else {
198 $w->$m (@$a);
199 }
200 });
201
202 $self->connect_ext (w_s => sub {
203 my ($arg) = @_;
204
205 my $w = $self->{widget}{$arg->{id}}
206 or return;
207
208 $w->{$arg->{name}} = $arg->{value};
209 });
210
211 $self->connect_ext (w_g => sub {
212 my ($arg) = @_;
213
214 my $w = $self->{widget}{$arg->{id}}
215 or return;
216
217 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
218 });
219
220 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
221 for my $ws (values %{delete $self->{widgetset} || {}}) {
222 $_->destroy
223 for values %{delete $ws->{w} || {}};
224 }
225 });
226
45 $self->{map_widget}->add_command (@$_) 227 $self->{map_widget}->add_command (@$_)
46 for @cmd_help; 228 for @cmd_help;
47
48 $self->{noface} = new_from_file CFPlus::Texture
49 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
50 229
51 { 230 {
52 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 231 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
53 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 232 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
54 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 233 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
55 } 234 }
56 235
236 {
237 $self->{noface} = my $tex = new_from_file CFPlus::Texture
238 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
239 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
240 }
241
57 $self->{open_container} = 0; 242 $self->{open_container} = 0;
58 243
59 # "global"
60 $self->{tilecache} = CFPlus::db_table "tilecache"
61 or die "tilecache: unable to open database table";
62 $self->{facemap} = CFPlus::db_table "facemap"
63 or die "facemap: unable to open database table";
64
65 # per server 244 # per server
66 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 245 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
67 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
68 246
69 $self 247 $self
70} 248}
71 249
72sub logprint { 250sub logprint {
… …
229 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 407 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
230 $::GAUGES->{food} ->set_value ($fo, $fo_m); 408 $::GAUGES->{food} ->set_value ($fo, $fo_m);
231 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 409 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
232 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 410 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
233 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 411 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
234 my $rng = $stats->{+CS_STAT_RANGE}; 412 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
235 $rng =~ s/^Range: //; # thank you so much dear server
236 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
237 my $title = $stats->{+CS_STAT_TITLE}; 413 my $title = $stats->{+CS_STAT_TITLE};
238 $title =~ s/^Player: //; 414 $title =~ s/^Player: //;
239 $::STATWIDS->{title} ->set_text ("Title: " . $title); 415 $::STATWIDS->{title} ->set_text ("Title: " . $title);
240 416
241 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 417 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
374 or return; 550 or return;
375 551
376 my ($hash, $x, $y, $w, $h) = @$map_info; 552 my ($hash, $x, $y, $w, $h) = @$map_info;
377 553
378 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 554 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
379 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 555 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
380 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 556 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
381} 557}
382 558
383sub map_clear { 559sub map_clear {
384 my ($self) = @_; 560 my ($self) = @_;
… …
388 564
389 $self->{map}->clear; 565 $self->{map}->clear;
390 delete $self->{map_widget}{magicmap}; 566 delete $self->{map_widget}{magicmap};
391} 567}
392 568
569sub bg_fetch {
570 my ($self) = @_;
571
572 my $id;
573
574 do {
575 $id = pop @{$self->{bg_fetch}}
576 or return;
577 } while $self->{texture}[$id];
578
579 CFPlus::DB::get tilecache => $id, sub {
580 my ($data) = @_;
581
582 return unless $self->{map}; # stop when destroyed
583
584 $self->set_texture ($id => $data)
585 if defined $data;
586
587 $self->bg_fetch;
588 };
589}
393 590
394sub load_map($$$) { 591sub load_map($$$) {
395 my ($self, $hash, $x, $y) = @_; 592 my ($self, $hash, $x, $y) = @_;
396 593
397 if (defined (my $data = $self->{mapcache}->get ($hash))) { 594 my $gen = $self->{map_change_gen};
595
596 CFPlus::DB::get $self->{mapcache} => $hash, sub {
597 return unless $gen == $self->{map_change_gen};
598
599 my ($data) = @_;
600
601 if (defined $data) {
398 $data = Compress::LZF::decompress $data; 602 $data = Compress::LZF::decompress $data;
399 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 603 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
400 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
401 my $data = $self->{tilecache}->get ($id)
402 or next;
403 604
404 $self->set_texture ($id => $data); 605 my $inprogress = @{ $self->{bg_fetch} || [] };
606 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
607 $self->bg_fetch unless $inprogress;
405 } 608 }
406 } 609 };
407} 610}
408 611
409# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 612# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
410# (server resource,s latency, bandwidth), so this hack is warranted. 613# (server resource,s latency, bandwidth), so this hack is warranted.
411# the right fix is to make real tiled maps with an overview file 614# the right fix is to make real tiled maps with an overview file
… …
475 678
476 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 679 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
477 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 680 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
478 681
479 } else { 682 } else {
683 my $gen = $self->{map_change_gen};
480 $self->send_mapinfo ("spatial $path$tile", sub { 684 $self->send_mapinfo ("spatial $path$tile", sub {
685 return unless $gen == $self->{map_change_gen};
686
481 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 687 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
482 688
483 return if $mode ne "spatial"; 689 return if $mode ne "spatial";
484 690
485 $x += $self->{map}->ox; 691 $x += $self->{map}->ox;
… …
499 705
500sub map_change { 706sub map_change {
501 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 707 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
502 708
503 $self->flush_map; 709 $self->flush_map;
710
711 ++$self->{map_change_gen};
504 712
505 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 713 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
506 714
507 my $mapmapw = $self->{mapmap}->{w}; 715 my $mapmapw = $self->{mapmap}->{w};
508 my $mapmaph = $self->{mapmap}->{h}; 716 my $mapmaph = $self->{mapmap}->{h};
… …
525 $self->load_map ($hash, $x, $y); 733 $self->load_map ($hash, $x, $y);
526 $self->flood_fill (0, 0, 0, "", $hash, $flags); 734 $self->flood_fill (0, 0, 0, "", $hash, $flags);
527} 735}
528 736
529sub face_find { 737sub face_find {
530 my ($self, $facenum, $face) = @_; 738 my ($self, $facenum, $face, $cb) = @_;
531 739
532 my $hash = "$face->{chksum},$face->{name}"; 740 my $hash = "$face->{chksum},$face->{name}";
533 741
534 my $id = $self->{facemap}->get ($hash); 742 my $id = CFPlus::DB::get_tile_id_sync $hash;
535 743
536 unless ($id) {
537 # create new id for face
538 # I love transactions
539 for (1..100) {
540 my $txn = $CFPlus::DB_ENV->txn_begin;
541 my $status = $self->{facemap}->db_get (id => $id);
542 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
543 $id = ($id || 64) + 1;
544 if ($self->{facemap}->put (id => $id) == 0
545 && $self->{facemap}->put ($hash => $id) == 0) {
546 $txn->txn_commit;
547
548 goto gotid;
549 }
550 }
551 $txn->txn_abort;
552 }
553
554 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
555 }
556
557gotid:
558 $face->{id} = $id; 744 $face->{id} = $id;
559 $self->{map}->set_face ($facenum => $id);
560 $self->{faceid}[$facenum] = $id;#d# 745 $self->{faceid}[$facenum] = $id;
561 746
562 my $face = $self->{tilecache}->get ($id); 747 $self->{map}->set_tileid ($facenum => $id);
563 748
564 if ($face) { 749 CFPlus::DB::get tilecache => $id, $cb;
565 #$self->face_prefetch;
566 $face
567 } else {
568 my $tex = $self->{noface};
569 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
570 undef
571 };
572} 750}
573 751
574sub face_update { 752sub face_update {
575 my ($self, $facenum, $face, $changed) = @_; 753 my ($self, $facenum, $face, $changed) = @_;
576 754
577 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 755 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
756 if $changed;
578 757
579 $self->set_texture ($face->{id} => delete $face->{image}); 758 $self->set_texture ($face->{id} => delete $face->{image});
759}
760
761sub smooth_update {
762 my ($self, $facenum, $face) = @_;
763
764 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
580} 765}
581 766
582sub set_texture { 767sub set_texture {
583 my ($self, $id, $data) = @_; 768 my ($self, $id, $data) = @_;
584 769
770 return unless $self->{map};
771
585 $self->{texture}[$id] ||= do { 772 $self->{texture}[$id] = my $tex =
586 my $tex =
587 new_from_image CFPlus::Texture 773 new_from_image CFPlus::Texture
588 $data, minify => 1, mipmap => 1; 774 $data, minify => 1, mipmap => 1;
589 775
590 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 776 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
591 $self->{map_widget}->update; 777 $self->{map_widget}->update;
592
593 $tex
594 };
595} 778}
596 779
597sub sound_play { 780sub sound_play {
598 my ($self, $x, $y, $soundnum, $type) = @_; 781 my ($self, $x, $y, $soundnum, $type) = @_;
599 782
… …
609 $LAST_QUERY = $prompt; 792 $LAST_QUERY = $prompt;
610 793
611 $self->{query}-> ($self, $flags, $prompt); 794 $self->{query}-> ($self, $flags, $prompt);
612} 795}
613 796
614sub drawinfo { 797sub sanitise_xml($) {
615 my ($self, $color, $text) = @_; 798 local $_ = shift;
616 799
617 my @color = ( 800 # we now weed out all tags we do not support
801 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
802 # now all entities
803 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
804
805 # handle some elements
806 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
807 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
808
809 $_
810}
811
812our %NAME_TO_COLOR = (
813 black => 0,
814 white => 1,
815 darkblue => 2,
816 red => 3,
817 orange => 4,
818 lightblue => 5,
819 darkorange => 6,
820 green => 7,
821 darkgreen => 8,
822 grey => 9,
823 brown => 10,
824 yellow => 11,
825 tan => 12,
826);
827
828our @CF_COLOR = (
618 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 829 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
619 [1.00, 1.00, 1.00], 830 [1.00, 1.00, 1.00],
620 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 831 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
621 [1.00, 0.00, 0.00], 832 [1.00, 0.00, 0.00],
622 [1.00, 0.54, 0.00], 833 [1.00, 0.54, 0.00],
623 [0.11, 0.56, 1.00], 834 [0.11, 0.56, 1.00],
624 [0.93, 0.46, 0.00], 835 [0.93, 0.46, 0.00],
625 [0.18, 0.54, 0.34], 836 [0.18, 0.54, 0.34],
626 [0.56, 0.73, 0.56], 837 [0.56, 0.73, 0.56],
627 [0.80, 0.80, 0.80], 838 [0.80, 0.80, 0.80],
628 [0.75, 0.61, 0.20], 839 [0.75, 0.61, 0.20],
629 [0.99, 0.77, 0.26], 840 [0.99, 0.77, 0.26],
630 [0.74, 0.65, 0.41], 841 [0.74, 0.65, 0.41],
631 ); 842);
632 843
633 my $fg = $color[$color % @color]; 844sub msg {
845 my ($self, $color, $type, $text, @extra) = @_;
634 846
847 $text = sanitise_xml $text;
848
849 if (my $cb = $self->{cb_msg}{$type}) {
850 $_->($self, $color, $type, $text, @extra) for values %$cb;
851 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
852 $type =~ s/-/_/g;
853 $self->{$type} = $text;
854 } else {
635 $self->logprint ("info: ", $text); 855 $self->logprint ("msg: ", $text);
856 return if $color < 0; # negative color == ignore if not understood
636 857
858 my $fg = $CF_COLOR[$color % @CF_COLOR];
859
637 # try to create single paragraphs of multiple lines sent by the server 860 ## try to create single paragraphs of multiple lines sent by the server
861 # no longer neecssary with TRT servers
638 $text =~ s/(?<=\S)\n(?=\w)/ /g; 862 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
639 863
640 $text = CFPlus::asxml $text;
641 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
642 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
643
644 ::message ({ fg => $fg, markup => $_ }) 864 ::message ({ fg => $fg, markup => $_ })
645 for split /\n/, $text; 865 for split /\n/, $text;
646 866
647 $self->{statusbox}->add ($text, 867 $self->{statusbox}->add ($text,
648 group => $text, 868 group => $text,
649 fg => $fg, 869 fg => $fg,
650 timeout => $color >= 2 ? 180 : 10, 870 timeout => $color >= 2 ? 180 : 10,
651 tooltip_font => $::FONT_FIXED, 871 tooltip_font => $::FONT_FIXED,
652 ); 872 );
653} 873 }
654
655sub drawextinfo {
656 my ($self, $color, $type, $subtype, $message) = @_;
657
658 $self->drawinfo ($color, $message);
659} 874}
660 875
661sub spell_add { 876sub spell_add {
662 my ($self, $spell) = @_; 877 my ($self, $spell) = @_;
663 878
… …
679} 894}
680 895
681sub setup { 896sub setup {
682 my ($self, $setup) = @_; 897 my ($self, $setup) = @_;
683 898
899 $self->{map_widget}->set_tilesize ($self->{tilesize});
684 $::MAP->resize ($self->{mapw}, $self->{maph}); 900 $::MAP->resize ($self->{mapw}, $self->{maph});
685} 901}
686 902
687sub addme_success { 903sub addme_success {
688 my ($self) = @_; 904 my ($self) = @_;
… …
895 $::SERVER_INFO->set_markup ( 1111 $::SERVER_INFO->set_markup (
896 "server <tt>$self->{host}:$self->{port}</tt>\n" 1112 "server <tt>$self->{host}:$self->{port}</tt>\n"
897 . "protocol version <tt>$self->{version}</tt>\n" 1113 . "protocol version <tt>$self->{version}</tt>\n"
898 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1114 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
899 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1115 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1116 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
900 . "editing support $yesno[!!$self->{editor_support}]\n" 1117 . "editing support $yesno[!!$self->{editor_support}]\n"
901 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1118 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1119 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
902 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1120 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
903 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1121 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
904 . "map size $self->{mapw}×$self->{maph}\n" 1122 . "map size $self->{mapw}×$self->{maph}\n"
905 ); 1123 );
906 1124
… …
969 1187
970 (delete $self->{npc_dialog})->destroy 1188 (delete $self->{npc_dialog})->destroy
971 if $self->{npc_dialog}; 1189 if $self->{npc_dialog};
972 1190
973 $self->SUPER::destroy; 1191 $self->SUPER::destroy;
1192
1193 %$self = ();
974} 1194}
975 1195
976package CFPlus::NPCDialog; 1196package CFPlus::NPCDialog;
977 1197
978our @ISA = 'CFPlus::UI::Toplevel'; 1198our @ISA = 'CFPlus::UI::Toplevel';
… …
1069 1289
1070 if ($msg->{msgtype} eq "reply") { 1290 if ($msg->{msgtype} eq "reply") {
1071 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1291 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1072 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1292 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1073 1293
1074 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1294 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1075 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1295 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1076 my @link; 1296 my @link;
1077 $text =~ s{ 1297 $text =~ s{
1078 ($match) 1298 ($match)
1079 }{ 1299 }{

Diff Legend

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