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.108 by root, Sun Jun 24 04:11:22 2007 UTC vs.
Revision 1.171 by root, Sat Sep 1 08:08:52 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 xwidget2 => 1,#d#
26 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
27 }, 28 },
28 ); 29 );
29 30
30 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
47 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
48 @args 49 @args
49 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
50 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
51 52
52 $self->connect_ext (event_capabilities => sub { 53 $self->{json_coder}
54 ->convert_blessed
55 ->filter_json_single_key_object ("\fw" => sub {
56 $self->{widget}{$_[0]}
57 })
58 ->filter_json_single_key_object ("\fc" => sub {
53 my ($cap) = @_; 59 my ($id) = @_;
54 60 sub {
55 if (my $ts = $cap->{tileset}) { 61 $self->send_exti_msg (w_e => $id, @_);
56 if (my ($default) = grep $_->[2] & 1, @$ts) {
57 $self->{tileset} = $default;
58 $self->{tilesize} = $default->[3];
59 $self->setup_req (tileset => $default->[0]);
60
61 my $w = int $self->{mapw} * 32 / $self->{tilesize};
62 my $h = int $self->{maph} * 32 / $self->{tilesize};
63
64 $self->setup_req (mapsize => "${w}x${h}");
65 } 62 }
63 });
64
65 # destroy widgets on logout
66 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
67 for my $ws (values %{delete $self->{widgetset} || {}}) {
68 $_->destroy
69 for values %{delete $ws->{w} || {}};
66 } 70 }
67 }); 71 });
68 72
69 $self->{map_widget}->add_command (@$_) 73 $self->{map_widget}->add_command (@$_)
70 for @cmd_help; 74 for @cmd_help;
… …
87 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 91 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
88 92
89 $self 93 $self
90} 94}
91 95
96sub update_fx_want {
97 my ($self) = @_;
98
99 $self->send_exti_msg (fx_want => {
100 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
101 5 => !!$::CFG->{audio_enable}, # FT_SOUND
102 6 => 1, # FT_RSRC
103 });
104}
105
106sub ext_capabilities {
107 my ($self, %cap) = @_;
108
109 #$self->send ("setup sound 0"); # we use a different protocol
110 $self->update_fx_want;
111
112 $self->send_exti_req (resource => "exp_table", sub {
113 my ($exp_table) = @_;
114
115 $self->register_face_handler ($exp_table, sub {
116 my ($face) = @_;
117
118 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
119 $_->() for values %{ $self->{on_exp_update} || {} };
120 });
121
122 ()
123 });
124
125 if (my $ts = $cap{tileset}) {
126 if (my ($default) = grep $_->[2] & 1, @$ts) {
127 $self->{tileset} = $default;
128 $self->{tilesize} = $default->[3];
129 $self->setup_req (tileset => $default->[0]);
130
131 my $w = int $self->{mapw} * 32 / $self->{tilesize};
132 my $h = int $self->{maph} * 32 / $self->{tilesize};
133
134 $self->setup_req (mapsize => "${w}x${h}");
135 }
136 }
137}
138
139sub ext_ambient_music {
140 my ($self, $songs) = @_;
141 &::audio_music_set_ambient ($songs);
142}
143
144#############################################################################
145
146sub widget_associate {
147 my ($self, $ws, $id, $widget) = @_;
148
149 $widget ||= new CFPlus::UI::Bin;
150
151 $widget->{s_id} = $id;
152 $self->{widget}{$id} = $widget;
153
154 if ($ws) {
155 $widget->{s_ws} = $ws;
156 $self->{widgetset}{$ws}{w}{$id} = $widget;
157 }
158
159 $widget->connect (on_destroy => sub {
160 my ($widget) = @_;
161
162 delete $self->{widget}{$widget->{s_id}};
163 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
164 if exists $widget->{s_ws};
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 $self->widget_associate (
193 $ws, $id => scalar eval {
194 local $SIG{__DIE__};
195 "CFPlus::UI::$class"->new (%$args)
196 }
197 );
198}
199
200# widgetset associate
201sub ext_ws_a {
202 my ($self, %ass) = @_;
203
204 # everything that has a name, wether conceivably useful or not
205 my %wkw = (
206 root => $CFPlus::UI::ROOT,
207 tooltip => $CFPlus::UI::TOOLTIP,
208
209 mapwidget => $::MAPWIDGET,
210 buttonbar => $::BUTTONBAR,
211 metaserver => $::METASERVER,
212 buttonbar => $::BUTTONBAR,
213 login_button => $::LOGIN_BUTTON,
214 quit_dialog => $::QUIT_DIALOG,
215 host_entry => $::HOST_ENTRY,
216 metaserver => $::METASERVER,
217 server_info => $::SERVER_INFO,
218
219 setup_dialog => $::SETUP_DIALOG,
220 setup_notebook => $::SETUP_NOTEBOOK,
221 setup_server => $::SETUP_SERVER,
222 setup_keyboard => $::SETUP_KEYBOARD,
223
224 pl_notebook => $::PL_NOTEBOOK,
225 pl_window => $::PL_WINDOW,
226 inventory_page => $::INVENTORY_PAGE,
227 stats_page => $::STATS_PAGE,
228 skill_page => $::SKILL_PAGE,
229 spell_page => $::SPELL_PAGE,
230 spell_list => $::SPELL_LIST,
231
232 floorbox => $::FLOORBOX,
233 help_window => $::HELP_WINDOW,
234 message_window => $::MESSAGE_WINDOW,
235 statusbox => $::SDTATUSBOX,
236
237 inv => $::INV,
238 invr => $::INVR,
239 invr_hb => $::INVR_HB,
240 );
241
242 while (my ($id, $name) = each %ass) {
243 $self->widget_associate (undef, $id => $wkw{$name});
244 }
245}
246
247# widget call
248sub ext_w_c {
249 my ($self, $id, $rcb, $method, @args) = @_;
250
251 my $w = $self->{widget}{$id}
252 or return;
253
254 if ($rcb) {
255 $rcb->($w->$method (@args));
256 } else {
257 $w->$method (@args);
258 }
259}
260
261# widget set
262sub ext_w_s {
263 my ($self, $id, $attr) = @_;
264
265 my $w = $self->{widget}{$id}
266 or return;
267
268 for (my $i = 0; $i < $#$attr; $i += 2) {
269 my ($member, $value) = @$attr[$i, $i+1];
270 if (defined $value) {
271 $w->{$member} = $value;
272 } else {
273 delete $w->{$member};
274 }
275 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
276 }
277}
278
279# widget get
280sub ext_w_g {
281 my ($self, $id, $rid, @attr) = @_;
282
283 my $w = $self->{widget}{$id}
284 or return;
285
286 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
287}
288
289# message window
290sub ext_channel_info {
291 my ($self, $info) = @_;
292 $self->{channels}->{$info->{id}} = $info;
293 $::MESSAGE_WINDOW->add_channel ($info);
294}
295
296#############################################################################
297
92sub logprint { 298sub logprint {
93 my ($self, @a) = @_; 299 my ($self, @a) = @_;
94 300
95 $self->{log_fh} ||= do { 301 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
96 my $path = "$Crossfire::VARDIR/log.$self->{host}";
97
98 open my $fh, ">>:utf8", $path
99 or die "Couldn't open logfile $path: $!";
100
101 $fh->autoflush (1);
102
103 $fh;
104 };
105
106 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
107
108 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
109 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
110
111 print {$self->{log_fh}} "$ts ", @a, "\n";
112} 302}
113 303
114sub _stat_numdiff { 304sub _stat_numdiff {
115 my ($self, $name, $old, $new) = @_; 305 my ($self, $name, $old, $new) = @_;
116 306
… …
200 390
201 if ( 391 if (
202 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 392 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
203 ) { 393 ) {
204 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 394 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
205 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 395 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
206 } 396 }
207 397
208 $self->update_stats_window ($stats, $prev); 398 $self->update_stats_window ($stats, $prev);
209 399
210 $self->{prev_stats} = { %$stats }; 400 $self->{prev_stats} = { %$stats };
… …
249 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 439 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
250 $::GAUGES->{food} ->set_value ($fo, $fo_m); 440 $::GAUGES->{food} ->set_value ($fo, $fo_m);
251 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 441 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
252 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 442 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
253 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 443 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
444 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
254 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 445 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
255 my $title = $stats->{+CS_STAT_TITLE}; 446 my $title = $stats->{+CS_STAT_TITLE};
256 $title =~ s/^Player: //; 447 $title =~ s/^Player: //;
257 $::STATWIDS->{title} ->set_text ("Title: " . $title); 448 $::STATWIDS->{title} ->set_text ("Title: " . $title);
258 449
… …
276 for keys %RES_TBL; 467 for keys %RES_TBL;
277 468
278 my $sktbl = $::STATWIDS->{skill_tbl}; 469 my $sktbl = $::STATWIDS->{skill_tbl};
279 my @skills = keys %{ $self->{skill_info} }; 470 my @skills = keys %{ $self->{skill_info} };
280 471
281 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 472 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
473 map [$_, $self->{skill_info}{$_}],
474 grep exists $stats->{$_},
475 @skills;
476
477 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
478 $self->{stat_order} = join ",", map $_->[0], @order;
479
282 $sktbl->clear; 480 $sktbl->clear;
283 481
482 my $sw = $self->{skillwid}{""} ||= [
284 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 483 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
285 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 484 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
485 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
286 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 486 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
287 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 487 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
288 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 488 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
489 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
289 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 490 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
491 ];
492
493 my @add = @$sw;
290 494
291 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>";
292 496
293 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);
294 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 498 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
295 499
296 my ($x, $y) = (0, 1); 500 my ($x, $y) = (0, 1);
297 for ( 501 for (@order) {
298 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
299 map [$_, $self->{skill_info}{$_}],
300 grep exists $stats->{$_},
301 @skills
302 ) {
303 my ($idx, $name) = @$_; 502 my ($idx, $name) = @$_;
304 503
305 my $spell_cb = sub { 504 my $spell_cb = sub {
306 my ($widget, $ev) = @_; 505 my ($widget, $ev) = @_;
307 506
… …
322 } 521 }
323 522
324 1 523 1
325 }; 524 };
326 525
327 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 526 my $sw = $self->{skillwid}{$idx} ||= [
527 # exp
528 (new CFPlus::UI::Label
328 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 529 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
329 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 530
531 # level
532 (new CFPlus::UI::Label
330 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 533 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
534
535 # progress
536 (new CFPlus::UI::ExperienceProgress),
537
538 # label
331 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 539 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
332 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 540 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
541 ];
542
543 push @add,
544 $x * 4 + 0, $y, $sw->[0],
545 $x * 4 + 1, $y, $sw->[1],
546 $x * 4 + 2, $y, $sw->[2],
547 $x * 4 + 3, $y, $sw->[3],
548 ;
333 549
334 $x++ and ($x, $y) = (0, $y + 1); 550 $x++ and ($x, $y) = (0, $y + 1);
335 } 551 }
336 }
337 552
338 for (grep exists $stats->{$_}, @skills) { 553 $sktbl->add_at (@add);
339 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
340 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
341 } 554 }
342}
343 555
344sub macro_send { 556 for (@order) {
345 my ($self, $macro) = @_; 557 my ($idx, $name) = @$_;
558 my $val = $stats->{$idx};
346 559
347 for my $cmd (@{ $macro->{action} }) { 560 next if $prev->{$idx}[1] eq $val->[1];
348 $self->send_command ($cmd); 561
562 my $sw = $self->{skillwid}{$idx};
563 $sw->[0]->set_text (::formsep ($val->[1]));
564 $sw->[1]->set_text ($val->[0] * 1);
565 $sw->[2]->set_value (@$val);
566
567 $::GAUGES->{sklprg}->set_label ("$name %d%%");
568 $::GAUGES->{sklprg}->set_value (@$val);
349 } 569 }
350} 570}
351 571
352sub user_send { 572sub user_send {
353 my ($self, $command) = @_; 573 my ($self, $command) = @_;
… …
355 $self->{record}->($command) 575 $self->{record}->($command)
356 if $self->{record}; 576 if $self->{record};
357 577
358 $self->logprint ("send: ", $command); 578 $self->logprint ("send: ", $command);
359 $self->send_command ($command); 579 $self->send_command ($command);
360 ::status ($command);
361} 580}
362 581
363sub record { 582sub record {
364 my ($self, $cb) = @_; 583 my ($self, $cb) = @_;
365 584
… …
373} 592}
374 593
375sub feed_map1a { 594sub feed_map1a {
376 my ($self, $data) = @_; 595 my ($self, $data) = @_;
377 596
378 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 597 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
598 my $delay;
599
600 for my $tile (@$missing) {
601 next if $self->{delay}{$tile};
602
603 $delay = 1;
604
605 if (my $tex = $::CONN->{texture}[$tile]) {
606 $tex->upload;
607 } else {
608 $self->{delay}{$tile} = 1;
609
610 # we assume the face is in-flight and will eventually come
611 push @{$self->{tile_cb}{$tile}}, sub {
612 delete $self->{delay}{$tile};
613 $_[0]->upload;
614 };
615 }
616 }
617
618 if ($delay) {
619 # delay the map drawing a tiny bit in the hope of getting the missing fetched
620 Event->timer (after => 0.03, cb => sub {
621 $_[0]->w->cancel;
622 $self->{map_widget}->update
623 if $self->{map_widget};
624 });
625 } else {
379 $self->{map_widget}->update; 626 $self->{map_widget}->update;
627 }
380} 628}
381 629
382sub magicmap { 630sub magicmap {
383 my ($self, $w, $h, $x, $y, $data) = @_; 631 my ($self, $w, $h, $x, $y, $data) = @_;
384 632
… …
391 my $map_info = delete $self->{map_info} 639 my $map_info = delete $self->{map_info}
392 or return; 640 or return;
393 641
394 my ($hash, $x, $y, $w, $h) = @$map_info; 642 my ($hash, $x, $y, $w, $h) = @$map_info;
395 643
396 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 644 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
645 $self->{map_cache_new}{$hash} = \$data;
397 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 646 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
398 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
399} 647}
400 648
401sub map_clear { 649sub map_clear {
402 my ($self) = @_; 650 my ($self) = @_;
403 651
… …
409} 657}
410 658
411sub bg_fetch { 659sub bg_fetch {
412 my ($self) = @_; 660 my ($self) = @_;
413 661
414 my $id; 662 my $tile;
415 663
416 do { 664 do {
417 $id = pop @{$self->{bg_fetch}} 665 $tile = pop @{$self->{bg_fetch}}
418 or return; 666 or return;
419 } while $self->{texture}[$id]; 667 } while $self->{texture}[$tile];
420 668
421 CFPlus::DB::get tilecache => $id, sub { 669 CFPlus::DB::get tilecache => $tile, sub {
422 my ($data) = @_; 670 my ($data) = @_;
423 671
424 return unless $self->{map}; # stop when destroyed 672 return unless $self->{map}; # stop when destroyed
425 673
426 $self->set_texture ($id => $data)
427 if defined $data; 674 if (defined $data) {
675 $self->have_tile ($tile, $data);
676 $self->{texture}[$tile]->upload;
677 }
428 678
429 $self->bg_fetch; 679 $self->bg_fetch;
430 }; 680 };
431} 681}
432 682
433sub load_map($$$) { 683sub load_map($$$) {
434 my ($self, $hash, $x, $y) = @_; 684 my ($self, $hash, $x, $y) = @_;
435 685
436 my $gen = $self->{map_change_gen}; 686 my $gen = $self->{map_change_gen};
437 687
438 CFPlus::DB::get $self->{mapcache} => $hash, sub { 688 my $cb = sub {
439 return unless $gen == $self->{map_change_gen}; 689 return unless $gen == $self->{map_change_gen};
440 690
441 my ($data) = @_; 691 my ($data) = @_;
442 692
443 if (defined $data) { 693 if (defined $data) {
694 $self->{map_cache_new}{$hash} = \$data;
695
444 $data = Compress::LZF::decompress $data; 696 my $data = Compress::LZF::decompress $data;
445 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
446 697
447 my $inprogress = @{ $self->{bg_fetch} || [] }; 698 my $inprogress = @{ $self->{bg_fetch} || [] };
448 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 699 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
449 $self->bg_fetch unless $inprogress; 700 $self->bg_fetch unless $inprogress;
450 } 701 }
451 }; 702 };
703
704 if (my $rdata = $self->{map_cache_old}{$hash}) {
705 $cb->($$rdata);
706 } else {
707 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
708 }
452} 709}
453 710
454# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 711# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
455# (server resource,s latency, bandwidth), so this hack is warranted. 712# (server resource,s latency, bandwidth), so this hack is warranted.
456# the right fix is to make real tiled maps with an overview file 713# the right fix is to make real tiled maps with an overview file
… …
549 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 806 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
550 807
551 $self->flush_map; 808 $self->flush_map;
552 809
553 ++$self->{map_change_gen}; 810 ++$self->{map_change_gen};
811 $self->{map_cache_old} = delete $self->{map_cache_new};
554 812
555 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 813 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
556 814
557 my $mapmapw = $self->{mapmap}->{w}; 815 my $mapmapw = $self->{mapmap}->{w};
558 my $mapmaph = $self->{mapmap}->{h}; 816 my $mapmaph = $self->{mapmap}->{h};
… …
577} 835}
578 836
579sub face_find { 837sub face_find {
580 my ($self, $facenum, $face, $cb) = @_; 838 my ($self, $facenum, $face, $cb) = @_;
581 839
582 my $hash = "$face->{chksum},$face->{name}"; 840 if ($face->{type} == 0) { # FT_FACE
583
584 my $id = CFPlus::DB::get_tile_id_sync $hash; 841 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
585 842
586 $face->{id} = $id; 843 $face->{id} = $id;
587 $self->{faceid}[$facenum] = $id;
588
589 $self->{map}->set_tileid ($facenum => $id); 844 $self->{map}->set_tileid ($facenum => $id);
590 845
591 CFPlus::DB::get tilecache => $id, $cb; 846 CFPlus::DB::get tilecache => $id, $cb;
847
848 } elsif ($face->{type} & 1) { # with metadata
849 CFPlus::DB::get res_meta => $face->{name}, $cb;
850
851 } else { # no metadata
852 CFPlus::DB::get res_data => $face->{name}, $cb;
853 }
592} 854}
593 855
594sub face_update { 856sub face_update {
595 my ($self, $facenum, $face, $changed) = @_; 857 my ($self, $facenum, $face, $changed) = @_;
596 858
859 if ($face->{type} == 0) {
860 # image, FT_FACE
597 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 861 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
598 if $changed; 862 if $changed;
599 863
600 $self->set_texture ($face->{id} => delete $face->{image}); 864 $self->have_tile ($face->{id}, delete $face->{data});
865
866 } elsif ($face->{type} & 1) {
867 # split metadata case, FT_MUSIC, FT_SOUND
868 if ($changed) { # new data
869 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
870 $face->{data} = $meta;
871
872 # rely on strict ordering here and also on later fetch
873 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
874 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
875 }
876
877 $face->{data} = $self->{json_coder}->decode ($face->{data});
878 ::add_license ($face);
879 ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
880 if $changed;
881
882 if ($face->{type} == 3) { # FT_MUSIC
883 &::audio_music_push ($facenum);
884 } elsif ($face->{type} == 5) { # FT_SOUND
885 &::audio_sound_push ($facenum);
886 }
887
888 } else {
889 # flat resource case, FT_RSRC
890 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
891 if $changed;
892 }
893
894 if (my $cbs = $self->{face_cb}{$facenum}) {
895 $_->($face, $changed) for @$cbs;
896 }
601} 897}
602 898
603sub smooth_update { 899sub smooth_update {
604 my ($self, $facenum, $face) = @_; 900 my ($self, $facenum, $face) = @_;
605 901
606 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 902 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
607} 903}
608 904
609sub set_texture { 905sub have_tile {
610 my ($self, $id, $data) = @_; 906 my ($self, $tile, $data) = @_;
611 907
612 $self->{texture}[$id] = my $tex = 908 return unless $self->{map};
909
910 my $tex = $self->{texture}[$tile] ||=
613 new_from_image CFPlus::Texture 911 new CFPlus::Texture
912 tile => $tile,
913 image => $data, delete_image => 1,
614 $data, minify => 1, mipmap => 1; 914 minify => 1, mipmap => 1;
615 915
616 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 916 if (my $cbs = delete $self->{tile_cb}{$tile}) {
617 $self->{map_widget}->update; 917 $_->($tex) for @$cbs;
918 }
919}
920
921# call in non-void context registers a temporary
922# hook with handle, otherwise its permanent
923sub on_face_change {
924 my ($self, $num, $cb) = @_;
925
926 push @{$self->{face_cb}{$num}}, $cb;
927
928 defined wantarray
929 ? CFPlus::guard {
930 @{$self->{face_cb}{$num}}
931 = grep $_ != $cb,
932 @{$self->{face_cb}{$num}};
933 }
934 : ()
935}
936
937# call in non-void context registers a temporary
938# hook with handle, otherwise its permanent
939sub register_face_handler {
940 my ($self, $num, $cb) = @_;
941
942 return unless $num;
943
944 # invoke if available right now
945 $cb->($self->{face}[$num], 0)
946 unless exists $self->{face}[$num]{loading};
947
948 # future changes
949 $self->on_face_change ($num => $cb)
618} 950}
619 951
620sub sound_play { 952sub sound_play {
621 my ($self, $x, $y, $soundnum, $type) = @_; 953 my ($self, $type, $face, $dx, $dy, $vol) = @_;
622 954
623 $self->{sound_play}->($x, $y, $soundnum, $type); 955 &::audio_sound_play ($face, $dx, $dy, $vol)
956 unless $type & 1; # odd types are silent for future expansion
624} 957}
625 958
626my $LAST_QUERY; # server is stupid, stupid, stupid 959my $LAST_QUERY; # server is stupid, stupid, stupid
627 960
628sub query { 961sub query {
… …
693 $self->{$type} = $text; 1026 $self->{$type} = $text;
694 } else { 1027 } else {
695 $self->logprint ("msg: ", $text); 1028 $self->logprint ("msg: ", $text);
696 return if $color < 0; # negative color == ignore if not understood 1029 return if $color < 0; # negative color == ignore if not understood
697 1030
698 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1031 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
699 1032
700 ## try to create single paragraphs of multiple lines sent by the server 1033 ## try to create single paragraphs of multiple lines sent by the server
701 # no longer neecssary with TRT servers 1034 # no longer neecssary with TRT servers
702 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1035 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
703 1036
704 ::message ({ fg => $fg, markup => $_ })
705 for split /\n/, $text; 1037 for (split /\n/, $text) {
1038 ::message ({
1039 fg => $fg,
1040 markup => $_,
1041 type => $type,
1042 extra => [@extra],
1043 color_flags => $color, #d# ugly, kill
1044 });
1045
1046 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1047 # actually, this is an ugly design. _we_ should control the channels,
1048 # not some random other widget, as the channels are clearly protocol-specific.
1049 # then we could also react to flags such as CLEAR without resorting to
1050 # hacks such as color_flags, above.
1051 }
706 1052
707 $self->{statusbox}->add ($text, 1053 $self->{statusbox}->add ($text,
708 group => $text, 1054 group => $text,
709 fg => $fg, 1055 fg => $fg,
710 timeout => $color >= 2 ? 180 : 10, 1056 timeout => $color >= 2 ? 180 : 10,
… …
766 $self->{map_widget}->clr_commands; 1112 $self->{map_widget}->clr_commands;
767 1113
768 ::stop_game (); 1114 ::stop_game ();
769} 1115}
770 1116
771sub image_info {
772 my ($self, $numfaces) = @_;
773
774 $self->{num_faces} = $numfaces;
775 $self->{face_prefetch} = [1 .. $numfaces];
776 $self->face_prefetch;
777}
778
779sub face_prefetch {
780 my ($self) = @_;
781
782 return unless $::CFG->{face_prefetch};
783
784 if ($self->{num_faces}) {
785 return if @{ $self->{send_queue} || [] };
786 my $todo = @{ $self->{face_prefetch} }
787 or return;
788
789 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
790
791 $self->send ("requestinfo image_sums $face $face");
792
793 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
794 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
795 } elsif (!exists $self->{num_faces}) {
796 $self->send ("requestinfo image_info");
797
798 $self->{num_faces} = 0;
799
800 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
801 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
802 }
803}
804
805sub update_floorbox { 1117sub update_floorbox {
806 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1118 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
807 return unless $::CONN; 1119 return unless $::CONN;
808 1120
809 $::FLOORBOX->clear; 1121 $::FLOORBOX->clear;
1122
1123 my @add;
810 1124
811 my $row; 1125 my $row;
812 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1126 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
813 if ($row < 6) { 1127 if ($row < 6) {
814 local $_->{face_widget}; # hack to force recreation of widget 1128 local $_->{face_widget}; # hack to force recreation of widget
815 local $_->{desc_widget}; # hack to force recreation of widget 1129 local $_->{desc_widget}; # hack to force recreation of widget
816 CFPlus::Item::update_widgets $_; 1130 CFPlus::Item::update_widgets $_;
817 1131
1132 push @add,
818 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1133 0, $row, $_->{face_widget},
819 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1134 1, $row, $_->{desc_widget};
820 1135
821 $row++; 1136 $row++;
822 } else { 1137 } else {
823 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1138 push @add, 1, $row, new CFPlus::UI::Button
824 text => "More...", 1139 text => "More...",
825 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1140 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
826 ); 1141 ;
827 last; 1142 last;
828 } 1143 }
829 } 1144 }
830 if ($::CONN->{open_container}) { 1145 if ($::CONN->{open_container}) {
831 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1146 push @add, 1, $row++, new CFPlus::UI::Button
832 text => "Close container", 1147 text => "Close container",
833 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1148 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
834 ); 1149 ;
835 } 1150 }
1151
1152 $::FLOORBOX->add_at (@add);
836 }); 1153 });
837 1154
838 $::WANT_REFRESH++; 1155 $::WANT_REFRESH->start;
839} 1156}
840 1157
841sub set_opencont { 1158sub set_opencont {
842 my ($conn, $tag, $name) = @_; 1159 my ($conn, $tag, $name) = @_;
843 $conn->{open_container} = $tag; 1160 $conn->{open_container} = $tag;
844 update_floorbox; 1161 update_floorbox;
845 1162
846 $::INV_RIGHT_HB->clear (); 1163 $::INVR_HB->clear ();
847 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1164 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
848 1165
849 if ($tag != 0) { # Floor isn't closable, is it? 1166 if ($tag != 0) { # Floor isn't closable, is it?
850 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1167 $::INVR_HB->add (new CFPlus::UI::Button
851 text => "Close container", 1168 text => "Close container",
852 tooltip => "Close the currently open container (if one is open)", 1169 tooltip => "Close the currently open container (if one is open)",
853 on_activate => sub { 1170 on_activate => sub {
854 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1171 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
855 if $tag != 0; 1172 if $tag != 0;
856 #if $CONN->{open_container} != 0;
857 0 1173 0
858 }, 1174 },
859 ); 1175 );
860 } 1176 }
861 1177
… …
960 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1276 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
961 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1277 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
962 . "map size $self->{mapw}×$self->{maph}\n" 1278 . "map size $self->{mapw}×$self->{maph}\n"
963 ); 1279 );
964 1280
965 ::setup_build_button ($self->{editor_support}->{builder_ui});
966} 1281}
967 1282
968sub logged_in { 1283sub logged_in {
969 my ($self) = @_; 1284 my ($self) = @_;
970 1285
971 $self->send_ext_req (cfplus_support => version => 1, sub { 1286 $self->send_ext_req (cfplus_support => version => 2, sub {
1287 my (%msg) = @_;
1288
972 $self->{cfplus_ext} = $_[0]{version}; 1289 $self->{cfplus_ext} = $msg{version};
973 $self->update_server_info; 1290 $self->update_server_info;
974 1291
975 if ($self->{cfplus_ext} >= 2) { 1292 if ($self->{cfplus_ext} >= 2) {
976 $self->send_ext_req ("editor_support", sub { 1293 $self->send_ext_req ("editor_support", sub {
977 $self->{editor_support} = $_[0]; 1294 $self->{editor_support} = { @_ };
978 $self->update_server_info; 1295 $self->update_server_info;
979 1296
980 0 1297 0
981 }); 1298 });
982 } 1299 }
… …
990 $self->send_command ("output-count $::CFG->{output_count}"); 1307 $self->send_command ("output-count $::CFG->{output_count}");
991 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1308 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
992 $self->send_command ("pickup $::CFG->{pickup}"); 1309 $self->send_command ("pickup $::CFG->{pickup}");
993} 1310}
994 1311
995sub buildat {
996 my ($self, $builditem, $x, $y) = @_;
997
998 if ($self->{cfplus_ext}) {
999 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1000 }
1001}
1002
1003sub lookat { 1312sub lookat {
1004 my ($self, $x, $y) = @_; 1313 my ($self, $x, $y) = @_;
1005 1314
1006 if ($self->{cfplus_ext}) { 1315 if ($self->{cfplus_ext}) {
1007 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1316 $self->send_ext_req (lookat => $x, $y, sub {
1008 my ($msg) = @_; 1317 my (%msg) = @_;
1009 1318
1010 if (exists $msg->{npc_dialog}) { 1319 if (exists $msg{npc_dialog}) {
1011 # start npc chat dialog 1320 # start npc chat dialog
1012 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1321 $self->{npc_dialog} = new CFPlus::NPCDialog::
1013 dx => $x, 1322 token => $msg{npc_dialog},
1014 dy => $y,
1015 title => "$msg->{npc_dialog} (NPC)", 1323 title => "$msg{npc_dialog}[0] (NPC)",
1016 conn => $self, 1324 conn => $self,
1017 ; 1325 ;
1018 } 1326 }
1019 }); 1327 });
1020 } 1328 }
… …
1027 1335
1028 (delete $self->{npc_dialog})->destroy 1336 (delete $self->{npc_dialog})->destroy
1029 if $self->{npc_dialog}; 1337 if $self->{npc_dialog};
1030 1338
1031 $self->SUPER::destroy; 1339 $self->SUPER::destroy;
1340
1341 %$self = ();
1032} 1342}
1033 1343
1034package CFPlus::NPCDialog; 1344package CFPlus::NPCDialog;
1035 1345
1036our @ISA = 'CFPlus::UI::Toplevel'; 1346our @ISA = 'CFPlus::UI::Toplevel';
… …
1083 on_activate => sub { $this->destroy; 1 }, 1393 on_activate => sub { $this->destroy; 1 },
1084 ; 1394 ;
1085 1395
1086 $self->update_options; 1396 $self->update_options;
1087 1397
1088 $self->{id} = $self->{conn}->send_ext_req ( 1398 $self->{id} = "npc-channel-" . $self->{conn}->token;
1089 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1399 $self->{conn}->connect_ext ($self->{id} => sub {
1090 sub { $this && $this->feed (@_) } 1400 $this->feed (@_) if $this;
1091 ); 1401 });
1402
1403 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1092 1404
1093 $self->{entry}->grab_focus; 1405 $self->{entry}->grab_focus;
1094 1406
1095 $self->{textview}->add_paragraph ({ 1407 $self->{textview}->add_paragraph ({
1096 fg => [1, 1, 0, 1], 1408 fg => [1, 1, 0, 1],
… …
1119 ); 1431 );
1120 } 1432 }
1121} 1433}
1122 1434
1123sub feed { 1435sub feed {
1124 my ($self, $msg) = @_; 1436 my ($self, $type, @arg) = @_;
1125 1437
1126 CFPlus::weaken $self; 1438 CFPlus::weaken $self;
1127 1439
1128 if ($msg->{msgtype} eq "reply") { 1440 if ($type eq "update") {
1441 my (%info) = @arg;
1442
1129 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1443 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1130 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1444 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1131
1132 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1133 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1134 my @link;
1135 $text =~ s{
1136 ($match)
1137 }{
1138 my $kw = $1;
1139
1140 push @link, new CFPlus::UI::Label
1141 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1142 can_hover => 1,
1143 can_events => 1,
1144 padding_x => 0,
1145 padding_y => 0,
1146 on_button_up => sub {
1147 $self->send ($kw);
1148 };
1149
1150 "\x{fffc}"
1151 }giex;
1152 1445
1446 if (exists $info{msg}) {
1447 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1448 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1449 my @link;
1450 $text =~ s{
1451 ($match)
1452 }{
1453 my $kw = $1;
1454
1455 push @link, new CFPlus::UI::Label
1456 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1457 can_hover => 1,
1458 can_events => 1,
1459 padding_x => 0,
1460 padding_y => 0,
1461 on_button_up => sub {
1462 $self->send ($kw);
1463 };
1464
1465 "\x{fffc}"
1466 }giex;
1467
1153 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1468 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1154 $self->{textview}->scroll_to_bottom; 1469 $self->{textview}->scroll_to_bottom;
1470 }
1471
1155 $self->update_options; 1472 $self->update_options;
1156 } else { 1473 } else {
1157 $self->destroy; 1474 $self->destroy;
1158 } 1475 }
1159 1476
… …
1164 my ($self, $msg) = @_; 1481 my ($self, $msg) = @_;
1165 1482
1166 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1483 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1167 $self->{textview}->scroll_to_bottom; 1484 $self->{textview}->scroll_to_bottom;
1168 1485
1169 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1486 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1170} 1487}
1171 1488
1172sub destroy { 1489sub destroy {
1173 my ($self) = @_; 1490 my ($self) = @_;
1174 1491
1175 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1492 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1176 1493
1177 if ($self->{conn}) { 1494 if ($self->{conn}) {
1178 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1495 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1179 delete $self->{conn}{npc_dialog}; 1496 delete $self->{conn}{npc_dialog};
1180 $self->{conn}->disconnect_ext ($self->{id}); 1497 $self->{conn}->disconnect_ext ($self->{id});
1181 } 1498 }
1182 1499
1183 $self->SUPER::destroy; 1500 $self->SUPER::destroy;

Diff Legend

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