… | |
… | |
10 | use CFPlus::UI; |
10 | use CFPlus::UI; |
11 | use CFPlus::Pod; |
11 | use CFPlus::Pod; |
12 | use CFPlus::Macro; |
12 | use CFPlus::Macro; |
13 | use CFPlus::Item; |
13 | use CFPlus::Item; |
14 | |
14 | |
15 | use Crossfire::Protocol::Base 0.95; |
|
|
16 | |
|
|
17 | use base 'Crossfire::Protocol::Base'; |
15 | use base 'Crossfire::Protocol::Base'; |
18 | |
16 | |
19 | sub new { |
17 | sub new { |
20 | my ($class, %arg) = @_; |
18 | my ($class, %arg) = @_; |
21 | |
19 | |
22 | my $self = $class->SUPER::new (%arg, |
20 | my $self = $class->SUPER::new (%arg, |
23 | setup_req => { |
21 | setup_req => { |
24 | extmap => 1, |
22 | extmap => 1, |
25 | excmd => 1, |
23 | excmd => 1, |
26 | xwidget => 1,#d# |
24 | xwidget2 => 1,#d# |
27 | %{$arg{setup_req} || {}}, |
25 | %{$arg{setup_req} || {}}, |
28 | }, |
26 | }, |
29 | ); |
27 | ); |
30 | |
28 | |
31 | $self->{map_widget}->clr_commands; |
29 | $self->{map_widget}->clr_commands; |
… | |
… | |
48 | sort { (length $a) <=> (length $b) } |
46 | sort { (length $a) <=> (length $b) } |
49 | @args |
47 | @args |
50 | } sort { $a->{par} <=> $b->{par} } |
48 | } sort { $a->{par} <=> $b->{par} } |
51 | CFPlus::Pod::find command => "*"; |
49 | CFPlus::Pod::find command => "*"; |
52 | |
50 | |
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 | |
|
|
63 | $self->send_exti_msg (fx_want => { |
|
|
64 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
|
|
65 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
|
|
66 | }); |
|
|
67 | |
|
|
68 | if (my $ts = $cap{tileset}) { |
|
|
69 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
|
|
70 | $self->{tileset} = $default; |
|
|
71 | $self->{tilesize} = $default->[3]; |
|
|
72 | $self->setup_req (tileset => $default->[0]); |
|
|
73 | |
|
|
74 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
|
|
75 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
|
|
76 | |
|
|
77 | $self->setup_req (mapsize => "${w}x${h}"); |
|
|
78 | } |
|
|
79 | } |
|
|
80 | }); |
|
|
81 | |
|
|
82 | $self->{json_coder} |
51 | $self->{json_coder} |
83 | ->convert_blessed |
52 | ->convert_blessed |
84 | ->filter_json_single_key_object (__w_ => sub { |
53 | ->filter_json_single_key_object ("\fw" => sub { |
85 | $self->{widget}{$_[0]} |
54 | $self->{widget}{$_[0]} |
|
|
55 | }) |
|
|
56 | ->filter_json_single_key_object ("\fc" => sub { |
|
|
57 | my ($id) = @_; |
|
|
58 | sub { |
|
|
59 | $self->send_exti_msg (w_e => $id, @_); |
|
|
60 | } |
86 | }); |
61 | }); |
87 | |
|
|
88 | # widgetset new |
|
|
89 | $self->connect_ext (ws_n => sub { |
|
|
90 | my ($id) = @_; |
|
|
91 | |
|
|
92 | $self->{widgetset}{$id} = { |
|
|
93 | w => {}, |
|
|
94 | }; |
|
|
95 | }); |
|
|
96 | |
|
|
97 | # widgetset destroy |
|
|
98 | $self->connect_ext (ws_d => sub { |
|
|
99 | my ($id) = @_; |
|
|
100 | |
|
|
101 | my $ws = delete $self->{widgetset}{$id} |
|
|
102 | or return; |
|
|
103 | |
|
|
104 | $_->destroy |
|
|
105 | for values %{$ws->{w}}; |
|
|
106 | }); |
|
|
107 | |
|
|
108 | # widgetset create |
|
|
109 | $self->connect_ext (ws_c => sub { |
|
|
110 | my ($ws, $id, $class, $args) = @_; |
|
|
111 | |
|
|
112 | for my $ev (grep /^on_/, keys %$args) { |
|
|
113 | $args->{$ev} = sub { |
|
|
114 | my $id = shift->{s_id}; |
|
|
115 | $self->send_exti_msg (w_e => $id, $ev, \@_); |
|
|
116 | |
|
|
117 | 1 |
|
|
118 | }; |
|
|
119 | } |
|
|
120 | |
|
|
121 | if (my $widget = eval { |
|
|
122 | local $SIG{__DIE__}; |
|
|
123 | "CFPlus::UI::$class"->new ( |
|
|
124 | %$args, |
|
|
125 | s_ws => $ws, |
|
|
126 | s_id => $id, |
|
|
127 | ) |
|
|
128 | } |
|
|
129 | ) { |
|
|
130 | $self->{widget}{$id} |
|
|
131 | = $self->{widgetset}{$ws}{w}{$id} |
|
|
132 | = $widget; |
|
|
133 | |
|
|
134 | $widget->connect (on_destroy => sub { |
|
|
135 | my ($widget) = @_; |
|
|
136 | |
|
|
137 | delete $self->{widget}{$widget->{s_id}}; |
|
|
138 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; |
|
|
139 | }); |
|
|
140 | } else { |
|
|
141 | warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; |
|
|
142 | $self->send_exti_msg (w_e => $id, "destroy"); |
|
|
143 | } |
|
|
144 | }); |
|
|
145 | |
|
|
146 | # widget call |
|
|
147 | $self->connect_ext (w_c => sub { |
|
|
148 | my ($id, $rid, $method, $args) = @_; |
|
|
149 | |
|
|
150 | my $w = $self->{widget}{$id} |
|
|
151 | or return; |
|
|
152 | |
|
|
153 | $args ||= []; |
|
|
154 | |
|
|
155 | if ($rid) { |
|
|
156 | $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]); |
|
|
157 | } else { |
|
|
158 | $w->$method (@$args); |
|
|
159 | } |
|
|
160 | }); |
|
|
161 | |
|
|
162 | # widget set |
|
|
163 | $self->connect_ext (w_s => sub { |
|
|
164 | my ($id, $attr) = @_; |
|
|
165 | |
|
|
166 | my $w = $self->{widget}{$id} |
|
|
167 | or return; |
|
|
168 | |
|
|
169 | for (my $i = 0; $i < $#$attr; $i += 2) { |
|
|
170 | my ($member, $value) = @$attr[$i, $i+1]; |
|
|
171 | if (defined $value) { |
|
|
172 | $w->{$member} = $value; |
|
|
173 | } else { |
|
|
174 | delete $w->{$member}; |
|
|
175 | } |
|
|
176 | $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible}; |
|
|
177 | } |
|
|
178 | }); |
|
|
179 | |
|
|
180 | # widget get |
|
|
181 | $self->connect_ext (w_g => sub { |
|
|
182 | my ($id, $rid, $attr) = @_; |
|
|
183 | |
|
|
184 | my $w = $self->{widget}{$id} |
|
|
185 | or return; |
|
|
186 | |
|
|
187 | $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); |
|
|
188 | }); |
|
|
189 | |
|
|
190 | # message window |
|
|
191 | $self->connect_ext (channel_info => sub { |
|
|
192 | my ($info) = @_; |
|
|
193 | $self->{channels}->{$info->{id}} = $info; |
|
|
194 | $::MESSAGE_WINDOW->add_channel ($info); |
|
|
195 | }); |
|
|
196 | |
62 | |
197 | # destroy widgets on logout |
63 | # destroy widgets on logout |
198 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
64 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
199 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
65 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
200 | $_->destroy |
66 | $_->destroy |
… | |
… | |
222 | # per server |
88 | # per server |
223 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
89 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
224 | |
90 | |
225 | $self |
91 | $self |
226 | } |
92 | } |
|
|
93 | |
|
|
94 | sub update_fx_want { |
|
|
95 | my ($self) = @_; |
|
|
96 | |
|
|
97 | $self->send_exti_msg (fx_want => { |
|
|
98 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
|
|
99 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
|
|
100 | 6 => 1, # FT_RSRC |
|
|
101 | }); |
|
|
102 | } |
|
|
103 | |
|
|
104 | sub ext_capabilities { |
|
|
105 | my ($self, %cap) = @_; |
|
|
106 | |
|
|
107 | #$self->send ("setup sound 0"); # we use a different protocol |
|
|
108 | $self->update_fx_want; |
|
|
109 | |
|
|
110 | $self->send_exti_req (resource => "exp_table", sub { |
|
|
111 | my ($exp_table) = @_; |
|
|
112 | |
|
|
113 | $self->register_face_handler ($exp_table, sub { |
|
|
114 | my ($face) = @_; |
|
|
115 | |
|
|
116 | $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
117 | $_->() for values %{ $self->{on_exp_update} || {} }; |
|
|
118 | }); |
|
|
119 | |
|
|
120 | () |
|
|
121 | }); |
|
|
122 | |
|
|
123 | if (my $ts = $cap{tileset}) { |
|
|
124 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
|
|
125 | $self->{tileset} = $default; |
|
|
126 | $self->{tilesize} = $default->[3]; |
|
|
127 | $self->setup_req (tileset => $default->[0]); |
|
|
128 | |
|
|
129 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
|
|
130 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
|
|
131 | |
|
|
132 | $self->setup_req (mapsize => "${w}x${h}"); |
|
|
133 | } |
|
|
134 | } |
|
|
135 | } |
|
|
136 | |
|
|
137 | sub ext_ambient_music { |
|
|
138 | my ($self, $songs) = @_; |
|
|
139 | &::audio_music_set_ambient ($songs); |
|
|
140 | } |
|
|
141 | |
|
|
142 | ############################################################################# |
|
|
143 | |
|
|
144 | sub widget_associate { |
|
|
145 | my ($self, $ws, $id, $widget) = @_; |
|
|
146 | |
|
|
147 | $widget ||= new CFPlus::UI::Bin; |
|
|
148 | |
|
|
149 | $widget->{s_id} = $id; |
|
|
150 | $self->{widget}{$id} = $widget; |
|
|
151 | |
|
|
152 | if ($ws) { |
|
|
153 | $widget->{s_ws} = $ws; |
|
|
154 | $self->{widgetset}{$ws}{w}{$id} = $widget; |
|
|
155 | } |
|
|
156 | |
|
|
157 | $widget->connect (on_destroy => sub { |
|
|
158 | my ($widget) = @_; |
|
|
159 | |
|
|
160 | delete $self->{widget}{$widget->{s_id}}; |
|
|
161 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} |
|
|
162 | if exists $widget->{s_ws}; |
|
|
163 | }); |
|
|
164 | } |
|
|
165 | |
|
|
166 | # widgetset new |
|
|
167 | sub ext_ws_n { |
|
|
168 | my ($self, $id) = @_; |
|
|
169 | |
|
|
170 | $self->{widgetset}{$id} = { |
|
|
171 | w => {}, |
|
|
172 | }; |
|
|
173 | } |
|
|
174 | |
|
|
175 | # widgetset destroy |
|
|
176 | sub ext_ws_d { |
|
|
177 | my ($self, $id) = @_; |
|
|
178 | |
|
|
179 | my $ws = delete $self->{widgetset}{$id} |
|
|
180 | or return; |
|
|
181 | |
|
|
182 | $_->destroy |
|
|
183 | for values %{$ws->{w}}; |
|
|
184 | } |
|
|
185 | |
|
|
186 | # widgetset create |
|
|
187 | sub ext_ws_c { |
|
|
188 | my ($self, $ws, $id, $class, $args) = @_; |
|
|
189 | |
|
|
190 | $self->widget_associate ( |
|
|
191 | $ws, $id => scalar eval { |
|
|
192 | local $SIG{__DIE__}; |
|
|
193 | "CFPlus::UI::$class"->new (%$args) |
|
|
194 | } |
|
|
195 | ); |
|
|
196 | } |
|
|
197 | |
|
|
198 | # widgetset associate |
|
|
199 | sub ext_ws_a { |
|
|
200 | my ($self, %ass) = @_; |
|
|
201 | |
|
|
202 | # everything that has a name, wether conceivably useful or not |
|
|
203 | my %wkw = ( |
|
|
204 | root => $CFPlus::UI::ROOT, |
|
|
205 | tooltip => $CFPlus::UI::TOOLTIP, |
|
|
206 | |
|
|
207 | mapwidget => $::MAPWIDGET, |
|
|
208 | buttonbar => $::BUTTONBAR, |
|
|
209 | metaserver => $::METASERVER, |
|
|
210 | buttonbar => $::BUTTONBAR, |
|
|
211 | login_button => $::LOGIN_BUTTON, |
|
|
212 | quit_dialog => $::QUIT_DIALOG, |
|
|
213 | host_entry => $::HOST_ENTRY, |
|
|
214 | metaserver => $::METASERVER, |
|
|
215 | server_info => $::SERVER_INFO, |
|
|
216 | |
|
|
217 | setup_dialog => $::SETUP_DIALOG, |
|
|
218 | setup_notebook => $::SETUP_NOTEBOOK, |
|
|
219 | setup_server => $::SETUP_SERVER, |
|
|
220 | setup_keyboard => $::SETUP_KEYBOARD, |
|
|
221 | |
|
|
222 | pl_notebook => $::PL_NOTEBOOK, |
|
|
223 | pl_window => $::PL_WINDOW, |
|
|
224 | inventory_page => $::INVENTORY_PAGE, |
|
|
225 | stats_page => $::STATS_PAGE, |
|
|
226 | skill_page => $::SKILL_PAGE, |
|
|
227 | spell_page => $::SPELL_PAGE, |
|
|
228 | spell_list => $::SPELL_LIST, |
|
|
229 | |
|
|
230 | floorbox => $::FLOORBOX, |
|
|
231 | help_window => $::HELP_WINDOW, |
|
|
232 | message_window => $::MESSAGE_WINDOW, |
|
|
233 | statusbox => $::SDTATUSBOX, |
|
|
234 | |
|
|
235 | inv => $::INV, |
|
|
236 | invr => $::INVR, |
|
|
237 | invr_hb => $::INVR_HB, |
|
|
238 | ); |
|
|
239 | |
|
|
240 | while (my ($id, $name) = each %ass) { |
|
|
241 | $self->widget_associate (undef, $id => $wkw{$name}); |
|
|
242 | } |
|
|
243 | } |
|
|
244 | |
|
|
245 | # widget call |
|
|
246 | sub ext_w_c { |
|
|
247 | my ($self, $id, $rcb, $method, @args) = @_; |
|
|
248 | |
|
|
249 | my $w = $self->{widget}{$id} |
|
|
250 | or return; |
|
|
251 | |
|
|
252 | if ($rcb) { |
|
|
253 | $rcb->($w->$method (@args)); |
|
|
254 | } else { |
|
|
255 | $w->$method (@args); |
|
|
256 | } |
|
|
257 | } |
|
|
258 | |
|
|
259 | # widget set |
|
|
260 | sub ext_w_s { |
|
|
261 | my ($self, $id, $attr) = @_; |
|
|
262 | |
|
|
263 | my $w = $self->{widget}{$id} |
|
|
264 | or return; |
|
|
265 | |
|
|
266 | for (my $i = 0; $i < $#$attr; $i += 2) { |
|
|
267 | my ($member, $value) = @$attr[$i, $i+1]; |
|
|
268 | if (defined $value) { |
|
|
269 | $w->{$member} = $value; |
|
|
270 | } else { |
|
|
271 | delete $w->{$member}; |
|
|
272 | } |
|
|
273 | $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible}; |
|
|
274 | } |
|
|
275 | } |
|
|
276 | |
|
|
277 | # widget get |
|
|
278 | sub ext_w_g { |
|
|
279 | my ($self, $id, $rid, @attr) = @_; |
|
|
280 | |
|
|
281 | my $w = $self->{widget}{$id} |
|
|
282 | or return; |
|
|
283 | |
|
|
284 | $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr); |
|
|
285 | } |
|
|
286 | |
|
|
287 | # message window |
|
|
288 | sub ext_channel_info { |
|
|
289 | my ($self, $info) = @_; |
|
|
290 | $self->{channels}->{$info->{id}} = $info; |
|
|
291 | $::MESSAGE_WINDOW->add_channel ($info); |
|
|
292 | } |
|
|
293 | |
|
|
294 | ############################################################################# |
227 | |
295 | |
228 | sub logprint { |
296 | sub logprint { |
229 | my ($self, @a) = @_; |
297 | my ($self, @a) = @_; |
230 | |
298 | |
231 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
299 | CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
… | |
… | |
320 | |
388 | |
321 | if ( |
389 | if ( |
322 | my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange |
390 | my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange |
323 | ) { |
391 | ) { |
324 | my $msg = "<b>stat change</b>: " . (join " ", @diffs); |
392 | my $msg = "<b>stat change</b>: " . (join " ", @diffs); |
325 | $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); |
393 | $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20); |
326 | } |
394 | } |
327 | |
395 | |
328 | $self->update_stats_window ($stats, $prev); |
396 | $self->update_stats_window ($stats, $prev); |
329 | |
397 | |
330 | $self->{prev_stats} = { %$stats }; |
398 | $self->{prev_stats} = { %$stats }; |
… | |
… | |
369 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
437 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
370 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
438 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
371 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
439 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
372 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
440 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
373 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
441 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
|
|
442 | $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); |
374 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
443 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
375 | my $title = $stats->{+CS_STAT_TITLE}; |
444 | my $title = $stats->{+CS_STAT_TITLE}; |
376 | $title =~ s/^Player: //; |
445 | $title =~ s/^Player: //; |
377 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
446 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
378 | |
447 | |
… | |
… | |
396 | for keys %RES_TBL; |
465 | for keys %RES_TBL; |
397 | |
466 | |
398 | my $sktbl = $::STATWIDS->{skill_tbl}; |
467 | my $sktbl = $::STATWIDS->{skill_tbl}; |
399 | my @skills = keys %{ $self->{skill_info} }; |
468 | my @skills = keys %{ $self->{skill_info} }; |
400 | |
469 | |
401 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
470 | my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
|
|
471 | map [$_, $self->{skill_info}{$_}], |
|
|
472 | grep exists $stats->{$_}, |
|
|
473 | @skills; |
|
|
474 | |
|
|
475 | if ($self->{stat_order} ne join ",", map $_->[0], @order) { |
|
|
476 | $self->{stat_order} = join ",", map $_->[0], @order; |
|
|
477 | |
402 | $sktbl->clear; |
478 | $sktbl->clear; |
403 | |
479 | |
404 | my @add; |
480 | my $sw = $self->{skillwid}{""} ||= [ |
405 | |
|
|
406 | push @add, |
|
|
407 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
481 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
408 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
482 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
|
|
483 | 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
409 | 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
484 | 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
410 | 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
485 | 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
411 | 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
486 | 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
|
|
487 | 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
412 | 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
488 | 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
413 | ; |
489 | ]; |
|
|
490 | |
|
|
491 | my @add = @$sw; |
414 | |
492 | |
415 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
493 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
416 | |
494 | |
417 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
495 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
418 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
496 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
419 | |
497 | |
420 | my ($x, $y) = (0, 1); |
498 | my ($x, $y) = (0, 1); |
421 | for ( |
499 | for (@order) { |
422 | sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
|
|
423 | map [$_, $self->{skill_info}{$_}], |
|
|
424 | grep exists $stats->{$_}, |
|
|
425 | @skills |
|
|
426 | ) { |
|
|
427 | my ($idx, $name) = @$_; |
500 | my ($idx, $name) = @$_; |
428 | |
501 | |
429 | my $spell_cb = sub { |
502 | my $spell_cb = sub { |
430 | my ($widget, $ev) = @_; |
503 | my ($widget, $ev) = @_; |
431 | |
504 | |
… | |
… | |
446 | } |
519 | } |
447 | |
520 | |
448 | 1 |
521 | 1 |
449 | }; |
522 | }; |
450 | |
523 | |
|
|
524 | my $sw = $self->{skillwid}{$idx} ||= [ |
|
|
525 | # exp |
|
|
526 | (new CFPlus::UI::Label |
|
|
527 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
|
|
528 | |
|
|
529 | # level |
|
|
530 | (new CFPlus::UI::Label |
|
|
531 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
|
|
532 | |
|
|
533 | # progress |
|
|
534 | (new CFPlus::UI::ExperienceProgress), |
|
|
535 | |
|
|
536 | # label |
|
|
537 | (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 | ]; |
|
|
540 | |
451 | push @add, |
541 | push @add, |
452 | $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label |
542 | $x * 4 + 0, $y, $sw->[0], |
453 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
543 | $x * 4 + 1, $y, $sw->[1], |
454 | $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label |
544 | $x * 4 + 2, $y, $sw->[2], |
455 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
545 | $x * 4 + 3, $y, $sw->[3], |
456 | $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
|
|
457 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
|
|
458 | ; |
546 | ; |
459 | |
547 | |
460 | $x++ and ($x, $y) = (0, $y + 1); |
548 | $x++ and ($x, $y) = (0, $y + 1); |
461 | } |
549 | } |
462 | |
550 | |
463 | $sktbl->add_at (@add); |
551 | $sktbl->add_at (@add); |
464 | } |
552 | } |
465 | |
553 | |
466 | for (grep exists $stats->{$_}, @skills) { |
554 | for (@order) { |
467 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
555 | my ($idx, $name) = @$_; |
468 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
556 | my $val = $stats->{$idx}; |
469 | } |
|
|
470 | } |
|
|
471 | |
557 | |
472 | sub macro_send { |
558 | next if $prev->{$idx}[1] eq $val->[1]; |
473 | my ($self, $macro) = @_; |
|
|
474 | |
559 | |
475 | for my $cmd (@{ $macro->{action} }) { |
560 | my $sw = $self->{skillwid}{$idx}; |
476 | $self->send_command ($cmd); |
561 | $sw->[0]->set_text (::formsep ($val->[1])); |
|
|
562 | $sw->[1]->set_text ($val->[0] * 1); |
|
|
563 | $sw->[2]->set_value (@$val); |
|
|
564 | |
|
|
565 | $::GAUGES->{sklprg}->set_label ("$name %d%%"); |
|
|
566 | $::GAUGES->{sklprg}->set_value (@$val); |
477 | } |
567 | } |
478 | } |
568 | } |
479 | |
569 | |
480 | sub user_send { |
570 | sub user_send { |
481 | my ($self, $command) = @_; |
571 | my ($self, $command) = @_; |
… | |
… | |
483 | $self->{record}->($command) |
573 | $self->{record}->($command) |
484 | if $self->{record}; |
574 | if $self->{record}; |
485 | |
575 | |
486 | $self->logprint ("send: ", $command); |
576 | $self->logprint ("send: ", $command); |
487 | $self->send_command ($command); |
577 | $self->send_command ($command); |
488 | ::status ($command); |
|
|
489 | } |
578 | } |
490 | |
579 | |
491 | sub record { |
580 | sub record { |
492 | my ($self, $cb) = @_; |
581 | my ($self, $cb) = @_; |
493 | |
582 | |
… | |
… | |
501 | } |
590 | } |
502 | |
591 | |
503 | sub feed_map1a { |
592 | sub feed_map1a { |
504 | my ($self, $data) = @_; |
593 | my ($self, $data) = @_; |
505 | |
594 | |
506 | $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
595 | my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
|
|
596 | my $delay; |
|
|
597 | |
|
|
598 | for my $tile (@$missing) { |
|
|
599 | next if $self->{delay}{$tile}; |
|
|
600 | |
|
|
601 | $delay = 1; |
|
|
602 | |
|
|
603 | if (my $tex = $::CONN->{texture}[$tile]) { |
|
|
604 | $tex->upload; |
|
|
605 | } else { |
|
|
606 | $self->{delay}{$tile} = 1; |
|
|
607 | |
|
|
608 | # we assume the face is in-flight and will eventually come |
|
|
609 | push @{$self->{tile_cb}{$tile}}, sub { |
|
|
610 | delete $self->{delay}{$tile}; |
|
|
611 | $_[0]->upload; |
|
|
612 | }; |
|
|
613 | } |
|
|
614 | } |
|
|
615 | |
|
|
616 | if ($delay) { |
|
|
617 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
|
|
618 | Event->timer (after => 0.03, cb => sub { |
|
|
619 | $_[0]->w->cancel; |
|
|
620 | $self->{map_widget}->update |
|
|
621 | if $self->{map_widget}; |
|
|
622 | }); |
|
|
623 | } else { |
507 | $self->{map_widget}->update; |
624 | $self->{map_widget}->update; |
|
|
625 | } |
508 | } |
626 | } |
509 | |
627 | |
510 | sub magicmap { |
628 | sub magicmap { |
511 | my ($self, $w, $h, $x, $y, $data) = @_; |
629 | my ($self, $w, $h, $x, $y, $data) = @_; |
512 | |
630 | |
… | |
… | |
519 | my $map_info = delete $self->{map_info} |
637 | my $map_info = delete $self->{map_info} |
520 | or return; |
638 | or return; |
521 | |
639 | |
522 | my ($hash, $x, $y, $w, $h) = @$map_info; |
640 | my ($hash, $x, $y, $w, $h) = @$map_info; |
523 | |
641 | |
524 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
642 | my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); |
|
|
643 | $self->{map_cache_new}{$hash} = \$data; |
525 | CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; |
644 | CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; |
526 | #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# |
|
|
527 | } |
645 | } |
528 | |
646 | |
529 | sub map_clear { |
647 | sub map_clear { |
530 | my ($self) = @_; |
648 | my ($self) = @_; |
531 | |
649 | |
… | |
… | |
537 | } |
655 | } |
538 | |
656 | |
539 | sub bg_fetch { |
657 | sub bg_fetch { |
540 | my ($self) = @_; |
658 | my ($self) = @_; |
541 | |
659 | |
542 | my $id; |
660 | my $tile; |
543 | |
661 | |
544 | do { |
662 | do { |
545 | $id = pop @{$self->{bg_fetch}} |
663 | $tile = pop @{$self->{bg_fetch}} |
546 | or return; |
664 | or return; |
547 | } while $self->{texture}[$id]; |
665 | } while $self->{texture}[$tile]; |
548 | |
666 | |
549 | CFPlus::DB::get tilecache => $id, sub { |
667 | CFPlus::DB::get tilecache => $tile, sub { |
550 | my ($data) = @_; |
668 | my ($data) = @_; |
551 | |
669 | |
552 | return unless $self->{map}; # stop when destroyed |
670 | return unless $self->{map}; # stop when destroyed |
553 | |
671 | |
554 | $self->set_texture ($id => $data) |
|
|
555 | if defined $data; |
672 | if (defined $data) { |
|
|
673 | $self->have_tile ($tile, $data); |
|
|
674 | $self->{texture}[$tile]->upload; |
|
|
675 | } |
556 | |
676 | |
557 | $self->bg_fetch; |
677 | $self->bg_fetch; |
558 | }; |
678 | }; |
559 | } |
679 | } |
560 | |
680 | |
561 | sub load_map($$$) { |
681 | sub load_map($$$) { |
562 | my ($self, $hash, $x, $y) = @_; |
682 | my ($self, $hash, $x, $y) = @_; |
563 | |
683 | |
564 | my $gen = $self->{map_change_gen}; |
684 | my $gen = $self->{map_change_gen}; |
565 | |
685 | |
566 | CFPlus::DB::get $self->{mapcache} => $hash, sub { |
686 | my $cb = sub { |
567 | return unless $gen == $self->{map_change_gen}; |
687 | return unless $gen == $self->{map_change_gen}; |
568 | |
688 | |
569 | my ($data) = @_; |
689 | my ($data) = @_; |
570 | |
690 | |
571 | if (defined $data) { |
691 | if (defined $data) { |
|
|
692 | $self->{map_cache_new}{$hash} = \$data; |
|
|
693 | |
572 | $data = Compress::LZF::decompress $data; |
694 | my $data = Compress::LZF::decompress $data; |
573 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
|
|
574 | |
695 | |
575 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
696 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
576 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
697 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
577 | $self->bg_fetch unless $inprogress; |
698 | $self->bg_fetch unless $inprogress; |
578 | } |
699 | } |
579 | }; |
700 | }; |
|
|
701 | |
|
|
702 | if (my $rdata = $self->{map_cache_old}{$hash}) { |
|
|
703 | $cb->($$rdata); |
|
|
704 | } else { |
|
|
705 | CFPlus::DB::get $self->{mapcache} => $hash, $cb; |
|
|
706 | } |
580 | } |
707 | } |
581 | |
708 | |
582 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
709 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
583 | # (server resource,s latency, bandwidth), so this hack is warranted. |
710 | # (server resource,s latency, bandwidth), so this hack is warranted. |
584 | # the right fix is to make real tiled maps with an overview file |
711 | # the right fix is to make real tiled maps with an overview file |
… | |
… | |
677 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
804 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
678 | |
805 | |
679 | $self->flush_map; |
806 | $self->flush_map; |
680 | |
807 | |
681 | ++$self->{map_change_gen}; |
808 | ++$self->{map_change_gen}; |
|
|
809 | $self->{map_cache_old} = delete $self->{map_cache_new}; |
682 | |
810 | |
683 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
811 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
684 | |
812 | |
685 | my $mapmapw = $self->{mapmap}->{w}; |
813 | my $mapmapw = $self->{mapmap}->{w}; |
686 | my $mapmaph = $self->{mapmap}->{h}; |
814 | my $mapmaph = $self->{mapmap}->{h}; |
… | |
… | |
708 | my ($self, $facenum, $face, $cb) = @_; |
836 | my ($self, $facenum, $face, $cb) = @_; |
709 | |
837 | |
710 | if ($face->{type} == 0) { # FT_FACE |
838 | if ($face->{type} == 0) { # FT_FACE |
711 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
839 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
712 | |
840 | |
713 | $face->{id} = $id; |
841 | $face->{id} = $id; |
714 | $self->{faceid}[$facenum] = $id; |
|
|
715 | |
|
|
716 | $self->{map}->set_tileid ($facenum => $id); |
842 | $self->{map}->set_tileid ($facenum => $id); |
717 | |
843 | |
718 | CFPlus::DB::get tilecache => $id, $cb; |
844 | CFPlus::DB::get tilecache => $id, $cb; |
719 | |
845 | |
720 | } elsif ($face->{type} & 1) { # with metadata |
846 | } elsif ($face->{type} & 1) { # with metadata |
721 | #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." }); |
|
|
722 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
847 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
|
|
848 | |
|
|
849 | } else { # no metadata |
|
|
850 | CFPlus::DB::get res_data => $face->{name}, $cb; |
723 | } |
851 | } |
724 | } |
852 | } |
725 | |
853 | |
726 | sub face_update { |
854 | sub face_update { |
727 | my ($self, $facenum, $face, $changed) = @_; |
855 | my ($self, $facenum, $face, $changed) = @_; |
728 | |
856 | |
729 | if ($face->{type} == 0) { # FT_FACE |
857 | if ($face->{type} == 0) { |
|
|
858 | # image, FT_FACE |
730 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
859 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
731 | if $changed; |
860 | if $changed; |
732 | |
861 | |
733 | $self->set_texture ($face->{id} => delete $face->{data}); |
862 | $self->have_tile ($face->{id}, delete $face->{data}); |
734 | |
863 | |
735 | } elsif ($face->{type} & 1) { # split metadata |
864 | } elsif ($face->{type} & 1) { |
736 | my $cb = sub { }; |
865 | # split metadata case, FT_MUSIC, FT_SOUND |
|
|
866 | if ($changed) { # new data |
|
|
867 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
|
|
868 | $face->{data} = $meta; |
|
|
869 | |
|
|
870 | # rely on strict ordering here and also on later fetch |
|
|
871 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
|
|
872 | CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; |
|
|
873 | } |
|
|
874 | |
|
|
875 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
|
|
876 | ::add_license ($face); |
|
|
877 | ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) |
|
|
878 | if $changed; |
737 | |
879 | |
738 | if ($face->{type} == 3) { # FT_MUSIC |
880 | if ($face->{type} == 3) { # FT_MUSIC |
739 | $cb = sub { |
|
|
740 | $self->{music_meta}{$facenum} = $face; |
|
|
741 | |
|
|
742 | ::message ({ markup => "downloaded song #$facenum" }) |
|
|
743 | if $changed; |
|
|
744 | |
|
|
745 | &::audio_music_push ($facenum); |
881 | &::audio_music_push ($facenum); |
746 | }; |
|
|
747 | } elsif ($face->{type} == 5) { # FT_SOUND |
882 | } elsif ($face->{type} == 5) { # FT_SOUND |
748 | $cb = sub { |
|
|
749 | $self->{sound_meta}{$facenum} = $face; |
|
|
750 | |
|
|
751 | ::message ({ markup => "downloaded sound #$facenum" }) |
|
|
752 | if $changed; |
|
|
753 | |
|
|
754 | &::audio_sound_push ($facenum); |
883 | &::audio_sound_push ($facenum); |
755 | }; |
884 | } |
756 | } |
|
|
757 | |
885 | |
758 | if ($changed) { # new data |
886 | } else { |
759 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
887 | # flat resource case, FT_RSRC |
760 | |
|
|
761 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
888 | CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } |
762 | CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { |
889 | if $changed; |
763 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
890 | } |
764 | ::add_license ($face); |
|
|
765 | $cb->(); |
|
|
766 | }; |
|
|
767 | |
891 | |
768 | } else { |
892 | if (my $cbs = $self->{face_cb}{$facenum}) { |
769 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
893 | $_->($face, $changed) for @$cbs; |
770 | ::add_license ($face); |
|
|
771 | $cb->(); |
|
|
772 | } |
|
|
773 | } |
894 | } |
774 | } |
895 | } |
775 | |
896 | |
776 | sub smooth_update { |
897 | sub smooth_update { |
777 | my ($self, $facenum, $face) = @_; |
898 | my ($self, $facenum, $face) = @_; |
778 | |
899 | |
779 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
900 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
780 | } |
901 | } |
781 | |
902 | |
782 | sub set_texture { |
903 | sub have_tile { |
783 | my ($self, $id, $data) = @_; |
904 | my ($self, $tile, $data) = @_; |
784 | |
905 | |
785 | return unless $self->{map}; |
906 | return unless $self->{map}; |
786 | |
907 | |
787 | $self->{texture}[$id] = my $tex = |
908 | my $tex = $self->{texture}[$tile] ||= |
788 | new_from_image CFPlus::Texture |
909 | new CFPlus::Texture |
|
|
910 | tile => $tile, |
|
|
911 | image => $data, delete_image => 1, |
789 | $data, minify => 1, mipmap => 1; |
912 | minify => 1, mipmap => 1; |
790 | |
913 | |
791 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
914 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
792 | $self->{map_widget}->update; |
915 | $_->($tex) for @$cbs; |
793 | |
916 | } |
794 | $_->() for @{(delete $self->{face_cb}{$id}) || []}; |
|
|
795 | } |
917 | } |
796 | |
918 | |
797 | sub connect_face_update { |
919 | # call in non-void context registers a temporary |
|
|
920 | # hook with handle, otherwise its permanent |
|
|
921 | sub on_face_change { |
798 | my ($self, $id, $cb) = @_; |
922 | my ($self, $num, $cb) = @_; |
799 | |
923 | |
800 | push @{$self->{face_cb}{$id}}, $cb; |
924 | push @{$self->{face_cb}{$num}}, $cb; |
801 | |
925 | |
|
|
926 | defined wantarray |
802 | CFPlus::guard { |
927 | ? CFPlus::guard { |
803 | @{$self->{face_cb}{$id}} |
928 | @{$self->{face_cb}{$num}} |
804 | = grep $_ != $cb, |
929 | = grep $_ != $cb, |
805 | @{$self->{face_cb}{$id}}; |
930 | @{$self->{face_cb}{$num}}; |
806 | } |
931 | } |
|
|
932 | : () |
|
|
933 | } |
|
|
934 | |
|
|
935 | # call in non-void context registers a temporary |
|
|
936 | # hook with handle, otherwise its permanent |
|
|
937 | sub register_face_handler { |
|
|
938 | my ($self, $num, $cb) = @_; |
|
|
939 | |
|
|
940 | return unless $num; |
|
|
941 | |
|
|
942 | # invoke if available right now |
|
|
943 | $cb->($self->{face}[$num], 0) |
|
|
944 | unless exists $self->{face}[$num]{loading}; |
|
|
945 | |
|
|
946 | # future changes |
|
|
947 | $self->on_face_change ($num => $cb) |
807 | } |
948 | } |
808 | |
949 | |
809 | sub sound_play { |
950 | sub sound_play { |
810 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
951 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
811 | |
952 | |
… | |
… | |
826 | |
967 | |
827 | sub sanitise_xml($) { |
968 | sub sanitise_xml($) { |
828 | local $_ = shift; |
969 | local $_ = shift; |
829 | |
970 | |
830 | # we now weed out all tags we do not support |
971 | # we now weed out all tags we do not support |
831 | s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g; |
972 | s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>) |
|
|
973 | }{ |
|
|
974 | "<" |
|
|
975 | }gex; |
|
|
976 | |
832 | # now all entities |
977 | # now all entities |
833 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
978 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
834 | |
979 | |
835 | # handle some elements |
980 | # handle some elements |
836 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
981 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
… | |
… | |
883 | $self->{$type} = $text; |
1028 | $self->{$type} = $text; |
884 | } else { |
1029 | } else { |
885 | $self->logprint ("msg: ", $text); |
1030 | $self->logprint ("msg: ", $text); |
886 | return if $color < 0; # negative color == ignore if not understood |
1031 | return if $color < 0; # negative color == ignore if not understood |
887 | |
1032 | |
888 | my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; |
1033 | my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; |
889 | |
1034 | |
890 | ## try to create single paragraphs of multiple lines sent by the server |
1035 | ## try to create single paragraphs of multiple lines sent by the server |
891 | # no longer neecssary with TRT servers |
1036 | # no longer neecssary with TRT servers |
892 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
1037 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
893 | |
1038 | |
894 | ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] }) |
|
|
895 | for split /\n/, $text; |
1039 | for (split /\n/, $text) { |
|
|
1040 | ::message ({ |
|
|
1041 | fg => $fg, |
|
|
1042 | markup => $_, |
|
|
1043 | type => $type, |
|
|
1044 | extra => [@extra], |
|
|
1045 | color_flags => $color, #d# ugly, kill |
|
|
1046 | }); |
|
|
1047 | |
|
|
1048 | $color &= ~NDI_CLEAR; # only clear once for multiline messages |
|
|
1049 | # actually, this is an ugly design. _we_ should control the channels, |
|
|
1050 | # not some random other widget, as the channels are clearly protocol-specific. |
|
|
1051 | # then we could also react to flags such as CLEAR without resorting to |
|
|
1052 | # hacks such as color_flags, above. |
|
|
1053 | } |
896 | |
1054 | |
897 | $self->{statusbox}->add ($text, |
1055 | $self->{statusbox}->add ($text, |
898 | group => $text, |
1056 | group => $text, |
899 | fg => $fg, |
1057 | fg => $fg, |
900 | timeout => $color >= 2 ? 180 : 10, |
1058 | timeout => $color >= 2 ? 180 : 10, |
901 | tooltip_font => $::FONT_FIXED, |
1059 | tooltip_font => $::FONT_FIXED, |
902 | ); |
1060 | ) if $type eq "info"; |
903 | } |
1061 | } |
904 | } |
1062 | } |
905 | |
1063 | |
906 | sub spell_add { |
1064 | sub spell_add { |
907 | my ($self, $spell) = @_; |
1065 | my ($self, $spell) = @_; |
… | |
… | |
994 | } |
1152 | } |
995 | |
1153 | |
996 | $::FLOORBOX->add_at (@add); |
1154 | $::FLOORBOX->add_at (@add); |
997 | }); |
1155 | }); |
998 | |
1156 | |
999 | $::WANT_REFRESH++; |
1157 | $::WANT_REFRESH->start; |
1000 | } |
1158 | } |
1001 | |
1159 | |
1002 | sub set_opencont { |
1160 | sub set_opencont { |
1003 | my ($conn, $tag, $name) = @_; |
1161 | my ($conn, $tag, $name) = @_; |
1004 | $conn->{open_container} = $tag; |
1162 | $conn->{open_container} = $tag; |
1005 | update_floorbox; |
1163 | update_floorbox; |
1006 | |
1164 | |
1007 | $::INV_RIGHT_HB->clear (); |
1165 | $::INVR_HB->clear (); |
1008 | $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
1166 | $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
1009 | |
1167 | |
1010 | if ($tag != 0) { # Floor isn't closable, is it? |
1168 | if ($tag != 0) { # Floor isn't closable, is it? |
1011 | $::INV_RIGHT_HB->add (new CFPlus::UI::Button |
1169 | $::INVR_HB->add (new CFPlus::UI::Button |
1012 | text => "Close container", |
1170 | text => "Close container", |
1013 | tooltip => "Close the currently open container (if one is open)", |
1171 | tooltip => "Close the currently open container (if one is open)", |
1014 | on_activate => sub { |
1172 | on_activate => sub { |
1015 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1173 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1016 | if $tag != 0; |
1174 | if $tag != 0; |
1017 | #if $CONN->{open_container} != 0; |
|
|
1018 | 0 |
1175 | 0 |
1019 | }, |
1176 | }, |
1020 | ); |
1177 | ); |
1021 | } |
1178 | } |
1022 | |
1179 | |
… | |
… | |
1146 | 0 |
1303 | 0 |
1147 | }); |
1304 | }); |
1148 | |
1305 | |
1149 | $self->update_server_info; |
1306 | $self->update_server_info; |
1150 | |
1307 | |
1151 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
|
|
1152 | $self->send_command ("output-count $::CFG->{output_count}"); |
|
|
1153 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1308 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1154 | $self->send_command ("pickup $::CFG->{pickup}"); |
1309 | $self->send_command ("pickup $::CFG->{pickup}"); |
1155 | } |
1310 | } |
1156 | |
1311 | |
1157 | sub lookat { |
1312 | sub lookat { |