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.97 by root, Fri Apr 6 08:09:43 2007 UTC vs.
Revision 1.124 by root, Fri Jul 20 16:32:04 2007 UTC

… …
15use Crossfire::Protocol::Base 0.95; 15use Crossfire::Protocol::Base 0.95;
16 16
17use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
18 18
19sub new { 19sub new {
20 my $class = shift; 20 my ($class, %arg) = @_;
21 21
22 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 );
23 30
24 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
25 32
26 my @cmd_help = map { 33 my @cmd_help = map {
27 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
41 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
42 @args 49 @args
43 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
44 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
45 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
46 $self->connect_ext (event_capabilities => sub { 107 $self->connect_ext (event_capabilities => sub {
47 my ($cap) = @_; 108 my ($cap) = @_;
48 109
49 if (my $ts = $cap->{tileset}) { 110 if (my $ts = $cap->{tileset}) {
50 if (my ($default) = grep $_->[2] & 1, @$ts) { 111 if (my ($default) = grep $_->[2] & 1, @$ts) {
… …
55 my $w = int $self->{mapw} * 32 / $self->{tilesize}; 116 my $w = int $self->{mapw} * 32 / $self->{tilesize};
56 my $h = int $self->{maph} * 32 / $self->{tilesize}; 117 my $h = int $self->{maph} * 32 / $self->{tilesize};
57 118
58 $self->setup_req (mapsize => "${w}x${h}"); 119 $self->setup_req (mapsize => "${w}x${h}");
59 } 120 }
121 }
122 });
123
124 $self->{json_coder}
125 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub {
127 $self->{widget}{$_[0]}
128 });
129
130 # widgetset new
131 $self->connect_ext (ws_n => sub {
132 my ($arg) = @_;
133
134 $self->{widgetset}{$arg{id}} = {
135 w => {},
136 };
137 });
138
139 # widgetset destroy
140 $self->connect_ext (ws_d => sub {
141 my ($arg) = @_;
142
143 my $ws = delete $self->{widgetset}{$arg{id}}
144 or return;
145
146 $_->destroy
147 for values %{$ws->{w}};
148 });
149
150 # widgetset destroy
151 $self->connect_ext (ws_c => sub {
152 my ($arg) = @_;
153
154 my $args = $arg->{args} || {};
155
156 for my $ev (grep /^on_/, keys %$args) {
157 $args->{$ev} = sub {
158 my $id = shift->{s_id};
159 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
160
161 1
162 };
163 }
164
165 if (my $widget = eval {
166 local $SIG{__DIE__};
167 "CFPlus::UI::$arg->{class}"->new (
168 %$args,
169 s_ws => $arg->{ws},
170 s_id => $arg->{id},
171 )
172 }
173 ) {
174 $self->{widget}{$arg->{id}}
175 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
176 = $widget;
177
178 $widget->connect (on_destroy => sub {
179 my ($widget) = @_;
180
181 delete $self->{widget}{$widget->{s_id}};
182 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
183 });
184 } else {
185 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
187 }
188 });
189
190 # widget call
191 $self->connect_ext (w_c => sub {
192 my ($arg) = @_;
193
194 my $w = $self->{widget}{$arg->{id}}
195 or return;
196 my $m = $arg->{name};
197
198 my $a = $arg->{args} || [];
199
200 if (exists $arg->{rid}) {
201 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
202 } else {
203 $w->$m (@$a);
204 }
205 });
206
207 # widget set
208 $self->connect_ext (w_s => sub {
209 my ($arg) = @_;
210
211 my $w = $self->{widget}{$arg->{id}}
212 or return;
213
214 $w->{$arg->{name}} = $arg->{value};
215 });
216
217 # widget get
218 $self->connect_ext (w_g => sub {
219 my ($arg) = @_;
220
221 my $w = $self->{widget}{$arg->{id}}
222 or return;
223
224 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
225 });
226
227 # destroy widgets on logout
228 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
229 for my $ws (values %{delete $self->{widgetset} || {}}) {
230 $_->destroy
231 for values %{delete $ws->{w} || {}};
60 } 232 }
61 }); 233 });
62 234
63 $self->{map_widget}->add_command (@$_) 235 $self->{map_widget}->add_command (@$_)
64 for @cmd_help; 236 for @cmd_help;
… …
243 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 415 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
244 $::GAUGES->{food} ->set_value ($fo, $fo_m); 416 $::GAUGES->{food} ->set_value ($fo, $fo_m);
245 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 417 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
246 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 418 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
247 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 419 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
248 my $rng = $stats->{+CS_STAT_RANGE}; 420 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
249 $rng =~ s/^Range: //; # thank you so much dear server
250 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
251 my $title = $stats->{+CS_STAT_TITLE}; 421 my $title = $stats->{+CS_STAT_TITLE};
252 $title =~ s/^Player: //; 422 $title =~ s/^Player: //;
253 $::STATWIDS->{title} ->set_text ("Title: " . $title); 423 $::STATWIDS->{title} ->set_text ("Title: " . $title);
254 424
255 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 425 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
275 my @skills = keys %{ $self->{skill_info} }; 445 my @skills = keys %{ $self->{skill_info} };
276 446
277 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 447 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
278 $sktbl->clear; 448 $sktbl->clear;
279 449
450 my @add;
451
452 push @add,
280 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 453 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
281 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 454 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
282 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 455 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
283 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 456 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
284 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 457 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
285 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 458 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
459 ;
286 460
287 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 461 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
288 462
289 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 463 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
290 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 464 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
318 } 492 }
319 493
320 1 494 1
321 }; 495 };
322 496
497 push @add,
323 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 498 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
324 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 499 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
325 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 500 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
326 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 501 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
327 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 502 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
328 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 503 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
504 ;
329 505
330 $x++ and ($x, $y) = (0, $y + 1); 506 $x++ and ($x, $y) = (0, $y + 1);
331 } 507 }
508
509 $sktbl->add_at (@add);
332 } 510 }
333 511
334 for (grep exists $stats->{$_}, @skills) { 512 for (grep exists $stats->{$_}, @skills) {
335 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 513 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
336 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 514 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
415 } while $self->{texture}[$id]; 593 } while $self->{texture}[$id];
416 594
417 CFPlus::DB::get tilecache => $id, sub { 595 CFPlus::DB::get tilecache => $id, sub {
418 my ($data) = @_; 596 my ($data) = @_;
419 597
598 return unless $self->{map}; # stop when destroyed
599
420 $self->set_texture ($id => $data) 600 $self->set_texture ($id => $data)
421 if defined $data; 601 if defined $data;
422 602
423 $self->bg_fetch; 603 $self->bg_fetch;
424 }; 604 };
425} 605}
426 606
427sub load_map($$$) { 607sub load_map($$$) {
428 my ($self, $hash, $x, $y) = @_; 608 my ($self, $hash, $x, $y) = @_;
429 609
610 my $gen = $self->{map_change_gen};
611
430 CFPlus::DB::get $self->{mapcache} => $hash, sub { 612 CFPlus::DB::get $self->{mapcache} => $hash, sub {
613 return unless $gen == $self->{map_change_gen};
614
431 my ($data) = @_; 615 my ($data) = @_;
432 616
433 if (defined $data) { 617 if (defined $data) {
434 $data = Compress::LZF::decompress $data; 618 $data = Compress::LZF::decompress $data;
435 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 619 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
436 620
437 my $inprogress = @{ $self->{bg_fetch} || [] }; 621 my $inprogress = @{ $self->{bg_fetch} || [] };
438 push @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 622 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
439 $self->bg_fetch unless $inprogress; 623 $self->bg_fetch unless $inprogress;
440 } 624 }
441 }; 625 };
442} 626}
443 627
… …
510 694
511 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 695 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
512 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 696 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
513 697
514 } else { 698 } else {
699 my $gen = $self->{map_change_gen};
515 $self->send_mapinfo ("spatial $path$tile", sub { 700 $self->send_mapinfo ("spatial $path$tile", sub {
701 return unless $gen == $self->{map_change_gen};
702
516 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 703 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
517 704
518 return if $mode ne "spatial"; 705 return if $mode ne "spatial";
519 706
520 $x += $self->{map}->ox; 707 $x += $self->{map}->ox;
… …
534 721
535sub map_change { 722sub map_change {
536 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 723 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
537 724
538 $self->flush_map; 725 $self->flush_map;
726
727 ++$self->{map_change_gen};
539 728
540 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 729 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
541 730
542 my $mapmapw = $self->{mapmap}->{w}; 731 my $mapmapw = $self->{mapmap}->{w};
543 my $mapmaph = $self->{mapmap}->{h}; 732 my $mapmaph = $self->{mapmap}->{h};
… …
583 if $changed; 772 if $changed;
584 773
585 $self->set_texture ($face->{id} => delete $face->{image}); 774 $self->set_texture ($face->{id} => delete $face->{image});
586} 775}
587 776
777sub smooth_update {
778 my ($self, $facenum, $face) = @_;
779
780 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
781}
782
588sub set_texture { 783sub set_texture {
589 my ($self, $id, $data) = @_; 784 my ($self, $id, $data) = @_;
590 785
786 return unless $self->{map};
787
591 $self->{texture}[$id] ||= do { 788 $self->{texture}[$id] = my $tex =
592 my $tex =
593 new_from_image CFPlus::Texture 789 new_from_image CFPlus::Texture
594 $data, minify => 1, mipmap => 1; 790 $data, minify => 1, mipmap => 1;
595 791
596 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 792 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
597 $self->{map_widget}->update; 793 $self->{map_widget}->update;
598 794
599 $tex 795 $_->() for @{(delete $self->{face_cb}{$id}) || []};
796}
797
798sub connect_face_update {
799 my ($self, $id, $cb) = @_;
800
801 push @{$self->{face_cb}{$id}}, $cb;
802
803 CFPlus::guard {
804 @{$self->{face_cb}{$id}}
805 = grep $_ != $cb,
806 @{$self->{face_cb}{$id}};
600 }; 807 }
601} 808}
602 809
603sub sound_play { 810sub sound_play {
604 my ($self, $x, $y, $soundnum, $type) = @_; 811 my ($self, $x, $y, $soundnum, $type) = @_;
605 812
… …
615 $LAST_QUERY = $prompt; 822 $LAST_QUERY = $prompt;
616 823
617 $self->{query}-> ($self, $flags, $prompt); 824 $self->{query}-> ($self, $flags, $prompt);
618} 825}
619 826
620sub drawinfo { 827sub sanitise_xml($) {
621 my ($self, $color, $text) = @_; 828 local $_ = shift;
622 829
623 my @color = ( 830 # we now weed out all tags we do not support
831 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
832 # now all entities
833 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
834
835 # handle some elements
836 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
837 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
838
839 $_
840}
841
842our %NAME_TO_COLOR = (
843 black => 0,
844 white => 1,
845 darkblue => 2,
846 red => 3,
847 orange => 4,
848 lightblue => 5,
849 darkorange => 6,
850 green => 7,
851 darkgreen => 8,
852 grey => 9,
853 brown => 10,
854 yellow => 11,
855 tan => 12,
856);
857
858our @CF_COLOR = (
624 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 859 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
625 [1.00, 1.00, 1.00], 860 [1.00, 1.00, 1.00],
626 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 861 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
627 [1.00, 0.00, 0.00], 862 [1.00, 0.00, 0.00],
628 [1.00, 0.54, 0.00], 863 [1.00, 0.54, 0.00],
629 [0.11, 0.56, 1.00], 864 [0.11, 0.56, 1.00],
630 [0.93, 0.46, 0.00], 865 [0.93, 0.46, 0.00],
631 [0.18, 0.54, 0.34], 866 [0.18, 0.54, 0.34],
632 [0.56, 0.73, 0.56], 867 [0.56, 0.73, 0.56],
633 [0.80, 0.80, 0.80], 868 [0.80, 0.80, 0.80],
634 [0.75, 0.61, 0.20], 869 [0.75, 0.61, 0.20],
635 [0.99, 0.77, 0.26], 870 [0.99, 0.77, 0.26],
636 [0.74, 0.65, 0.41], 871 [0.74, 0.65, 0.41],
637 ); 872);
638 873
639 my $fg = $color[$color % @color]; 874sub msg {
875 my ($self, $color, $type, $text, @extra) = @_;
640 876
877 $text = sanitise_xml $text;
878
879 if (my $cb = $self->{cb_msg}{$type}) {
880 $_->($self, $color, $type, $text, @extra) for values %$cb;
881 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
882 $type =~ s/-/_/g;
883 $self->{$type} = $text;
884 } else {
641 $self->logprint ("info: ", $text); 885 $self->logprint ("msg: ", $text);
886 return if $color < 0; # negative color == ignore if not understood
642 887
888 my $fg = $CF_COLOR[$color % @CF_COLOR];
889
643 # try to create single paragraphs of multiple lines sent by the server 890 ## try to create single paragraphs of multiple lines sent by the server
891 # no longer neecssary with TRT servers
644 $text =~ s/(?<=\S)\n(?=\w)/ /g; 892 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
645 893
646 $text = CFPlus::asxml $text;
647 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
648 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
649
650 ::message ({ fg => $fg, markup => $_ }) 894 ::message ({ fg => $fg, markup => $_ })
651 for split /\n/, $text; 895 for split /\n/, $text;
652 896
653 $self->{statusbox}->add ($text, 897 $self->{statusbox}->add ($text,
654 group => $text, 898 group => $text,
655 fg => $fg, 899 fg => $fg,
656 timeout => $color >= 2 ? 180 : 10, 900 timeout => $color >= 2 ? 180 : 10,
657 tooltip_font => $::FONT_FIXED, 901 tooltip_font => $::FONT_FIXED,
658 ); 902 );
659} 903 }
660
661sub drawextinfo {
662 my ($self, $color, $type, $subtype, $message) = @_;
663
664 $self->drawinfo ($color, $message);
665} 904}
666 905
667sub spell_add { 906sub spell_add {
668 my ($self, $spell) = @_; 907 my ($self, $spell) = @_;
669 908
… …
757 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 996 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
758 return unless $::CONN; 997 return unless $::CONN;
759 998
760 $::FLOORBOX->clear; 999 $::FLOORBOX->clear;
761 1000
1001 my @add;
1002
762 my $row; 1003 my $row;
763 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1004 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
764 if ($row < 6) { 1005 if ($row < 6) {
765 local $_->{face_widget}; # hack to force recreation of widget 1006 local $_->{face_widget}; # hack to force recreation of widget
766 local $_->{desc_widget}; # hack to force recreation of widget 1007 local $_->{desc_widget}; # hack to force recreation of widget
767 CFPlus::Item::update_widgets $_; 1008 CFPlus::Item::update_widgets $_;
768 1009
1010 push @add,
769 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1011 0, $row, $_->{face_widget},
770 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1012 1, $row, $_->{desc_widget};
771 1013
772 $row++; 1014 $row++;
773 } else { 1015 } else {
774 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1016 push @add, 1, $row, new CFPlus::UI::Button
775 text => "More...", 1017 text => "More...",
776 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1018 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
777 ); 1019 ;
778 last; 1020 last;
779 } 1021 }
780 } 1022 }
781 if ($::CONN->{open_container}) { 1023 if ($::CONN->{open_container}) {
782 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1024 push @add, 1, $row++, new CFPlus::UI::Button
783 text => "Close container", 1025 text => "Close container",
784 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1026 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
785 ); 1027 ;
786 } 1028 }
1029
1030 $::FLOORBOX->add_at (@add);
787 }); 1031 });
788 1032
789 $::WANT_REFRESH++; 1033 $::WANT_REFRESH++;
790} 1034}
791 1035
… …
902 $::SERVER_INFO->set_markup ( 1146 $::SERVER_INFO->set_markup (
903 "server <tt>$self->{host}:$self->{port}</tt>\n" 1147 "server <tt>$self->{host}:$self->{port}</tt>\n"
904 . "protocol version <tt>$self->{version}</tt>\n" 1148 . "protocol version <tt>$self->{version}</tt>\n"
905 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1149 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
906 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1150 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1151 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
907 . "editing support $yesno[!!$self->{editor_support}]\n" 1152 . "editing support $yesno[!!$self->{editor_support}]\n"
908 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1153 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1154 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
909 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1155 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
910 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1156 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
911 . "map size $self->{mapw}×$self->{maph}\n" 1157 . "map size $self->{mapw}×$self->{maph}\n"
912 ); 1158 );
913 1159
… …
976 1222
977 (delete $self->{npc_dialog})->destroy 1223 (delete $self->{npc_dialog})->destroy
978 if $self->{npc_dialog}; 1224 if $self->{npc_dialog};
979 1225
980 $self->SUPER::destroy; 1226 $self->SUPER::destroy;
1227
1228 %$self = ();
981} 1229}
982 1230
983package CFPlus::NPCDialog; 1231package CFPlus::NPCDialog;
984 1232
985our @ISA = 'CFPlus::UI::Toplevel'; 1233our @ISA = 'CFPlus::UI::Toplevel';
… …
1076 1324
1077 if ($msg->{msgtype} eq "reply") { 1325 if ($msg->{msgtype} eq "reply") {
1078 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1326 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1079 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1327 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1080 1328
1081 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1329 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1082 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1330 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1083 my @link; 1331 my @link;
1084 $text =~ s{ 1332 $text =~ s{
1085 ($match) 1333 ($match)
1086 }{ 1334 }{

Diff Legend

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