| … | |
… | |
| 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 | # 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}); |
| … | |
… | |
| 415 | } while $self->{texture}[$id]; |
585 | } while $self->{texture}[$id]; |
| 416 | |
586 | |
| 417 | CFPlus::DB::get tilecache => $id, sub { |
587 | CFPlus::DB::get tilecache => $id, sub { |
| 418 | my ($data) = @_; |
588 | my ($data) = @_; |
| 419 | |
589 | |
|
|
590 | return unless $self->{map}; # stop when destroyed |
|
|
591 | |
| 420 | $self->set_texture ($id => $data) |
592 | $self->set_texture ($id => $data) |
| 421 | if defined $data; |
593 | if defined $data; |
| 422 | |
594 | |
| 423 | $self->bg_fetch; |
595 | $self->bg_fetch; |
| 424 | }; |
596 | }; |
| 425 | } |
597 | } |
| 426 | |
598 | |
| 427 | sub load_map($$$) { |
599 | sub load_map($$$) { |
| 428 | my ($self, $hash, $x, $y) = @_; |
600 | my ($self, $hash, $x, $y) = @_; |
| 429 | |
601 | |
|
|
602 | my $gen = $self->{map_change_gen}; |
|
|
603 | |
| 430 | CFPlus::DB::get $self->{mapcache} => $hash, sub { |
604 | CFPlus::DB::get $self->{mapcache} => $hash, sub { |
|
|
605 | return unless $gen == $self->{map_change_gen}; |
|
|
606 | |
| 431 | my ($data) = @_; |
607 | my ($data) = @_; |
| 432 | |
608 | |
| 433 | if (defined $data) { |
609 | if (defined $data) { |
| 434 | $data = Compress::LZF::decompress $data; |
610 | $data = Compress::LZF::decompress $data; |
| 435 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
611 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
| 436 | |
612 | |
| 437 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
613 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
| 438 | push @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
614 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
| 439 | $self->bg_fetch unless $inprogress; |
615 | $self->bg_fetch unless $inprogress; |
| 440 | } |
616 | } |
| 441 | }; |
617 | }; |
| 442 | } |
618 | } |
| 443 | |
619 | |
| … | |
… | |
| 510 | |
686 | |
| 511 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
687 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
| 512 | if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; |
688 | if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; |
| 513 | |
689 | |
| 514 | } else { |
690 | } else { |
|
|
691 | my $gen = $self->{map_change_gen}; |
| 515 | $self->send_mapinfo ("spatial $path$tile", sub { |
692 | $self->send_mapinfo ("spatial $path$tile", sub { |
|
|
693 | return unless $gen == $self->{map_change_gen}; |
|
|
694 | |
| 516 | my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; |
695 | my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; |
| 517 | |
696 | |
| 518 | return if $mode ne "spatial"; |
697 | return if $mode ne "spatial"; |
| 519 | |
698 | |
| 520 | $x += $self->{map}->ox; |
699 | $x += $self->{map}->ox; |
| … | |
… | |
| 534 | |
713 | |
| 535 | sub map_change { |
714 | sub map_change { |
| 536 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
715 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
| 537 | |
716 | |
| 538 | $self->flush_map; |
717 | $self->flush_map; |
|
|
718 | |
|
|
719 | ++$self->{map_change_gen}; |
| 539 | |
720 | |
| 540 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
721 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
| 541 | |
722 | |
| 542 | my $mapmapw = $self->{mapmap}->{w}; |
723 | my $mapmapw = $self->{mapmap}->{w}; |
| 543 | my $mapmaph = $self->{mapmap}->{h}; |
724 | my $mapmaph = $self->{mapmap}->{h}; |
| … | |
… | |
| 583 | if $changed; |
764 | if $changed; |
| 584 | |
765 | |
| 585 | $self->set_texture ($face->{id} => delete $face->{image}); |
766 | $self->set_texture ($face->{id} => delete $face->{image}); |
| 586 | } |
767 | } |
| 587 | |
768 | |
|
|
769 | sub smooth_update { |
|
|
770 | my ($self, $facenum, $face) = @_; |
|
|
771 | |
|
|
772 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
|
|
773 | } |
|
|
774 | |
| 588 | sub set_texture { |
775 | sub set_texture { |
| 589 | my ($self, $id, $data) = @_; |
776 | my ($self, $id, $data) = @_; |
| 590 | |
777 | |
|
|
778 | return unless $self->{map}; |
|
|
779 | |
| 591 | $self->{texture}[$id] ||= do { |
780 | $self->{texture}[$id] = my $tex = |
| 592 | my $tex = |
|
|
| 593 | new_from_image CFPlus::Texture |
781 | new_from_image CFPlus::Texture |
| 594 | $data, minify => 1, mipmap => 1; |
782 | $data, minify => 1, mipmap => 1; |
| 595 | |
783 | |
| 596 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
784 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
| 597 | $self->{map_widget}->update; |
785 | $self->{map_widget}->update; |
| 598 | |
786 | |
| 599 | $tex |
787 | $_->() for @{(delete $self->{face_cb}{$id}) || []}; |
|
|
788 | } |
|
|
789 | |
|
|
790 | sub connect_face_update { |
|
|
791 | my ($self, $id, $cb) = @_; |
|
|
792 | |
|
|
793 | push @{$self->{face_cb}{$id}}, $cb; |
|
|
794 | |
|
|
795 | CFPlus::guard { |
|
|
796 | @{$self->{face_cb}{$id}} |
|
|
797 | = grep $_ != $cb, |
|
|
798 | @{$self->{face_cb}{$id}}; |
| 600 | }; |
799 | } |
| 601 | } |
800 | } |
| 602 | |
801 | |
| 603 | sub sound_play { |
802 | sub sound_play { |
| 604 | my ($self, $x, $y, $soundnum, $type) = @_; |
803 | my ($self, $x, $y, $soundnum, $type) = @_; |
| 605 | |
804 | |
| … | |
… | |
| 615 | $LAST_QUERY = $prompt; |
814 | $LAST_QUERY = $prompt; |
| 616 | |
815 | |
| 617 | $self->{query}-> ($self, $flags, $prompt); |
816 | $self->{query}-> ($self, $flags, $prompt); |
| 618 | } |
817 | } |
| 619 | |
818 | |
| 620 | sub drawinfo { |
819 | sub sanitise_xml($) { |
| 621 | my ($self, $color, $text) = @_; |
820 | local $_ = shift; |
| 622 | |
821 | |
| 623 | my @color = ( |
822 | # we now weed out all tags we do not support |
|
|
823 | s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; |
|
|
824 | # now all entities |
|
|
825 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
|
|
826 | |
|
|
827 | # handle some elements |
|
|
828 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
|
|
829 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
|
|
830 | |
|
|
831 | $_ |
|
|
832 | } |
|
|
833 | |
|
|
834 | our %NAME_TO_COLOR = ( |
|
|
835 | black => 0, |
|
|
836 | white => 1, |
|
|
837 | darkblue => 2, |
|
|
838 | red => 3, |
|
|
839 | orange => 4, |
|
|
840 | lightblue => 5, |
|
|
841 | darkorange => 6, |
|
|
842 | green => 7, |
|
|
843 | darkgreen => 8, |
|
|
844 | grey => 9, |
|
|
845 | brown => 10, |
|
|
846 | yellow => 11, |
|
|
847 | tan => 12, |
|
|
848 | ); |
|
|
849 | |
|
|
850 | our @CF_COLOR = ( |
| 624 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
851 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
| 625 | [1.00, 1.00, 1.00], |
852 | [1.00, 1.00, 1.00], |
| 626 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] |
853 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] |
| 627 | [1.00, 0.00, 0.00], |
854 | [1.00, 0.00, 0.00], |
| 628 | [1.00, 0.54, 0.00], |
855 | [1.00, 0.54, 0.00], |
| 629 | [0.11, 0.56, 1.00], |
856 | [0.11, 0.56, 1.00], |
| 630 | [0.93, 0.46, 0.00], |
857 | [0.93, 0.46, 0.00], |
| 631 | [0.18, 0.54, 0.34], |
858 | [0.18, 0.54, 0.34], |
| 632 | [0.56, 0.73, 0.56], |
859 | [0.56, 0.73, 0.56], |
| 633 | [0.80, 0.80, 0.80], |
860 | [0.80, 0.80, 0.80], |
| 634 | [0.75, 0.61, 0.20], |
861 | [0.75, 0.61, 0.20], |
| 635 | [0.99, 0.77, 0.26], |
862 | [0.99, 0.77, 0.26], |
| 636 | [0.74, 0.65, 0.41], |
863 | [0.74, 0.65, 0.41], |
| 637 | ); |
864 | ); |
| 638 | |
865 | |
| 639 | my $fg = $color[$color % @color]; |
866 | sub msg { |
|
|
867 | my ($self, $color, $type, $text, @extra) = @_; |
| 640 | |
868 | |
|
|
869 | $text = sanitise_xml $text; |
|
|
870 | |
|
|
871 | if (my $cb = $self->{cb_msg}{$type}) { |
|
|
872 | $_->($self, $color, $type, $text, @extra) for values %$cb; |
|
|
873 | } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { |
|
|
874 | $type =~ s/-/_/g; |
|
|
875 | $self->{$type} = $text; |
|
|
876 | } else { |
| 641 | $self->logprint ("info: ", $text); |
877 | $self->logprint ("msg: ", $text); |
|
|
878 | return if $color < 0; # negative color == ignore if not understood |
| 642 | |
879 | |
|
|
880 | my $fg = $CF_COLOR[$color % @CF_COLOR]; |
|
|
881 | |
| 643 | # try to create single paragraphs of multiple lines sent by the server |
882 | ## try to create single paragraphs of multiple lines sent by the server |
|
|
883 | # no longer neecssary with TRT servers |
| 644 | $text =~ s/(?<=\S)\n(?=\w)/ /g; |
884 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
| 645 | |
885 | |
| 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 => $_ }) |
886 | ::message ({ fg => $fg, markup => $_ }) |
| 651 | for split /\n/, $text; |
887 | for split /\n/, $text; |
| 652 | |
888 | |
| 653 | $self->{statusbox}->add ($text, |
889 | $self->{statusbox}->add ($text, |
| 654 | group => $text, |
890 | group => $text, |
| 655 | fg => $fg, |
891 | fg => $fg, |
| 656 | timeout => $color >= 2 ? 180 : 10, |
892 | timeout => $color >= 2 ? 180 : 10, |
| 657 | tooltip_font => $::FONT_FIXED, |
893 | tooltip_font => $::FONT_FIXED, |
| 658 | ); |
894 | ); |
| 659 | } |
895 | } |
| 660 | |
|
|
| 661 | sub drawextinfo { |
|
|
| 662 | my ($self, $color, $type, $subtype, $message) = @_; |
|
|
| 663 | |
|
|
| 664 | $self->drawinfo ($color, $message); |
|
|
| 665 | } |
896 | } |
| 666 | |
897 | |
| 667 | sub spell_add { |
898 | sub spell_add { |
| 668 | my ($self, $spell) = @_; |
899 | my ($self, $spell) = @_; |
| 669 | |
900 | |
| … | |
… | |
| 902 | $::SERVER_INFO->set_markup ( |
1133 | $::SERVER_INFO->set_markup ( |
| 903 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
1134 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
| 904 | . "protocol version <tt>$self->{version}</tt>\n" |
1135 | . "protocol version <tt>$self->{version}</tt>\n" |
| 905 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
1136 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
| 906 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
1137 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
|
|
1138 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
| 907 | . "editing support $yesno[!!$self->{editor_support}]\n" |
1139 | . "editing support $yesno[!!$self->{editor_support}]\n" |
| 908 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
1140 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
|
|
1141 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
| 909 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1142 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
| 910 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1143 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
| 911 | . "map size $self->{mapw}×$self->{maph}\n" |
1144 | . "map size $self->{mapw}×$self->{maph}\n" |
| 912 | ); |
1145 | ); |
| 913 | |
1146 | |
| … | |
… | |
| 976 | |
1209 | |
| 977 | (delete $self->{npc_dialog})->destroy |
1210 | (delete $self->{npc_dialog})->destroy |
| 978 | if $self->{npc_dialog}; |
1211 | if $self->{npc_dialog}; |
| 979 | |
1212 | |
| 980 | $self->SUPER::destroy; |
1213 | $self->SUPER::destroy; |
|
|
1214 | |
|
|
1215 | %$self = (); |
| 981 | } |
1216 | } |
| 982 | |
1217 | |
| 983 | package CFPlus::NPCDialog; |
1218 | package CFPlus::NPCDialog; |
| 984 | |
1219 | |
| 985 | our @ISA = 'CFPlus::UI::Toplevel'; |
1220 | our @ISA = 'CFPlus::UI::Toplevel'; |
| … | |
… | |
| 1076 | |
1311 | |
| 1077 | if ($msg->{msgtype} eq "reply") { |
1312 | if ($msg->{msgtype} eq "reply") { |
| 1078 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
1313 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
| 1079 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
1314 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
| 1080 | |
1315 | |
| 1081 | my $text = "\n" . CFPlus::asxml $msg->{msg}; |
1316 | 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} }; |
1317 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
| 1083 | my @link; |
1318 | my @link; |
| 1084 | $text =~ s{ |
1319 | $text =~ s{ |
| 1085 | ($match) |
1320 | ($match) |
| 1086 | }{ |
1321 | }{ |
