| … | |
… | |
| 21 | |
21 | |
| 22 | my $self = $class->SUPER::new (%arg, |
22 | my $self = $class->SUPER::new (%arg, |
| 23 | setup_req => { |
23 | setup_req => { |
| 24 | extmap => 1, |
24 | extmap => 1, |
| 25 | excmd => 1, |
25 | excmd => 1, |
|
|
26 | xwidget => 1, |
| 26 | %{$arg{setup_req} || {}}, |
27 | %{$arg{setup_req} || {}}, |
| 27 | }, |
28 | }, |
| 28 | ); |
29 | ); |
| 29 | |
30 | |
| 30 | $self->{map_widget}->clr_commands; |
31 | $self->{map_widget}->clr_commands; |
| … | |
… | |
| 61 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
62 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
| 62 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
63 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
| 63 | |
64 | |
| 64 | $self->setup_req (mapsize => "${w}x${h}"); |
65 | $self->setup_req (mapsize => "${w}x${h}"); |
| 65 | } |
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} || {}}; |
| 66 | } |
169 | } |
| 67 | }); |
170 | }); |
| 68 | |
171 | |
| 69 | $self->{map_widget}->add_command (@$_) |
172 | $self->{map_widget}->add_command (@$_) |
| 70 | for @cmd_help; |
173 | for @cmd_help; |
| … | |
… | |
| 632 | $LAST_QUERY = $prompt; |
735 | $LAST_QUERY = $prompt; |
| 633 | |
736 | |
| 634 | $self->{query}-> ($self, $flags, $prompt); |
737 | $self->{query}-> ($self, $flags, $prompt); |
| 635 | } |
738 | } |
| 636 | |
739 | |
|
|
740 | sub sanitise_xml($) { |
|
|
741 | local $_ = shift; |
|
|
742 | |
|
|
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 | |
| 637 | our %NAME_TO_COLOR = ( |
755 | our %NAME_TO_COLOR = ( |
| 638 | black => 0, |
756 | black => 0, |
| 639 | white => 1, |
757 | white => 1, |
| 640 | darkblue => 2, |
758 | darkblue => 2, |
| 641 | red => 3, |
759 | red => 3, |
| … | |
… | |
| 666 | [0.74, 0.65, 0.41], |
784 | [0.74, 0.65, 0.41], |
| 667 | ); |
785 | ); |
| 668 | |
786 | |
| 669 | sub msg { |
787 | sub msg { |
| 670 | my ($self, $color, $type, $text, @extra) = @_; |
788 | my ($self, $color, $type, $text, @extra) = @_; |
|
|
789 | |
|
|
790 | $text = sanitise_xml $text; |
| 671 | |
791 | |
| 672 | if (my $cb = $self->{cb_msg}{$type}) { |
792 | if (my $cb = $self->{cb_msg}{$type}) { |
| 673 | $_->($self, $color, $type, $text, @extra) for values %$cb; |
793 | $_->($self, $color, $type, $text, @extra) for values %$cb; |
| 674 | } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { |
794 | } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { |
| 675 | $type =~ s/-/_/g; |
795 | $type =~ s/-/_/g; |
| … | |
… | |
| 1110 | |
1230 | |
| 1111 | if ($msg->{msgtype} eq "reply") { |
1231 | if ($msg->{msgtype} eq "reply") { |
| 1112 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
1232 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
| 1113 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
1233 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
| 1114 | |
1234 | |
| 1115 | my $text = "\n" . CFPlus::asxml $msg->{msg}; |
1235 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg}; |
| 1116 | 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} }; |
| 1117 | my @link; |
1237 | my @link; |
| 1118 | $text =~ s{ |
1238 | $text =~ s{ |
| 1119 | ($match) |
1239 | ($match) |
| 1120 | }{ |
1240 | }{ |
