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

Diff Legend

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