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.132 by root, Tue Jul 24 05:13:23 2007 UTC vs.
Revision 1.167 by root, Tue Aug 28 01:23:47 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 # destroy widgets on logout 59 # destroy widgets on logout
191 $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 {
192 for my $ws (values %{delete $self->{widgetset} || {}}) { 61 for my $ws (values %{delete $self->{widgetset} || {}}) {
193 $_->destroy 62 $_->destroy
194 for values %{delete $ws->{w} || {}}; 63 for values %{delete $ws->{w} || {}};
… …
216 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 85 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
217 86
218 $self 87 $self
219} 88}
220 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
221sub logprint { 309sub logprint {
222 my ($self, @a) = @_; 310 my ($self, @a) = @_;
223 311
224 $self->{log_fh} ||= do { 312 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
225 my $path = "$Crossfire::VARDIR/log.$self->{host}";
226
227 open my $fh, ">>:utf8", $path
228 or die "Couldn't open logfile $path: $!";
229
230 $fh->autoflush (1);
231
232 $fh;
233 };
234
235 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
236
237 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
238 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
239
240 print {$self->{log_fh}} "$ts ", @a, "\n";
241} 313}
242 314
243sub _stat_numdiff { 315sub _stat_numdiff {
244 my ($self, $name, $old, $new) = @_; 316 my ($self, $name, $old, $new) = @_;
245 317
… …
329 401
330 if ( 402 if (
331 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 403 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
332 ) { 404 ) {
333 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 405 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
334 $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);
335 } 407 }
336 408
337 $self->update_stats_window ($stats, $prev); 409 $self->update_stats_window ($stats, $prev);
338 410
339 $self->{prev_stats} = { %$stats }; 411 $self->{prev_stats} = { %$stats };
… …
378 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 450 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
379 $::GAUGES->{food} ->set_value ($fo, $fo_m); 451 $::GAUGES->{food} ->set_value ($fo, $fo_m);
380 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 452 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
381 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 453 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
382 . " (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});
383 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 456 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
384 my $title = $stats->{+CS_STAT_TITLE}; 457 my $title = $stats->{+CS_STAT_TITLE};
385 $title =~ s/^Player: //; 458 $title =~ s/^Player: //;
386 $::STATWIDS->{title} ->set_text ("Title: " . $title); 459 $::STATWIDS->{title} ->set_text ("Title: " . $title);
387 460
… …
405 for keys %RES_TBL; 478 for keys %RES_TBL;
406 479
407 my $sktbl = $::STATWIDS->{skill_tbl}; 480 my $sktbl = $::STATWIDS->{skill_tbl};
408 my @skills = keys %{ $self->{skill_info} }; 481 my @skills = keys %{ $self->{skill_info} };
409 482
410 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
411 $sktbl->clear; 491 $sktbl->clear;
412 492
413 my @add; 493 my $sw = $self->{skillwid}{""} ||= [
414
415 push @add,
416 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 494 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
417 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),
418 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 497 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
419 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 498 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
420 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),
421 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 501 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
422 ; 502 ];
503
504 my @add = @$sw;
423 505
424 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>";
425 507
426 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);
427 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);
428 510
429 my ($x, $y) = (0, 1); 511 my ($x, $y) = (0, 1);
430 for ( 512 for (@order) {
431 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
432 map [$_, $self->{skill_info}{$_}],
433 grep exists $stats->{$_},
434 @skills
435 ) {
436 my ($idx, $name) = @$_; 513 my ($idx, $name) = @$_;
437 514
438 my $spell_cb = sub { 515 my $spell_cb = sub {
439 my ($widget, $ev) = @_; 516 my ($widget, $ev) = @_;
440 517
… …
455 } 532 }
456 533
457 1 534 1
458 }; 535 };
459 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
460 push @add, 554 push @add,
461 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 555 $x * 4 + 0, $y, $sw->[0],
462 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 556 $x * 4 + 1, $y, $sw->[1],
463 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 557 $x * 4 + 2, $y, $sw->[2],
464 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],
465 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
466 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
467 ; 559 ;
468 560
469 $x++ and ($x, $y) = (0, $y + 1); 561 $x++ and ($x, $y) = (0, $y + 1);
470 } 562 }
471 563
472 $sktbl->add_at (@add); 564 $sktbl->add_at (@add);
473 } 565 }
474 566
475 for (grep exists $stats->{$_}, @skills) { 567 for (@order) {
476 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 568 my ($idx, $name) = @$_;
477 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 569 my $val = $stats->{$idx};
478 }
479}
480 570
481sub macro_send { 571 next if $prev->{$idx}[1] eq $val->[1];
482 my ($self, $macro) = @_;
483 572
484 for my $cmd (@{ $macro->{action} }) { 573 my $sw = $self->{skillwid}{$idx};
485 $self->send_command ($cmd); 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);
486 } 580 }
487} 581}
488 582
489sub user_send { 583sub user_send {
490 my ($self, $command) = @_; 584 my ($self, $command) = @_;
… …
492 $self->{record}->($command) 586 $self->{record}->($command)
493 if $self->{record}; 587 if $self->{record};
494 588
495 $self->logprint ("send: ", $command); 589 $self->logprint ("send: ", $command);
496 $self->send_command ($command); 590 $self->send_command ($command);
497 ::status ($command);
498} 591}
499 592
500sub record { 593sub record {
501 my ($self, $cb) = @_; 594 my ($self, $cb) = @_;
502 595
… …
510} 603}
511 604
512sub feed_map1a { 605sub feed_map1a {
513 my ($self, $data) = @_; 606 my ($self, $data) = @_;
514 607
515 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 608 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
609 my $delay;
610
611 for my $tile (@$missing) {
612 next if $self->{delay}{$tile};
613
614 $delay = 1;
615
616 if (my $tex = $::CONN->{texture}[$tile]) {
617 $tex->upload;
618 } else {
619 $self->{delay}{$tile} = 1;
620
621 # we assume the face is in-flight and will eventually come
622 push @{$self->{tile_cb}{$tile}}, sub {
623 delete $self->{delay}{$tile};
624 $_[0]->upload;
625 };
626 }
627 }
628
629 if ($delay) {
630 # delay the map drawing a tiny bit in the hope of getting the missing fetched
631 Event->timer (after => 0.03, cb => sub {
632 $_[0]->w->cancel;
633 $self->{map_widget}->update
634 if $self->{map_widget};
635 });
636 } else {
516 $self->{map_widget}->update; 637 $self->{map_widget}->update;
638 }
517} 639}
518 640
519sub magicmap { 641sub magicmap {
520 my ($self, $w, $h, $x, $y, $data) = @_; 642 my ($self, $w, $h, $x, $y, $data) = @_;
521 643
… …
528 my $map_info = delete $self->{map_info} 650 my $map_info = delete $self->{map_info}
529 or return; 651 or return;
530 652
531 my ($hash, $x, $y, $w, $h) = @$map_info; 653 my ($hash, $x, $y, $w, $h) = @$map_info;
532 654
533 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 655 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
656 $self->{map_cache_new}{$hash} = \$data;
534 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 657 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
535 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
536} 658}
537 659
538sub map_clear { 660sub map_clear {
539 my ($self) = @_; 661 my ($self) = @_;
540 662
… …
546} 668}
547 669
548sub bg_fetch { 670sub bg_fetch {
549 my ($self) = @_; 671 my ($self) = @_;
550 672
551 my $id; 673 my $tile;
552 674
553 do { 675 do {
554 $id = pop @{$self->{bg_fetch}} 676 $tile = pop @{$self->{bg_fetch}}
555 or return; 677 or return;
556 } while $self->{texture}[$id]; 678 } while $self->{texture}[$tile];
557 679
558 CFPlus::DB::get tilecache => $id, sub { 680 CFPlus::DB::get tilecache => $tile, sub {
559 my ($data) = @_; 681 my ($data) = @_;
560 682
561 return unless $self->{map}; # stop when destroyed 683 return unless $self->{map}; # stop when destroyed
562 684
563 $self->set_texture ($id => $data)
564 if defined $data; 685 if (defined $data) {
686 $self->have_tile ($tile, $data);
687 $self->{texture}[$tile]->upload;
688 }
565 689
566 $self->bg_fetch; 690 $self->bg_fetch;
567 }; 691 };
568} 692}
569 693
570sub load_map($$$) { 694sub load_map($$$) {
571 my ($self, $hash, $x, $y) = @_; 695 my ($self, $hash, $x, $y) = @_;
572 696
573 my $gen = $self->{map_change_gen}; 697 my $gen = $self->{map_change_gen};
574 698
575 CFPlus::DB::get $self->{mapcache} => $hash, sub { 699 my $cb = sub {
576 return unless $gen == $self->{map_change_gen}; 700 return unless $gen == $self->{map_change_gen};
577 701
578 my ($data) = @_; 702 my ($data) = @_;
579 703
580 if (defined $data) { 704 if (defined $data) {
705 $self->{map_cache_new}{$hash} = \$data;
706
581 $data = Compress::LZF::decompress $data; 707 my $data = Compress::LZF::decompress $data;
582 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
583 708
584 my $inprogress = @{ $self->{bg_fetch} || [] }; 709 my $inprogress = @{ $self->{bg_fetch} || [] };
585 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 710 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
586 $self->bg_fetch unless $inprogress; 711 $self->bg_fetch unless $inprogress;
587 } 712 }
588 }; 713 };
714
715 if (my $rdata = $self->{map_cache_old}{$hash}) {
716 $cb->($$rdata);
717 } else {
718 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
719 }
589} 720}
590 721
591# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 722# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
592# (server resource,s latency, bandwidth), so this hack is warranted. 723# (server resource,s latency, bandwidth), so this hack is warranted.
593# the right fix is to make real tiled maps with an overview file 724# the right fix is to make real tiled maps with an overview file
… …
686 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 817 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
687 818
688 $self->flush_map; 819 $self->flush_map;
689 820
690 ++$self->{map_change_gen}; 821 ++$self->{map_change_gen};
822 $self->{map_cache_old} = delete $self->{map_cache_new};
691 823
692 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 824 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
693 825
694 my $mapmapw = $self->{mapmap}->{w}; 826 my $mapmapw = $self->{mapmap}->{w};
695 my $mapmaph = $self->{mapmap}->{h}; 827 my $mapmaph = $self->{mapmap}->{h};
… …
717 my ($self, $facenum, $face, $cb) = @_; 849 my ($self, $facenum, $face, $cb) = @_;
718 850
719 if ($face->{type} == 0) { # FT_FACE 851 if ($face->{type} == 0) { # FT_FACE
720 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 852 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
721 853
722 $face->{id} = $id; 854 $face->{id} = $id;
723 $self->{faceid}[$facenum] = $id;
724
725 $self->{map}->set_tileid ($facenum => $id); 855 $self->{map}->set_tileid ($facenum => $id);
726 856
727 CFPlus::DB::get tilecache => $id, $cb; 857 CFPlus::DB::get tilecache => $id, $cb;
728 858
729 } elsif ($face->{type} & 1) { # with metadata 859 } elsif ($face->{type} & 1) { # with metadata
730 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
731 CFPlus::DB::get "res-metadata" => $face->{name}, $cb; 860 CFPlus::DB::get res_meta => $face->{name}, $cb;
861
862 } else { # no metadata
863 CFPlus::DB::get res_data => $face->{name}, $cb;
732 } 864 }
733} 865}
734 866
735sub face_update { 867sub face_update {
736 my ($self, $facenum, $face, $changed) = @_; 868 my ($self, $facenum, $face, $changed) = @_;
737 869
738 if ($face->{type} == 0) { # FT_FACE 870 if ($face->{type} == 0) {
871 # image, FT_FACE
739 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 872 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
740 if $changed; 873 if $changed;
741 874
742 $self->set_texture ($face->{id} => delete $face->{data}); 875 $self->have_tile ($face->{id}, delete $face->{data});
743 876
744 } elsif ($face->{type} & 1) { # split metadata 877 } elsif ($face->{type} & 1) {
745 my $cb = sub { }; 878 # split metadata case, FT_MUSIC, FT_SOUND
879 if ($changed) { # new data
880 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
881 $face->{data} = $meta;
882
883 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
884 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
885 }
886
887 $face->{data} = $self->{json_coder}->decode ($face->{data});
888
889 ::add_license ($face);
746 890
747 if ($face->{type} == 3) { # FT_MUSIC 891 if ($face->{type} == 3) { # FT_MUSIC
748 $cb = sub {
749 $self->{music_meta}{$facenum} = $face;
750
751 ::message ({ markup => "downloaded song #$facenum" }) 892 ::message ({ markup => "downloaded song #$facenum" })
752 if $changed; 893 if $changed;
753 894
754 &::audio_music_set ($self->{songs}); 895 &::audio_music_push ($facenum);
896 } elsif ($face->{type} == 5) { # FT_SOUND
897 ::message ({ markup => "downloaded sound #$facenum" })
898 if $changed;
899
900 &::audio_sound_push ($facenum);
755 }; 901 }
756 }
757 902
758 if ($changed) { # new data
759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
760 my $path = CFPlus::DB::path_of_res $face->{name};
761
762 CFPlus::DB::write_file $path, $data, sub {
763 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
764 $face->{meta} = $self->{json_coder}->decode ($meta_json);
765 $face->{path} = $path;
766
767 $cb->();
768 };
769 };
770 } else { 903 } else {
771 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 904 # flat resource case, FT_RSRC
772 $cb->(); 905 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
773 } 906 if $changed;
907 }
908
909 if (my $cbs = $self->{face_cb}{$facenum}) {
910 $_->($face, $changed) for @$cbs;
774 } 911 }
775} 912}
776 913
777sub smooth_update { 914sub smooth_update {
778 my ($self, $facenum, $face) = @_; 915 my ($self, $facenum, $face) = @_;
779 916
780 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 917 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
781} 918}
782 919
783sub set_texture { 920sub have_tile {
784 my ($self, $id, $data) = @_; 921 my ($self, $tile, $data) = @_;
785 922
786 return unless $self->{map}; 923 return unless $self->{map};
787 924
788 $self->{texture}[$id] = my $tex = 925 my $tex = $self->{texture}[$tile] ||=
789 new_from_image CFPlus::Texture 926 new CFPlus::Texture
927 tile => $tile,
928 image => $data, delete_image => 1,
790 $data, minify => 1, mipmap => 1; 929 minify => 1, mipmap => 1;
791 930
792 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 931 if (my $cbs = delete $self->{tile_cb}{$tile}) {
793 $self->{map_widget}->update; 932 $_->($tex) for @$cbs;
794 933 }
795 $_->() for @{(delete $self->{face_cb}{$id}) || []};
796} 934}
797 935
798sub connect_face_update { 936# call in non-void context registers a temporary
937# hook with handle, otherwise its permanent
938sub on_face_change {
799 my ($self, $id, $cb) = @_; 939 my ($self, $num, $cb) = @_;
800 940
801 push @{$self->{face_cb}{$id}}, $cb; 941 push @{$self->{face_cb}{$num}}, $cb;
802 942
943 defined wantarray
803 CFPlus::guard { 944 ? CFPlus::guard {
804 @{$self->{face_cb}{$id}} 945 @{$self->{face_cb}{$num}}
805 = grep $_ != $cb, 946 = grep $_ != $cb,
806 @{$self->{face_cb}{$id}}; 947 @{$self->{face_cb}{$num}};
807 } 948 }
949 : ()
950}
951
952# call in non-void context registers a temporary
953# hook with handle, otherwise its permanent
954sub register_face_handler {
955 my ($self, $num, $cb) = @_;
956
957 return unless $num;
958
959 # invoke if available right now
960 $cb->($self->{face}[$num], 0)
961 unless exists $self->{face}[$num]{loading};
962
963 # future changes
964 $self->on_face_change ($num => $cb)
808} 965}
809 966
810sub sound_play { 967sub sound_play {
811 my ($self, $x, $y, $soundnum, $type) = @_; 968 my ($self, $type, $face, $dx, $dy, $vol) = @_;
812 969
813 $self->{sound_play}->($x, $y, $soundnum, $type); 970 &::audio_sound_play ($face, $dx, $dy, $vol)
971 unless $type & 1; # odd types are silent for future expansion
814} 972}
815 973
816my $LAST_QUERY; # server is stupid, stupid, stupid 974my $LAST_QUERY; # server is stupid, stupid, stupid
817 975
818sub query { 976sub query {
… …
883 $self->{$type} = $text; 1041 $self->{$type} = $text;
884 } else { 1042 } else {
885 $self->logprint ("msg: ", $text); 1043 $self->logprint ("msg: ", $text);
886 return if $color < 0; # negative color == ignore if not understood 1044 return if $color < 0; # negative color == ignore if not understood
887 1045
888 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1046 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
889 1047
890 ## try to create single paragraphs of multiple lines sent by the server 1048 ## try to create single paragraphs of multiple lines sent by the server
891 # no longer neecssary with TRT servers 1049 # no longer neecssary with TRT servers
892 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1050 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
893 1051
894 ::message ({ fg => $fg, markup => $_ }) 1052 ::message ({
1053 fg => $fg,
1054 markup => $_,
1055 type => $type,
1056 extra => [@extra],
1057 color_flags => $color
895 for split /\n/, $text; 1058 }) for split /\n/, $text;
896 1059
897 $self->{statusbox}->add ($text, 1060 $self->{statusbox}->add ($text,
898 group => $text, 1061 group => $text,
899 fg => $fg, 1062 fg => $fg,
900 timeout => $color >= 2 ? 180 : 10, 1063 timeout => $color >= 2 ? 180 : 10,
… …
956 $self->{map_widget}->clr_commands; 1119 $self->{map_widget}->clr_commands;
957 1120
958 ::stop_game (); 1121 ::stop_game ();
959} 1122}
960 1123
961sub image_info {
962 my ($self, $numfaces) = @_;
963
964 $self->{num_faces} = $numfaces;
965 $self->{face_prefetch} = [1 .. $numfaces];
966 $self->face_prefetch;
967}
968
969sub face_prefetch {
970 my ($self) = @_;
971
972 return unless $::CFG->{face_prefetch};
973
974 if ($self->{num_faces}) {
975 return if @{ $self->{send_queue} || [] };
976 my $todo = @{ $self->{face_prefetch} }
977 or return;
978
979 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
980
981 $self->send ("requestinfo image_sums $face $face");
982
983 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
984 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
985 } elsif (!exists $self->{num_faces}) {
986 $self->send ("requestinfo image_info");
987
988 $self->{num_faces} = 0;
989
990 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
991 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
992 }
993}
994
995sub update_floorbox { 1124sub update_floorbox {
996 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1125 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
997 return unless $::CONN; 1126 return unless $::CONN;
998 1127
999 $::FLOORBOX->clear; 1128 $::FLOORBOX->clear;
… …
1028 } 1157 }
1029 1158
1030 $::FLOORBOX->add_at (@add); 1159 $::FLOORBOX->add_at (@add);
1031 }); 1160 });
1032 1161
1033 $::WANT_REFRESH++; 1162 $::WANT_REFRESH->start;
1034} 1163}
1035 1164
1036sub set_opencont { 1165sub set_opencont {
1037 my ($conn, $tag, $name) = @_; 1166 my ($conn, $tag, $name) = @_;
1038 $conn->{open_container} = $tag; 1167 $conn->{open_container} = $tag;
1039 update_floorbox; 1168 update_floorbox;
1040 1169
1041 $::INV_RIGHT_HB->clear (); 1170 $::INVR_HB->clear ();
1042 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1171 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1043 1172
1044 if ($tag != 0) { # Floor isn't closable, is it? 1173 if ($tag != 0) { # Floor isn't closable, is it?
1045 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1174 $::INVR_HB->add (new CFPlus::UI::Button
1046 text => "Close container", 1175 text => "Close container",
1047 tooltip => "Close the currently open container (if one is open)", 1176 tooltip => "Close the currently open container (if one is open)",
1048 on_activate => sub { 1177 on_activate => sub {
1049 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1178 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1050 if $tag != 0; 1179 if $tag != 0;
1051 #if $CONN->{open_container} != 0;
1052 0 1180 0
1053 }, 1181 },
1054 ); 1182 );
1055 } 1183 }
1056 1184
… …
1155 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1283 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1156 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1284 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1157 . "map size $self->{mapw}×$self->{maph}\n" 1285 . "map size $self->{mapw}×$self->{maph}\n"
1158 ); 1286 );
1159 1287
1160 ::setup_build_button ($self->{editor_support}->{builder_ui});
1161} 1288}
1162 1289
1163sub logged_in { 1290sub logged_in {
1164 my ($self) = @_; 1291 my ($self) = @_;
1165 1292
… …
1185 1312
1186 $self->send_command ("output-sync $::CFG->{output_sync}"); 1313 $self->send_command ("output-sync $::CFG->{output_sync}");
1187 $self->send_command ("output-count $::CFG->{output_count}"); 1314 $self->send_command ("output-count $::CFG->{output_count}");
1188 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1315 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1189 $self->send_command ("pickup $::CFG->{pickup}"); 1316 $self->send_command ("pickup $::CFG->{pickup}");
1190}
1191
1192sub buildat {
1193 my ($self, $builditem, $x, $y) = @_;
1194
1195 if ($self->{cfplus_ext}) {
1196 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1197 }
1198} 1317}
1199 1318
1200sub lookat { 1319sub lookat {
1201 my ($self, $x, $y) = @_; 1320 my ($self, $x, $y) = @_;
1202 1321

Diff Legend

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