ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.157 by root, Tue Aug 21 02:39:17 2007 UTC vs.
Revision 1.177 by root, Sat Nov 3 12:08:44 2007 UTC

… …
10use CFPlus::UI; 10use CFPlus::UI;
11use CFPlus::Pod; 11use CFPlus::Pod;
12use CFPlus::Macro; 12use CFPlus::Macro;
13use CFPlus::Item; 13use CFPlus::Item;
14 14
15use Crossfire::Protocol::Base 0.95;
16
17use base 'Crossfire::Protocol::Base'; 15use base 'Crossfire::Protocol::Base';
18 16
19sub new { 17sub 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 xwidget1 => 1,#d# 24 widget => 1,
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 $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} 51 $self->{json_coder}
92 ->convert_blessed 52 ->convert_blessed
93 ->filter_json_single_key_object (__w_ => sub { 53 ->filter_json_single_key_object ("\fw" => sub {
94 $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 }
95 }); 61 });
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 62
236 # destroy widgets on logout 63 # destroy widgets on logout
237 $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 {
238 for my $ws (values %{delete $self->{widgetset} || {}}) { 65 for my $ws (values %{delete $self->{widgetset} || {}}) {
239 $_->destroy 66 $_->destroy
… …
262 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
263 90
264 $self 91 $self
265} 92}
266 93
267sub 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
295sub update_fx_want { 94sub update_fx_want {
296 my ($self) = @_; 95 my ($self) = @_;
297 96
298 $self->send_exti_msg (fx_want => { 97 $self->send_exti_msg (fx_want => {
299 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC 98 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
300 5 => !!$::CFG->{audio_enable}, # FT_SOUND 99 5 => !!$::CFG->{audio_enable}, # FT_SOUND
301 6 => 1, # FT_RSRC 100 6 => 1, # FT_RSRC
302 }); 101 });
303} 102}
103
104sub 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
137sub ext_ambient_music {
138 my ($self, $songs) = @_;
139 &::audio_music_set_ambient ($songs);
140}
141
142#############################################################################
143
144sub 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
167sub ext_ws_n {
168 my ($self, $id) = @_;
169
170 $self->{widgetset}{$id} = {
171 w => {},
172 };
173}
174
175# widgetset destroy
176sub 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
187sub 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
199sub 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
246sub 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
260sub 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
278sub 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
288sub ext_channel_info {
289 my ($self, $info) = @_;
290 $self->{channels}->{$info->{id}} = $info;
291 $::MESSAGE_WINDOW->add_channel ($info);
292}
293
294#############################################################################
304 295
305sub logprint { 296sub logprint {
306 my ($self, @a) = @_; 297 my ($self, @a) = @_;
307 298
308 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 299 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
… …
397 388
398 if ( 389 if (
399 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 390 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
400 ) { 391 ) {
401 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 392 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); 393 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
403 } 394 }
404 395
405 $self->update_stats_window ($stats, $prev); 396 $self->update_stats_window ($stats, $prev);
406 397
407 $self->{prev_stats} = { %$stats }; 398 $self->{prev_stats} = { %$stats };
… …
474 for keys %RES_TBL; 465 for keys %RES_TBL;
475 466
476 my $sktbl = $::STATWIDS->{skill_tbl}; 467 my $sktbl = $::STATWIDS->{skill_tbl};
477 my @skills = keys %{ $self->{skill_info} }; 468 my @skills = keys %{ $self->{skill_info} };
478 469
479 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
480 $sktbl->clear; 478 $sktbl->clear;
481 479
482 my @add; 480 my $sw = $self->{skillwid}{""} ||= [
483
484 push @add,
485 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 481 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
486 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 482 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
487 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 483 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
488 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 484 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
489 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 485 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
490 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 486 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
491 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 487 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
492 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 488 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
493 ; 489 ];
490
491 my @add = @$sw;
494 492
495 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>";
496 494
497 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);
498 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);
499 497
500 my ($x, $y) = (0, 1); 498 my ($x, $y) = (0, 1);
501 for ( 499 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) = @$_; 500 my ($idx, $name) = @$_;
508 501
509 my $spell_cb = sub { 502 my $spell_cb = sub {
510 my ($widget, $ev) = @_; 503 my ($widget, $ev) = @_;
511 504
… …
526 } 519 }
527 520
528 1 521 1
529 }; 522 };
530 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
531 push @add, 541 push @add,
532 $x * 4 + 0, $y, ($self->{stat_widget_exp}{$idx} ||= new CFPlus::UI::Label 542 $x * 4 + 0, $y, $sw->[0],
533 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 543 $x * 4 + 1, $y, $sw->[1],
534 $x * 4 + 1, $y, ($self->{stat_widget_lvl}{$idx} ||= new CFPlus::UI::Label 544 $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), 545 $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 ; 546 ;
540 547
541 $x++ and ($x, $y) = (0, $y + 1); 548 $x++ and ($x, $y) = (0, $y + 1);
542 } 549 }
543 550
544 $sktbl->add_at (@add); 551 $sktbl->add_at (@add);
545 } 552 }
546 553
547 for (grep exists $stats->{$_}, @skills) { 554 for (@order) {
548 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 555 my ($idx, $name) = @$_;
549 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 556 my $val = $stats->{$idx};
550 $self->{stat_widget_prg}{$_}->set_value (@{$stats->{$_}});
551 }
552}
553 557
554sub macro_send { 558 next if $prev->{$idx}[1] eq $val->[1];
555 my ($self, $macro) = @_;
556 559
557 for my $cmd (@{ $macro->{action} }) { 560 my $sw = $self->{skillwid}{$idx};
558 $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);
559 } 567 }
560} 568}
561 569
562sub user_send { 570sub user_send {
563 my ($self, $command) = @_; 571 my ($self, $command) = @_;
… …
565 $self->{record}->($command) 573 $self->{record}->($command)
566 if $self->{record}; 574 if $self->{record};
567 575
568 $self->logprint ("send: ", $command); 576 $self->logprint ("send: ", $command);
569 $self->send_command ($command); 577 $self->send_command ($command);
570 ::status ($command);
571} 578}
572 579
573sub record { 580sub record {
574 my ($self, $cb) = @_; 581 my ($self, $cb) = @_;
575 582
… …
608 615
609 if ($delay) { 616 if ($delay) {
610 # delay the map drawing a tiny bit in the hope of getting the missing fetched 617 # delay the map drawing a tiny bit in the hope of getting the missing fetched
611 Event->timer (after => 0.03, cb => sub { 618 Event->timer (after => 0.03, cb => sub {
612 $_[0]->w->cancel; 619 $_[0]->w->cancel;
613 $self->{map_widget}->update; 620 $self->{map_widget}->update
621 if $self->{map_widget};
614 }); 622 });
615 } else { 623 } else {
616 $self->{map_widget}->update; 624 $self->{map_widget}->update;
617 } 625 }
618} 626}
… …
857 # split metadata case, FT_MUSIC, FT_SOUND 865 # split metadata case, FT_MUSIC, FT_SOUND
858 if ($changed) { # new data 866 if ($changed) { # new data
859 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 867 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
860 $face->{data} = $meta; 868 $face->{data} = $meta;
861 869
870 # rely on strict ordering here and also on later fetch
862 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 871 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
863 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; 872 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
864 } 873 }
865 874
866 $face->{data} = $self->{json_coder}->decode ($face->{data}); 875 $face->{data} = $self->{json_coder}->decode ($face->{data});
867
868 ::add_license ($face); 876 ::add_license ($face);
877 ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
878 if $changed;
869 879
870 if ($face->{type} == 3) { # FT_MUSIC 880 if ($face->{type} == 3) { # FT_MUSIC
871 ::message ({ markup => "downloaded song #$facenum" })
872 if $changed;
873
874 &::audio_music_push ($facenum); 881 &::audio_music_push ($facenum);
875 } elsif ($face->{type} == 5) { # FT_SOUND 882 } elsif ($face->{type} == 5) { # FT_SOUND
876 ::message ({ markup => "downloaded sound #$facenum" })
877 if $changed;
878
879 &::audio_sound_push ($facenum); 883 &::audio_sound_push ($facenum);
880 } 884 }
881 885
882 } else { 886 } else {
883 # flat resource case, FT_RSRC 887 # flat resource case, FT_RSRC
… …
963 967
964sub sanitise_xml($) { 968sub sanitise_xml($) {
965 local $_ = shift; 969 local $_ = shift;
966 970
967 # we now weed out all tags we do not support 971 # we now weed out all tags we do not support
968 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 972 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
973 }{
974 "&lt;"
975 }gex;
976
969 # now all entities 977 # now all entities
970 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 978 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
971 979
972 # handle some elements 980 # handle some elements
973 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 981 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
1026 1034
1027 ## 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
1028 # no longer neecssary with TRT servers 1036 # no longer neecssary with TRT servers
1029 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1037 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1030 1038
1039 for (split /\n/, $text) {
1031 ::message ({ 1040 ::message ({
1032 fg => $fg, 1041 fg => $fg,
1033 markup => $_, 1042 markup => $_,
1034 type => $type, 1043 type => $type,
1035 extra => [@extra], 1044 extra => [@extra],
1036 color_flags => $color 1045 color_flags => $color, #d# ugly, kill
1037 }) for split /\n/, $text; 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 }
1038 1054
1039 $self->{statusbox}->add ($text, 1055 $self->{statusbox}->add ($text,
1040 group => $text, 1056 group => $text,
1041 fg => $fg, 1057 fg => $fg,
1042 timeout => $color >= 2 ? 180 : 10, 1058 timeout => $color >= 2 ? 180 : 10,
1043 tooltip_font => $::FONT_FIXED, 1059 tooltip_font => $::FONT_FIXED,
1044 ); 1060 ) if $type eq "info";
1045 } 1061 }
1046} 1062}
1047 1063
1048sub spell_add { 1064sub spell_add {
1049 my ($self, $spell) = @_; 1065 my ($self, $spell) = @_;
… …
1287 0 1303 0
1288 }); 1304 });
1289 1305
1290 $self->update_server_info; 1306 $self->update_server_info;
1291 1307
1292 $self->send_command ("output-sync $::CFG->{output_sync}");
1293 $self->send_command ("output-count $::CFG->{output_count}");
1294 $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;
1295 $self->send_command ("pickup $::CFG->{pickup}"); 1309 $self->send_command ("pickup $::CFG->{pickup}");
1296} 1310}
1297 1311
1298sub lookat { 1312sub lookat {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines