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.147 by root, Thu Aug 9 03:40:01 2007 UTC vs.
Revision 1.175 by root, Thu Sep 6 15:06:25 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} || {}},
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 if (my $ts = $cap{tileset}) {
65 if (my ($default) = grep $_->[2] & 1, @$ts) {
66 $self->{tileset} = $default;
67 $self->{tilesize} = $default->[3];
68 $self->setup_req (tileset => $default->[0]);
69
70 my $w = int $self->{mapw} * 32 / $self->{tilesize};
71 my $h = int $self->{maph} * 32 / $self->{tilesize};
72
73 $self->setup_req (mapsize => "${w}x${h}");
74 }
75 }
76 });
77
78 $self->{json_coder} 51 $self->{json_coder}
79 ->convert_blessed 52 ->convert_blessed
80 ->filter_json_single_key_object (__w_ => sub { 53 ->filter_json_single_key_object ("\fw" => sub {
81 $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 }
82 }); 61 });
83
84 # widgetset new
85 $self->connect_ext (ws_n => sub {
86 my ($id) = @_;
87
88 $self->{widgetset}{$id} = {
89 w => {},
90 };
91 });
92
93 # widgetset destroy
94 $self->connect_ext (ws_d => sub {
95 my ($id) = @_;
96
97 my $ws = delete $self->{widgetset}{$id}
98 or return;
99
100 $_->destroy
101 for values %{$ws->{w}};
102 });
103
104 # widgetset create
105 $self->connect_ext (ws_c => sub {
106 my ($ws, $id, $class, $args) = @_;
107
108 for my $ev (grep /^on_/, keys %$args) {
109 $args->{$ev} = sub {
110 my $id = shift->{s_id};
111 $self->send_exti_msg (w_e => $id, $ev, \@_);
112
113 1
114 };
115 }
116
117 if (my $widget = eval {
118 local $SIG{__DIE__};
119 "CFPlus::UI::$class"->new (
120 %$args,
121 s_ws => $ws,
122 s_id => $id,
123 )
124 }
125 ) {
126 $self->{widget}{$id}
127 = $self->{widgetset}{$ws}{w}{$id}
128 = $widget;
129
130 $widget->connect (on_destroy => sub {
131 my ($widget) = @_;
132
133 delete $self->{widget}{$widget->{s_id}};
134 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
135 });
136 } else {
137 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
138 $self->send_exti_msg (w_e => $id, "destroy");
139 }
140 });
141
142 # widget call
143 $self->connect_ext (w_c => sub {
144 my ($id, $rid, $method, $args) = @_;
145
146 my $w = $self->{widget}{$id}
147 or return;
148
149 $args ||= [];
150
151 if ($rid) {
152 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
153 } else {
154 $w->$method (@$args);
155 }
156 });
157
158 # widget set
159 $self->connect_ext (w_s => sub {
160 my ($id, $attr) = @_;
161
162 my $w = $self->{widget}{$id}
163 or return;
164
165 for (my $i = 0; $i < $#$attr; $i += 2) {
166 my ($member, $value) = @$attr[$i, $i+1];
167 if (defined $value) {
168 $w->{$member} = $value;
169 } else {
170 delete $w->{$member};
171 }
172 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
173 }
174 });
175
176 # widget get
177 $self->connect_ext (w_g => sub {
178 my ($id, $rid, $attr) = @_;
179
180 my $w = $self->{widget}{$id}
181 or return;
182
183 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
184 });
185
186 # message window
187 $self->connect_ext (channel_info => sub {
188 my ($info) = @_;
189 $self->{channels}->{$info->{id}} = $info;
190 $::MESSAGE_WINDOW->add_channel ($info);
191 });
192 62
193 # destroy widgets on logout 63 # destroy widgets on logout
194 $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 {
195 for my $ws (values %{delete $self->{widgetset} || {}}) { 65 for my $ws (values %{delete $self->{widgetset} || {}}) {
196 $_->destroy 66 $_->destroy
… …
225 my ($self) = @_; 95 my ($self) = @_;
226 96
227 $self->send_exti_msg (fx_want => { 97 $self->send_exti_msg (fx_want => {
228 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC 98 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
229 5 => !!$::CFG->{audio_enable}, # FT_SOUND 99 5 => !!$::CFG->{audio_enable}, # FT_SOUND
100 6 => 1, # FT_RSRC
230 }); 101 });
231} 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#############################################################################
232 295
233sub logprint { 296sub logprint {
234 my ($self, @a) = @_; 297 my ($self, @a) = @_;
235 298
236 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 299 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
… …
325 388
326 if ( 389 if (
327 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 390 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
328 ) { 391 ) {
329 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 392 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
330 $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);
331 } 394 }
332 395
333 $self->update_stats_window ($stats, $prev); 396 $self->update_stats_window ($stats, $prev);
334 397
335 $self->{prev_stats} = { %$stats }; 398 $self->{prev_stats} = { %$stats };
… …
374 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 437 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
375 $::GAUGES->{food} ->set_value ($fo, $fo_m); 438 $::GAUGES->{food} ->set_value ($fo, $fo_m);
376 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 439 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
377 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 440 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
378 . " (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});
379 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 443 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
380 my $title = $stats->{+CS_STAT_TITLE}; 444 my $title = $stats->{+CS_STAT_TITLE};
381 $title =~ s/^Player: //; 445 $title =~ s/^Player: //;
382 $::STATWIDS->{title} ->set_text ("Title: " . $title); 446 $::STATWIDS->{title} ->set_text ("Title: " . $title);
383 447
… …
401 for keys %RES_TBL; 465 for keys %RES_TBL;
402 466
403 my $sktbl = $::STATWIDS->{skill_tbl}; 467 my $sktbl = $::STATWIDS->{skill_tbl};
404 my @skills = keys %{ $self->{skill_info} }; 468 my @skills = keys %{ $self->{skill_info} };
405 469
406 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
407 $sktbl->clear; 478 $sktbl->clear;
408 479
409 my @add; 480 my $sw = $self->{skillwid}{""} ||= [
410
411 push @add,
412 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 481 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
413 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),
414 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 484 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
415 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 485 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
416 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),
417 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 488 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
418 ; 489 ];
490
491 my @add = @$sw;
419 492
420 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>";
421 494
422 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);
423 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);
424 497
425 my ($x, $y) = (0, 1); 498 my ($x, $y) = (0, 1);
426 for ( 499 for (@order) {
427 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
428 map [$_, $self->{skill_info}{$_}],
429 grep exists $stats->{$_},
430 @skills
431 ) {
432 my ($idx, $name) = @$_; 500 my ($idx, $name) = @$_;
433 501
434 my $spell_cb = sub { 502 my $spell_cb = sub {
435 my ($widget, $ev) = @_; 503 my ($widget, $ev) = @_;
436 504
… …
451 } 519 }
452 520
453 1 521 1
454 }; 522 };
455 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
456 push @add, 541 push @add,
457 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 542 $x * 4 + 0, $y, $sw->[0],
458 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 543 $x * 4 + 1, $y, $sw->[1],
459 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 544 $x * 4 + 2, $y, $sw->[2],
460 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],
461 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
462 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
463 ; 546 ;
464 547
465 $x++ and ($x, $y) = (0, $y + 1); 548 $x++ and ($x, $y) = (0, $y + 1);
466 } 549 }
467 550
468 $sktbl->add_at (@add); 551 $sktbl->add_at (@add);
469 } 552 }
470 553
471 for (grep exists $stats->{$_}, @skills) { 554 for (@order) {
472 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 555 my ($idx, $name) = @$_;
473 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 556 my $val = $stats->{$idx};
474 }
475}
476 557
477sub macro_send { 558 next if $prev->{$idx}[1] eq $val->[1];
478 my ($self, $macro) = @_;
479 559
480 for my $cmd (@{ $macro->{action} }) { 560 my $sw = $self->{skillwid}{$idx};
481 $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);
482 } 567 }
483} 568}
484 569
485sub user_send { 570sub user_send {
486 my ($self, $command) = @_; 571 my ($self, $command) = @_;
… …
488 $self->{record}->($command) 573 $self->{record}->($command)
489 if $self->{record}; 574 if $self->{record};
490 575
491 $self->logprint ("send: ", $command); 576 $self->logprint ("send: ", $command);
492 $self->send_command ($command); 577 $self->send_command ($command);
493 ::status ($command);
494} 578}
495 579
496sub record { 580sub record {
497 my ($self, $cb) = @_; 581 my ($self, $cb) = @_;
498 582
… …
506} 590}
507 591
508sub feed_map1a { 592sub feed_map1a {
509 my ($self, $data) = @_; 593 my ($self, $data) = @_;
510 594
511 $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 {
512 $self->{map_widget}->update; 624 $self->{map_widget}->update;
625 }
513} 626}
514 627
515sub magicmap { 628sub magicmap {
516 my ($self, $w, $h, $x, $y, $data) = @_; 629 my ($self, $w, $h, $x, $y, $data) = @_;
517 630
… …
524 my $map_info = delete $self->{map_info} 637 my $map_info = delete $self->{map_info}
525 or return; 638 or return;
526 639
527 my ($hash, $x, $y, $w, $h) = @$map_info; 640 my ($hash, $x, $y, $w, $h) = @$map_info;
528 641
529 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;
530 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 644 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
531 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
532} 645}
533 646
534sub map_clear { 647sub map_clear {
535 my ($self) = @_; 648 my ($self) = @_;
536 649
… …
542} 655}
543 656
544sub bg_fetch { 657sub bg_fetch {
545 my ($self) = @_; 658 my ($self) = @_;
546 659
547 my $id; 660 my $tile;
548 661
549 do { 662 do {
550 $id = pop @{$self->{bg_fetch}} 663 $tile = pop @{$self->{bg_fetch}}
551 or return; 664 or return;
552 } while $self->{texture}[$id]; 665 } while $self->{texture}[$tile];
553 666
554 CFPlus::DB::exists tilecache => $id, sub { 667 CFPlus::DB::get tilecache => $tile, sub {
555 my ($exists) = @_; 668 my ($data) = @_;
556 669
557 return unless $self->{map}; # stop when destroyed 670 return unless $self->{map}; # stop when destroyed
558 671
672 if (defined $data) {
559 $self->have_tile ($id) 673 $self->have_tile ($tile, $data);
560 if $exists; 674 $self->{texture}[$tile]->upload;
675 }
561 676
562 $self->bg_fetch; 677 $self->bg_fetch;
563 }; 678 };
564} 679}
565 680
566sub load_map($$$) { 681sub load_map($$$) {
567 my ($self, $hash, $x, $y) = @_; 682 my ($self, $hash, $x, $y) = @_;
568 683
569 my $gen = $self->{map_change_gen}; 684 my $gen = $self->{map_change_gen};
570 685
571 CFPlus::DB::get $self->{mapcache} => $hash, sub { 686 my $cb = sub {
572 return unless $gen == $self->{map_change_gen}; 687 return unless $gen == $self->{map_change_gen};
573 688
574 my ($data) = @_; 689 my ($data) = @_;
575 690
576 if (defined $data) { 691 if (defined $data) {
692 $self->{map_cache_new}{$hash} = \$data;
693
577 $data = Compress::LZF::decompress $data; 694 my $data = Compress::LZF::decompress $data;
578 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
579 695
580 my $inprogress = @{ $self->{bg_fetch} || [] }; 696 my $inprogress = @{ $self->{bg_fetch} || [] };
581 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 697 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
582 $self->bg_fetch unless $inprogress; 698 $self->bg_fetch unless $inprogress;
583 } 699 }
584 }; 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 }
585} 707}
586 708
587# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 709# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
588# (server resource,s latency, bandwidth), so this hack is warranted. 710# (server resource,s latency, bandwidth), so this hack is warranted.
589# 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
… …
682 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 804 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
683 805
684 $self->flush_map; 806 $self->flush_map;
685 807
686 ++$self->{map_change_gen}; 808 ++$self->{map_change_gen};
809 $self->{map_cache_old} = delete $self->{map_cache_new};
687 810
688 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 811 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
689 812
690 my $mapmapw = $self->{mapmap}->{w}; 813 my $mapmapw = $self->{mapmap}->{w};
691 my $mapmaph = $self->{mapmap}->{h}; 814 my $mapmaph = $self->{mapmap}->{h};
… …
713 my ($self, $facenum, $face, $cb) = @_; 836 my ($self, $facenum, $face, $cb) = @_;
714 837
715 if ($face->{type} == 0) { # FT_FACE 838 if ($face->{type} == 0) { # FT_FACE
716 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 839 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
717 840
718 $face->{id} = $id; 841 $face->{id} = $id;
719 $self->{faceid}[$facenum] = $id;
720
721 $self->{map}->set_tileid ($facenum => $id); 842 $self->{map}->set_tileid ($facenum => $id);
722 843
723 CFPlus::DB::get tilecache => $id, $cb; 844 CFPlus::DB::get tilecache => $id, $cb;
724 845
725 } elsif ($face->{type} & 1) { # with metadata 846 } elsif ($face->{type} & 1) { # with metadata
726 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
727 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;
728 } 851 }
729} 852}
730 853
731sub face_update { 854sub face_update {
732 my ($self, $facenum, $face, $changed) = @_; 855 my ($self, $facenum, $face, $changed) = @_;
733 856
734 if ($face->{type} == 0) { # FT_FACE 857 if ($face->{type} == 0) {
858 # image, FT_FACE
735 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 859 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
736 if $changed; 860 if $changed;
737 861
738 $self->have_tile ($face->{id}); 862 $self->have_tile ($face->{id}, delete $face->{data});
739 863
740 } elsif ($face->{type} & 1) { # split metadata 864 } elsif ($face->{type} & 1) {
865 # split metadata case, FT_MUSIC, FT_SOUND
741 if ($changed) { # new data 866 if ($changed) { # new data
742 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 867 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
743 $face->{meta} = $self->{json_coder}->decode ($meta_json); 868 $face->{data} = $meta;
744 869
870 # rely on strict ordering here and also on later fetch
745 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 871 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
746 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { }; 872 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
747 } else { 873 }
874
748 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 875 $face->{data} = $self->{json_coder}->decode ($face->{data});
749 }
750
751 ::add_license ($face); 876 ::add_license ($face);
877 ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
878 if $changed;
752 879
753 if ($face->{type} == 3) { # FT_MUSIC 880 if ($face->{type} == 3) { # FT_MUSIC
754 $self->{music_meta}{$facenum} = $face;
755
756 ::message ({ markup => "downloaded song #$facenum" })
757 if $changed;
758
759 &::audio_music_push ($facenum); 881 &::audio_music_push ($facenum);
760 } elsif ($face->{type} == 5) { # FT_SOUND 882 } elsif ($face->{type} == 5) { # FT_SOUND
761 $self->{sound_meta}{$facenum} = $face;
762
763 ::message ({ markup => "downloaded sound #$facenum" })
764 if $changed;
765
766 &::audio_sound_push ($facenum); 883 &::audio_sound_push ($facenum);
767 } 884 }
768 885
886 } else {
887 # flat resource case, FT_RSRC
888 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
889 if $changed;
890 }
891
892 if (my $cbs = $self->{face_cb}{$facenum}) {
893 $_->($face, $changed) for @$cbs;
769 } 894 }
770} 895}
771 896
772sub smooth_update { 897sub smooth_update {
773 my ($self, $facenum, $face) = @_; 898 my ($self, $facenum, $face) = @_;
774 899
775 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 900 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
776} 901}
777 902
778sub have_tile { 903sub have_tile {
779 my ($self, $tile) = @_; 904 my ($self, $tile, $data) = @_;
780 905
781 return unless $self->{map}; 906 return unless $self->{map};
782 907
783 $self->{texture}[$tile] ||= my $tex = 908 my $tex = $self->{texture}[$tile] ||=
784 new CFPlus::Texture 909 new CFPlus::Texture
785 tile => $tile, minify => 1, mipmap => 1, delay => 1; 910 tile => $tile,
911 image => $data, delete_image => 1,
912 minify => 1, mipmap => 1;
786 913
787 $_->() for @{(delete $self->{face_cb}{$tile}) || []}; 914 if (my $cbs = delete $self->{tile_cb}{$tile}) {
915 $_->($tex) for @$cbs;
916 }
788} 917}
789 918
790sub connect_face_update { 919# call in non-void context registers a temporary
920# hook with handle, otherwise its permanent
921sub on_face_change {
791 my ($self, $id, $cb) = @_; 922 my ($self, $num, $cb) = @_;
792 923
793 push @{$self->{face_cb}{$id}}, $cb; 924 push @{$self->{face_cb}{$num}}, $cb;
794 925
926 defined wantarray
795 CFPlus::guard { 927 ? CFPlus::guard {
796 @{$self->{face_cb}{$id}} 928 @{$self->{face_cb}{$num}}
797 = grep $_ != $cb, 929 = grep $_ != $cb,
798 @{$self->{face_cb}{$id}}; 930 @{$self->{face_cb}{$num}};
799 } 931 }
932 : ()
933}
934
935# call in non-void context registers a temporary
936# hook with handle, otherwise its permanent
937sub 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)
800} 948}
801 949
802sub sound_play { 950sub sound_play {
803 my ($self, $type, $face, $dx, $dy, $vol) = @_; 951 my ($self, $type, $face, $dx, $dy, $vol) = @_;
804 952
… …
819 967
820sub sanitise_xml($) { 968sub sanitise_xml($) {
821 local $_ = shift; 969 local $_ = shift;
822 970
823 # we now weed out all tags we do not support 971 # we now weed out all tags we do not support
824 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
825 # now all entities 977 # now all entities
826 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;
827 979
828 # handle some elements 980 # handle some elements
829 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 981 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
876 $self->{$type} = $text; 1028 $self->{$type} = $text;
877 } else { 1029 } else {
878 $self->logprint ("msg: ", $text); 1030 $self->logprint ("msg: ", $text);
879 return if $color < 0; # negative color == ignore if not understood 1031 return if $color < 0; # negative color == ignore if not understood
880 1032
881 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; 1033 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
882 1034
883 ## 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
884 # no longer neecssary with TRT servers 1036 # no longer neecssary with TRT servers
885 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1037 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
886 1038
887 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
888 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 }
889 1054
890 $self->{statusbox}->add ($text, 1055 $self->{statusbox}->add ($text,
891 group => $text, 1056 group => $text,
892 fg => $fg, 1057 fg => $fg,
893 timeout => $color >= 2 ? 180 : 10, 1058 timeout => $color >= 2 ? 180 : 10,
894 tooltip_font => $::FONT_FIXED, 1059 tooltip_font => $::FONT_FIXED,
895 ); 1060 ) if $type eq "info";
896 } 1061 }
897} 1062}
898 1063
899sub spell_add { 1064sub spell_add {
900 my ($self, $spell) = @_; 1065 my ($self, $spell) = @_;
… …
987 } 1152 }
988 1153
989 $::FLOORBOX->add_at (@add); 1154 $::FLOORBOX->add_at (@add);
990 }); 1155 });
991 1156
992 $::WANT_REFRESH++; 1157 $::WANT_REFRESH->start;
993} 1158}
994 1159
995sub set_opencont { 1160sub set_opencont {
996 my ($conn, $tag, $name) = @_; 1161 my ($conn, $tag, $name) = @_;
997 $conn->{open_container} = $tag; 1162 $conn->{open_container} = $tag;
998 update_floorbox; 1163 update_floorbox;
999 1164
1000 $::INV_RIGHT_HB->clear (); 1165 $::INVR_HB->clear ();
1001 $::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);
1002 1167
1003 if ($tag != 0) { # Floor isn't closable, is it? 1168 if ($tag != 0) { # Floor isn't closable, is it?
1004 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1169 $::INVR_HB->add (new CFPlus::UI::Button
1005 text => "Close container", 1170 text => "Close container",
1006 tooltip => "Close the currently open container (if one is open)", 1171 tooltip => "Close the currently open container (if one is open)",
1007 on_activate => sub { 1172 on_activate => sub {
1008 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1173 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1009 if $tag != 0; 1174 if $tag != 0;
1010 #if $CONN->{open_container} != 0;
1011 0 1175 0
1012 }, 1176 },
1013 ); 1177 );
1014 } 1178 }
1015 1179

Diff Legend

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