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.136 by elmex, Fri Jul 27 18:04:42 2007 UTC vs.
Revision 1.166 by root, Wed Aug 22 22:44:45 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_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} 53 $self->{json_coder}
83 ->convert_blessed 54 ->convert_blessed
84 ->filter_json_single_key_object (__w_ => sub { 55 ->filter_json_single_key_object (__w_ => sub {
85 $self->{widget}{$_[0]} 56 $self->{widget}{$_[0]}
86 }); 57 });
87 58
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
197 # destroy widgets on logout 59 # destroy widgets on logout
198 $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 {
199 for my $ws (values %{delete $self->{widgetset} || {}}) { 61 for my $ws (values %{delete $self->{widgetset} || {}}) {
200 $_->destroy 62 $_->destroy
201 for values %{delete $ws->{w} || {}}; 63 for values %{delete $ws->{w} || {}};
… …
223 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 85 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
224 86
225 $self 87 $self
226} 88}
227 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
228sub logprint { 309sub logprint {
229 my ($self, @a) = @_; 310 my ($self, @a) = @_;
230 311
231 $self->{log_fh} ||= do { 312 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} 313}
249 314
250sub _stat_numdiff { 315sub _stat_numdiff {
251 my ($self, $name, $old, $new) = @_; 316 my ($self, $name, $old, $new) = @_;
252 317
… …
336 401
337 if ( 402 if (
338 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 403 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
339 ) { 404 ) {
340 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 405 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); 406 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
342 } 407 }
343 408
344 $self->update_stats_window ($stats, $prev); 409 $self->update_stats_window ($stats, $prev);
345 410
346 $self->{prev_stats} = { %$stats }; 411 $self->{prev_stats} = { %$stats };
… …
385 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 450 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
386 $::GAUGES->{food} ->set_value ($fo, $fo_m); 451 $::GAUGES->{food} ->set_value ($fo, $fo_m);
387 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 452 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
388 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 453 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
389 . " (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});
390 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 456 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
391 my $title = $stats->{+CS_STAT_TITLE}; 457 my $title = $stats->{+CS_STAT_TITLE};
392 $title =~ s/^Player: //; 458 $title =~ s/^Player: //;
393 $::STATWIDS->{title} ->set_text ("Title: " . $title); 459 $::STATWIDS->{title} ->set_text ("Title: " . $title);
394 460
… …
412 for keys %RES_TBL; 478 for keys %RES_TBL;
413 479
414 my $sktbl = $::STATWIDS->{skill_tbl}; 480 my $sktbl = $::STATWIDS->{skill_tbl};
415 my @skills = keys %{ $self->{skill_info} }; 481 my @skills = keys %{ $self->{skill_info} };
416 482
417 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
418 $sktbl->clear; 491 $sktbl->clear;
419 492
420 my @add; 493 my $sw = $self->{skillwid}{""} ||= [
421
422 push @add,
423 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 494 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
424 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),
425 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 497 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
426 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 498 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
427 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),
428 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 501 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
429 ; 502 ];
503
504 my @add = @$sw;
430 505
431 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>";
432 507
433 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);
434 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);
435 510
436 my ($x, $y) = (0, 1); 511 my ($x, $y) = (0, 1);
437 for ( 512 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) = @$_; 513 my ($idx, $name) = @$_;
444 514
445 my $spell_cb = sub { 515 my $spell_cb = sub {
446 my ($widget, $ev) = @_; 516 my ($widget, $ev) = @_;
447 517
… …
462 } 532 }
463 533
464 1 534 1
465 }; 535 };
466 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
467 push @add, 554 push @add,
468 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 555 $x * 4 + 0, $y, $sw->[0],
469 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 556 $x * 4 + 1, $y, $sw->[1],
470 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 557 $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), 558 $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 ; 559 ;
475 560
476 $x++ and ($x, $y) = (0, $y + 1); 561 $x++ and ($x, $y) = (0, $y + 1);
477 } 562 }
478 563
479 $sktbl->add_at (@add); 564 $sktbl->add_at (@add);
480 } 565 }
481 566
482 for (grep exists $stats->{$_}, @skills) { 567 for (@order) {
483 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 568 my ($idx, $name) = @$_;
484 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 569 my $val = $stats->{$idx};
570
571 next if $prev->{$idx}[1] eq $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 %d%%");
579 $::GAUGES->{sklprg}->set_value (@$val);
485 } 580 }
486} 581}
487 582
488sub macro_send { 583sub macro_send {
489 my ($self, $macro) = @_; 584 my ($self, $macro) = @_;
… …
499 $self->{record}->($command) 594 $self->{record}->($command)
500 if $self->{record}; 595 if $self->{record};
501 596
502 $self->logprint ("send: ", $command); 597 $self->logprint ("send: ", $command);
503 $self->send_command ($command); 598 $self->send_command ($command);
504 ::status ($command);
505} 599}
506 600
507sub record { 601sub record {
508 my ($self, $cb) = @_; 602 my ($self, $cb) = @_;
509 603
… …
517} 611}
518 612
519sub feed_map1a { 613sub feed_map1a {
520 my ($self, $data) = @_; 614 my ($self, $data) = @_;
521 615
522 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 616 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
617 my $delay;
618
619 for my $tile (@$missing) {
620 next if $self->{delay}{$tile};
621
622 $delay = 1;
623
624 if (my $tex = $::CONN->{texture}[$tile]) {
625 $tex->upload;
626 } else {
627 $self->{delay}{$tile} = 1;
628
629 # we assume the face is in-flight and will eventually come
630 push @{$self->{tile_cb}{$tile}}, sub {
631 delete $self->{delay}{$tile};
632 $_[0]->upload;
633 };
634 }
635 }
636
637 if ($delay) {
638 # delay the map drawing a tiny bit in the hope of getting the missing fetched
639 Event->timer (after => 0.03, cb => sub {
640 $_[0]->w->cancel;
641 $self->{map_widget}->update
642 if $self->{map_widget};
643 });
644 } else {
523 $self->{map_widget}->update; 645 $self->{map_widget}->update;
646 }
524} 647}
525 648
526sub magicmap { 649sub magicmap {
527 my ($self, $w, $h, $x, $y, $data) = @_; 650 my ($self, $w, $h, $x, $y, $data) = @_;
528 651
… …
535 my $map_info = delete $self->{map_info} 658 my $map_info = delete $self->{map_info}
536 or return; 659 or return;
537 660
538 my ($hash, $x, $y, $w, $h) = @$map_info; 661 my ($hash, $x, $y, $w, $h) = @$map_info;
539 662
540 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 663 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
664 $self->{map_cache_new}{$hash} = \$data;
541 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 665 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
542 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
543} 666}
544 667
545sub map_clear { 668sub map_clear {
546 my ($self) = @_; 669 my ($self) = @_;
547 670
… …
553} 676}
554 677
555sub bg_fetch { 678sub bg_fetch {
556 my ($self) = @_; 679 my ($self) = @_;
557 680
558 my $id; 681 my $tile;
559 682
560 do { 683 do {
561 $id = pop @{$self->{bg_fetch}} 684 $tile = pop @{$self->{bg_fetch}}
562 or return; 685 or return;
563 } while $self->{texture}[$id]; 686 } while $self->{texture}[$tile];
564 687
565 CFPlus::DB::get tilecache => $id, sub { 688 CFPlus::DB::get tilecache => $tile, sub {
566 my ($data) = @_; 689 my ($data) = @_;
567 690
568 return unless $self->{map}; # stop when destroyed 691 return unless $self->{map}; # stop when destroyed
569 692
570 $self->set_texture ($id => $data)
571 if defined $data; 693 if (defined $data) {
694 $self->have_tile ($tile, $data);
695 $self->{texture}[$tile]->upload;
696 }
572 697
573 $self->bg_fetch; 698 $self->bg_fetch;
574 }; 699 };
575} 700}
576 701
577sub load_map($$$) { 702sub load_map($$$) {
578 my ($self, $hash, $x, $y) = @_; 703 my ($self, $hash, $x, $y) = @_;
579 704
580 my $gen = $self->{map_change_gen}; 705 my $gen = $self->{map_change_gen};
581 706
582 CFPlus::DB::get $self->{mapcache} => $hash, sub { 707 my $cb = sub {
583 return unless $gen == $self->{map_change_gen}; 708 return unless $gen == $self->{map_change_gen};
584 709
585 my ($data) = @_; 710 my ($data) = @_;
586 711
587 if (defined $data) { 712 if (defined $data) {
713 $self->{map_cache_new}{$hash} = \$data;
714
588 $data = Compress::LZF::decompress $data; 715 my $data = Compress::LZF::decompress $data;
589 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
590 716
591 my $inprogress = @{ $self->{bg_fetch} || [] }; 717 my $inprogress = @{ $self->{bg_fetch} || [] };
592 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 718 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
593 $self->bg_fetch unless $inprogress; 719 $self->bg_fetch unless $inprogress;
594 } 720 }
595 }; 721 };
722
723 if (my $rdata = $self->{map_cache_old}{$hash}) {
724 $cb->($$rdata);
725 } else {
726 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
727 }
596} 728}
597 729
598# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 730# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
599# (server resource,s latency, bandwidth), so this hack is warranted. 731# (server resource,s latency, bandwidth), so this hack is warranted.
600# the right fix is to make real tiled maps with an overview file 732# the right fix is to make real tiled maps with an overview file
… …
693 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 825 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
694 826
695 $self->flush_map; 827 $self->flush_map;
696 828
697 ++$self->{map_change_gen}; 829 ++$self->{map_change_gen};
830 $self->{map_cache_old} = delete $self->{map_cache_new};
698 831
699 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 832 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
700 833
701 my $mapmapw = $self->{mapmap}->{w}; 834 my $mapmapw = $self->{mapmap}->{w};
702 my $mapmaph = $self->{mapmap}->{h}; 835 my $mapmaph = $self->{mapmap}->{h};
… …
724 my ($self, $facenum, $face, $cb) = @_; 857 my ($self, $facenum, $face, $cb) = @_;
725 858
726 if ($face->{type} == 0) { # FT_FACE 859 if ($face->{type} == 0) { # FT_FACE
727 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 860 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
728 861
729 $face->{id} = $id; 862 $face->{id} = $id;
730 $self->{faceid}[$facenum] = $id;
731
732 $self->{map}->set_tileid ($facenum => $id); 863 $self->{map}->set_tileid ($facenum => $id);
733 864
734 CFPlus::DB::get tilecache => $id, $cb; 865 CFPlus::DB::get tilecache => $id, $cb;
735 866
736 } elsif ($face->{type} & 1) { # with metadata 867 } 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-metadata" => $face->{name}, $cb; 868 CFPlus::DB::get res_meta => $face->{name}, $cb;
869
870 } else { # no metadata
871 CFPlus::DB::get res_data => $face->{name}, $cb;
739 } 872 }
740} 873}
741 874
742sub face_update { 875sub face_update {
743 my ($self, $facenum, $face, $changed) = @_; 876 my ($self, $facenum, $face, $changed) = @_;
744 877
745 if ($face->{type} == 0) { # FT_FACE 878 if ($face->{type} == 0) {
879 # image, FT_FACE
746 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 880 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
747 if $changed; 881 if $changed;
748 882
749 $self->set_texture ($face->{id} => delete $face->{data}); 883 $self->have_tile ($face->{id}, delete $face->{data});
750 884
751 } elsif ($face->{type} & 1) { # split metadata 885 } elsif ($face->{type} & 1) {
752 my $cb = sub { }; 886 # split metadata case, FT_MUSIC, FT_SOUND
887 if ($changed) { # new data
888 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
889 $face->{data} = $meta;
890
891 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
892 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
893 }
894
895 $face->{data} = $self->{json_coder}->decode ($face->{data});
896
897 ::add_license ($face);
753 898
754 if ($face->{type} == 3) { # FT_MUSIC 899 if ($face->{type} == 3) { # FT_MUSIC
755 $cb = sub {
756 $self->{music_meta}{$facenum} = $face;
757
758 ::message ({ markup => "downloaded song #$facenum" }) 900 ::message ({ markup => "downloaded song #$facenum" })
759 if $changed; 901 if $changed;
760 902
761 &::audio_music_set ($self->{songs}); 903 &::audio_music_push ($facenum);
904 } elsif ($face->{type} == 5) { # FT_SOUND
905 ::message ({ markup => "downloaded sound #$facenum" })
906 if $changed;
907
908 &::audio_sound_push ($facenum);
762 }; 909 }
763 }
764 910
765 if ($changed) { # new data
766 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
767 my $path = CFPlus::DB::path_of_res $face->{name};
768
769 CFPlus::DB::write_file $path, $data, sub {
770 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
771 $face->{meta} = $self->{json_coder}->decode ($meta_json);
772 $face->{path} = $path;
773
774 $cb->();
775 };
776 };
777 } else { 911 } else {
778 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 912 # flat resource case, FT_RSRC
779 $cb->(); 913 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
780 } 914 if $changed;
915 }
916
917 if (my $cbs = $self->{face_cb}{$facenum}) {
918 $_->($face, $changed) for @$cbs;
781 } 919 }
782} 920}
783 921
784sub smooth_update { 922sub smooth_update {
785 my ($self, $facenum, $face) = @_; 923 my ($self, $facenum, $face) = @_;
786 924
787 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 925 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
788} 926}
789 927
790sub set_texture { 928sub have_tile {
791 my ($self, $id, $data) = @_; 929 my ($self, $tile, $data) = @_;
792 930
793 return unless $self->{map}; 931 return unless $self->{map};
794 932
795 $self->{texture}[$id] = my $tex = 933 my $tex = $self->{texture}[$tile] ||=
796 new_from_image CFPlus::Texture 934 new CFPlus::Texture
935 tile => $tile,
936 image => $data, delete_image => 1,
797 $data, minify => 1, mipmap => 1; 937 minify => 1, mipmap => 1;
798 938
799 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 939 if (my $cbs = delete $self->{tile_cb}{$tile}) {
800 $self->{map_widget}->update; 940 $_->($tex) for @$cbs;
801 941 }
802 $_->() for @{(delete $self->{face_cb}{$id}) || []};
803} 942}
804 943
805sub connect_face_update { 944# call in non-void context registers a temporary
945# hook with handle, otherwise its permanent
946sub on_face_change {
806 my ($self, $id, $cb) = @_; 947 my ($self, $num, $cb) = @_;
807 948
808 push @{$self->{face_cb}{$id}}, $cb; 949 push @{$self->{face_cb}{$num}}, $cb;
809 950
951 defined wantarray
810 CFPlus::guard { 952 ? CFPlus::guard {
811 @{$self->{face_cb}{$id}} 953 @{$self->{face_cb}{$num}}
812 = grep $_ != $cb, 954 = grep $_ != $cb,
813 @{$self->{face_cb}{$id}}; 955 @{$self->{face_cb}{$num}};
814 } 956 }
957 : ()
958}
959
960# call in non-void context registers a temporary
961# hook with handle, otherwise its permanent
962sub register_face_handler {
963 my ($self, $num, $cb) = @_;
964
965 return unless $num;
966
967 # invoke if available right now
968 $cb->($self->{face}[$num], 0)
969 unless exists $self->{face}[$num]{loading};
970
971 # future changes
972 $self->on_face_change ($num => $cb)
815} 973}
816 974
817sub sound_play { 975sub sound_play {
818 my ($self, $x, $y, $soundnum, $type) = @_; 976 my ($self, $type, $face, $dx, $dy, $vol) = @_;
819 977
820 $self->{sound_play}->($x, $y, $soundnum, $type); 978 &::audio_sound_play ($face, $dx, $dy, $vol)
979 unless $type & 1; # odd types are silent for future expansion
821} 980}
822 981
823my $LAST_QUERY; # server is stupid, stupid, stupid 982my $LAST_QUERY; # server is stupid, stupid, stupid
824 983
825sub query { 984sub query {
… …
890 $self->{$type} = $text; 1049 $self->{$type} = $text;
891 } else { 1050 } else {
892 $self->logprint ("msg: ", $text); 1051 $self->logprint ("msg: ", $text);
893 return if $color < 0; # negative color == ignore if not understood 1052 return if $color < 0; # negative color == ignore if not understood
894 1053
895 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1054 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
896 1055
897 ## try to create single paragraphs of multiple lines sent by the server 1056 ## try to create single paragraphs of multiple lines sent by the server
898 # no longer neecssary with TRT servers 1057 # no longer neecssary with TRT servers
899 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1058 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
900 1059
901 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] }) 1060 ::message ({
1061 fg => $fg,
1062 markup => $_,
1063 type => $type,
1064 extra => [@extra],
1065 color_flags => $color
902 for split /\n/, $text; 1066 }) for split /\n/, $text;
903 1067
904 $self->{statusbox}->add ($text, 1068 $self->{statusbox}->add ($text,
905 group => $text, 1069 group => $text,
906 fg => $fg, 1070 fg => $fg,
907 timeout => $color >= 2 ? 180 : 10, 1071 timeout => $color >= 2 ? 180 : 10,
… …
963 $self->{map_widget}->clr_commands; 1127 $self->{map_widget}->clr_commands;
964 1128
965 ::stop_game (); 1129 ::stop_game ();
966} 1130}
967 1131
968sub image_info {
969 my ($self, $numfaces) = @_;
970
971 $self->{num_faces} = $numfaces;
972 $self->{face_prefetch} = [1 .. $numfaces];
973 $self->face_prefetch;
974}
975
976sub face_prefetch {
977 my ($self) = @_;
978
979 return unless $::CFG->{face_prefetch};
980
981 if ($self->{num_faces}) {
982 return if @{ $self->{send_queue} || [] };
983 my $todo = @{ $self->{face_prefetch} }
984 or return;
985
986 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
987
988 $self->send ("requestinfo image_sums $face $face");
989
990 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
991 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
992 } elsif (!exists $self->{num_faces}) {
993 $self->send ("requestinfo image_info");
994
995 $self->{num_faces} = 0;
996
997 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
998 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
999 }
1000}
1001
1002sub update_floorbox { 1132sub update_floorbox {
1003 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1133 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1004 return unless $::CONN; 1134 return unless $::CONN;
1005 1135
1006 $::FLOORBOX->clear; 1136 $::FLOORBOX->clear;
… …
1035 } 1165 }
1036 1166
1037 $::FLOORBOX->add_at (@add); 1167 $::FLOORBOX->add_at (@add);
1038 }); 1168 });
1039 1169
1040 $::WANT_REFRESH++; 1170 $::WANT_REFRESH->start;
1041} 1171}
1042 1172
1043sub set_opencont { 1173sub set_opencont {
1044 my ($conn, $tag, $name) = @_; 1174 my ($conn, $tag, $name) = @_;
1045 $conn->{open_container} = $tag; 1175 $conn->{open_container} = $tag;
1046 update_floorbox; 1176 update_floorbox;
1047 1177
1048 $::INV_RIGHT_HB->clear (); 1178 $::INVR_HB->clear ();
1049 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1179 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1050 1180
1051 if ($tag != 0) { # Floor isn't closable, is it? 1181 if ($tag != 0) { # Floor isn't closable, is it?
1052 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1182 $::INVR_HB->add (new CFPlus::UI::Button
1053 text => "Close container", 1183 text => "Close container",
1054 tooltip => "Close the currently open container (if one is open)", 1184 tooltip => "Close the currently open container (if one is open)",
1055 on_activate => sub { 1185 on_activate => sub {
1056 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1186 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1057 if $tag != 0; 1187 if $tag != 0;
1058 #if $CONN->{open_container} != 0;
1059 0 1188 0
1060 }, 1189 },
1061 ); 1190 );
1062 } 1191 }
1063 1192

Diff Legend

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