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.140 by root, Sun Jul 29 18:56:02 2007 UTC vs.
Revision 1.163 by root, Wed Aug 22 21:17:32 2007 UTC

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

Diff Legend

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