| … | |
… | |
| 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 (@_, |
22 | my $self = $class->SUPER::new (%arg, |
| 23 | setup_req => { |
23 | setup_req => { |
| 24 | extmap => 1, |
24 | extmap => 1, |
| 25 | smoothing => 1, |
25 | excmd => 1, |
|
|
26 | xwidget => 1, |
|
|
27 | %{$arg{setup_req} || {}}, |
| 26 | }, |
28 | }, |
| 27 | ); |
29 | ); |
| 28 | |
30 | |
| 29 | $self->{map_widget}->clr_commands; |
31 | $self->{map_widget}->clr_commands; |
| 30 | |
32 | |
| … | |
… | |
| 60 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
62 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
| 61 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
63 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
| 62 | |
64 | |
| 63 | $self->setup_req (mapsize => "${w}x${h}"); |
65 | $self->setup_req (mapsize => "${w}x${h}"); |
| 64 | } |
66 | } |
|
|
67 | } |
|
|
68 | }); |
|
|
69 | |
|
|
70 | $self->connect_ext (ws_n => sub { |
|
|
71 | my ($arg) = @_; |
|
|
72 | |
|
|
73 | $self->{widgetset}{$arg{id}} = { |
|
|
74 | w => {}, |
|
|
75 | }; |
|
|
76 | }); |
|
|
77 | |
|
|
78 | $self->connect_ext (ws_d => sub { |
|
|
79 | my ($arg) = @_; |
|
|
80 | |
|
|
81 | my $ws = delete $self->{widgetset}{$arg{id}} |
|
|
82 | or return; |
|
|
83 | |
|
|
84 | $_->destroy |
|
|
85 | for values %{$ws->{w}}; |
|
|
86 | }); |
|
|
87 | |
|
|
88 | $self->connect_ext (ws_c => sub { |
|
|
89 | my ($arg) = @_; |
|
|
90 | |
|
|
91 | my $args = $arg->{args} || {}; |
|
|
92 | |
|
|
93 | for my $ev (grep /^on_/, keys %$args) { |
|
|
94 | $args->{$ev} = sub { |
|
|
95 | my $id = shift->{s_id}; |
|
|
96 | $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); |
|
|
97 | |
|
|
98 | 1 |
|
|
99 | }; |
|
|
100 | } |
|
|
101 | |
|
|
102 | if (my $widget = eval { |
|
|
103 | local $SIG{__DIE__}; |
|
|
104 | "CFPlus::UI::$arg->{class}"->new ( |
|
|
105 | %$args, |
|
|
106 | s_ws => $arg->{ws}, |
|
|
107 | s_id => $arg->{id}, |
|
|
108 | ) |
|
|
109 | } |
|
|
110 | ) { |
|
|
111 | $self->{widget}{$arg->{id}} |
|
|
112 | = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} |
|
|
113 | = $widget; |
|
|
114 | |
|
|
115 | $widget->connect (on_destroy => sub { |
|
|
116 | my ($widget) = @_; |
|
|
117 | |
|
|
118 | delete $self->{widget}{$widget->{s_id}}; |
|
|
119 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; |
|
|
120 | }); |
|
|
121 | } else { |
|
|
122 | warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; |
|
|
123 | $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); |
|
|
124 | } |
|
|
125 | }); |
|
|
126 | |
|
|
127 | $self->connect_ext (w_c => sub { |
|
|
128 | my ($arg) = @_; |
|
|
129 | |
|
|
130 | my $w = $self->{widget}{$arg->{id}} |
|
|
131 | or return; |
|
|
132 | my $m = $arg->{name}; |
|
|
133 | |
|
|
134 | my @a = map { |
|
|
135 | "HASH" eq ref && 1 == (scalar keys %$_) && exists $_->{__widget_ref__} |
|
|
136 | ? $self->{widget}{$_->{__widget_ref__}} |
|
|
137 | : $_ |
|
|
138 | } @{ $arg->{args} || [] }; |
|
|
139 | |
|
|
140 | if (exists $arg->{rid}) { |
|
|
141 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@a)]); |
|
|
142 | } else { |
|
|
143 | $w->$m (@a); |
|
|
144 | } |
|
|
145 | }); |
|
|
146 | |
|
|
147 | $self->connect_ext (w_s => sub { |
|
|
148 | my ($arg) = @_; |
|
|
149 | |
|
|
150 | my $w = $self->{widget}{$arg->{id}} |
|
|
151 | or return; |
|
|
152 | |
|
|
153 | $w->{$arg->{name}} = $arg->{value}; |
|
|
154 | }); |
|
|
155 | |
|
|
156 | $self->connect_ext (w_g => sub { |
|
|
157 | my ($arg) = @_; |
|
|
158 | |
|
|
159 | my $w = $self->{widget}{$arg->{id}} |
|
|
160 | or return; |
|
|
161 | |
|
|
162 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); |
|
|
163 | }); |
|
|
164 | |
|
|
165 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
|
|
166 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
|
|
167 | $_->destroy |
|
|
168 | for values %{delete $ws->{w} || {}}; |
| 65 | } |
169 | } |
| 66 | }); |
170 | }); |
| 67 | |
171 | |
| 68 | $self->{map_widget}->add_command (@$_) |
172 | $self->{map_widget}->add_command (@$_) |
| 69 | for @cmd_help; |
173 | for @cmd_help; |
| … | |
… | |
| 248 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
352 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
| 249 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
353 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
| 250 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
354 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
| 251 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
355 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
| 252 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
356 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
| 253 | my $rng = $stats->{+CS_STAT_RANGE}; |
357 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
| 254 | $rng =~ s/^Range: //; # thank you so much dear server |
|
|
| 255 | $::GAUGES->{range} ->set_text ("Rng: " . $rng); |
|
|
| 256 | my $title = $stats->{+CS_STAT_TITLE}; |
358 | my $title = $stats->{+CS_STAT_TITLE}; |
| 257 | $title =~ s/^Player: //; |
359 | $title =~ s/^Player: //; |
| 258 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
360 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
| 259 | |
361 | |
| 260 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
362 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
| … | |
… | |
| 432 | } |
534 | } |
| 433 | |
535 | |
| 434 | sub load_map($$$) { |
536 | sub load_map($$$) { |
| 435 | my ($self, $hash, $x, $y) = @_; |
537 | my ($self, $hash, $x, $y) = @_; |
| 436 | |
538 | |
|
|
539 | my $gen = $self->{map_change_gen}; |
|
|
540 | |
| 437 | CFPlus::DB::get $self->{mapcache} => $hash, sub { |
541 | CFPlus::DB::get $self->{mapcache} => $hash, sub { |
|
|
542 | return unless $gen == $self->{map_change_gen}; |
|
|
543 | |
| 438 | my ($data) = @_; |
544 | my ($data) = @_; |
| 439 | |
545 | |
| 440 | if (defined $data) { |
546 | if (defined $data) { |
| 441 | $data = Compress::LZF::decompress $data; |
547 | $data = Compress::LZF::decompress $data; |
| 442 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
548 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
| … | |
… | |
| 517 | |
623 | |
| 518 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
624 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
| 519 | if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; |
625 | if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; |
| 520 | |
626 | |
| 521 | } else { |
627 | } else { |
|
|
628 | my $gen = $self->{map_change_gen}; |
| 522 | $self->send_mapinfo ("spatial $path$tile", sub { |
629 | $self->send_mapinfo ("spatial $path$tile", sub { |
|
|
630 | return unless $gen == $self->{map_change_gen}; |
|
|
631 | |
| 523 | my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; |
632 | my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; |
| 524 | |
633 | |
| 525 | return if $mode ne "spatial"; |
634 | return if $mode ne "spatial"; |
| 526 | |
635 | |
| 527 | $x += $self->{map}->ox; |
636 | $x += $self->{map}->ox; |
| … | |
… | |
| 541 | |
650 | |
| 542 | sub map_change { |
651 | sub map_change { |
| 543 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
652 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
| 544 | |
653 | |
| 545 | $self->flush_map; |
654 | $self->flush_map; |
|
|
655 | |
|
|
656 | ++$self->{map_change_gen}; |
| 546 | |
657 | |
| 547 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
658 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
| 548 | |
659 | |
| 549 | my $mapmapw = $self->{mapmap}->{w}; |
660 | my $mapmapw = $self->{mapmap}->{w}; |
| 550 | my $mapmaph = $self->{mapmap}->{h}; |
661 | my $mapmaph = $self->{mapmap}->{h}; |
| … | |
… | |
| 624 | $LAST_QUERY = $prompt; |
735 | $LAST_QUERY = $prompt; |
| 625 | |
736 | |
| 626 | $self->{query}-> ($self, $flags, $prompt); |
737 | $self->{query}-> ($self, $flags, $prompt); |
| 627 | } |
738 | } |
| 628 | |
739 | |
| 629 | sub drawinfo { |
740 | sub sanitise_xml($) { |
| 630 | my ($self, $color, $text) = @_; |
741 | local $_ = shift; |
| 631 | |
742 | |
| 632 | my @color = ( |
743 | # we now weed out all tags we do not support |
|
|
744 | s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; |
|
|
745 | # now all entities |
|
|
746 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
|
|
747 | |
|
|
748 | # handle some elements |
|
|
749 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
|
|
750 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
|
|
751 | |
|
|
752 | $_ |
|
|
753 | } |
|
|
754 | |
|
|
755 | our %NAME_TO_COLOR = ( |
|
|
756 | black => 0, |
|
|
757 | white => 1, |
|
|
758 | darkblue => 2, |
|
|
759 | red => 3, |
|
|
760 | orange => 4, |
|
|
761 | lightblue => 5, |
|
|
762 | darkorange => 6, |
|
|
763 | green => 7, |
|
|
764 | darkgreen => 8, |
|
|
765 | grey => 9, |
|
|
766 | brown => 10, |
|
|
767 | yellow => 11, |
|
|
768 | tan => 12, |
|
|
769 | ); |
|
|
770 | |
|
|
771 | our @CF_COLOR = ( |
| 633 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
772 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
| 634 | [1.00, 1.00, 1.00], |
773 | [1.00, 1.00, 1.00], |
| 635 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] |
774 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] |
| 636 | [1.00, 0.00, 0.00], |
775 | [1.00, 0.00, 0.00], |
| 637 | [1.00, 0.54, 0.00], |
776 | [1.00, 0.54, 0.00], |
| 638 | [0.11, 0.56, 1.00], |
777 | [0.11, 0.56, 1.00], |
| 639 | [0.93, 0.46, 0.00], |
778 | [0.93, 0.46, 0.00], |
| 640 | [0.18, 0.54, 0.34], |
779 | [0.18, 0.54, 0.34], |
| 641 | [0.56, 0.73, 0.56], |
780 | [0.56, 0.73, 0.56], |
| 642 | [0.80, 0.80, 0.80], |
781 | [0.80, 0.80, 0.80], |
| 643 | [0.75, 0.61, 0.20], |
782 | [0.75, 0.61, 0.20], |
| 644 | [0.99, 0.77, 0.26], |
783 | [0.99, 0.77, 0.26], |
| 645 | [0.74, 0.65, 0.41], |
784 | [0.74, 0.65, 0.41], |
| 646 | ); |
785 | ); |
| 647 | |
786 | |
| 648 | my $fg = $color[$color % @color]; |
787 | sub msg { |
|
|
788 | my ($self, $color, $type, $text, @extra) = @_; |
| 649 | |
789 | |
|
|
790 | $text = sanitise_xml $text; |
|
|
791 | |
|
|
792 | if (my $cb = $self->{cb_msg}{$type}) { |
|
|
793 | $_->($self, $color, $type, $text, @extra) for values %$cb; |
|
|
794 | } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { |
|
|
795 | $type =~ s/-/_/g; |
|
|
796 | $self->{$type} = $text; |
|
|
797 | } else { |
| 650 | $self->logprint ("info: ", $text); |
798 | $self->logprint ("msg: ", $text); |
|
|
799 | return if $color < 0; # negative color == ignore if not understood |
| 651 | |
800 | |
|
|
801 | my $fg = $CF_COLOR[$color % @CF_COLOR]; |
|
|
802 | |
| 652 | # try to create single paragraphs of multiple lines sent by the server |
803 | ## try to create single paragraphs of multiple lines sent by the server |
|
|
804 | # no longer neecssary with TRT servers |
| 653 | $text =~ s/(?<=\S)\n(?=\w)/ /g; |
805 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
| 654 | |
806 | |
| 655 | $text = CFPlus::asxml $text; |
|
|
| 656 | $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; |
|
|
| 657 | $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; |
|
|
| 658 | |
|
|
| 659 | ::message ({ fg => $fg, markup => $_ }) |
807 | ::message ({ fg => $fg, markup => $_ }) |
| 660 | for split /\n/, $text; |
808 | for split /\n/, $text; |
| 661 | |
809 | |
| 662 | $self->{statusbox}->add ($text, |
810 | $self->{statusbox}->add ($text, |
| 663 | group => $text, |
811 | group => $text, |
| 664 | fg => $fg, |
812 | fg => $fg, |
| 665 | timeout => $color >= 2 ? 180 : 10, |
813 | timeout => $color >= 2 ? 180 : 10, |
| 666 | tooltip_font => $::FONT_FIXED, |
814 | tooltip_font => $::FONT_FIXED, |
| 667 | ); |
815 | ); |
| 668 | } |
816 | } |
| 669 | |
|
|
| 670 | sub drawextinfo { |
|
|
| 671 | my ($self, $color, $type, $subtype, $message) = @_; |
|
|
| 672 | |
|
|
| 673 | $self->drawinfo ($color, $message); |
|
|
| 674 | } |
817 | } |
| 675 | |
818 | |
| 676 | sub spell_add { |
819 | sub spell_add { |
| 677 | my ($self, $spell) = @_; |
820 | my ($self, $spell) = @_; |
| 678 | |
821 | |
| … | |
… | |
| 911 | $::SERVER_INFO->set_markup ( |
1054 | $::SERVER_INFO->set_markup ( |
| 912 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
1055 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
| 913 | . "protocol version <tt>$self->{version}</tt>\n" |
1056 | . "protocol version <tt>$self->{version}</tt>\n" |
| 914 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
1057 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
| 915 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
1058 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
|
|
1059 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
| 916 | . "editing support $yesno[!!$self->{editor_support}]\n" |
1060 | . "editing support $yesno[!!$self->{editor_support}]\n" |
| 917 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
1061 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
|
|
1062 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
| 918 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1063 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
| 919 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1064 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
| 920 | . "map size $self->{mapw}×$self->{maph}\n" |
1065 | . "map size $self->{mapw}×$self->{maph}\n" |
| 921 | ); |
1066 | ); |
| 922 | |
1067 | |
| … | |
… | |
| 1085 | |
1230 | |
| 1086 | if ($msg->{msgtype} eq "reply") { |
1231 | if ($msg->{msgtype} eq "reply") { |
| 1087 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
1232 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
| 1088 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
1233 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
| 1089 | |
1234 | |
| 1090 | my $text = "\n" . CFPlus::asxml $msg->{msg}; |
1235 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg}; |
| 1091 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1236 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
| 1092 | my @link; |
1237 | my @link; |
| 1093 | $text =~ s{ |
1238 | $text =~ s{ |
| 1094 | ($match) |
1239 | ($match) |
| 1095 | }{ |
1240 | }{ |
