| … | |
… | |
| 15 | use Crossfire::Protocol::Base 0.95; |
15 | use Crossfire::Protocol::Base 0.95; |
| 16 | |
16 | |
| 17 | use base 'Crossfire::Protocol::Base'; |
17 | use base 'Crossfire::Protocol::Base'; |
| 18 | |
18 | |
| 19 | sub new { |
19 | sub 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 | $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} || {}}; |
| 60 | } |
225 | } |
| 61 | }); |
226 | }); |
| 62 | |
227 | |
| 63 | $self->{map_widget}->add_command (@$_) |
228 | $self->{map_widget}->add_command (@$_) |
| 64 | for @cmd_help; |
229 | for @cmd_help; |
| … | |
… | |
| 243 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
408 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
| 244 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
409 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
| 245 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
410 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
| 246 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
411 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
| 247 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
412 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
| 248 | my $rng = $stats->{+CS_STAT_RANGE}; |
413 | $::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}; |
414 | my $title = $stats->{+CS_STAT_TITLE}; |
| 252 | $title =~ s/^Player: //; |
415 | $title =~ s/^Player: //; |
| 253 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
416 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
| 254 | |
417 | |
| 255 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
418 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
| … | |
… | |
| 402 | |
565 | |
| 403 | $self->{map}->clear; |
566 | $self->{map}->clear; |
| 404 | delete $self->{map_widget}{magicmap}; |
567 | delete $self->{map_widget}{magicmap}; |
| 405 | } |
568 | } |
| 406 | |
569 | |
|
|
570 | sub 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 | } |
| 407 | |
591 | |
| 408 | sub load_map($$$) { |
592 | sub load_map($$$) { |
| 409 | my ($self, $hash, $x, $y) = @_; |
593 | my ($self, $hash, $x, $y) = @_; |
| 410 | |
594 | |
|
|
595 | my $gen = $self->{map_change_gen}; |
|
|
596 | |
| 411 | CFPlus::DB::get $self->{mapcache} => $hash, sub { |
597 | CFPlus::DB::get $self->{mapcache} => $hash, sub { |
|
|
598 | return unless $gen == $self->{map_change_gen}; |
|
|
599 | |
| 412 | my ($data) = @_; |
600 | my ($data) = @_; |
| 413 | |
601 | |
| 414 | if (defined $data) { |
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 | CFPlus::DB::get tilecache => $id, sub { |
|
|
| 419 | my ($data) = @_; |
|
|
| 420 | |
605 | |
| 421 | $self->set_texture ($id => $data) |
606 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
| 422 | if defined $data; |
607 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
| 423 | }; |
608 | $self->bg_fetch unless $inprogress; |
| 424 | } |
|
|
| 425 | } |
609 | } |
| 426 | }; |
610 | }; |
| 427 | } |
611 | } |
| 428 | |
612 | |
| 429 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
613 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
| … | |
… | |
| 495 | |
679 | |
| 496 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
680 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
| 497 | if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; |
681 | if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; |
| 498 | |
682 | |
| 499 | } else { |
683 | } else { |
|
|
684 | my $gen = $self->{map_change_gen}; |
| 500 | $self->send_mapinfo ("spatial $path$tile", sub { |
685 | $self->send_mapinfo ("spatial $path$tile", sub { |
|
|
686 | return unless $gen == $self->{map_change_gen}; |
|
|
687 | |
| 501 | my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; |
688 | my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; |
| 502 | |
689 | |
| 503 | return if $mode ne "spatial"; |
690 | return if $mode ne "spatial"; |
| 504 | |
691 | |
| 505 | $x += $self->{map}->ox; |
692 | $x += $self->{map}->ox; |
| … | |
… | |
| 519 | |
706 | |
| 520 | sub map_change { |
707 | sub map_change { |
| 521 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
708 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
| 522 | |
709 | |
| 523 | $self->flush_map; |
710 | $self->flush_map; |
|
|
711 | |
|
|
712 | ++$self->{map_change_gen}; |
| 524 | |
713 | |
| 525 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
714 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
| 526 | |
715 | |
| 527 | my $mapmapw = $self->{mapmap}->{w}; |
716 | my $mapmapw = $self->{mapmap}->{w}; |
| 528 | my $mapmaph = $self->{mapmap}->{h}; |
717 | my $mapmaph = $self->{mapmap}->{h}; |
| … | |
… | |
| 568 | if $changed; |
757 | if $changed; |
| 569 | |
758 | |
| 570 | $self->set_texture ($face->{id} => delete $face->{image}); |
759 | $self->set_texture ($face->{id} => delete $face->{image}); |
| 571 | } |
760 | } |
| 572 | |
761 | |
|
|
762 | sub smooth_update { |
|
|
763 | my ($self, $facenum, $face) = @_; |
|
|
764 | |
|
|
765 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
|
|
766 | } |
|
|
767 | |
| 573 | sub set_texture { |
768 | sub set_texture { |
| 574 | my ($self, $id, $data) = @_; |
769 | my ($self, $id, $data) = @_; |
| 575 | |
770 | |
|
|
771 | return unless $self->{map}; |
|
|
772 | |
| 576 | $self->{texture}[$id] ||= do { |
773 | $self->{texture}[$id] = my $tex = |
| 577 | my $tex = |
|
|
| 578 | new_from_image CFPlus::Texture |
774 | new_from_image CFPlus::Texture |
| 579 | $data, minify => 1, mipmap => 1; |
775 | $data, minify => 1, mipmap => 1; |
| 580 | |
776 | |
| 581 | $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}}); |
| 582 | $self->{map_widget}->update; |
778 | $self->{map_widget}->update; |
| 583 | |
779 | |
| 584 | $tex |
780 | $_->() for @{(delete $self->{face_cb}{$id}) || []}; |
|
|
781 | } |
|
|
782 | |
|
|
783 | sub 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}}; |
| 585 | }; |
792 | } |
| 586 | } |
793 | } |
| 587 | |
794 | |
| 588 | sub sound_play { |
795 | sub sound_play { |
| 589 | my ($self, $x, $y, $soundnum, $type) = @_; |
796 | my ($self, $x, $y, $soundnum, $type) = @_; |
| 590 | |
797 | |
| … | |
… | |
| 600 | $LAST_QUERY = $prompt; |
807 | $LAST_QUERY = $prompt; |
| 601 | |
808 | |
| 602 | $self->{query}-> ($self, $flags, $prompt); |
809 | $self->{query}-> ($self, $flags, $prompt); |
| 603 | } |
810 | } |
| 604 | |
811 | |
| 605 | sub drawinfo { |
812 | sub sanitise_xml($) { |
| 606 | my ($self, $color, $text) = @_; |
813 | local $_ = shift; |
| 607 | |
814 | |
| 608 | my @color = ( |
815 | # we now weed out all tags we do not support |
|
|
816 | s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; |
|
|
817 | # now all entities |
|
|
818 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/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 | |
|
|
827 | our %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 | |
|
|
843 | our @CF_COLOR = ( |
| 609 | [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], |
| 610 | [1.00, 1.00, 1.00], |
845 | [1.00, 1.00, 1.00], |
| 611 | [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] |
| 612 | [1.00, 0.00, 0.00], |
847 | [1.00, 0.00, 0.00], |
| 613 | [1.00, 0.54, 0.00], |
848 | [1.00, 0.54, 0.00], |
| 614 | [0.11, 0.56, 1.00], |
849 | [0.11, 0.56, 1.00], |
| 615 | [0.93, 0.46, 0.00], |
850 | [0.93, 0.46, 0.00], |
| 616 | [0.18, 0.54, 0.34], |
851 | [0.18, 0.54, 0.34], |
| 617 | [0.56, 0.73, 0.56], |
852 | [0.56, 0.73, 0.56], |
| 618 | [0.80, 0.80, 0.80], |
853 | [0.80, 0.80, 0.80], |
| 619 | [0.75, 0.61, 0.20], |
854 | [0.75, 0.61, 0.20], |
| 620 | [0.99, 0.77, 0.26], |
855 | [0.99, 0.77, 0.26], |
| 621 | [0.74, 0.65, 0.41], |
856 | [0.74, 0.65, 0.41], |
| 622 | ); |
857 | ); |
| 623 | |
858 | |
| 624 | my $fg = $color[$color % @color]; |
859 | sub msg { |
|
|
860 | my ($self, $color, $type, $text, @extra) = @_; |
| 625 | |
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 { |
| 626 | $self->logprint ("info: ", $text); |
870 | $self->logprint ("msg: ", $text); |
|
|
871 | return if $color < 0; # negative color == ignore if not understood |
| 627 | |
872 | |
|
|
873 | my $fg = $CF_COLOR[$color % @CF_COLOR]; |
|
|
874 | |
| 628 | # 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 |
| 629 | $text =~ s/(?<=\S)\n(?=\w)/ /g; |
877 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
| 630 | |
878 | |
| 631 | $text = CFPlus::asxml $text; |
|
|
| 632 | $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; |
|
|
| 633 | $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; |
|
|
| 634 | |
|
|
| 635 | ::message ({ fg => $fg, markup => $_ }) |
879 | ::message ({ fg => $fg, markup => $_ }) |
| 636 | for split /\n/, $text; |
880 | for split /\n/, $text; |
| 637 | |
881 | |
| 638 | $self->{statusbox}->add ($text, |
882 | $self->{statusbox}->add ($text, |
| 639 | group => $text, |
883 | group => $text, |
| 640 | fg => $fg, |
884 | fg => $fg, |
| 641 | timeout => $color >= 2 ? 180 : 10, |
885 | timeout => $color >= 2 ? 180 : 10, |
| 642 | tooltip_font => $::FONT_FIXED, |
886 | tooltip_font => $::FONT_FIXED, |
| 643 | ); |
887 | ); |
| 644 | } |
888 | } |
| 645 | |
|
|
| 646 | sub drawextinfo { |
|
|
| 647 | my ($self, $color, $type, $subtype, $message) = @_; |
|
|
| 648 | |
|
|
| 649 | $self->drawinfo ($color, $message); |
|
|
| 650 | } |
889 | } |
| 651 | |
890 | |
| 652 | sub spell_add { |
891 | sub spell_add { |
| 653 | my ($self, $spell) = @_; |
892 | my ($self, $spell) = @_; |
| 654 | |
893 | |
| … | |
… | |
| 887 | $::SERVER_INFO->set_markup ( |
1126 | $::SERVER_INFO->set_markup ( |
| 888 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
1127 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
| 889 | . "protocol version <tt>$self->{version}</tt>\n" |
1128 | . "protocol version <tt>$self->{version}</tt>\n" |
| 890 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
1129 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
| 891 | . "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" |
| 892 | . "editing support $yesno[!!$self->{editor_support}]\n" |
1132 | . "editing support $yesno[!!$self->{editor_support}]\n" |
| 893 | . "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" |
| 894 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1135 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
| 895 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1136 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
| 896 | . "map size $self->{mapw}×$self->{maph}\n" |
1137 | . "map size $self->{mapw}×$self->{maph}\n" |
| 897 | ); |
1138 | ); |
| 898 | |
1139 | |
| … | |
… | |
| 961 | |
1202 | |
| 962 | (delete $self->{npc_dialog})->destroy |
1203 | (delete $self->{npc_dialog})->destroy |
| 963 | if $self->{npc_dialog}; |
1204 | if $self->{npc_dialog}; |
| 964 | |
1205 | |
| 965 | $self->SUPER::destroy; |
1206 | $self->SUPER::destroy; |
|
|
1207 | |
|
|
1208 | %$self = (); |
| 966 | } |
1209 | } |
| 967 | |
1210 | |
| 968 | package CFPlus::NPCDialog; |
1211 | package CFPlus::NPCDialog; |
| 969 | |
1212 | |
| 970 | our @ISA = 'CFPlus::UI::Toplevel'; |
1213 | our @ISA = 'CFPlus::UI::Toplevel'; |
| … | |
… | |
| 1061 | |
1304 | |
| 1062 | if ($msg->{msgtype} eq "reply") { |
1305 | if ($msg->{msgtype} eq "reply") { |
| 1063 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
1306 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
| 1064 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
1307 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
| 1065 | |
1308 | |
| 1066 | my $text = "\n" . CFPlus::asxml $msg->{msg}; |
1309 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg}; |
| 1067 | 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} }; |
| 1068 | my @link; |
1311 | my @link; |
| 1069 | $text =~ s{ |
1312 | $text =~ s{ |
| 1070 | ($match) |
1313 | ($match) |
| 1071 | }{ |
1314 | }{ |
