… | |
… | |
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 | "CFPlus::UI::$arg->{class}"->new ( |
|
|
104 | %$args, |
|
|
105 | s_ws => $arg->{ws}, |
|
|
106 | s_id => $arg->{id}, |
|
|
107 | ) |
|
|
108 | } |
|
|
109 | ) { |
|
|
110 | $self->{widget}{$arg->{id}} |
|
|
111 | = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} |
|
|
112 | = $widget; |
|
|
113 | |
|
|
114 | $widget->connect (on_destroy => sub { |
|
|
115 | my ($widget) = @_; |
|
|
116 | |
|
|
117 | delete $self->{widget}{$widget->{s_id}}; |
|
|
118 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; |
|
|
119 | }); |
|
|
120 | } else { |
|
|
121 | warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; |
|
|
122 | $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); |
|
|
123 | } |
|
|
124 | }); |
|
|
125 | |
|
|
126 | $self->connect_ext (w_c => sub { |
|
|
127 | my ($arg) = @_; |
|
|
128 | |
|
|
129 | my $w = $self->{widget}{$arg->{id}} |
|
|
130 | or return; |
|
|
131 | my $m = $arg->{name}; |
|
|
132 | |
|
|
133 | my @a = map { |
|
|
134 | "HASH" eq ref && 1 == (scalar keys %$_) && exists $_->{__widget_ref__} |
|
|
135 | ? $self->{widget}{$_->{__widget_ref__}} |
|
|
136 | : $_ |
|
|
137 | } @{ $arg->{args} || [] }; |
|
|
138 | |
|
|
139 | if (exists $arg->{rid}) { |
|
|
140 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@a)]); |
|
|
141 | } else { |
|
|
142 | $w->$m (@a); |
|
|
143 | } |
|
|
144 | }); |
|
|
145 | |
|
|
146 | $self->connect_ext (w_s => sub { |
|
|
147 | my ($arg) = @_; |
|
|
148 | |
|
|
149 | my $w = $self->{widget}{$arg->{id}} |
|
|
150 | or return; |
|
|
151 | |
|
|
152 | $w->{$arg->{name}} = $arg->{value}; |
|
|
153 | }); |
|
|
154 | |
|
|
155 | $self->connect_ext (w_g => sub { |
|
|
156 | my ($arg) = @_; |
|
|
157 | |
|
|
158 | my $w = $self->{widget}{$arg->{id}} |
|
|
159 | or return; |
|
|
160 | |
|
|
161 | $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); |
|
|
162 | }); |
|
|
163 | |
|
|
164 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
|
|
165 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
|
|
166 | $_->destroy |
|
|
167 | for values %{delete $ws->{w} || {}}; |
66 | } |
168 | } |
67 | }); |
169 | }); |
68 | |
170 | |
69 | $self->{map_widget}->add_command (@$_) |
171 | $self->{map_widget}->add_command (@$_) |
70 | for @cmd_help; |
172 | for @cmd_help; |
… | |
… | |
249 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
351 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
250 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
352 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
251 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
353 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
252 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
354 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
253 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
355 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
254 | my $rng = $stats->{+CS_STAT_RANGE}; |
356 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
255 | $rng =~ s/^Range: //; # thank you so much dear server |
|
|
256 | $::GAUGES->{range} ->set_text ("Rng: " . $rng); |
|
|
257 | my $title = $stats->{+CS_STAT_TITLE}; |
357 | my $title = $stats->{+CS_STAT_TITLE}; |
258 | $title =~ s/^Player: //; |
358 | $title =~ s/^Player: //; |
259 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
359 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
260 | |
360 | |
261 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
361 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
… | |
… | |
634 | $LAST_QUERY = $prompt; |
734 | $LAST_QUERY = $prompt; |
635 | |
735 | |
636 | $self->{query}-> ($self, $flags, $prompt); |
736 | $self->{query}-> ($self, $flags, $prompt); |
637 | } |
737 | } |
638 | |
738 | |
|
|
739 | sub sanitise_xml($) { |
|
|
740 | local $_ = shift; |
|
|
741 | |
|
|
742 | # we now weed out all tags we do not support |
|
|
743 | s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; |
|
|
744 | # now all entities |
|
|
745 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
|
|
746 | |
|
|
747 | # handle some elements |
|
|
748 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
|
|
749 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
|
|
750 | |
|
|
751 | $_ |
|
|
752 | } |
|
|
753 | |
639 | our %NAME_TO_COLOR = ( |
754 | our %NAME_TO_COLOR = ( |
640 | black => 0, |
755 | black => 0, |
641 | white => 1, |
756 | white => 1, |
642 | darkblue => 2, |
757 | darkblue => 2, |
643 | red => 3, |
758 | red => 3, |
… | |
… | |
668 | [0.74, 0.65, 0.41], |
783 | [0.74, 0.65, 0.41], |
669 | ); |
784 | ); |
670 | |
785 | |
671 | sub msg { |
786 | sub msg { |
672 | my ($self, $color, $type, $text, @extra) = @_; |
787 | my ($self, $color, $type, $text, @extra) = @_; |
|
|
788 | |
|
|
789 | $text = sanitise_xml $text; |
673 | |
790 | |
674 | if (my $cb = $self->{cb_msg}{$type}) { |
791 | if (my $cb = $self->{cb_msg}{$type}) { |
675 | $_->($self, $color, $type, $text, @extra) for values %$cb; |
792 | $_->($self, $color, $type, $text, @extra) for values %$cb; |
676 | } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { |
793 | } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { |
677 | $type =~ s/-/_/g; |
794 | $type =~ s/-/_/g; |
… | |
… | |
1112 | |
1229 | |
1113 | if ($msg->{msgtype} eq "reply") { |
1230 | if ($msg->{msgtype} eq "reply") { |
1114 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
1231 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
1115 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
1232 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
1116 | |
1233 | |
1117 | my $text = "\n" . CFPlus::asxml $msg->{msg}; |
1234 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg}; |
1118 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1235 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1119 | my @link; |
1236 | my @link; |
1120 | $text =~ s{ |
1237 | $text =~ s{ |
1121 | ($match) |
1238 | ($match) |
1122 | }{ |
1239 | }{ |