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

Diff Legend

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