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.125 by root, Sat Jul 21 15:04:27 2007 UTC vs.
Revision 1.157 by root, Tue Aug 21 02:39:17 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 (event_music => sub { 53 $self->connect_ext (ambient_music => sub {
54 my ($ev) = @_; 54 my ($songs) = @_;
55 55 &::audio_music_set_ambient ($songs);
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 }); 56 });
106 57
107 $self->connect_ext (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
108 my ($cap) = @_; 59 my (%cap) = @_;
109 60
61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want;
63
64 $self->send_exti_req (resource => "exp_table", sub {
65 my ($exp_table) = @_;
66
67 $self->register_face_handler ($exp_table, sub {
68 my ($face) = @_;
69
70 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
71 $_->() for values %{ $self->{on_exp_update} || {} };
72 });
73
74 ()
75 });
76
110 if (my $ts = $cap->{tileset}) { 77 if (my $ts = $cap{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) { 78 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default; 79 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3]; 80 $self->{tilesize} = $default->[3];
114 $self->setup_req (tileset => $default->[0]); 81 $self->setup_req (tileset => $default->[0]);
115 82
… …
121 } 88 }
122 }); 89 });
123 90
124 $self->{json_coder} 91 $self->{json_coder}
125 ->convert_blessed 92 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub { 93 ->filter_json_single_key_object (__w_ => sub {
127 $self->{widget}{$_[0]} 94 $self->{widget}{$_[0]}
128 }); 95 });
129 96
130 # widgetset new 97 # widgetset new
131 $self->connect_ext (ws_n => sub { 98 $self->connect_ext (ws_n => sub {
132 my ($arg) = @_; 99 my ($id) = @_;
133 100
134 $self->{widgetset}{$arg{id}} = { 101 $self->{widgetset}{$id} = {
135 w => {}, 102 w => {},
136 }; 103 };
137 }); 104 });
138 105
139 # widgetset destroy 106 # widgetset destroy
140 $self->connect_ext (ws_d => sub { 107 $self->connect_ext (ws_d => sub {
141 my ($arg) = @_; 108 my ($id) = @_;
142 109
143 my $ws = delete $self->{widgetset}{$arg{id}} 110 my $ws = delete $self->{widgetset}{$id}
144 or return; 111 or return;
145 112
146 $_->destroy 113 $_->destroy
147 for values %{$ws->{w}}; 114 for values %{$ws->{w}};
148 }); 115 });
149 116
150 # widgetset destroy 117 # widgetset create
151 $self->connect_ext (ws_c => sub { 118 $self->connect_ext (ws_c => sub {
152 my ($arg) = @_; 119 my ($ws, $id, $class, $args) = @_;
153
154 my $args = $arg->{args} || {};
155 120
156 for my $ev (grep /^on_/, keys %$args) { 121 for my $ev (grep /^on_/, keys %$args) {
122 my $rid = $args->{$ev};
157 $args->{$ev} = sub { 123 $args->{$ev} = sub {
158 my $id = shift->{s_id}; 124 my $id = shift->{s_id};
159 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 125 $self->send_exti_msg (w_e => $id, $rid, @_);
160 126
161 1 127 1
162 }; 128 };
163 } 129 }
164 130
165 if (my $widget = eval { 131 $self->widget_associate (
132 $ws, $id => scalar eval {
166 local $SIG{__DIE__}; 133 local $SIG{__DIE__};
167 "CFPlus::UI::$arg->{class}"->new ( 134 "CFPlus::UI::$class"->new (%$args)
168 %$args,
169 s_ws => $arg->{ws},
170 s_id => $arg->{id},
171 )
172 } 135 }
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"; 136 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 137 });
138
139 # widgetset associate
140 $self->connect_ext (ws_a => sub {
141 my (%ass) = @_;
142
143 # everything that has a name, wether conceivably useful or not
144 my %wkw = (
145 root => $CFPlus::UI::ROOT,
146 tooltip => $CFPlus::UI::TOOLTIP,
147
148 mapwidget => $::MAPWIDGET,
149 buttonbar => $::BUTTONBAR,
150 metaserver => $::METASERVER,
151 buttonbar => $::BUTTONBAR,
152 login_button => $::LOGIN_BUTTON,
153 quit_dialog => $::QUIT_DIALOG,
154 host_entry => $::HOST_ENTRY,
155 metaserver => $::METASERVER,
156 server_info => $::SERVER_INFO,
157
158 setup_dialog => $::SETUP_DIALOG,
159 setup_notebook => $::SETUP_NOTEBOOK,
160 setup_server => $::SETUP_SERVER,
161 setup_keyboard => $::SETUP_KEYBOARD,
162
163 pl_notebook => $::PL_NOTEBOOK,
164 pl_window => $::PL_WINDOW,
165 inventory_page => $::INVENTORY_PAGE,
166 stats_page => $::STATS_PAGE,
167 skill_page => $::SKILL_PAGE,
168 spell_page => $::SPELL_PAGE,
169 spell_list => $::SPELL_LIST,
170
171 floorbox => $::FLOORBOX,
172 help_window => $::HELP_WINDOW,
173 message_window => $::MESSAGE_WINDOW,
174 statusbox => $::SDTATUSBOX,
175
176 inv => $::INV,
177 invr => $::INVR,
178 invr_hb => $::INVR_HB,
179 );
180
181 while (my ($id, $name) = each %ass) {
182 $self->widget_associate (undef, $id => $wkw{$name})
183 or warn "server failed to associate non-existent well-known widget $name\n";
187 } 184 }
188 }); 185 });
189 186
190 # widget call 187 # widget call
191 $self->connect_ext (w_c => sub { 188 $self->connect_ext (w_c => sub {
192 my ($arg) = @_; 189 my ($id, $rid, $method, @args) = @_;
193 190
194 my $w = $self->{widget}{$arg->{id}} 191 my $w = $self->{widget}{$id}
195 or return; 192 or return;
196 my $m = $arg->{name};
197 193
198 my $a = $arg->{args} || []; 194 if ($rid) {
199
200 if (exists $arg->{rid}) {
201 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); 195 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
202 } else { 196 } else {
203 $w->$m (@$a); 197 $w->$method (@args);
204 } 198 }
205 }); 199 });
206 200
207 # widget set 201 # widget set
208 $self->connect_ext (w_s => sub { 202 $self->connect_ext (w_s => sub {
209 my ($arg) = @_; 203 my ($id, $attr) = @_;
210 204
211 my $w = $self->{widget}{$arg->{id}} 205 my $w = $self->{widget}{$id}
212 or return; 206 or return;
213 207
214 $w->{$_->[0]} = $_->[1] 208 for (my $i = 0; $i < $#$attr; $i += 2) {
215 for @{ $arg->{attr} }; 209 my ($member, $value) = @$attr[$i, $i+1];
210 if (defined $value) {
211 $w->{$member} = $value;
212 } else {
213 delete $w->{$member};
214 }
215 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
216 }
216 }); 217 });
217 218
218 # widget get 219 # widget get
219 $self->connect_ext (w_g => sub { 220 $self->connect_ext (w_g => sub {
220 my ($arg) = @_; 221 my ($id, $rid, $attr) = @_;
221 222
222 my $w = $self->{widget}{$arg->{id}} 223 my $w = $self->{widget}{$id}
223 or return; 224 or return;
224 225
225 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{attr}}]); 226 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
227 });
228
229 # message window
230 $self->connect_ext (channel_info => sub {
231 my ($info) = @_;
232 $self->{channels}->{$info->{id}} = $info;
233 $::MESSAGE_WINDOW->add_channel ($info);
226 }); 234 });
227 235
228 # destroy widgets on logout 236 # destroy widgets on logout
229 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 237 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
230 for my $ws (values %{delete $self->{widgetset} || {}}) { 238 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
254 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 262 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
255 263
256 $self 264 $self
257} 265}
258 266
267sub widget_associate {
268 my ($self, $ws, $id, $widget) = @_;
269
270 if ($widget) {
271 $widget->{s_id} = $id;
272 $self->{widget}{$id} = $widget;
273
274 if ($ws) {
275 $widget->{s_ws} = $ws;
276 $self->{widgetset}{$ws}{w}{$id} = $widget;
277 }
278
279 $widget->connect (on_destroy => sub {
280 my ($widget) = @_;
281
282 delete $self->{widget}{$widget->{s_id}};
283 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
284 if exists $widget->{s_ws};
285 });
286
287 1
288 } else {
289 $self->send_exti_msg (w_e => $id, undef);
290
291 0
292 }
293}
294
295sub update_fx_want {
296 my ($self) = @_;
297
298 $self->send_exti_msg (fx_want => {
299 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
300 5 => !!$::CFG->{audio_enable}, # FT_SOUND
301 6 => 1, # FT_RSRC
302 });
303}
304
259sub logprint { 305sub logprint {
260 my ($self, @a) = @_; 306 my ($self, @a) = @_;
261 307
262 $self->{log_fh} ||= do { 308 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
263 my $path = "$Crossfire::VARDIR/log.$self->{host}";
264
265 open my $fh, ">>:utf8", $path
266 or die "Couldn't open logfile $path: $!";
267
268 $fh->autoflush (1);
269
270 $fh;
271 };
272
273 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
274
275 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
276 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
277
278 print {$self->{log_fh}} "$ts ", @a, "\n";
279} 309}
280 310
281sub _stat_numdiff { 311sub _stat_numdiff {
282 my ($self, $name, $old, $new) = @_; 312 my ($self, $name, $old, $new) = @_;
283 313
… …
416 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 446 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
417 $::GAUGES->{food} ->set_value ($fo, $fo_m); 447 $::GAUGES->{food} ->set_value ($fo, $fo_m);
418 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 448 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
419 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 449 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
420 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 450 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
451 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
421 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 452 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
422 my $title = $stats->{+CS_STAT_TITLE}; 453 my $title = $stats->{+CS_STAT_TITLE};
423 $title =~ s/^Player: //; 454 $title =~ s/^Player: //;
424 $::STATWIDS->{title} ->set_text ("Title: " . $title); 455 $::STATWIDS->{title} ->set_text ("Title: " . $title);
425 456
… …
451 my @add; 482 my @add;
452 483
453 push @add, 484 push @add,
454 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 485 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
455 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 486 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
487 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
456 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 488 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
457 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 489 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
458 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 490 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
491 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
459 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 492 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
460 ; 493 ;
461 494
462 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 495 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
463 496
464 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 497 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
494 527
495 1 528 1
496 }; 529 };
497 530
498 push @add, 531 push @add,
499 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 532 $x * 4 + 0, $y, ($self->{stat_widget_exp}{$idx} ||= new CFPlus::UI::Label
500 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 533 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
501 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 534 $x * 4 + 1, $y, ($self->{stat_widget_lvl}{$idx} ||= new CFPlus::UI::Label
502 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 535 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
536 $x * 4 + 2, $y, ($self->{stat_widget_prg}{$idx} ||= new CFPlus::UI::ExperienceProgress),
503 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 537 $x * 4 + 3, $y, ($self->{stat_widget_lbl}{$idx} ||= new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
504 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), 538 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
505 ; 539 ;
506 540
507 $x++ and ($x, $y) = (0, $y + 1); 541 $x++ and ($x, $y) = (0, $y + 1);
508 } 542 }
… …
511 } 545 }
512 546
513 for (grep exists $stats->{$_}, @skills) { 547 for (grep exists $stats->{$_}, @skills) {
514 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 548 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
515 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 549 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
550 $self->{stat_widget_prg}{$_}->set_value (@{$stats->{$_}});
516 } 551 }
517} 552}
518 553
519sub macro_send { 554sub macro_send {
520 my ($self, $macro) = @_; 555 my ($self, $macro) = @_;
… …
548} 583}
549 584
550sub feed_map1a { 585sub feed_map1a {
551 my ($self, $data) = @_; 586 my ($self, $data) = @_;
552 587
553 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 588 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
589 my $delay;
590
591 for my $tile (@$missing) {
592 next if $self->{delay}{$tile};
593
594 $delay = 1;
595
596 if (my $tex = $::CONN->{texture}[$tile]) {
597 $tex->upload;
598 } else {
599 $self->{delay}{$tile} = 1;
600
601 # we assume the face is in-flight and will eventually come
602 push @{$self->{tile_cb}{$tile}}, sub {
603 delete $self->{delay}{$tile};
604 $_[0]->upload;
605 };
606 }
607 }
608
609 if ($delay) {
610 # delay the map drawing a tiny bit in the hope of getting the missing fetched
611 Event->timer (after => 0.03, cb => sub {
612 $_[0]->w->cancel;
613 $self->{map_widget}->update;
614 });
615 } else {
554 $self->{map_widget}->update; 616 $self->{map_widget}->update;
617 }
555} 618}
556 619
557sub magicmap { 620sub magicmap {
558 my ($self, $w, $h, $x, $y, $data) = @_; 621 my ($self, $w, $h, $x, $y, $data) = @_;
559 622
… …
566 my $map_info = delete $self->{map_info} 629 my $map_info = delete $self->{map_info}
567 or return; 630 or return;
568 631
569 my ($hash, $x, $y, $w, $h) = @$map_info; 632 my ($hash, $x, $y, $w, $h) = @$map_info;
570 633
571 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 634 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
635 $self->{map_cache_new}{$hash} = \$data;
572 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 636 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
573 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
574} 637}
575 638
576sub map_clear { 639sub map_clear {
577 my ($self) = @_; 640 my ($self) = @_;
578 641
… …
584} 647}
585 648
586sub bg_fetch { 649sub bg_fetch {
587 my ($self) = @_; 650 my ($self) = @_;
588 651
589 my $id; 652 my $tile;
590 653
591 do { 654 do {
592 $id = pop @{$self->{bg_fetch}} 655 $tile = pop @{$self->{bg_fetch}}
593 or return; 656 or return;
594 } while $self->{texture}[$id]; 657 } while $self->{texture}[$tile];
595 658
596 CFPlus::DB::get tilecache => $id, sub { 659 CFPlus::DB::get tilecache => $tile, sub {
597 my ($data) = @_; 660 my ($data) = @_;
598 661
599 return unless $self->{map}; # stop when destroyed 662 return unless $self->{map}; # stop when destroyed
600 663
601 $self->set_texture ($id => $data)
602 if defined $data; 664 if (defined $data) {
665 $self->have_tile ($tile, $data);
666 $self->{texture}[$tile]->upload;
667 }
603 668
604 $self->bg_fetch; 669 $self->bg_fetch;
605 }; 670 };
606} 671}
607 672
608sub load_map($$$) { 673sub load_map($$$) {
609 my ($self, $hash, $x, $y) = @_; 674 my ($self, $hash, $x, $y) = @_;
610 675
611 my $gen = $self->{map_change_gen}; 676 my $gen = $self->{map_change_gen};
612 677
613 CFPlus::DB::get $self->{mapcache} => $hash, sub { 678 my $cb = sub {
614 return unless $gen == $self->{map_change_gen}; 679 return unless $gen == $self->{map_change_gen};
615 680
616 my ($data) = @_; 681 my ($data) = @_;
617 682
618 if (defined $data) { 683 if (defined $data) {
684 $self->{map_cache_new}{$hash} = \$data;
685
619 $data = Compress::LZF::decompress $data; 686 my $data = Compress::LZF::decompress $data;
620 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
621 687
622 my $inprogress = @{ $self->{bg_fetch} || [] }; 688 my $inprogress = @{ $self->{bg_fetch} || [] };
623 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 689 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
624 $self->bg_fetch unless $inprogress; 690 $self->bg_fetch unless $inprogress;
625 } 691 }
626 }; 692 };
693
694 if (my $rdata = $self->{map_cache_old}{$hash}) {
695 $cb->($$rdata);
696 } else {
697 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
698 }
627} 699}
628 700
629# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 701# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
630# (server resource,s latency, bandwidth), so this hack is warranted. 702# (server resource,s latency, bandwidth), so this hack is warranted.
631# the right fix is to make real tiled maps with an overview file 703# the right fix is to make real tiled maps with an overview file
… …
724 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 796 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
725 797
726 $self->flush_map; 798 $self->flush_map;
727 799
728 ++$self->{map_change_gen}; 800 ++$self->{map_change_gen};
801 $self->{map_cache_old} = delete $self->{map_cache_new};
729 802
730 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 803 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
731 804
732 my $mapmapw = $self->{mapmap}->{w}; 805 my $mapmapw = $self->{mapmap}->{w};
733 my $mapmaph = $self->{mapmap}->{h}; 806 my $mapmaph = $self->{mapmap}->{h};
… …
752} 825}
753 826
754sub face_find { 827sub face_find {
755 my ($self, $facenum, $face, $cb) = @_; 828 my ($self, $facenum, $face, $cb) = @_;
756 829
757 my $hash = "$face->{chksum},$face->{name}"; 830 if ($face->{type} == 0) { # FT_FACE
758
759 my $id = CFPlus::DB::get_tile_id_sync $hash; 831 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
760 832
761 $face->{id} = $id; 833 $face->{id} = $id;
762 $self->{faceid}[$facenum] = $id;
763
764 $self->{map}->set_tileid ($facenum => $id); 834 $self->{map}->set_tileid ($facenum => $id);
765 835
766 CFPlus::DB::get tilecache => $id, $cb; 836 CFPlus::DB::get tilecache => $id, $cb;
837
838 } elsif ($face->{type} & 1) { # with metadata
839 CFPlus::DB::get res_meta => $face->{name}, $cb;
840
841 } else { # no metadata
842 CFPlus::DB::get res_data => $face->{name}, $cb;
843 }
767} 844}
768 845
769sub face_update { 846sub face_update {
770 my ($self, $facenum, $face, $changed) = @_; 847 my ($self, $facenum, $face, $changed) = @_;
771 848
849 if ($face->{type} == 0) {
850 # image, FT_FACE
772 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 851 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
773 if $changed; 852 if $changed;
774 853
775 $self->set_texture ($face->{id} => delete $face->{image}); 854 $self->have_tile ($face->{id}, delete $face->{data});
855
856 } elsif ($face->{type} & 1) {
857 # split metadata case, FT_MUSIC, FT_SOUND
858 if ($changed) { # new data
859 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
860 $face->{data} = $meta;
861
862 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
863 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
864 }
865
866 $face->{data} = $self->{json_coder}->decode ($face->{data});
867
868 ::add_license ($face);
869
870 if ($face->{type} == 3) { # FT_MUSIC
871 ::message ({ markup => "downloaded song #$facenum" })
872 if $changed;
873
874 &::audio_music_push ($facenum);
875 } elsif ($face->{type} == 5) { # FT_SOUND
876 ::message ({ markup => "downloaded sound #$facenum" })
877 if $changed;
878
879 &::audio_sound_push ($facenum);
880 }
881
882 } else {
883 # flat resource case, FT_RSRC
884 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
885 if $changed;
886 }
887
888 if (my $cbs = $self->{face_cb}{$facenum}) {
889 $_->($face, $changed) for @$cbs;
890 }
776} 891}
777 892
778sub smooth_update { 893sub smooth_update {
779 my ($self, $facenum, $face) = @_; 894 my ($self, $facenum, $face) = @_;
780 895
781 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 896 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
782} 897}
783 898
784sub set_texture { 899sub have_tile {
785 my ($self, $id, $data) = @_; 900 my ($self, $tile, $data) = @_;
786 901
787 return unless $self->{map}; 902 return unless $self->{map};
788 903
789 $self->{texture}[$id] = my $tex = 904 my $tex = $self->{texture}[$tile] ||=
790 new_from_image CFPlus::Texture 905 new CFPlus::Texture
906 tile => $tile,
907 image => $data, delete_image => 1,
791 $data, minify => 1, mipmap => 1; 908 minify => 1, mipmap => 1;
792 909
793 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 910 if (my $cbs = delete $self->{tile_cb}{$tile}) {
794 $self->{map_widget}->update; 911 $_->($tex) for @$cbs;
795 912 }
796 $_->() for @{(delete $self->{face_cb}{$id}) || []};
797} 913}
798 914
799sub connect_face_update { 915# call in non-void context registers a temporary
916# hook with handle, otherwise its permanent
917sub on_face_change {
800 my ($self, $id, $cb) = @_; 918 my ($self, $num, $cb) = @_;
801 919
802 push @{$self->{face_cb}{$id}}, $cb; 920 push @{$self->{face_cb}{$num}}, $cb;
803 921
922 defined wantarray
804 CFPlus::guard { 923 ? CFPlus::guard {
805 @{$self->{face_cb}{$id}} 924 @{$self->{face_cb}{$num}}
806 = grep $_ != $cb, 925 = grep $_ != $cb,
807 @{$self->{face_cb}{$id}}; 926 @{$self->{face_cb}{$num}};
808 } 927 }
928 : ()
929}
930
931# call in non-void context registers a temporary
932# hook with handle, otherwise its permanent
933sub register_face_handler {
934 my ($self, $num, $cb) = @_;
935
936 return unless $num;
937
938 # invoke if available right now
939 $cb->($self->{face}[$num], 0)
940 unless exists $self->{face}[$num]{loading};
941
942 # future changes
943 $self->on_face_change ($num => $cb)
809} 944}
810 945
811sub sound_play { 946sub sound_play {
812 my ($self, $x, $y, $soundnum, $type) = @_; 947 my ($self, $type, $face, $dx, $dy, $vol) = @_;
813 948
814 $self->{sound_play}->($x, $y, $soundnum, $type); 949 &::audio_sound_play ($face, $dx, $dy, $vol)
950 unless $type & 1; # odd types are silent for future expansion
815} 951}
816 952
817my $LAST_QUERY; # server is stupid, stupid, stupid 953my $LAST_QUERY; # server is stupid, stupid, stupid
818 954
819sub query { 955sub query {
… …
884 $self->{$type} = $text; 1020 $self->{$type} = $text;
885 } else { 1021 } else {
886 $self->logprint ("msg: ", $text); 1022 $self->logprint ("msg: ", $text);
887 return if $color < 0; # negative color == ignore if not understood 1023 return if $color < 0; # negative color == ignore if not understood
888 1024
889 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1025 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
890 1026
891 ## try to create single paragraphs of multiple lines sent by the server 1027 ## try to create single paragraphs of multiple lines sent by the server
892 # no longer neecssary with TRT servers 1028 # no longer neecssary with TRT servers
893 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1029 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
894 1030
895 ::message ({ fg => $fg, markup => $_ }) 1031 ::message ({
1032 fg => $fg,
1033 markup => $_,
1034 type => $type,
1035 extra => [@extra],
1036 color_flags => $color
896 for split /\n/, $text; 1037 }) for split /\n/, $text;
897 1038
898 $self->{statusbox}->add ($text, 1039 $self->{statusbox}->add ($text,
899 group => $text, 1040 group => $text,
900 fg => $fg, 1041 fg => $fg,
901 timeout => $color >= 2 ? 180 : 10, 1042 timeout => $color >= 2 ? 180 : 10,
… …
957 $self->{map_widget}->clr_commands; 1098 $self->{map_widget}->clr_commands;
958 1099
959 ::stop_game (); 1100 ::stop_game ();
960} 1101}
961 1102
962sub image_info {
963 my ($self, $numfaces) = @_;
964
965 $self->{num_faces} = $numfaces;
966 $self->{face_prefetch} = [1 .. $numfaces];
967 $self->face_prefetch;
968}
969
970sub face_prefetch {
971 my ($self) = @_;
972
973 return unless $::CFG->{face_prefetch};
974
975 if ($self->{num_faces}) {
976 return if @{ $self->{send_queue} || [] };
977 my $todo = @{ $self->{face_prefetch} }
978 or return;
979
980 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
981
982 $self->send ("requestinfo image_sums $face $face");
983
984 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
985 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
986 } elsif (!exists $self->{num_faces}) {
987 $self->send ("requestinfo image_info");
988
989 $self->{num_faces} = 0;
990
991 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
992 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
993 }
994}
995
996sub update_floorbox { 1103sub update_floorbox {
997 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1104 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
998 return unless $::CONN; 1105 return unless $::CONN;
999 1106
1000 $::FLOORBOX->clear; 1107 $::FLOORBOX->clear;
… …
1029 } 1136 }
1030 1137
1031 $::FLOORBOX->add_at (@add); 1138 $::FLOORBOX->add_at (@add);
1032 }); 1139 });
1033 1140
1034 $::WANT_REFRESH++; 1141 $::WANT_REFRESH->start;
1035} 1142}
1036 1143
1037sub set_opencont { 1144sub set_opencont {
1038 my ($conn, $tag, $name) = @_; 1145 my ($conn, $tag, $name) = @_;
1039 $conn->{open_container} = $tag; 1146 $conn->{open_container} = $tag;
1040 update_floorbox; 1147 update_floorbox;
1041 1148
1042 $::INV_RIGHT_HB->clear (); 1149 $::INVR_HB->clear ();
1043 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1150 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1044 1151
1045 if ($tag != 0) { # Floor isn't closable, is it? 1152 if ($tag != 0) { # Floor isn't closable, is it?
1046 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1153 $::INVR_HB->add (new CFPlus::UI::Button
1047 text => "Close container", 1154 text => "Close container",
1048 tooltip => "Close the currently open container (if one is open)", 1155 tooltip => "Close the currently open container (if one is open)",
1049 on_activate => sub { 1156 on_activate => sub {
1050 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1157 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1051 if $tag != 0; 1158 if $tag != 0;
1052 #if $CONN->{open_container} != 0;
1053 0 1159 0
1054 }, 1160 },
1055 ); 1161 );
1056 } 1162 }
1057 1163
… …
1156 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1262 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1157 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1263 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1158 . "map size $self->{mapw}×$self->{maph}\n" 1264 . "map size $self->{mapw}×$self->{maph}\n"
1159 ); 1265 );
1160 1266
1161 ::setup_build_button ($self->{editor_support}->{builder_ui});
1162} 1267}
1163 1268
1164sub logged_in { 1269sub logged_in {
1165 my ($self) = @_; 1270 my ($self) = @_;
1166 1271
1167 $self->send_ext_req (cfplus_support => version => 1, sub { 1272 $self->send_ext_req (cfplus_support => version => 2, sub {
1273 my (%msg) = @_;
1274
1168 $self->{cfplus_ext} = $_[0]{version}; 1275 $self->{cfplus_ext} = $msg{version};
1169 $self->update_server_info; 1276 $self->update_server_info;
1170 1277
1171 if ($self->{cfplus_ext} >= 2) { 1278 if ($self->{cfplus_ext} >= 2) {
1172 $self->send_ext_req ("editor_support", sub { 1279 $self->send_ext_req ("editor_support", sub {
1173 $self->{editor_support} = $_[0]; 1280 $self->{editor_support} = { @_ };
1174 $self->update_server_info; 1281 $self->update_server_info;
1175 1282
1176 0 1283 0
1177 }); 1284 });
1178 } 1285 }
… …
1186 $self->send_command ("output-count $::CFG->{output_count}"); 1293 $self->send_command ("output-count $::CFG->{output_count}");
1187 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1294 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1188 $self->send_command ("pickup $::CFG->{pickup}"); 1295 $self->send_command ("pickup $::CFG->{pickup}");
1189} 1296}
1190 1297
1191sub buildat {
1192 my ($self, $builditem, $x, $y) = @_;
1193
1194 if ($self->{cfplus_ext}) {
1195 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1196 }
1197}
1198
1199sub lookat { 1298sub lookat {
1200 my ($self, $x, $y) = @_; 1299 my ($self, $x, $y) = @_;
1201 1300
1202 if ($self->{cfplus_ext}) { 1301 if ($self->{cfplus_ext}) {
1203 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1302 $self->send_ext_req (lookat => $x, $y, sub {
1204 my ($msg) = @_; 1303 my (%msg) = @_;
1205 1304
1206 if (exists $msg->{npc_dialog}) { 1305 if (exists $msg{npc_dialog}) {
1207 # start npc chat dialog 1306 # start npc chat dialog
1208 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1307 $self->{npc_dialog} = new CFPlus::NPCDialog::
1209 dx => $x, 1308 token => $msg{npc_dialog},
1210 dy => $y,
1211 title => "$msg->{npc_dialog} (NPC)", 1309 title => "$msg{npc_dialog}[0] (NPC)",
1212 conn => $self, 1310 conn => $self,
1213 ; 1311 ;
1214 } 1312 }
1215 }); 1313 });
1216 } 1314 }
… …
1281 on_activate => sub { $this->destroy; 1 }, 1379 on_activate => sub { $this->destroy; 1 },
1282 ; 1380 ;
1283 1381
1284 $self->update_options; 1382 $self->update_options;
1285 1383
1286 $self->{id} = $self->{conn}->send_ext_req ( 1384 $self->{id} = "npc-channel-" . $self->{conn}->token;
1287 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1385 $self->{conn}->connect_ext ($self->{id} => sub {
1288 sub { $this && $this->feed (@_) } 1386 $this->feed (@_) if $this;
1289 ); 1387 });
1388
1389 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1290 1390
1291 $self->{entry}->grab_focus; 1391 $self->{entry}->grab_focus;
1292 1392
1293 $self->{textview}->add_paragraph ({ 1393 $self->{textview}->add_paragraph ({
1294 fg => [1, 1, 0, 1], 1394 fg => [1, 1, 0, 1],
… …
1317 ); 1417 );
1318 } 1418 }
1319} 1419}
1320 1420
1321sub feed { 1421sub feed {
1322 my ($self, $msg) = @_; 1422 my ($self, $type, @arg) = @_;
1323 1423
1324 CFPlus::weaken $self; 1424 CFPlus::weaken $self;
1325 1425
1326 if ($msg->{msgtype} eq "reply") { 1426 if ($type eq "update") {
1427 my (%info) = @arg;
1428
1327 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1429 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1328 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1430 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1329
1330 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1331 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1332 my @link;
1333 $text =~ s{
1334 ($match)
1335 }{
1336 my $kw = $1;
1337
1338 push @link, new CFPlus::UI::Label
1339 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1340 can_hover => 1,
1341 can_events => 1,
1342 padding_x => 0,
1343 padding_y => 0,
1344 on_button_up => sub {
1345 $self->send ($kw);
1346 };
1347
1348 "\x{fffc}"
1349 }giex;
1350 1431
1432 if (exists $info{msg}) {
1433 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1434 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1435 my @link;
1436 $text =~ s{
1437 ($match)
1438 }{
1439 my $kw = $1;
1440
1441 push @link, new CFPlus::UI::Label
1442 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1443 can_hover => 1,
1444 can_events => 1,
1445 padding_x => 0,
1446 padding_y => 0,
1447 on_button_up => sub {
1448 $self->send ($kw);
1449 };
1450
1451 "\x{fffc}"
1452 }giex;
1453
1351 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1454 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1352 $self->{textview}->scroll_to_bottom; 1455 $self->{textview}->scroll_to_bottom;
1456 }
1457
1353 $self->update_options; 1458 $self->update_options;
1354 } else { 1459 } else {
1355 $self->destroy; 1460 $self->destroy;
1356 } 1461 }
1357 1462
… …
1362 my ($self, $msg) = @_; 1467 my ($self, $msg) = @_;
1363 1468
1364 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1469 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1365 $self->{textview}->scroll_to_bottom; 1470 $self->{textview}->scroll_to_bottom;
1366 1471
1367 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1472 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1368} 1473}
1369 1474
1370sub destroy { 1475sub destroy {
1371 my ($self) = @_; 1476 my ($self) = @_;
1372 1477
1373 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1478 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1374 1479
1375 if ($self->{conn}) { 1480 if ($self->{conn}) {
1376 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1481 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1377 delete $self->{conn}{npc_dialog}; 1482 delete $self->{conn}{npc_dialog};
1378 $self->{conn}->disconnect_ext ($self->{id}); 1483 $self->{conn}->disconnect_ext ($self->{id});
1379 } 1484 }
1380 1485
1381 $self->SUPER::destroy; 1486 $self->SUPER::destroy;

Diff Legend

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