… | |
… | |
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 | xwidget1 => 1,#d# |
26 | xwidget2 => 1,#d# |
27 | %{$arg{setup_req} || {}}, |
27 | %{$arg{setup_req} || {}}, |
28 | }, |
28 | }, |
29 | ); |
29 | ); |
30 | |
30 | |
31 | $self->{map_widget}->clr_commands; |
31 | $self->{map_widget}->clr_commands; |
… | |
… | |
48 | sort { (length $a) <=> (length $b) } |
48 | sort { (length $a) <=> (length $b) } |
49 | @args |
49 | @args |
50 | } sort { $a->{par} <=> $b->{par} } |
50 | } sort { $a->{par} <=> $b->{par} } |
51 | CFPlus::Pod::find command => "*"; |
51 | CFPlus::Pod::find command => "*"; |
52 | |
52 | |
53 | $self->connect_ext (ambient_music => sub { |
|
|
54 | my ($songs) = @_; |
|
|
55 | &::audio_music_set_ambient ($songs); |
|
|
56 | }); |
|
|
57 | |
|
|
58 | $self->connect_ext (capabilities => sub { |
|
|
59 | my (%cap) = @_; |
|
|
60 | |
|
|
61 | #$self->send ("setup sound 0"); # we use a different protocol |
|
|
62 | $self->update_fx_want; |
|
|
63 | |
|
|
64 | $self->send_exti_req (resource => "exp_table", sub { |
|
|
65 | my ($exp_table) = @_; |
|
|
66 | |
|
|
67 | $self->register_face_handler ($exp_table, sub { |
|
|
68 | my ($face) = @_; |
|
|
69 | |
|
|
70 | $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
71 | $_->() for values %{ $self->{on_exp_update} || {} }; |
|
|
72 | }); |
|
|
73 | |
|
|
74 | () |
|
|
75 | }); |
|
|
76 | |
|
|
77 | if (my $ts = $cap{tileset}) { |
|
|
78 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
|
|
79 | $self->{tileset} = $default; |
|
|
80 | $self->{tilesize} = $default->[3]; |
|
|
81 | $self->setup_req (tileset => $default->[0]); |
|
|
82 | |
|
|
83 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
|
|
84 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
|
|
85 | |
|
|
86 | $self->setup_req (mapsize => "${w}x${h}"); |
|
|
87 | } |
|
|
88 | } |
|
|
89 | }); |
|
|
90 | |
|
|
91 | $self->{json_coder} |
53 | $self->{json_coder} |
92 | ->convert_blessed |
54 | ->convert_blessed |
93 | ->filter_json_single_key_object (__w_ => sub { |
55 | ->filter_json_single_key_object ("\fw" => sub { |
94 | $self->{widget}{$_[0]} |
56 | $self->{widget}{$_[0]} |
|
|
57 | }) |
|
|
58 | ->filter_json_single_key_object ("\fc" => sub { |
|
|
59 | my ($id) = @_; |
|
|
60 | sub { |
|
|
61 | $self->send_exti_msg (w_e => $id, @_); |
|
|
62 | } |
95 | }); |
63 | }); |
96 | |
|
|
97 | # widgetset new |
|
|
98 | $self->connect_ext (ws_n => sub { |
|
|
99 | my ($id) = @_; |
|
|
100 | |
|
|
101 | $self->{widgetset}{$id} = { |
|
|
102 | w => {}, |
|
|
103 | }; |
|
|
104 | }); |
|
|
105 | |
|
|
106 | # widgetset destroy |
|
|
107 | $self->connect_ext (ws_d => sub { |
|
|
108 | my ($id) = @_; |
|
|
109 | |
|
|
110 | my $ws = delete $self->{widgetset}{$id} |
|
|
111 | or return; |
|
|
112 | |
|
|
113 | $_->destroy |
|
|
114 | for values %{$ws->{w}}; |
|
|
115 | }); |
|
|
116 | |
|
|
117 | # widgetset create |
|
|
118 | $self->connect_ext (ws_c => sub { |
|
|
119 | my ($ws, $id, $class, $args) = @_; |
|
|
120 | |
|
|
121 | for my $ev (grep /^on_/, keys %$args) { |
|
|
122 | my $rid = $args->{$ev}; |
|
|
123 | $args->{$ev} = sub { |
|
|
124 | my $id = shift->{s_id}; |
|
|
125 | $self->send_exti_msg (w_e => $id, $rid, @_); |
|
|
126 | |
|
|
127 | 1 |
|
|
128 | }; |
|
|
129 | } |
|
|
130 | |
|
|
131 | $self->widget_associate ( |
|
|
132 | $ws, $id => scalar eval { |
|
|
133 | local $SIG{__DIE__}; |
|
|
134 | "CFPlus::UI::$class"->new (%$args) |
|
|
135 | } |
|
|
136 | ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; |
|
|
137 | }); |
|
|
138 | |
|
|
139 | # widgetset associate |
|
|
140 | $self->connect_ext (ws_a => sub { |
|
|
141 | my (%ass) = @_; |
|
|
142 | |
|
|
143 | # everything that has a name, wether conceivably useful or not |
|
|
144 | my %wkw = ( |
|
|
145 | root => $CFPlus::UI::ROOT, |
|
|
146 | tooltip => $CFPlus::UI::TOOLTIP, |
|
|
147 | |
|
|
148 | mapwidget => $::MAPWIDGET, |
|
|
149 | buttonbar => $::BUTTONBAR, |
|
|
150 | metaserver => $::METASERVER, |
|
|
151 | buttonbar => $::BUTTONBAR, |
|
|
152 | login_button => $::LOGIN_BUTTON, |
|
|
153 | quit_dialog => $::QUIT_DIALOG, |
|
|
154 | host_entry => $::HOST_ENTRY, |
|
|
155 | metaserver => $::METASERVER, |
|
|
156 | server_info => $::SERVER_INFO, |
|
|
157 | |
|
|
158 | setup_dialog => $::SETUP_DIALOG, |
|
|
159 | setup_notebook => $::SETUP_NOTEBOOK, |
|
|
160 | setup_server => $::SETUP_SERVER, |
|
|
161 | setup_keyboard => $::SETUP_KEYBOARD, |
|
|
162 | |
|
|
163 | pl_notebook => $::PL_NOTEBOOK, |
|
|
164 | pl_window => $::PL_WINDOW, |
|
|
165 | inventory_page => $::INVENTORY_PAGE, |
|
|
166 | stats_page => $::STATS_PAGE, |
|
|
167 | skill_page => $::SKILL_PAGE, |
|
|
168 | spell_page => $::SPELL_PAGE, |
|
|
169 | spell_list => $::SPELL_LIST, |
|
|
170 | |
|
|
171 | floorbox => $::FLOORBOX, |
|
|
172 | help_window => $::HELP_WINDOW, |
|
|
173 | message_window => $::MESSAGE_WINDOW, |
|
|
174 | statusbox => $::SDTATUSBOX, |
|
|
175 | |
|
|
176 | inv => $::INV, |
|
|
177 | invr => $::INVR, |
|
|
178 | invr_hb => $::INVR_HB, |
|
|
179 | ); |
|
|
180 | |
|
|
181 | while (my ($id, $name) = each %ass) { |
|
|
182 | $self->widget_associate (undef, $id => $wkw{$name}) |
|
|
183 | or warn "server failed to associate non-existent well-known widget $name\n"; |
|
|
184 | } |
|
|
185 | }); |
|
|
186 | |
|
|
187 | # widget call |
|
|
188 | $self->connect_ext (w_c => sub { |
|
|
189 | my ($id, $rid, $method, @args) = @_; |
|
|
190 | |
|
|
191 | my $w = $self->{widget}{$id} |
|
|
192 | or return; |
|
|
193 | |
|
|
194 | if ($rid) { |
|
|
195 | $self->send_exti_msg (w_r => $rid, $w->$method (@args)); |
|
|
196 | } else { |
|
|
197 | $w->$method (@args); |
|
|
198 | } |
|
|
199 | }); |
|
|
200 | |
|
|
201 | # widget set |
|
|
202 | $self->connect_ext (w_s => sub { |
|
|
203 | my ($id, $attr) = @_; |
|
|
204 | |
|
|
205 | my $w = $self->{widget}{$id} |
|
|
206 | or return; |
|
|
207 | |
|
|
208 | for (my $i = 0; $i < $#$attr; $i += 2) { |
|
|
209 | my ($member, $value) = @$attr[$i, $i+1]; |
|
|
210 | if (defined $value) { |
|
|
211 | $w->{$member} = $value; |
|
|
212 | } else { |
|
|
213 | delete $w->{$member}; |
|
|
214 | } |
|
|
215 | $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible}; |
|
|
216 | } |
|
|
217 | }); |
|
|
218 | |
|
|
219 | # widget get |
|
|
220 | $self->connect_ext (w_g => sub { |
|
|
221 | my ($id, $rid, $attr) = @_; |
|
|
222 | |
|
|
223 | my $w = $self->{widget}{$id} |
|
|
224 | or return; |
|
|
225 | |
|
|
226 | $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); |
|
|
227 | }); |
|
|
228 | |
|
|
229 | # message window |
|
|
230 | $self->connect_ext (channel_info => sub { |
|
|
231 | my ($info) = @_; |
|
|
232 | $self->{channels}->{$info->{id}} = $info; |
|
|
233 | $::MESSAGE_WINDOW->add_channel ($info); |
|
|
234 | }); |
|
|
235 | |
64 | |
236 | # destroy widgets on logout |
65 | # destroy widgets on logout |
237 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
66 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
238 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
67 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
239 | $_->destroy |
68 | $_->destroy |
… | |
… | |
262 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
91 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
263 | |
92 | |
264 | $self |
93 | $self |
265 | } |
94 | } |
266 | |
95 | |
267 | sub widget_associate { |
|
|
268 | my ($self, $ws, $id, $widget) = @_; |
|
|
269 | |
|
|
270 | if ($widget) { |
|
|
271 | $widget->{s_id} = $id; |
|
|
272 | $self->{widget}{$id} = $widget; |
|
|
273 | |
|
|
274 | if ($ws) { |
|
|
275 | $widget->{s_ws} = $ws; |
|
|
276 | $self->{widgetset}{$ws}{w}{$id} = $widget; |
|
|
277 | } |
|
|
278 | |
|
|
279 | $widget->connect (on_destroy => sub { |
|
|
280 | my ($widget) = @_; |
|
|
281 | |
|
|
282 | delete $self->{widget}{$widget->{s_id}}; |
|
|
283 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} |
|
|
284 | if exists $widget->{s_ws}; |
|
|
285 | }); |
|
|
286 | |
|
|
287 | 1 |
|
|
288 | } else { |
|
|
289 | $self->send_exti_msg (w_e => $id, undef); |
|
|
290 | |
|
|
291 | 0 |
|
|
292 | } |
|
|
293 | } |
|
|
294 | |
|
|
295 | sub update_fx_want { |
96 | sub update_fx_want { |
296 | my ($self) = @_; |
97 | my ($self) = @_; |
297 | |
98 | |
298 | $self->send_exti_msg (fx_want => { |
99 | $self->send_exti_msg (fx_want => { |
299 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
100 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
300 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
101 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
301 | 6 => 1, # FT_RSRC |
102 | 6 => 1, # FT_RSRC |
302 | }); |
103 | }); |
303 | } |
104 | } |
|
|
105 | |
|
|
106 | sub ext_capabilities { |
|
|
107 | my ($self, %cap) = @_; |
|
|
108 | |
|
|
109 | #$self->send ("setup sound 0"); # we use a different protocol |
|
|
110 | $self->update_fx_want; |
|
|
111 | |
|
|
112 | $self->send_exti_req (resource => "exp_table", sub { |
|
|
113 | my ($exp_table) = @_; |
|
|
114 | |
|
|
115 | $self->register_face_handler ($exp_table, sub { |
|
|
116 | my ($face) = @_; |
|
|
117 | |
|
|
118 | $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
119 | $_->() for values %{ $self->{on_exp_update} || {} }; |
|
|
120 | }); |
|
|
121 | |
|
|
122 | () |
|
|
123 | }); |
|
|
124 | |
|
|
125 | if (my $ts = $cap{tileset}) { |
|
|
126 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
|
|
127 | $self->{tileset} = $default; |
|
|
128 | $self->{tilesize} = $default->[3]; |
|
|
129 | $self->setup_req (tileset => $default->[0]); |
|
|
130 | |
|
|
131 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
|
|
132 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
|
|
133 | |
|
|
134 | $self->setup_req (mapsize => "${w}x${h}"); |
|
|
135 | } |
|
|
136 | } |
|
|
137 | } |
|
|
138 | |
|
|
139 | sub ext_ambient_music { |
|
|
140 | my ($self, $songs) = @_; |
|
|
141 | &::audio_music_set_ambient ($songs); |
|
|
142 | } |
|
|
143 | |
|
|
144 | ############################################################################# |
|
|
145 | |
|
|
146 | sub widget_associate { |
|
|
147 | my ($self, $ws, $id, $widget) = @_; |
|
|
148 | |
|
|
149 | $widget ||= new CFPlus::UI::Bin; |
|
|
150 | |
|
|
151 | $widget->{s_id} = $id; |
|
|
152 | $self->{widget}{$id} = $widget; |
|
|
153 | |
|
|
154 | if ($ws) { |
|
|
155 | $widget->{s_ws} = $ws; |
|
|
156 | $self->{widgetset}{$ws}{w}{$id} = $widget; |
|
|
157 | } |
|
|
158 | |
|
|
159 | $widget->connect (on_destroy => sub { |
|
|
160 | my ($widget) = @_; |
|
|
161 | |
|
|
162 | delete $self->{widget}{$widget->{s_id}}; |
|
|
163 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} |
|
|
164 | if exists $widget->{s_ws}; |
|
|
165 | }); |
|
|
166 | } |
|
|
167 | |
|
|
168 | # widgetset new |
|
|
169 | sub ext_ws_n { |
|
|
170 | my ($self, $id) = @_; |
|
|
171 | |
|
|
172 | $self->{widgetset}{$id} = { |
|
|
173 | w => {}, |
|
|
174 | }; |
|
|
175 | } |
|
|
176 | |
|
|
177 | # widgetset destroy |
|
|
178 | sub ext_ws_d { |
|
|
179 | my ($self, $id) = @_; |
|
|
180 | |
|
|
181 | my $ws = delete $self->{widgetset}{$id} |
|
|
182 | or return; |
|
|
183 | |
|
|
184 | $_->destroy |
|
|
185 | for values %{$ws->{w}}; |
|
|
186 | } |
|
|
187 | |
|
|
188 | # widgetset create |
|
|
189 | sub ext_ws_c { |
|
|
190 | my ($self, $ws, $id, $class, $args) = @_; |
|
|
191 | |
|
|
192 | $self->widget_associate ( |
|
|
193 | $ws, $id => scalar eval { |
|
|
194 | local $SIG{__DIE__}; |
|
|
195 | "CFPlus::UI::$class"->new (%$args) |
|
|
196 | } |
|
|
197 | ); |
|
|
198 | } |
|
|
199 | |
|
|
200 | # widgetset associate |
|
|
201 | sub ext_ws_a { |
|
|
202 | my ($self, %ass) = @_; |
|
|
203 | |
|
|
204 | # everything that has a name, wether conceivably useful or not |
|
|
205 | my %wkw = ( |
|
|
206 | root => $CFPlus::UI::ROOT, |
|
|
207 | tooltip => $CFPlus::UI::TOOLTIP, |
|
|
208 | |
|
|
209 | mapwidget => $::MAPWIDGET, |
|
|
210 | buttonbar => $::BUTTONBAR, |
|
|
211 | metaserver => $::METASERVER, |
|
|
212 | buttonbar => $::BUTTONBAR, |
|
|
213 | login_button => $::LOGIN_BUTTON, |
|
|
214 | quit_dialog => $::QUIT_DIALOG, |
|
|
215 | host_entry => $::HOST_ENTRY, |
|
|
216 | metaserver => $::METASERVER, |
|
|
217 | server_info => $::SERVER_INFO, |
|
|
218 | |
|
|
219 | setup_dialog => $::SETUP_DIALOG, |
|
|
220 | setup_notebook => $::SETUP_NOTEBOOK, |
|
|
221 | setup_server => $::SETUP_SERVER, |
|
|
222 | setup_keyboard => $::SETUP_KEYBOARD, |
|
|
223 | |
|
|
224 | pl_notebook => $::PL_NOTEBOOK, |
|
|
225 | pl_window => $::PL_WINDOW, |
|
|
226 | inventory_page => $::INVENTORY_PAGE, |
|
|
227 | stats_page => $::STATS_PAGE, |
|
|
228 | skill_page => $::SKILL_PAGE, |
|
|
229 | spell_page => $::SPELL_PAGE, |
|
|
230 | spell_list => $::SPELL_LIST, |
|
|
231 | |
|
|
232 | floorbox => $::FLOORBOX, |
|
|
233 | help_window => $::HELP_WINDOW, |
|
|
234 | message_window => $::MESSAGE_WINDOW, |
|
|
235 | statusbox => $::SDTATUSBOX, |
|
|
236 | |
|
|
237 | inv => $::INV, |
|
|
238 | invr => $::INVR, |
|
|
239 | invr_hb => $::INVR_HB, |
|
|
240 | ); |
|
|
241 | |
|
|
242 | while (my ($id, $name) = each %ass) { |
|
|
243 | $self->widget_associate (undef, $id => $wkw{$name}); |
|
|
244 | } |
|
|
245 | } |
|
|
246 | |
|
|
247 | # widget call |
|
|
248 | sub ext_w_c { |
|
|
249 | my ($self, $id, $rcb, $method, @args) = @_; |
|
|
250 | |
|
|
251 | my $w = $self->{widget}{$id} |
|
|
252 | or return; |
|
|
253 | |
|
|
254 | if ($rcb) { |
|
|
255 | $rcb->($w->$method (@args)); |
|
|
256 | } else { |
|
|
257 | $w->$method (@args); |
|
|
258 | } |
|
|
259 | } |
|
|
260 | |
|
|
261 | # widget set |
|
|
262 | sub ext_w_s { |
|
|
263 | my ($self, $id, $attr) = @_; |
|
|
264 | |
|
|
265 | my $w = $self->{widget}{$id} |
|
|
266 | or return; |
|
|
267 | |
|
|
268 | for (my $i = 0; $i < $#$attr; $i += 2) { |
|
|
269 | my ($member, $value) = @$attr[$i, $i+1]; |
|
|
270 | if (defined $value) { |
|
|
271 | $w->{$member} = $value; |
|
|
272 | } else { |
|
|
273 | delete $w->{$member}; |
|
|
274 | } |
|
|
275 | $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible}; |
|
|
276 | } |
|
|
277 | } |
|
|
278 | |
|
|
279 | # widget get |
|
|
280 | sub ext_w_g { |
|
|
281 | my ($self, $id, $rid, @attr) = @_; |
|
|
282 | |
|
|
283 | my $w = $self->{widget}{$id} |
|
|
284 | or return; |
|
|
285 | |
|
|
286 | $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr); |
|
|
287 | } |
|
|
288 | |
|
|
289 | # message window |
|
|
290 | sub ext_channel_info { |
|
|
291 | my ($self, $info) = @_; |
|
|
292 | $self->{channels}->{$info->{id}} = $info; |
|
|
293 | $::MESSAGE_WINDOW->add_channel ($info); |
|
|
294 | } |
|
|
295 | |
|
|
296 | ############################################################################# |
304 | |
297 | |
305 | sub logprint { |
298 | sub logprint { |
306 | my ($self, @a) = @_; |
299 | my ($self, @a) = @_; |
307 | |
300 | |
308 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
301 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
… | |
… | |
397 | |
390 | |
398 | if ( |
391 | if ( |
399 | my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange |
392 | my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange |
400 | ) { |
393 | ) { |
401 | my $msg = "<b>stat change</b>: " . (join " ", @diffs); |
394 | my $msg = "<b>stat change</b>: " . (join " ", @diffs); |
402 | $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); |
395 | $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20); |
403 | } |
396 | } |
404 | |
397 | |
405 | $self->update_stats_window ($stats, $prev); |
398 | $self->update_stats_window ($stats, $prev); |
406 | |
399 | |
407 | $self->{prev_stats} = { %$stats }; |
400 | $self->{prev_stats} = { %$stats }; |
… | |
… | |
474 | for keys %RES_TBL; |
467 | for keys %RES_TBL; |
475 | |
468 | |
476 | my $sktbl = $::STATWIDS->{skill_tbl}; |
469 | my $sktbl = $::STATWIDS->{skill_tbl}; |
477 | my @skills = keys %{ $self->{skill_info} }; |
470 | my @skills = keys %{ $self->{skill_info} }; |
478 | |
471 | |
479 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
472 | my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
|
|
473 | map [$_, $self->{skill_info}{$_}], |
|
|
474 | grep exists $stats->{$_}, |
|
|
475 | @skills; |
|
|
476 | |
|
|
477 | if ($self->{stat_order} ne join ",", map $_->[0], @order) { |
|
|
478 | $self->{stat_order} = join ",", map $_->[0], @order; |
|
|
479 | |
480 | $sktbl->clear; |
480 | $sktbl->clear; |
481 | |
481 | |
482 | my @add; |
482 | my $sw = $self->{skillwid}{""} ||= [ |
483 | |
|
|
484 | push @add, |
|
|
485 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
483 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
486 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
484 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
487 | 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
485 | 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
488 | 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
486 | 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
489 | 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
487 | 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
490 | 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
488 | 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
491 | 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
489 | 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
492 | 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
490 | 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
493 | ; |
491 | ]; |
|
|
492 | |
|
|
493 | my @add = @$sw; |
494 | |
494 | |
495 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
495 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
496 | |
496 | |
497 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
497 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
498 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
498 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
499 | |
499 | |
500 | my ($x, $y) = (0, 1); |
500 | my ($x, $y) = (0, 1); |
501 | for ( |
501 | for (@order) { |
502 | sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
|
|
503 | map [$_, $self->{skill_info}{$_}], |
|
|
504 | grep exists $stats->{$_}, |
|
|
505 | @skills |
|
|
506 | ) { |
|
|
507 | my ($idx, $name) = @$_; |
502 | my ($idx, $name) = @$_; |
508 | |
503 | |
509 | my $spell_cb = sub { |
504 | my $spell_cb = sub { |
510 | my ($widget, $ev) = @_; |
505 | my ($widget, $ev) = @_; |
511 | |
506 | |
… | |
… | |
526 | } |
521 | } |
527 | |
522 | |
528 | 1 |
523 | 1 |
529 | }; |
524 | }; |
530 | |
525 | |
|
|
526 | my $sw = $self->{skillwid}{$idx} ||= [ |
|
|
527 | # exp |
|
|
528 | (new CFPlus::UI::Label |
|
|
529 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
|
|
530 | |
|
|
531 | # level |
|
|
532 | (new CFPlus::UI::Label |
|
|
533 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
|
|
534 | |
|
|
535 | # progress |
|
|
536 | (new CFPlus::UI::ExperienceProgress), |
|
|
537 | |
|
|
538 | # label |
|
|
539 | (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
|
|
540 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
|
|
541 | ]; |
|
|
542 | |
531 | push @add, |
543 | push @add, |
532 | $x * 4 + 0, $y, ($self->{stat_widget_exp}{$idx} ||= new CFPlus::UI::Label |
544 | $x * 4 + 0, $y, $sw->[0], |
533 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
545 | $x * 4 + 1, $y, $sw->[1], |
534 | $x * 4 + 1, $y, ($self->{stat_widget_lvl}{$idx} ||= new CFPlus::UI::Label |
546 | $x * 4 + 2, $y, $sw->[2], |
535 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
547 | $x * 4 + 3, $y, $sw->[3], |
536 | $x * 4 + 2, $y, ($self->{stat_widget_prg}{$idx} ||= new CFPlus::UI::ExperienceProgress), |
|
|
537 | $x * 4 + 3, $y, ($self->{stat_widget_lbl}{$idx} ||= new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
|
|
538 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
|
|
539 | ; |
548 | ; |
540 | |
549 | |
541 | $x++ and ($x, $y) = (0, $y + 1); |
550 | $x++ and ($x, $y) = (0, $y + 1); |
542 | } |
551 | } |
543 | |
552 | |
544 | $sktbl->add_at (@add); |
553 | $sktbl->add_at (@add); |
545 | } |
554 | } |
546 | |
555 | |
547 | for (grep exists $stats->{$_}, @skills) { |
556 | for (@order) { |
548 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
557 | my ($idx, $name) = @$_; |
549 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
558 | my $val = $stats->{$idx}; |
550 | $self->{stat_widget_prg}{$_}->set_value (@{$stats->{$_}}); |
|
|
551 | } |
|
|
552 | } |
|
|
553 | |
559 | |
554 | sub macro_send { |
560 | next if $prev->{$idx}[1] eq $val->[1]; |
555 | my ($self, $macro) = @_; |
|
|
556 | |
561 | |
557 | for my $cmd (@{ $macro->{action} }) { |
562 | my $sw = $self->{skillwid}{$idx}; |
558 | $self->send_command ($cmd); |
563 | $sw->[0]->set_text (::formsep ($val->[1])); |
|
|
564 | $sw->[1]->set_text ($val->[0] * 1); |
|
|
565 | $sw->[2]->set_value (@$val); |
|
|
566 | |
|
|
567 | $::GAUGES->{sklprg}->set_label ("$name %d%%"); |
|
|
568 | $::GAUGES->{sklprg}->set_value (@$val); |
559 | } |
569 | } |
560 | } |
570 | } |
561 | |
571 | |
562 | sub user_send { |
572 | sub user_send { |
563 | my ($self, $command) = @_; |
573 | my ($self, $command) = @_; |
… | |
… | |
565 | $self->{record}->($command) |
575 | $self->{record}->($command) |
566 | if $self->{record}; |
576 | if $self->{record}; |
567 | |
577 | |
568 | $self->logprint ("send: ", $command); |
578 | $self->logprint ("send: ", $command); |
569 | $self->send_command ($command); |
579 | $self->send_command ($command); |
570 | ::status ($command); |
|
|
571 | } |
580 | } |
572 | |
581 | |
573 | sub record { |
582 | sub record { |
574 | my ($self, $cb) = @_; |
583 | my ($self, $cb) = @_; |
575 | |
584 | |
… | |
… | |
608 | |
617 | |
609 | if ($delay) { |
618 | if ($delay) { |
610 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
619 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
611 | Event->timer (after => 0.03, cb => sub { |
620 | Event->timer (after => 0.03, cb => sub { |
612 | $_[0]->w->cancel; |
621 | $_[0]->w->cancel; |
613 | $self->{map_widget}->update; |
622 | $self->{map_widget}->update |
|
|
623 | if $self->{map_widget}; |
614 | }); |
624 | }); |
615 | } else { |
625 | } else { |
616 | $self->{map_widget}->update; |
626 | $self->{map_widget}->update; |
617 | } |
627 | } |
618 | } |
628 | } |
… | |
… | |
857 | # split metadata case, FT_MUSIC, FT_SOUND |
867 | # split metadata case, FT_MUSIC, FT_SOUND |
858 | if ($changed) { # new data |
868 | if ($changed) { # new data |
859 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
869 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
860 | $face->{data} = $meta; |
870 | $face->{data} = $meta; |
861 | |
871 | |
|
|
872 | # rely on strict ordering here and also on later fetch |
862 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
873 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
863 | CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; |
874 | CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; |
864 | } |
875 | } |
865 | |
876 | |
866 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
877 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
867 | |
|
|
868 | ::add_license ($face); |
878 | ::add_license ($face); |
|
|
879 | ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) |
|
|
880 | if $changed; |
869 | |
881 | |
870 | if ($face->{type} == 3) { # FT_MUSIC |
882 | if ($face->{type} == 3) { # FT_MUSIC |
871 | ::message ({ markup => "downloaded song #$facenum" }) |
|
|
872 | if $changed; |
|
|
873 | |
|
|
874 | &::audio_music_push ($facenum); |
883 | &::audio_music_push ($facenum); |
875 | } elsif ($face->{type} == 5) { # FT_SOUND |
884 | } elsif ($face->{type} == 5) { # FT_SOUND |
876 | ::message ({ markup => "downloaded sound #$facenum" }) |
|
|
877 | if $changed; |
|
|
878 | |
|
|
879 | &::audio_sound_push ($facenum); |
885 | &::audio_sound_push ($facenum); |
880 | } |
886 | } |
881 | |
887 | |
882 | } else { |
888 | } else { |
883 | # flat resource case, FT_RSRC |
889 | # flat resource case, FT_RSRC |
… | |
… | |
1026 | |
1032 | |
1027 | ## try to create single paragraphs of multiple lines sent by the server |
1033 | ## try to create single paragraphs of multiple lines sent by the server |
1028 | # no longer neecssary with TRT servers |
1034 | # no longer neecssary with TRT servers |
1029 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
1035 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
1030 | |
1036 | |
|
|
1037 | for (split /\n/, $text) { |
1031 | ::message ({ |
1038 | ::message ({ |
1032 | fg => $fg, |
1039 | fg => $fg, |
1033 | markup => $_, |
1040 | markup => $_, |
1034 | type => $type, |
1041 | type => $type, |
1035 | extra => [@extra], |
1042 | extra => [@extra], |
1036 | color_flags => $color |
1043 | color_flags => $color, #d# ugly, kill |
1037 | }) for split /\n/, $text; |
1044 | }); |
|
|
1045 | |
|
|
1046 | $color &= ~NDI_CLEAR; # only clear once for multiline messages |
|
|
1047 | # actually, this is an ugly design. _we_ should control the channels, |
|
|
1048 | # not some random other widget, as the channels are clearly protocol-specific. |
|
|
1049 | # then we could also react to flags such as CLEAR without resorting to |
|
|
1050 | # hacks such as color_flags, above. |
|
|
1051 | } |
1038 | |
1052 | |
1039 | $self->{statusbox}->add ($text, |
1053 | $self->{statusbox}->add ($text, |
1040 | group => $text, |
1054 | group => $text, |
1041 | fg => $fg, |
1055 | fg => $fg, |
1042 | timeout => $color >= 2 ? 180 : 10, |
1056 | timeout => $color >= 2 ? 180 : 10, |