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.112 by root, Tue Jul 10 16:25:16 2007 UTC vs.
Revision 1.160 by root, Tue Aug 21 22:46:50 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_capabilities => sub {
54 my ($cap) = @_;
55
56 if (my $ts = $cap->{tileset}) {
57 if (my ($default) = grep $_->[2] & 1, @$ts) {
58 $self->{tileset} = $default;
59 $self->{tilesize} = $default->[3];
60 $self->setup_req (tileset => $default->[0]);
61
62 my $w = int $self->{mapw} * 32 / $self->{tilesize};
63 my $h = int $self->{maph} * 32 / $self->{tilesize};
64
65 $self->setup_req (mapsize => "${w}x${h}");
66 }
67 }
68 });
69
70 $self->{json_coder} 53 $self->{json_coder}
71 ->convert_blessed 54 ->convert_blessed
72 ->filter_json_single_key_object (__widget_ref__ => sub { 55 ->filter_json_single_key_object (__w_ => sub {
73 $self->{widget}{$_[0]} 56 $self->{widget}{$_[0]}
74 }); 57 });
75 58
76 $self->connect_ext (ws_n => sub { 59 # destroy widgets on logout
77 my ($arg) = @_;
78
79 $self->{widgetset}{$arg{id}} = {
80 w => {},
81 };
82 });
83
84 $self->connect_ext (ws_d => sub {
85 my ($arg) = @_;
86
87 my $ws = delete $self->{widgetset}{$arg{id}}
88 or return;
89
90 $_->destroy
91 for values %{$ws->{w}};
92 });
93
94 $self->connect_ext (ws_c => sub {
95 my ($arg) = @_;
96
97 my $args = $arg->{args} || {};
98
99 for my $ev (grep /^on_/, keys %$args) {
100 $args->{$ev} = sub {
101 my $id = shift->{s_id};
102 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
103
104 1
105 };
106 }
107
108 if (my $widget = eval {
109 local $SIG{__DIE__};
110 "CFPlus::UI::$arg->{class}"->new (
111 %$args,
112 s_ws => $arg->{ws},
113 s_id => $arg->{id},
114 )
115 }
116 ) {
117 $self->{widget}{$arg->{id}}
118 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
119 = $widget;
120
121 $widget->connect (on_destroy => sub {
122 my ($widget) = @_;
123
124 delete $self->{widget}{$widget->{s_id}};
125 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
126 });
127 } else {
128 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
129 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
130 }
131 });
132
133 $self->connect_ext (w_c => sub {
134 my ($arg) = @_;
135
136 my $w = $self->{widget}{$arg->{id}}
137 or return;
138 my $m = $arg->{name};
139
140 my $a = $arg->{args} || [];
141
142 if (exists $arg->{rid}) {
143 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
144 } else {
145 $w->$m (@$a);
146 }
147 });
148
149 $self->connect_ext (w_s => sub {
150 my ($arg) = @_;
151
152 my $w = $self->{widget}{$arg->{id}}
153 or return;
154
155 $w->{$arg->{name}} = $arg->{value};
156 });
157
158 $self->connect_ext (w_g => sub {
159 my ($arg) = @_;
160
161 my $w = $self->{widget}{$arg->{id}}
162 or return;
163
164 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
165 });
166
167 $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 {
168 for my $ws (values %{delete $self->{widgetset} || {}}) { 61 for my $ws (values %{delete $self->{widgetset} || {}}) {
169 $_->destroy 62 $_->destroy
170 for values %{delete $ws->{w} || {}}; 63 for values %{delete $ws->{w} || {}};
171 } 64 }
… …
192 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 85 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
193 86
194 $self 87 $self
195} 88}
196 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
197sub logprint { 309sub logprint {
198 my ($self, @a) = @_; 310 my ($self, @a) = @_;
199 311
200 $self->{log_fh} ||= do { 312 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
201 my $path = "$Crossfire::VARDIR/log.$self->{host}";
202
203 open my $fh, ">>:utf8", $path
204 or die "Couldn't open logfile $path: $!";
205
206 $fh->autoflush (1);
207
208 $fh;
209 };
210
211 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
212
213 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
214 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
215
216 print {$self->{log_fh}} "$ts ", @a, "\n";
217} 313}
218 314
219sub _stat_numdiff { 315sub _stat_numdiff {
220 my ($self, $name, $old, $new) = @_; 316 my ($self, $name, $old, $new) = @_;
221 317
… …
354 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 450 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
355 $::GAUGES->{food} ->set_value ($fo, $fo_m); 451 $::GAUGES->{food} ->set_value ($fo, $fo_m);
356 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 452 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
357 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 453 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
358 . " (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});
359 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 456 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
360 my $title = $stats->{+CS_STAT_TITLE}; 457 my $title = $stats->{+CS_STAT_TITLE};
361 $title =~ s/^Player: //; 458 $title =~ s/^Player: //;
362 $::STATWIDS->{title} ->set_text ("Title: " . $title); 459 $::STATWIDS->{title} ->set_text ("Title: " . $title);
363 460
… …
384 my @skills = keys %{ $self->{skill_info} }; 481 my @skills = keys %{ $self->{skill_info} };
385 482
386 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 483 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
387 $sktbl->clear; 484 $sktbl->clear;
388 485
486 my $sw = $self->{skillwid}{""} ||= [
389 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 487 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
390 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 488 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
489 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
391 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 490 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
392 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 491 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
393 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 492 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
493 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
394 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 494 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
495 ];
496
497 my @add = @$sw;
395 498
396 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 499 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
397 500
398 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 501 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
399 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 502 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
427 } 530 }
428 531
429 1 532 1
430 }; 533 };
431 534
432 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 535 my $sw = $self->{skillwid}{$idx} ||= [
536 # exp
537 (new CFPlus::UI::Label
433 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 538 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
434 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 539
540 # level
541 (new CFPlus::UI::Label
435 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 542 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
543
544 # progress
545 (new CFPlus::UI::ExperienceProgress),
546
547 # label
436 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 548 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
437 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 549 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
550 ];
551
552 push @add,
553 $x * 4 + 0, $y, $sw->[0],
554 $x * 4 + 1, $y, $sw->[1],
555 $x * 4 + 2, $y, $sw->[2],
556 $x * 4 + 3, $y, $sw->[3],
557 ;
438 558
439 $x++ and ($x, $y) = (0, $y + 1); 559 $x++ and ($x, $y) = (0, $y + 1);
440 } 560 }
561
562 $sktbl->add_at (@add);
441 } 563 }
442 564
443 for (grep exists $stats->{$_}, @skills) { 565 for (grep exists $stats->{$_}, @skills) {
566 my $sw = $self->{skillwid}{$_};
444 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 567 $sw->[0]->set_text (::formsep ($stats->{$_}[1]));
445 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 568 $sw->[1]->set_text ($stats->{$_}[0] * 1);
569 $sw->[2]->set_value (@{$stats->{$_}});
446 } 570 }
447} 571}
448 572
449sub macro_send { 573sub macro_send {
450 my ($self, $macro) = @_; 574 my ($self, $macro) = @_;
… …
478} 602}
479 603
480sub feed_map1a { 604sub feed_map1a {
481 my ($self, $data) = @_; 605 my ($self, $data) = @_;
482 606
483 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 607 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
608 my $delay;
609
610 for my $tile (@$missing) {
611 next if $self->{delay}{$tile};
612
613 $delay = 1;
614
615 if (my $tex = $::CONN->{texture}[$tile]) {
616 $tex->upload;
617 } else {
618 $self->{delay}{$tile} = 1;
619
620 # we assume the face is in-flight and will eventually come
621 push @{$self->{tile_cb}{$tile}}, sub {
622 delete $self->{delay}{$tile};
623 $_[0]->upload;
624 };
625 }
626 }
627
628 if ($delay) {
629 # delay the map drawing a tiny bit in the hope of getting the missing fetched
630 Event->timer (after => 0.03, cb => sub {
631 $_[0]->w->cancel;
632 $self->{map_widget}->update;
633 });
634 } else {
484 $self->{map_widget}->update; 635 $self->{map_widget}->update;
636 }
485} 637}
486 638
487sub magicmap { 639sub magicmap {
488 my ($self, $w, $h, $x, $y, $data) = @_; 640 my ($self, $w, $h, $x, $y, $data) = @_;
489 641
… …
496 my $map_info = delete $self->{map_info} 648 my $map_info = delete $self->{map_info}
497 or return; 649 or return;
498 650
499 my ($hash, $x, $y, $w, $h) = @$map_info; 651 my ($hash, $x, $y, $w, $h) = @$map_info;
500 652
501 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 653 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
654 $self->{map_cache_new}{$hash} = \$data;
502 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 655 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
503 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
504} 656}
505 657
506sub map_clear { 658sub map_clear {
507 my ($self) = @_; 659 my ($self) = @_;
508 660
… …
514} 666}
515 667
516sub bg_fetch { 668sub bg_fetch {
517 my ($self) = @_; 669 my ($self) = @_;
518 670
519 my $id; 671 my $tile;
520 672
521 do { 673 do {
522 $id = pop @{$self->{bg_fetch}} 674 $tile = pop @{$self->{bg_fetch}}
523 or return; 675 or return;
524 } while $self->{texture}[$id]; 676 } while $self->{texture}[$tile];
525 677
526 CFPlus::DB::get tilecache => $id, sub { 678 CFPlus::DB::get tilecache => $tile, sub {
527 my ($data) = @_; 679 my ($data) = @_;
528 680
529 return unless $self->{map}; # stop when destroyed 681 return unless $self->{map}; # stop when destroyed
530 682
531 $self->set_texture ($id => $data)
532 if defined $data; 683 if (defined $data) {
684 $self->have_tile ($tile, $data);
685 $self->{texture}[$tile]->upload;
686 }
533 687
534 $self->bg_fetch; 688 $self->bg_fetch;
535 }; 689 };
536} 690}
537 691
538sub load_map($$$) { 692sub load_map($$$) {
539 my ($self, $hash, $x, $y) = @_; 693 my ($self, $hash, $x, $y) = @_;
540 694
541 my $gen = $self->{map_change_gen}; 695 my $gen = $self->{map_change_gen};
542 696
543 CFPlus::DB::get $self->{mapcache} => $hash, sub { 697 my $cb = sub {
544 return unless $gen == $self->{map_change_gen}; 698 return unless $gen == $self->{map_change_gen};
545 699
546 my ($data) = @_; 700 my ($data) = @_;
547 701
548 if (defined $data) { 702 if (defined $data) {
703 $self->{map_cache_new}{$hash} = \$data;
704
549 $data = Compress::LZF::decompress $data; 705 my $data = Compress::LZF::decompress $data;
550 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
551 706
552 my $inprogress = @{ $self->{bg_fetch} || [] }; 707 my $inprogress = @{ $self->{bg_fetch} || [] };
553 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 708 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
554 $self->bg_fetch unless $inprogress; 709 $self->bg_fetch unless $inprogress;
555 } 710 }
556 }; 711 };
712
713 if (my $rdata = $self->{map_cache_old}{$hash}) {
714 $cb->($$rdata);
715 } else {
716 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
717 }
557} 718}
558 719
559# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 720# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
560# (server resource,s latency, bandwidth), so this hack is warranted. 721# (server resource,s latency, bandwidth), so this hack is warranted.
561# the right fix is to make real tiled maps with an overview file 722# the right fix is to make real tiled maps with an overview file
… …
654 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 815 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
655 816
656 $self->flush_map; 817 $self->flush_map;
657 818
658 ++$self->{map_change_gen}; 819 ++$self->{map_change_gen};
820 $self->{map_cache_old} = delete $self->{map_cache_new};
659 821
660 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 822 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
661 823
662 my $mapmapw = $self->{mapmap}->{w}; 824 my $mapmapw = $self->{mapmap}->{w};
663 my $mapmaph = $self->{mapmap}->{h}; 825 my $mapmaph = $self->{mapmap}->{h};
… …
682} 844}
683 845
684sub face_find { 846sub face_find {
685 my ($self, $facenum, $face, $cb) = @_; 847 my ($self, $facenum, $face, $cb) = @_;
686 848
687 my $hash = "$face->{chksum},$face->{name}"; 849 if ($face->{type} == 0) { # FT_FACE
688
689 my $id = CFPlus::DB::get_tile_id_sync $hash; 850 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
690 851
691 $face->{id} = $id; 852 $face->{id} = $id;
692 $self->{faceid}[$facenum] = $id;
693
694 $self->{map}->set_tileid ($facenum => $id); 853 $self->{map}->set_tileid ($facenum => $id);
695 854
696 CFPlus::DB::get tilecache => $id, $cb; 855 CFPlus::DB::get tilecache => $id, $cb;
856
857 } elsif ($face->{type} & 1) { # with metadata
858 CFPlus::DB::get res_meta => $face->{name}, $cb;
859
860 } else { # no metadata
861 CFPlus::DB::get res_data => $face->{name}, $cb;
862 }
697} 863}
698 864
699sub face_update { 865sub face_update {
700 my ($self, $facenum, $face, $changed) = @_; 866 my ($self, $facenum, $face, $changed) = @_;
701 867
868 if ($face->{type} == 0) {
869 # image, FT_FACE
702 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 870 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
703 if $changed; 871 if $changed;
704 872
705 $self->set_texture ($face->{id} => delete $face->{image}); 873 $self->have_tile ($face->{id}, delete $face->{data});
874
875 } elsif ($face->{type} & 1) {
876 # split metadata case, FT_MUSIC, FT_SOUND
877 if ($changed) { # new data
878 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
879 $face->{data} = $meta;
880
881 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
882 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
883 }
884
885 $face->{data} = $self->{json_coder}->decode ($face->{data});
886
887 ::add_license ($face);
888
889 if ($face->{type} == 3) { # FT_MUSIC
890 ::message ({ markup => "downloaded song #$facenum" })
891 if $changed;
892
893 &::audio_music_push ($facenum);
894 } elsif ($face->{type} == 5) { # FT_SOUND
895 ::message ({ markup => "downloaded sound #$facenum" })
896 if $changed;
897
898 &::audio_sound_push ($facenum);
899 }
900
901 } else {
902 # flat resource case, FT_RSRC
903 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
904 if $changed;
905 }
906
907 if (my $cbs = $self->{face_cb}{$facenum}) {
908 $_->($face, $changed) for @$cbs;
909 }
706} 910}
707 911
708sub smooth_update { 912sub smooth_update {
709 my ($self, $facenum, $face) = @_; 913 my ($self, $facenum, $face) = @_;
710 914
711 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 915 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
712} 916}
713 917
714sub set_texture { 918sub have_tile {
715 my ($self, $id, $data) = @_; 919 my ($self, $tile, $data) = @_;
716 920
717 $self->{texture}[$id] = my $tex = 921 return unless $self->{map};
922
923 my $tex = $self->{texture}[$tile] ||=
718 new_from_image CFPlus::Texture 924 new CFPlus::Texture
925 tile => $tile,
926 image => $data, delete_image => 1,
719 $data, minify => 1, mipmap => 1; 927 minify => 1, mipmap => 1;
720 928
721 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 929 if (my $cbs = delete $self->{tile_cb}{$tile}) {
722 $self->{map_widget}->update; 930 $_->($tex) for @$cbs;
931 }
932}
933
934# call in non-void context registers a temporary
935# hook with handle, otherwise its permanent
936sub on_face_change {
937 my ($self, $num, $cb) = @_;
938
939 push @{$self->{face_cb}{$num}}, $cb;
940
941 defined wantarray
942 ? CFPlus::guard {
943 @{$self->{face_cb}{$num}}
944 = grep $_ != $cb,
945 @{$self->{face_cb}{$num}};
946 }
947 : ()
948}
949
950# call in non-void context registers a temporary
951# hook with handle, otherwise its permanent
952sub register_face_handler {
953 my ($self, $num, $cb) = @_;
954
955 return unless $num;
956
957 # invoke if available right now
958 $cb->($self->{face}[$num], 0)
959 unless exists $self->{face}[$num]{loading};
960
961 # future changes
962 $self->on_face_change ($num => $cb)
723} 963}
724 964
725sub sound_play { 965sub sound_play {
726 my ($self, $x, $y, $soundnum, $type) = @_; 966 my ($self, $type, $face, $dx, $dy, $vol) = @_;
727 967
728 $self->{sound_play}->($x, $y, $soundnum, $type); 968 &::audio_sound_play ($face, $dx, $dy, $vol)
969 unless $type & 1; # odd types are silent for future expansion
729} 970}
730 971
731my $LAST_QUERY; # server is stupid, stupid, stupid 972my $LAST_QUERY; # server is stupid, stupid, stupid
732 973
733sub query { 974sub query {
… …
798 $self->{$type} = $text; 1039 $self->{$type} = $text;
799 } else { 1040 } else {
800 $self->logprint ("msg: ", $text); 1041 $self->logprint ("msg: ", $text);
801 return if $color < 0; # negative color == ignore if not understood 1042 return if $color < 0; # negative color == ignore if not understood
802 1043
803 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1044 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
804 1045
805 ## try to create single paragraphs of multiple lines sent by the server 1046 ## try to create single paragraphs of multiple lines sent by the server
806 # no longer neecssary with TRT servers 1047 # no longer neecssary with TRT servers
807 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1048 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
808 1049
809 ::message ({ fg => $fg, markup => $_ }) 1050 ::message ({
1051 fg => $fg,
1052 markup => $_,
1053 type => $type,
1054 extra => [@extra],
1055 color_flags => $color
810 for split /\n/, $text; 1056 }) for split /\n/, $text;
811 1057
812 $self->{statusbox}->add ($text, 1058 $self->{statusbox}->add ($text,
813 group => $text, 1059 group => $text,
814 fg => $fg, 1060 fg => $fg,
815 timeout => $color >= 2 ? 180 : 10, 1061 timeout => $color >= 2 ? 180 : 10,
… …
871 $self->{map_widget}->clr_commands; 1117 $self->{map_widget}->clr_commands;
872 1118
873 ::stop_game (); 1119 ::stop_game ();
874} 1120}
875 1121
876sub image_info {
877 my ($self, $numfaces) = @_;
878
879 $self->{num_faces} = $numfaces;
880 $self->{face_prefetch} = [1 .. $numfaces];
881 $self->face_prefetch;
882}
883
884sub face_prefetch {
885 my ($self) = @_;
886
887 return unless $::CFG->{face_prefetch};
888
889 if ($self->{num_faces}) {
890 return if @{ $self->{send_queue} || [] };
891 my $todo = @{ $self->{face_prefetch} }
892 or return;
893
894 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
895
896 $self->send ("requestinfo image_sums $face $face");
897
898 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
899 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
900 } elsif (!exists $self->{num_faces}) {
901 $self->send ("requestinfo image_info");
902
903 $self->{num_faces} = 0;
904
905 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
906 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
907 }
908}
909
910sub update_floorbox { 1122sub update_floorbox {
911 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1123 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
912 return unless $::CONN; 1124 return unless $::CONN;
913 1125
914 $::FLOORBOX->clear; 1126 $::FLOORBOX->clear;
1127
1128 my @add;
915 1129
916 my $row; 1130 my $row;
917 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1131 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
918 if ($row < 6) { 1132 if ($row < 6) {
919 local $_->{face_widget}; # hack to force recreation of widget 1133 local $_->{face_widget}; # hack to force recreation of widget
920 local $_->{desc_widget}; # hack to force recreation of widget 1134 local $_->{desc_widget}; # hack to force recreation of widget
921 CFPlus::Item::update_widgets $_; 1135 CFPlus::Item::update_widgets $_;
922 1136
1137 push @add,
923 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1138 0, $row, $_->{face_widget},
924 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1139 1, $row, $_->{desc_widget};
925 1140
926 $row++; 1141 $row++;
927 } else { 1142 } else {
928 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1143 push @add, 1, $row, new CFPlus::UI::Button
929 text => "More...", 1144 text => "More...",
930 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1145 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
931 ); 1146 ;
932 last; 1147 last;
933 } 1148 }
934 } 1149 }
935 if ($::CONN->{open_container}) { 1150 if ($::CONN->{open_container}) {
936 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1151 push @add, 1, $row++, new CFPlus::UI::Button
937 text => "Close container", 1152 text => "Close container",
938 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1153 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
939 ); 1154 ;
940 } 1155 }
1156
1157 $::FLOORBOX->add_at (@add);
941 }); 1158 });
942 1159
943 $::WANT_REFRESH++; 1160 $::WANT_REFRESH->start;
944} 1161}
945 1162
946sub set_opencont { 1163sub set_opencont {
947 my ($conn, $tag, $name) = @_; 1164 my ($conn, $tag, $name) = @_;
948 $conn->{open_container} = $tag; 1165 $conn->{open_container} = $tag;
949 update_floorbox; 1166 update_floorbox;
950 1167
951 $::INV_RIGHT_HB->clear (); 1168 $::INVR_HB->clear ();
952 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1169 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
953 1170
954 if ($tag != 0) { # Floor isn't closable, is it? 1171 if ($tag != 0) { # Floor isn't closable, is it?
955 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1172 $::INVR_HB->add (new CFPlus::UI::Button
956 text => "Close container", 1173 text => "Close container",
957 tooltip => "Close the currently open container (if one is open)", 1174 tooltip => "Close the currently open container (if one is open)",
958 on_activate => sub { 1175 on_activate => sub {
959 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1176 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
960 if $tag != 0; 1177 if $tag != 0;
961 #if $CONN->{open_container} != 0;
962 0 1178 0
963 }, 1179 },
964 ); 1180 );
965 } 1181 }
966 1182
… …
1065 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1281 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1066 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1282 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1067 . "map size $self->{mapw}×$self->{maph}\n" 1283 . "map size $self->{mapw}×$self->{maph}\n"
1068 ); 1284 );
1069 1285
1070 ::setup_build_button ($self->{editor_support}->{builder_ui});
1071} 1286}
1072 1287
1073sub logged_in { 1288sub logged_in {
1074 my ($self) = @_; 1289 my ($self) = @_;
1075 1290
1076 $self->send_ext_req (cfplus_support => version => 1, sub { 1291 $self->send_ext_req (cfplus_support => version => 2, sub {
1292 my (%msg) = @_;
1293
1077 $self->{cfplus_ext} = $_[0]{version}; 1294 $self->{cfplus_ext} = $msg{version};
1078 $self->update_server_info; 1295 $self->update_server_info;
1079 1296
1080 if ($self->{cfplus_ext} >= 2) { 1297 if ($self->{cfplus_ext} >= 2) {
1081 $self->send_ext_req ("editor_support", sub { 1298 $self->send_ext_req ("editor_support", sub {
1082 $self->{editor_support} = $_[0]; 1299 $self->{editor_support} = { @_ };
1083 $self->update_server_info; 1300 $self->update_server_info;
1084 1301
1085 0 1302 0
1086 }); 1303 });
1087 } 1304 }
… …
1095 $self->send_command ("output-count $::CFG->{output_count}"); 1312 $self->send_command ("output-count $::CFG->{output_count}");
1096 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1313 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1097 $self->send_command ("pickup $::CFG->{pickup}"); 1314 $self->send_command ("pickup $::CFG->{pickup}");
1098} 1315}
1099 1316
1100sub buildat {
1101 my ($self, $builditem, $x, $y) = @_;
1102
1103 if ($self->{cfplus_ext}) {
1104 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1105 }
1106}
1107
1108sub lookat { 1317sub lookat {
1109 my ($self, $x, $y) = @_; 1318 my ($self, $x, $y) = @_;
1110 1319
1111 if ($self->{cfplus_ext}) { 1320 if ($self->{cfplus_ext}) {
1112 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1321 $self->send_ext_req (lookat => $x, $y, sub {
1113 my ($msg) = @_; 1322 my (%msg) = @_;
1114 1323
1115 if (exists $msg->{npc_dialog}) { 1324 if (exists $msg{npc_dialog}) {
1116 # start npc chat dialog 1325 # start npc chat dialog
1117 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1326 $self->{npc_dialog} = new CFPlus::NPCDialog::
1118 dx => $x, 1327 token => $msg{npc_dialog},
1119 dy => $y,
1120 title => "$msg->{npc_dialog} (NPC)", 1328 title => "$msg{npc_dialog}[0] (NPC)",
1121 conn => $self, 1329 conn => $self,
1122 ; 1330 ;
1123 } 1331 }
1124 }); 1332 });
1125 } 1333 }
… …
1190 on_activate => sub { $this->destroy; 1 }, 1398 on_activate => sub { $this->destroy; 1 },
1191 ; 1399 ;
1192 1400
1193 $self->update_options; 1401 $self->update_options;
1194 1402
1195 $self->{id} = $self->{conn}->send_ext_req ( 1403 $self->{id} = "npc-channel-" . $self->{conn}->token;
1196 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1404 $self->{conn}->connect_ext ($self->{id} => sub {
1197 sub { $this && $this->feed (@_) } 1405 $this->feed (@_) if $this;
1198 ); 1406 });
1407
1408 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1199 1409
1200 $self->{entry}->grab_focus; 1410 $self->{entry}->grab_focus;
1201 1411
1202 $self->{textview}->add_paragraph ({ 1412 $self->{textview}->add_paragraph ({
1203 fg => [1, 1, 0, 1], 1413 fg => [1, 1, 0, 1],
… …
1226 ); 1436 );
1227 } 1437 }
1228} 1438}
1229 1439
1230sub feed { 1440sub feed {
1231 my ($self, $msg) = @_; 1441 my ($self, $type, @arg) = @_;
1232 1442
1233 CFPlus::weaken $self; 1443 CFPlus::weaken $self;
1234 1444
1235 if ($msg->{msgtype} eq "reply") { 1445 if ($type eq "update") {
1446 my (%info) = @arg;
1447
1236 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1448 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1237 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1449 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1238
1239 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1240 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1241 my @link;
1242 $text =~ s{
1243 ($match)
1244 }{
1245 my $kw = $1;
1246
1247 push @link, new CFPlus::UI::Label
1248 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1249 can_hover => 1,
1250 can_events => 1,
1251 padding_x => 0,
1252 padding_y => 0,
1253 on_button_up => sub {
1254 $self->send ($kw);
1255 };
1256
1257 "\x{fffc}"
1258 }giex;
1259 1450
1451 if (exists $info{msg}) {
1452 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1453 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1454 my @link;
1455 $text =~ s{
1456 ($match)
1457 }{
1458 my $kw = $1;
1459
1460 push @link, new CFPlus::UI::Label
1461 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1462 can_hover => 1,
1463 can_events => 1,
1464 padding_x => 0,
1465 padding_y => 0,
1466 on_button_up => sub {
1467 $self->send ($kw);
1468 };
1469
1470 "\x{fffc}"
1471 }giex;
1472
1260 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1473 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1261 $self->{textview}->scroll_to_bottom; 1474 $self->{textview}->scroll_to_bottom;
1475 }
1476
1262 $self->update_options; 1477 $self->update_options;
1263 } else { 1478 } else {
1264 $self->destroy; 1479 $self->destroy;
1265 } 1480 }
1266 1481
… …
1271 my ($self, $msg) = @_; 1486 my ($self, $msg) = @_;
1272 1487
1273 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1488 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1274 $self->{textview}->scroll_to_bottom; 1489 $self->{textview}->scroll_to_bottom;
1275 1490
1276 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1491 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1277} 1492}
1278 1493
1279sub destroy { 1494sub destroy {
1280 my ($self) = @_; 1495 my ($self) = @_;
1281 1496
1282 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1497 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1283 1498
1284 if ($self->{conn}) { 1499 if ($self->{conn}) {
1285 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1500 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1286 delete $self->{conn}{npc_dialog}; 1501 delete $self->{conn}{npc_dialog};
1287 $self->{conn}->disconnect_ext ($self->{id}); 1502 $self->{conn}->disconnect_ext ($self->{id});
1288 } 1503 }
1289 1504
1290 $self->SUPER::destroy; 1505 $self->SUPER::destroy;

Diff Legend

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