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.129 by root, Mon Jul 23 23:37:57 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, 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 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 if (my $faces = $ev{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
74
75 if (defined $meta_json) {
76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
80 } else {
81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82 $self->ask_face ($face, -100 - $pri, undef, sub {
83 my $len = length $_[1];
84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
85
86 CFPlus::DB::write_file $path, $data, sub {
87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
96 });
97 }
98 }
99 }
100 }
101
102 if (my $play = $ev{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104 }
105 });
106
107 $self->connect_ext (capabilities => sub {
108 my (%cap) = @_;
109
110 if (my $ts = $cap{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3];
114 $self->setup_req (tileset => $default->[0]);
115
116 my $w = int $self->{mapw} * 32 / $self->{tilesize};
117 my $h = int $self->{maph} * 32 / $self->{tilesize};
118
119 $self->setup_req (mapsize => "${w}x${h}");
120 }
121 }
122 });
123
124 $self->{json_coder} 53 $self->{json_coder}
125 ->convert_blessed 54 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub { 55 ->filter_json_single_key_object (__w_ => sub {
127 $self->{widget}{$_[0]} 56 $self->{widget}{$_[0]}
128 }); 57 });
129
130 # widgetset new
131 $self->connect_ext (ws_n => sub {
132 my ($id) = @_;
133
134 $self->{widgetset}{$id} = {
135 w => {},
136 };
137 });
138
139 # widgetset destroy
140 $self->connect_ext (ws_d => sub {
141 my ($id) = @_;
142
143 my $ws = delete $self->{widgetset}{$id}
144 or return;
145
146 $_->destroy
147 for values %{$ws->{w}};
148 });
149
150 # widgetset create
151 $self->connect_ext (ws_c => sub {
152 my ($ws, $id, $class, $args) = @_;
153
154 for my $ev (grep /^on_/, keys %$args) {
155 $args->{$ev} = sub {
156 my $id = shift->{s_id};
157 $self->send_exti_msg (w_e => $id, $ev, \@_);
158
159 1
160 };
161 }
162
163 if (my $widget = eval {
164 local $SIG{__DIE__};
165 "CFPlus::UI::$class"->new (
166 %$args,
167 s_ws => $ws,
168 s_id => $id,
169 )
170 }
171 ) {
172 $self->{widget}{$id}
173 = $self->{widgetset}{$ws}{w}{$id}
174 = $widget;
175
176 $widget->connect (on_destroy => sub {
177 my ($widget) = @_;
178
179 delete $self->{widget}{$widget->{s_id}};
180 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
181 });
182 } else {
183 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
184 $self->send_exti_msg (w_e => $id, "destroy");
185 }
186 });
187
188 # widget call
189 $self->connect_ext (w_c => sub {
190 my ($id, $rid, $method, $args) = @_;
191
192 my $w = $self->{widget}{$id}
193 or return;
194
195 $args ||= [];
196
197 if ($rid) {
198 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
199 } else {
200 $w->$method (@$args);
201 }
202 });
203
204 # widget set
205 $self->connect_ext (w_s => sub {
206 my ($id, $attr) = @_;
207
208 my $w = $self->{widget}{$id}
209 or return;
210
211 for (my $i = 0; $i < $#$attr; $i += 2) {
212 my ($member, $value) = @$attr[$i, $i+1];
213 if (defined $value) {
214 $w->{$member} = $value;
215 } else {
216 delete $w->{$member};
217 }
218 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
219 }
220 });
221
222 # widget get
223 $self->connect_ext (w_g => sub {
224 my ($id, $rid, $attr) = @_;
225
226 my $w = $self->{widget}{$id}
227 or return;
228
229 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
230 });
231 58
232 # destroy widgets on logout 59 # destroy widgets on logout
233 $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 {
234 for my $ws (values %{delete $self->{widgetset} || {}}) { 61 for my $ws (values %{delete $self->{widgetset} || {}}) {
235 $_->destroy 62 $_->destroy
… …
258 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 85 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
259 86
260 $self 87 $self
261} 88}
262 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
263sub logprint { 309sub logprint {
264 my ($self, @a) = @_; 310 my ($self, @a) = @_;
265 311
266 $self->{log_fh} ||= do { 312 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
267 my $path = "$Crossfire::VARDIR/log.$self->{host}";
268
269 open my $fh, ">>:utf8", $path
270 or die "Couldn't open logfile $path: $!";
271
272 $fh->autoflush (1);
273
274 $fh;
275 };
276
277 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
278
279 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
280 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
281
282 print {$self->{log_fh}} "$ts ", @a, "\n";
283} 313}
284 314
285sub _stat_numdiff { 315sub _stat_numdiff {
286 my ($self, $name, $old, $new) = @_; 316 my ($self, $name, $old, $new) = @_;
287 317
… …
420 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 450 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
421 $::GAUGES->{food} ->set_value ($fo, $fo_m); 451 $::GAUGES->{food} ->set_value ($fo, $fo_m);
422 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 452 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
423 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 453 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
424 . " (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});
425 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 456 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
426 my $title = $stats->{+CS_STAT_TITLE}; 457 my $title = $stats->{+CS_STAT_TITLE};
427 $title =~ s/^Player: //; 458 $title =~ s/^Player: //;
428 $::STATWIDS->{title} ->set_text ("Title: " . $title); 459 $::STATWIDS->{title} ->set_text ("Title: " . $title);
429 460
… …
447 for keys %RES_TBL; 478 for keys %RES_TBL;
448 479
449 my $sktbl = $::STATWIDS->{skill_tbl}; 480 my $sktbl = $::STATWIDS->{skill_tbl};
450 my @skills = keys %{ $self->{skill_info} }; 481 my @skills = keys %{ $self->{skill_info} };
451 482
452 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
453 $sktbl->clear; 491 $sktbl->clear;
454 492
455 my @add; 493 my $sw = $self->{skillwid}{""} ||= [
456
457 push @add,
458 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 494 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
459 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),
460 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 497 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
461 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 498 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
462 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),
463 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 501 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
464 ; 502 ];
503
504 my @add = @$sw;
465 505
466 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>";
467 507
468 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);
469 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);
470 510
471 my ($x, $y) = (0, 1); 511 my ($x, $y) = (0, 1);
472 for ( 512 for (@order) {
473 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
474 map [$_, $self->{skill_info}{$_}],
475 grep exists $stats->{$_},
476 @skills
477 ) {
478 my ($idx, $name) = @$_; 513 my ($idx, $name) = @$_;
479 514
480 my $spell_cb = sub { 515 my $spell_cb = sub {
481 my ($widget, $ev) = @_; 516 my ($widget, $ev) = @_;
482 517
… …
497 } 532 }
498 533
499 1 534 1
500 }; 535 };
501 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
502 push @add, 554 push @add,
503 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 555 $x * 4 + 0, $y, $sw->[0],
504 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 556 $x * 4 + 1, $y, $sw->[1],
505 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 557 $x * 4 + 2, $y, $sw->[2],
506 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],
507 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
508 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
509 ; 559 ;
510 560
511 $x++ and ($x, $y) = (0, $y + 1); 561 $x++ and ($x, $y) = (0, $y + 1);
512 } 562 }
513 563
514 $sktbl->add_at (@add); 564 $sktbl->add_at (@add);
515 } 565 }
516 566
517 for (grep exists $stats->{$_}, @skills) { 567 for (@order) {
518 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 568 my ($idx, $name) = @$_;
519 $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);
520 } 580 }
521} 581}
522 582
523sub macro_send { 583sub macro_send {
524 my ($self, $macro) = @_; 584 my ($self, $macro) = @_;
… …
552} 612}
553 613
554sub feed_map1a { 614sub feed_map1a {
555 my ($self, $data) = @_; 615 my ($self, $data) = @_;
556 616
557 $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 {
558 $self->{map_widget}->update; 646 $self->{map_widget}->update;
647 }
559} 648}
560 649
561sub magicmap { 650sub magicmap {
562 my ($self, $w, $h, $x, $y, $data) = @_; 651 my ($self, $w, $h, $x, $y, $data) = @_;
563 652
… …
570 my $map_info = delete $self->{map_info} 659 my $map_info = delete $self->{map_info}
571 or return; 660 or return;
572 661
573 my ($hash, $x, $y, $w, $h) = @$map_info; 662 my ($hash, $x, $y, $w, $h) = @$map_info;
574 663
575 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;
576 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 666 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
577 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
578} 667}
579 668
580sub map_clear { 669sub map_clear {
581 my ($self) = @_; 670 my ($self) = @_;
582 671
… …
588} 677}
589 678
590sub bg_fetch { 679sub bg_fetch {
591 my ($self) = @_; 680 my ($self) = @_;
592 681
593 my $id; 682 my $tile;
594 683
595 do { 684 do {
596 $id = pop @{$self->{bg_fetch}} 685 $tile = pop @{$self->{bg_fetch}}
597 or return; 686 or return;
598 } while $self->{texture}[$id]; 687 } while $self->{texture}[$tile];
599 688
600 CFPlus::DB::get tilecache => $id, sub { 689 CFPlus::DB::get tilecache => $tile, sub {
601 my ($data) = @_; 690 my ($data) = @_;
602 691
603 return unless $self->{map}; # stop when destroyed 692 return unless $self->{map}; # stop when destroyed
604 693
605 $self->set_texture ($id => $data)
606 if defined $data; 694 if (defined $data) {
695 $self->have_tile ($tile, $data);
696 $self->{texture}[$tile]->upload;
697 }
607 698
608 $self->bg_fetch; 699 $self->bg_fetch;
609 }; 700 };
610} 701}
611 702
612sub load_map($$$) { 703sub load_map($$$) {
613 my ($self, $hash, $x, $y) = @_; 704 my ($self, $hash, $x, $y) = @_;
614 705
615 my $gen = $self->{map_change_gen}; 706 my $gen = $self->{map_change_gen};
616 707
617 CFPlus::DB::get $self->{mapcache} => $hash, sub { 708 my $cb = sub {
618 return unless $gen == $self->{map_change_gen}; 709 return unless $gen == $self->{map_change_gen};
619 710
620 my ($data) = @_; 711 my ($data) = @_;
621 712
622 if (defined $data) { 713 if (defined $data) {
714 $self->{map_cache_new}{$hash} = \$data;
715
623 $data = Compress::LZF::decompress $data; 716 my $data = Compress::LZF::decompress $data;
624 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
625 717
626 my $inprogress = @{ $self->{bg_fetch} || [] }; 718 my $inprogress = @{ $self->{bg_fetch} || [] };
627 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 719 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
628 $self->bg_fetch unless $inprogress; 720 $self->bg_fetch unless $inprogress;
629 } 721 }
630 }; 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 }
631} 729}
632 730
633# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 731# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
634# (server resource,s latency, bandwidth), so this hack is warranted. 732# (server resource,s latency, bandwidth), so this hack is warranted.
635# 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
… …
728 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 826 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
729 827
730 $self->flush_map; 828 $self->flush_map;
731 829
732 ++$self->{map_change_gen}; 830 ++$self->{map_change_gen};
831 $self->{map_cache_old} = delete $self->{map_cache_new};
733 832
734 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 833 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
735 834
736 my $mapmapw = $self->{mapmap}->{w}; 835 my $mapmapw = $self->{mapmap}->{w};
737 my $mapmaph = $self->{mapmap}->{h}; 836 my $mapmaph = $self->{mapmap}->{h};
… …
756} 855}
757 856
758sub face_find { 857sub face_find {
759 my ($self, $facenum, $face, $cb) = @_; 858 my ($self, $facenum, $face, $cb) = @_;
760 859
761 my $hash = "$face->{chksum},$face->{name}"; 860 if ($face->{type} == 0) { # FT_FACE
762
763 my $id = CFPlus::DB::get_tile_id_sync $hash; 861 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
764 862
765 $face->{id} = $id; 863 $face->{id} = $id;
766 $self->{faceid}[$facenum] = $id;
767
768 $self->{map}->set_tileid ($facenum => $id); 864 $self->{map}->set_tileid ($facenum => $id);
769 865
770 CFPlus::DB::get tilecache => $id, $cb; 866 CFPlus::DB::get tilecache => $id, $cb;
867
868 } elsif ($face->{type} & 1) { # with metadata
869 CFPlus::DB::get res_meta => $face->{name}, $cb;
870
871 } else { # no metadata
872 CFPlus::DB::get res_data => $face->{name}, $cb;
873 }
771} 874}
772 875
773sub face_update { 876sub face_update {
774 my ($self, $facenum, $face, $changed) = @_; 877 my ($self, $facenum, $face, $changed) = @_;
775 878
879 if ($face->{type} == 0) {
880 # image, FT_FACE
776 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 881 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
777 if $changed; 882 if $changed;
778 883
779 $self->set_texture ($face->{id} => delete $face->{image}); 884 $self->have_tile ($face->{id}, delete $face->{data});
885
886 } elsif ($face->{type} & 1) {
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);
899
900 if ($face->{type} == 3) { # FT_MUSIC
901 ::message ({ markup => "downloaded song #$facenum" })
902 if $changed;
903
904 &::audio_music_push ($facenum);
905 } elsif ($face->{type} == 5) { # FT_SOUND
906 ::message ({ markup => "downloaded sound #$facenum" })
907 if $changed;
908
909 &::audio_sound_push ($facenum);
910 }
911
912 } else {
913 # flat resource case, FT_RSRC
914 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
915 if $changed;
916 }
917
918 if (my $cbs = $self->{face_cb}{$facenum}) {
919 $_->($face, $changed) for @$cbs;
920 }
780} 921}
781 922
782sub smooth_update { 923sub smooth_update {
783 my ($self, $facenum, $face) = @_; 924 my ($self, $facenum, $face) = @_;
784 925
785 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 926 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
786} 927}
787 928
788sub set_texture { 929sub have_tile {
789 my ($self, $id, $data) = @_; 930 my ($self, $tile, $data) = @_;
790 931
791 return unless $self->{map}; 932 return unless $self->{map};
792 933
793 $self->{texture}[$id] = my $tex = 934 my $tex = $self->{texture}[$tile] ||=
794 new_from_image CFPlus::Texture 935 new CFPlus::Texture
936 tile => $tile,
937 image => $data, delete_image => 1,
795 $data, minify => 1, mipmap => 1; 938 minify => 1, mipmap => 1;
796 939
797 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 940 if (my $cbs = delete $self->{tile_cb}{$tile}) {
798 $self->{map_widget}->update; 941 $_->($tex) for @$cbs;
799 942 }
800 $_->() for @{(delete $self->{face_cb}{$id}) || []};
801} 943}
802 944
803sub connect_face_update { 945# call in non-void context registers a temporary
946# hook with handle, otherwise its permanent
947sub on_face_change {
804 my ($self, $id, $cb) = @_; 948 my ($self, $num, $cb) = @_;
805 949
806 push @{$self->{face_cb}{$id}}, $cb; 950 push @{$self->{face_cb}{$num}}, $cb;
807 951
952 defined wantarray
808 CFPlus::guard { 953 ? CFPlus::guard {
809 @{$self->{face_cb}{$id}} 954 @{$self->{face_cb}{$num}}
810 = grep $_ != $cb, 955 = grep $_ != $cb,
811 @{$self->{face_cb}{$id}}; 956 @{$self->{face_cb}{$num}};
812 } 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)
813} 974}
814 975
815sub sound_play { 976sub sound_play {
816 my ($self, $x, $y, $soundnum, $type) = @_; 977 my ($self, $type, $face, $dx, $dy, $vol) = @_;
817 978
818 $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
819} 981}
820 982
821my $LAST_QUERY; # server is stupid, stupid, stupid 983my $LAST_QUERY; # server is stupid, stupid, stupid
822 984
823sub query { 985sub query {
… …
888 $self->{$type} = $text; 1050 $self->{$type} = $text;
889 } else { 1051 } else {
890 $self->logprint ("msg: ", $text); 1052 $self->logprint ("msg: ", $text);
891 return if $color < 0; # negative color == ignore if not understood 1053 return if $color < 0; # negative color == ignore if not understood
892 1054
893 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1055 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
894 1056
895 ## 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
896 # no longer neecssary with TRT servers 1058 # no longer neecssary with TRT servers
897 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1059 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
898 1060
899 ::message ({ fg => $fg, markup => $_ }) 1061 ::message ({
1062 fg => $fg,
1063 markup => $_,
1064 type => $type,
1065 extra => [@extra],
1066 color_flags => $color
900 for split /\n/, $text; 1067 }) for split /\n/, $text;
901 1068
902 $self->{statusbox}->add ($text, 1069 $self->{statusbox}->add ($text,
903 group => $text, 1070 group => $text,
904 fg => $fg, 1071 fg => $fg,
905 timeout => $color >= 2 ? 180 : 10, 1072 timeout => $color >= 2 ? 180 : 10,
… …
961 $self->{map_widget}->clr_commands; 1128 $self->{map_widget}->clr_commands;
962 1129
963 ::stop_game (); 1130 ::stop_game ();
964} 1131}
965 1132
966sub image_info {
967 my ($self, $numfaces) = @_;
968
969 $self->{num_faces} = $numfaces;
970 $self->{face_prefetch} = [1 .. $numfaces];
971 $self->face_prefetch;
972}
973
974sub face_prefetch {
975 my ($self) = @_;
976
977 return unless $::CFG->{face_prefetch};
978
979 if ($self->{num_faces}) {
980 return if @{ $self->{send_queue} || [] };
981 my $todo = @{ $self->{face_prefetch} }
982 or return;
983
984 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
985
986 $self->send ("requestinfo image_sums $face $face");
987
988 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
989 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
990 } elsif (!exists $self->{num_faces}) {
991 $self->send ("requestinfo image_info");
992
993 $self->{num_faces} = 0;
994
995 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
996 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
997 }
998}
999
1000sub update_floorbox { 1133sub update_floorbox {
1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1134 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1002 return unless $::CONN; 1135 return unless $::CONN;
1003 1136
1004 $::FLOORBOX->clear; 1137 $::FLOORBOX->clear;
… …
1033 } 1166 }
1034 1167
1035 $::FLOORBOX->add_at (@add); 1168 $::FLOORBOX->add_at (@add);
1036 }); 1169 });
1037 1170
1038 $::WANT_REFRESH++; 1171 $::WANT_REFRESH->start;
1039} 1172}
1040 1173
1041sub set_opencont { 1174sub set_opencont {
1042 my ($conn, $tag, $name) = @_; 1175 my ($conn, $tag, $name) = @_;
1043 $conn->{open_container} = $tag; 1176 $conn->{open_container} = $tag;
1044 update_floorbox; 1177 update_floorbox;
1045 1178
1046 $::INV_RIGHT_HB->clear (); 1179 $::INVR_HB->clear ();
1047 $::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);
1048 1181
1049 if ($tag != 0) { # Floor isn't closable, is it? 1182 if ($tag != 0) { # Floor isn't closable, is it?
1050 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1183 $::INVR_HB->add (new CFPlus::UI::Button
1051 text => "Close container", 1184 text => "Close container",
1052 tooltip => "Close the currently open container (if one is open)", 1185 tooltip => "Close the currently open container (if one is open)",
1053 on_activate => sub { 1186 on_activate => sub {
1054 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1187 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1055 if $tag != 0; 1188 if $tag != 0;
1056 #if $CONN->{open_container} != 0;
1057 0 1189 0
1058 }, 1190 },
1059 ); 1191 );
1060 } 1192 }
1061 1193
… …
1160 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1292 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1161 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1293 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1162 . "map size $self->{mapw}×$self->{maph}\n" 1294 . "map size $self->{mapw}×$self->{maph}\n"
1163 ); 1295 );
1164 1296
1165 ::setup_build_button ($self->{editor_support}->{builder_ui});
1166} 1297}
1167 1298
1168sub logged_in { 1299sub logged_in {
1169 my ($self) = @_; 1300 my ($self) = @_;
1170 1301
… …
1190 1321
1191 $self->send_command ("output-sync $::CFG->{output_sync}"); 1322 $self->send_command ("output-sync $::CFG->{output_sync}");
1192 $self->send_command ("output-count $::CFG->{output_count}"); 1323 $self->send_command ("output-count $::CFG->{output_count}");
1193 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1324 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1194 $self->send_command ("pickup $::CFG->{pickup}"); 1325 $self->send_command ("pickup $::CFG->{pickup}");
1195}
1196
1197sub buildat {
1198 my ($self, $builditem, $x, $y) = @_;
1199
1200 if ($self->{cfplus_ext}) {
1201 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1202 }
1203} 1326}
1204 1327
1205sub lookat { 1328sub lookat {
1206 my ($self, $x, $y) = @_; 1329 my ($self, $x, $y) = @_;
1207 1330

Diff Legend

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