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.138 by root, Sat Jul 28 16:48:45 2007 UTC vs.
Revision 1.174 by root, Sun Sep 2 08:44:28 2007 UTC

… …
10use CFPlus::UI; 10use CFPlus::UI;
11use CFPlus::Pod; 11use CFPlus::Pod;
12use CFPlus::Macro; 12use CFPlus::Macro;
13use CFPlus::Item; 13use CFPlus::Item;
14 14
15use Crossfire::Protocol::Base 0.95;
16
17use base 'Crossfire::Protocol::Base'; 15use base 'Crossfire::Protocol::Base';
18 16
19sub new { 17sub new {
20 my ($class, %arg) = @_; 18 my ($class, %arg) = @_;
21 19
22 my $self = $class->SUPER::new (%arg, 20 my $self = $class->SUPER::new (%arg,
23 setup_req => { 21 setup_req => {
24 extmap => 1, 22 extmap => 1,
25 excmd => 1, 23 excmd => 1,
26 ywidget => 1,#d# 24 #xwidget2 => 1,#d#
27 %{$arg{setup_req} || {}}, 25 %{$arg{setup_req} || {}},
26 msg => 0,
28 }, 27 },
29 ); 28 );
30 29
31 $self->{map_widget}->clr_commands; 30 $self->{map_widget}->clr_commands;
32 31
… …
48 sort { (length $a) <=> (length $b) } 47 sort { (length $a) <=> (length $b) }
49 @args 48 @args
50 } sort { $a->{par} <=> $b->{par} } 49 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 50 CFPlus::Pod::find command => "*";
52 51
53 $self->connect_ext (music => sub {
54 my ($ev) = @_;
55
56 &::audio_music_set ($self->{songs} = $ev->{play})
57 if $ev->{play};
58 });
59
60 $self->connect_ext (capabilities => sub {
61 my (%cap) = @_;
62
63 #$self->send ("setup sound 0"); # we use a different protocol
64
65 $self->send_exti_msg (fx_want => {
66 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
67 #5 => !!$::CFG->{audio_enable}, # FT_SOUND
68 });
69
70 if (my $ts = $cap{tileset}) {
71 if (my ($default) = grep $_->[2] & 1, @$ts) {
72 $self->{tileset} = $default;
73 $self->{tilesize} = $default->[3];
74 $self->setup_req (tileset => $default->[0]);
75
76 my $w = int $self->{mapw} * 32 / $self->{tilesize};
77 my $h = int $self->{maph} * 32 / $self->{tilesize};
78
79 $self->setup_req (mapsize => "${w}x${h}");
80 }
81 }
82 });
83
84 $self->{json_coder} 52 $self->{json_coder}
85 ->convert_blessed 53 ->convert_blessed
86 ->filter_json_single_key_object (__w_ => sub { 54 ->filter_json_single_key_object ("\fw" => sub {
87 $self->{widget}{$_[0]} 55 $self->{widget}{$_[0]}
56 })
57 ->filter_json_single_key_object ("\fc" => sub {
58 my ($id) = @_;
59 sub {
60 $self->send_exti_msg (w_e => $id, @_);
61 }
88 }); 62 });
89
90 # widgetset new
91 $self->connect_ext (ws_n => sub {
92 my ($id) = @_;
93
94 $self->{widgetset}{$id} = {
95 w => {},
96 };
97 });
98
99 # widgetset destroy
100 $self->connect_ext (ws_d => sub {
101 my ($id) = @_;
102
103 my $ws = delete $self->{widgetset}{$id}
104 or return;
105
106 $_->destroy
107 for values %{$ws->{w}};
108 });
109
110 # widgetset create
111 $self->connect_ext (ws_c => sub {
112 my ($ws, $id, $class, $args) = @_;
113
114 for my $ev (grep /^on_/, keys %$args) {
115 $args->{$ev} = sub {
116 my $id = shift->{s_id};
117 $self->send_exti_msg (w_e => $id, $ev, \@_);
118
119 1
120 };
121 }
122
123 if (my $widget = eval {
124 local $SIG{__DIE__};
125 "CFPlus::UI::$class"->new (
126 %$args,
127 s_ws => $ws,
128 s_id => $id,
129 )
130 }
131 ) {
132 $self->{widget}{$id}
133 = $self->{widgetset}{$ws}{w}{$id}
134 = $widget;
135
136 $widget->connect (on_destroy => sub {
137 my ($widget) = @_;
138
139 delete $self->{widget}{$widget->{s_id}};
140 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
141 });
142 } else {
143 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
144 $self->send_exti_msg (w_e => $id, "destroy");
145 }
146 });
147
148 # widget call
149 $self->connect_ext (w_c => sub {
150 my ($id, $rid, $method, $args) = @_;
151
152 my $w = $self->{widget}{$id}
153 or return;
154
155 $args ||= [];
156
157 if ($rid) {
158 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
159 } else {
160 $w->$method (@$args);
161 }
162 });
163
164 # widget set
165 $self->connect_ext (w_s => sub {
166 my ($id, $attr) = @_;
167
168 my $w = $self->{widget}{$id}
169 or return;
170
171 for (my $i = 0; $i < $#$attr; $i += 2) {
172 my ($member, $value) = @$attr[$i, $i+1];
173 if (defined $value) {
174 $w->{$member} = $value;
175 } else {
176 delete $w->{$member};
177 }
178 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
179 }
180 });
181
182 # widget get
183 $self->connect_ext (w_g => sub {
184 my ($id, $rid, $attr) = @_;
185
186 my $w = $self->{widget}{$id}
187 or return;
188
189 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
190 });
191
192 # message window
193 $self->connect_ext (channel_info => sub {
194 my ($info) = @_;
195 $self->{channels}->{$info->{id}} = $info;
196 $::MESSAGE_WINDOW->add_channel ($info);
197 });
198 63
199 # destroy widgets on logout 64 # destroy widgets on logout
200 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 65 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
201 for my $ws (values %{delete $self->{widgetset} || {}}) { 66 for my $ws (values %{delete $self->{widgetset} || {}}) {
202 $_->destroy 67 $_->destroy
… …
225 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 90 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
226 91
227 $self 92 $self
228} 93}
229 94
95sub update_fx_want {
96 my ($self) = @_;
97
98 $self->send_exti_msg (fx_want => {
99 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
100 5 => !!$::CFG->{audio_enable}, # FT_SOUND
101 6 => 1, # FT_RSRC
102 });
103}
104
105sub ext_capabilities {
106 my ($self, %cap) = @_;
107
108 #$self->send ("setup sound 0"); # we use a different protocol
109 $self->update_fx_want;
110
111 $self->send_exti_req (resource => "exp_table", sub {
112 my ($exp_table) = @_;
113
114 $self->register_face_handler ($exp_table, sub {
115 my ($face) = @_;
116
117 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
118 $_->() for values %{ $self->{on_exp_update} || {} };
119 });
120
121 ()
122 });
123
124 if (my $ts = $cap{tileset}) {
125 if (my ($default) = grep $_->[2] & 1, @$ts) {
126 $self->{tileset} = $default;
127 $self->{tilesize} = $default->[3];
128 $self->setup_req (tileset => $default->[0]);
129
130 my $w = int $self->{mapw} * 32 / $self->{tilesize};
131 my $h = int $self->{maph} * 32 / $self->{tilesize};
132
133 $self->setup_req (mapsize => "${w}x${h}");
134 }
135 }
136}
137
138sub ext_ambient_music {
139 my ($self, $songs) = @_;
140 &::audio_music_set_ambient ($songs);
141}
142
143#############################################################################
144
145sub widget_associate {
146 my ($self, $ws, $id, $widget) = @_;
147
148 $widget ||= new CFPlus::UI::Bin;
149
150 $widget->{s_id} = $id;
151 $self->{widget}{$id} = $widget;
152
153 if ($ws) {
154 $widget->{s_ws} = $ws;
155 $self->{widgetset}{$ws}{w}{$id} = $widget;
156 }
157
158 $widget->connect (on_destroy => sub {
159 my ($widget) = @_;
160
161 delete $self->{widget}{$widget->{s_id}};
162 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
163 if exists $widget->{s_ws};
164 });
165}
166
167# widgetset new
168sub ext_ws_n {
169 my ($self, $id) = @_;
170
171 $self->{widgetset}{$id} = {
172 w => {},
173 };
174}
175
176# widgetset destroy
177sub ext_ws_d {
178 my ($self, $id) = @_;
179
180 my $ws = delete $self->{widgetset}{$id}
181 or return;
182
183 $_->destroy
184 for values %{$ws->{w}};
185}
186
187# widgetset create
188sub ext_ws_c {
189 my ($self, $ws, $id, $class, $args) = @_;
190
191 $self->widget_associate (
192 $ws, $id => scalar eval {
193 local $SIG{__DIE__};
194 "CFPlus::UI::$class"->new (%$args)
195 }
196 );
197}
198
199# widgetset associate
200sub ext_ws_a {
201 my ($self, %ass) = @_;
202
203 # everything that has a name, wether conceivably useful or not
204 my %wkw = (
205 root => $CFPlus::UI::ROOT,
206 tooltip => $CFPlus::UI::TOOLTIP,
207
208 mapwidget => $::MAPWIDGET,
209 buttonbar => $::BUTTONBAR,
210 metaserver => $::METASERVER,
211 buttonbar => $::BUTTONBAR,
212 login_button => $::LOGIN_BUTTON,
213 quit_dialog => $::QUIT_DIALOG,
214 host_entry => $::HOST_ENTRY,
215 metaserver => $::METASERVER,
216 server_info => $::SERVER_INFO,
217
218 setup_dialog => $::SETUP_DIALOG,
219 setup_notebook => $::SETUP_NOTEBOOK,
220 setup_server => $::SETUP_SERVER,
221 setup_keyboard => $::SETUP_KEYBOARD,
222
223 pl_notebook => $::PL_NOTEBOOK,
224 pl_window => $::PL_WINDOW,
225 inventory_page => $::INVENTORY_PAGE,
226 stats_page => $::STATS_PAGE,
227 skill_page => $::SKILL_PAGE,
228 spell_page => $::SPELL_PAGE,
229 spell_list => $::SPELL_LIST,
230
231 floorbox => $::FLOORBOX,
232 help_window => $::HELP_WINDOW,
233 message_window => $::MESSAGE_WINDOW,
234 statusbox => $::SDTATUSBOX,
235
236 inv => $::INV,
237 invr => $::INVR,
238 invr_hb => $::INVR_HB,
239 );
240
241 while (my ($id, $name) = each %ass) {
242 $self->widget_associate (undef, $id => $wkw{$name});
243 }
244}
245
246# widget call
247sub ext_w_c {
248 my ($self, $id, $rcb, $method, @args) = @_;
249
250 my $w = $self->{widget}{$id}
251 or return;
252
253 if ($rcb) {
254 $rcb->($w->$method (@args));
255 } else {
256 $w->$method (@args);
257 }
258}
259
260# widget set
261sub ext_w_s {
262 my ($self, $id, $attr) = @_;
263
264 my $w = $self->{widget}{$id}
265 or return;
266
267 for (my $i = 0; $i < $#$attr; $i += 2) {
268 my ($member, $value) = @$attr[$i, $i+1];
269 if (defined $value) {
270 $w->{$member} = $value;
271 } else {
272 delete $w->{$member};
273 }
274 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
275 }
276}
277
278# widget get
279sub ext_w_g {
280 my ($self, $id, $rid, @attr) = @_;
281
282 my $w = $self->{widget}{$id}
283 or return;
284
285 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
286}
287
288# message window
289sub ext_channel_info {
290 my ($self, $info) = @_;
291 $self->{channels}->{$info->{id}} = $info;
292 $::MESSAGE_WINDOW->add_channel ($info);
293}
294
295#############################################################################
296
230sub logprint { 297sub logprint {
231 my ($self, @a) = @_; 298 my ($self, @a) = @_;
232 299
233 $self->{log_fh} ||= do { 300 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
234 my $path = "$Crossfire::VARDIR/log.$self->{host}";
235
236 open my $fh, ">>:utf8", $path
237 or die "Couldn't open logfile $path: $!";
238
239 $fh->autoflush (1);
240
241 $fh;
242 };
243
244 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
245
246 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
247 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
248
249 print {$self->{log_fh}} "$ts ", @a, "\n";
250} 301}
251 302
252sub _stat_numdiff { 303sub _stat_numdiff {
253 my ($self, $name, $old, $new) = @_; 304 my ($self, $name, $old, $new) = @_;
254 305
… …
338 389
339 if ( 390 if (
340 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 391 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
341 ) { 392 ) {
342 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 393 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
343 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 394 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
344 } 395 }
345 396
346 $self->update_stats_window ($stats, $prev); 397 $self->update_stats_window ($stats, $prev);
347 398
348 $self->{prev_stats} = { %$stats }; 399 $self->{prev_stats} = { %$stats };
… …
387 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 438 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
388 $::GAUGES->{food} ->set_value ($fo, $fo_m); 439 $::GAUGES->{food} ->set_value ($fo, $fo_m);
389 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 440 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
390 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 441 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
391 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 442 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
443 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
392 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 444 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
393 my $title = $stats->{+CS_STAT_TITLE}; 445 my $title = $stats->{+CS_STAT_TITLE};
394 $title =~ s/^Player: //; 446 $title =~ s/^Player: //;
395 $::STATWIDS->{title} ->set_text ("Title: " . $title); 447 $::STATWIDS->{title} ->set_text ("Title: " . $title);
396 448
… …
414 for keys %RES_TBL; 466 for keys %RES_TBL;
415 467
416 my $sktbl = $::STATWIDS->{skill_tbl}; 468 my $sktbl = $::STATWIDS->{skill_tbl};
417 my @skills = keys %{ $self->{skill_info} }; 469 my @skills = keys %{ $self->{skill_info} };
418 470
419 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 471 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
472 map [$_, $self->{skill_info}{$_}],
473 grep exists $stats->{$_},
474 @skills;
475
476 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
477 $self->{stat_order} = join ",", map $_->[0], @order;
478
420 $sktbl->clear; 479 $sktbl->clear;
421 480
422 my @add; 481 my $sw = $self->{skillwid}{""} ||= [
423
424 push @add,
425 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 482 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
426 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 483 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
484 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
427 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 485 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
428 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 486 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
429 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 487 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
488 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
430 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 489 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
431 ; 490 ];
491
492 my @add = @$sw;
432 493
433 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 494 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
434 495
435 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 496 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
436 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 497 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
437 498
438 my ($x, $y) = (0, 1); 499 my ($x, $y) = (0, 1);
439 for ( 500 for (@order) {
440 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
441 map [$_, $self->{skill_info}{$_}],
442 grep exists $stats->{$_},
443 @skills
444 ) {
445 my ($idx, $name) = @$_; 501 my ($idx, $name) = @$_;
446 502
447 my $spell_cb = sub { 503 my $spell_cb = sub {
448 my ($widget, $ev) = @_; 504 my ($widget, $ev) = @_;
449 505
… …
464 } 520 }
465 521
466 1 522 1
467 }; 523 };
468 524
525 my $sw = $self->{skillwid}{$idx} ||= [
526 # exp
527 (new CFPlus::UI::Label
528 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
529
530 # level
531 (new CFPlus::UI::Label
532 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
533
534 # progress
535 (new CFPlus::UI::ExperienceProgress),
536
537 # label
538 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
539 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
540 ];
541
469 push @add, 542 push @add,
470 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 543 $x * 4 + 0, $y, $sw->[0],
471 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 544 $x * 4 + 1, $y, $sw->[1],
472 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 545 $x * 4 + 2, $y, $sw->[2],
473 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 546 $x * 4 + 3, $y, $sw->[3],
474 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
475 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
476 ; 547 ;
477 548
478 $x++ and ($x, $y) = (0, $y + 1); 549 $x++ and ($x, $y) = (0, $y + 1);
479 } 550 }
480 551
481 $sktbl->add_at (@add); 552 $sktbl->add_at (@add);
482 } 553 }
483 554
484 for (grep exists $stats->{$_}, @skills) { 555 for (@order) {
485 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 556 my ($idx, $name) = @$_;
486 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 557 my $val = $stats->{$idx};
487 }
488}
489 558
490sub macro_send { 559 next if $prev->{$idx}[1] eq $val->[1];
491 my ($self, $macro) = @_;
492 560
493 for my $cmd (@{ $macro->{action} }) { 561 my $sw = $self->{skillwid}{$idx};
494 $self->send_command ($cmd); 562 $sw->[0]->set_text (::formsep ($val->[1]));
563 $sw->[1]->set_text ($val->[0] * 1);
564 $sw->[2]->set_value (@$val);
565
566 $::GAUGES->{sklprg}->set_label ("$name %d%%");
567 $::GAUGES->{sklprg}->set_value (@$val);
495 } 568 }
496} 569}
497 570
498sub user_send { 571sub user_send {
499 my ($self, $command) = @_; 572 my ($self, $command) = @_;
… …
501 $self->{record}->($command) 574 $self->{record}->($command)
502 if $self->{record}; 575 if $self->{record};
503 576
504 $self->logprint ("send: ", $command); 577 $self->logprint ("send: ", $command);
505 $self->send_command ($command); 578 $self->send_command ($command);
506 ::status ($command);
507} 579}
508 580
509sub record { 581sub record {
510 my ($self, $cb) = @_; 582 my ($self, $cb) = @_;
511 583
… …
519} 591}
520 592
521sub feed_map1a { 593sub feed_map1a {
522 my ($self, $data) = @_; 594 my ($self, $data) = @_;
523 595
524 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 596 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
597 my $delay;
598
599 for my $tile (@$missing) {
600 next if $self->{delay}{$tile};
601
602 $delay = 1;
603
604 if (my $tex = $::CONN->{texture}[$tile]) {
605 $tex->upload;
606 } else {
607 $self->{delay}{$tile} = 1;
608
609 # we assume the face is in-flight and will eventually come
610 push @{$self->{tile_cb}{$tile}}, sub {
611 delete $self->{delay}{$tile};
612 $_[0]->upload;
613 };
614 }
615 }
616
617 if ($delay) {
618 # delay the map drawing a tiny bit in the hope of getting the missing fetched
619 Event->timer (after => 0.03, cb => sub {
620 $_[0]->w->cancel;
621 $self->{map_widget}->update
622 if $self->{map_widget};
623 });
624 } else {
525 $self->{map_widget}->update; 625 $self->{map_widget}->update;
626 }
526} 627}
527 628
528sub magicmap { 629sub magicmap {
529 my ($self, $w, $h, $x, $y, $data) = @_; 630 my ($self, $w, $h, $x, $y, $data) = @_;
530 631
… …
537 my $map_info = delete $self->{map_info} 638 my $map_info = delete $self->{map_info}
538 or return; 639 or return;
539 640
540 my ($hash, $x, $y, $w, $h) = @$map_info; 641 my ($hash, $x, $y, $w, $h) = @$map_info;
541 642
542 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 643 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
644 $self->{map_cache_new}{$hash} = \$data;
543 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 645 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
544 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
545} 646}
546 647
547sub map_clear { 648sub map_clear {
548 my ($self) = @_; 649 my ($self) = @_;
549 650
… …
555} 656}
556 657
557sub bg_fetch { 658sub bg_fetch {
558 my ($self) = @_; 659 my ($self) = @_;
559 660
560 my $id; 661 my $tile;
561 662
562 do { 663 do {
563 $id = pop @{$self->{bg_fetch}} 664 $tile = pop @{$self->{bg_fetch}}
564 or return; 665 or return;
565 } while $self->{texture}[$id]; 666 } while $self->{texture}[$tile];
566 667
567 CFPlus::DB::get tilecache => $id, sub { 668 CFPlus::DB::get tilecache => $tile, sub {
568 my ($data) = @_; 669 my ($data) = @_;
569 670
570 return unless $self->{map}; # stop when destroyed 671 return unless $self->{map}; # stop when destroyed
571 672
572 $self->set_texture ($id => $data)
573 if defined $data; 673 if (defined $data) {
674 $self->have_tile ($tile, $data);
675 $self->{texture}[$tile]->upload;
676 }
574 677
575 $self->bg_fetch; 678 $self->bg_fetch;
576 }; 679 };
577} 680}
578 681
579sub load_map($$$) { 682sub load_map($$$) {
580 my ($self, $hash, $x, $y) = @_; 683 my ($self, $hash, $x, $y) = @_;
581 684
582 my $gen = $self->{map_change_gen}; 685 my $gen = $self->{map_change_gen};
583 686
584 CFPlus::DB::get $self->{mapcache} => $hash, sub { 687 my $cb = sub {
585 return unless $gen == $self->{map_change_gen}; 688 return unless $gen == $self->{map_change_gen};
586 689
587 my ($data) = @_; 690 my ($data) = @_;
588 691
589 if (defined $data) { 692 if (defined $data) {
693 $self->{map_cache_new}{$hash} = \$data;
694
590 $data = Compress::LZF::decompress $data; 695 my $data = Compress::LZF::decompress $data;
591 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
592 696
593 my $inprogress = @{ $self->{bg_fetch} || [] }; 697 my $inprogress = @{ $self->{bg_fetch} || [] };
594 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 698 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
595 $self->bg_fetch unless $inprogress; 699 $self->bg_fetch unless $inprogress;
596 } 700 }
597 }; 701 };
702
703 if (my $rdata = $self->{map_cache_old}{$hash}) {
704 $cb->($$rdata);
705 } else {
706 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
707 }
598} 708}
599 709
600# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 710# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
601# (server resource,s latency, bandwidth), so this hack is warranted. 711# (server resource,s latency, bandwidth), so this hack is warranted.
602# the right fix is to make real tiled maps with an overview file 712# the right fix is to make real tiled maps with an overview file
… …
695 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 805 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
696 806
697 $self->flush_map; 807 $self->flush_map;
698 808
699 ++$self->{map_change_gen}; 809 ++$self->{map_change_gen};
810 $self->{map_cache_old} = delete $self->{map_cache_new};
700 811
701 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 812 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
702 813
703 my $mapmapw = $self->{mapmap}->{w}; 814 my $mapmapw = $self->{mapmap}->{w};
704 my $mapmaph = $self->{mapmap}->{h}; 815 my $mapmaph = $self->{mapmap}->{h};
… …
726 my ($self, $facenum, $face, $cb) = @_; 837 my ($self, $facenum, $face, $cb) = @_;
727 838
728 if ($face->{type} == 0) { # FT_FACE 839 if ($face->{type} == 0) { # FT_FACE
729 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 840 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
730 841
731 $face->{id} = $id; 842 $face->{id} = $id;
732 $self->{faceid}[$facenum] = $id;
733
734 $self->{map}->set_tileid ($facenum => $id); 843 $self->{map}->set_tileid ($facenum => $id);
735 844
736 CFPlus::DB::get tilecache => $id, $cb; 845 CFPlus::DB::get tilecache => $id, $cb;
737 846
738 } elsif ($face->{type} & 1) { # with metadata 847 } elsif ($face->{type} & 1) { # with metadata
739 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
740 CFPlus::DB::get "res-metadata" => $face->{name}, $cb; 848 CFPlus::DB::get res_meta => $face->{name}, $cb;
849
850 } else { # no metadata
851 CFPlus::DB::get res_data => $face->{name}, $cb;
741 } 852 }
742} 853}
743 854
744sub face_update { 855sub face_update {
745 my ($self, $facenum, $face, $changed) = @_; 856 my ($self, $facenum, $face, $changed) = @_;
746 857
747 if ($face->{type} == 0) { # FT_FACE 858 if ($face->{type} == 0) {
859 # image, FT_FACE
748 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 860 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
749 if $changed; 861 if $changed;
750 862
751 $self->set_texture ($face->{id} => delete $face->{data}); 863 $self->have_tile ($face->{id}, delete $face->{data});
752 864
753 } elsif ($face->{type} & 1) { # split metadata 865 } elsif ($face->{type} & 1) {
754 my $cb = sub { }; 866 # split metadata case, FT_MUSIC, FT_SOUND
867 if ($changed) { # new data
868 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
869 $face->{data} = $meta;
870
871 # rely on strict ordering here and also on later fetch
872 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
873 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
874 }
875
876 $face->{data} = $self->{json_coder}->decode ($face->{data});
877 ::add_license ($face);
878 ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
879 if $changed;
755 880
756 if ($face->{type} == 3) { # FT_MUSIC 881 if ($face->{type} == 3) { # FT_MUSIC
757 $cb = sub { 882 &::audio_music_push ($facenum);
758 $self->{music_meta}{$facenum} = $face; 883 } elsif ($face->{type} == 5) { # FT_SOUND
759 884 &::audio_sound_push ($facenum);
760 ::message ({ markup => "downloaded song #$facenum" })
761 if $changed;
762
763 &::audio_music_set ($self->{songs});
764 }; 885 }
765 }
766 886
767 my $path = CFPlus::DB::path_of_res $face->{name};
768
769 if ($changed) { # new data
770 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
771
772 CFPlus::DB::write_file $path, $data, sub {
773 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
774 $face->{meta} = $self->{json_coder}->decode ($meta_json);
775 $face->{path} = $path;
776
777 $cb->();
778 };
779 };
780 } else { 887 } else {
781 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 888 # flat resource case, FT_RSRC
782 $face->{path} = $path; 889 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
783 $cb->(); 890 if $changed;
784 } 891 }
892
893 if (my $cbs = $self->{face_cb}{$facenum}) {
894 $_->($face, $changed) for @$cbs;
785 } 895 }
786} 896}
787 897
788sub smooth_update { 898sub smooth_update {
789 my ($self, $facenum, $face) = @_; 899 my ($self, $facenum, $face) = @_;
790 900
791 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 901 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
792} 902}
793 903
794sub set_texture { 904sub have_tile {
795 my ($self, $id, $data) = @_; 905 my ($self, $tile, $data) = @_;
796 906
797 return unless $self->{map}; 907 return unless $self->{map};
798 908
799 $self->{texture}[$id] = my $tex = 909 my $tex = $self->{texture}[$tile] ||=
800 new_from_image CFPlus::Texture 910 new CFPlus::Texture
911 tile => $tile,
912 image => $data, delete_image => 1,
801 $data, minify => 1, mipmap => 1; 913 minify => 1, mipmap => 1;
802 914
803 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 915 if (my $cbs = delete $self->{tile_cb}{$tile}) {
804 $self->{map_widget}->update; 916 $_->($tex) for @$cbs;
805 917 }
806 $_->() for @{(delete $self->{face_cb}{$id}) || []};
807} 918}
808 919
809sub connect_face_update { 920# call in non-void context registers a temporary
921# hook with handle, otherwise its permanent
922sub on_face_change {
810 my ($self, $id, $cb) = @_; 923 my ($self, $num, $cb) = @_;
811 924
812 push @{$self->{face_cb}{$id}}, $cb; 925 push @{$self->{face_cb}{$num}}, $cb;
813 926
927 defined wantarray
814 CFPlus::guard { 928 ? CFPlus::guard {
815 @{$self->{face_cb}{$id}} 929 @{$self->{face_cb}{$num}}
816 = grep $_ != $cb, 930 = grep $_ != $cb,
817 @{$self->{face_cb}{$id}}; 931 @{$self->{face_cb}{$num}};
818 } 932 }
933 : ()
934}
935
936# call in non-void context registers a temporary
937# hook with handle, otherwise its permanent
938sub register_face_handler {
939 my ($self, $num, $cb) = @_;
940
941 return unless $num;
942
943 # invoke if available right now
944 $cb->($self->{face}[$num], 0)
945 unless exists $self->{face}[$num]{loading};
946
947 # future changes
948 $self->on_face_change ($num => $cb)
819} 949}
820 950
821sub sound_play { 951sub sound_play {
822 my ($self, $x, $y, $soundnum, $type) = @_; 952 my ($self, $type, $face, $dx, $dy, $vol) = @_;
823 warn "sound play <@_>\n";#d#
824 953
825 #$self->{sound_play}->($x, $y, $soundnum, $type); 954 &::audio_sound_play ($face, $dx, $dy, $vol)
955 unless $type & 1; # odd types are silent for future expansion
826} 956}
827 957
828my $LAST_QUERY; # server is stupid, stupid, stupid 958my $LAST_QUERY; # server is stupid, stupid, stupid
829 959
830sub query { 960sub query {
… …
838 968
839sub sanitise_xml($) { 969sub sanitise_xml($) {
840 local $_ = shift; 970 local $_ = shift;
841 971
842 # we now weed out all tags we do not support 972 # we now weed out all tags we do not support
843 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 973 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
974 }{
975 "&lt;"
976 }gex;
977
844 # now all entities 978 # now all entities
845 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 979 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
846 980
847 # handle some elements 981 # handle some elements
848 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 982 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
… …
895 $self->{$type} = $text; 1029 $self->{$type} = $text;
896 } else { 1030 } else {
897 $self->logprint ("msg: ", $text); 1031 $self->logprint ("msg: ", $text);
898 return if $color < 0; # negative color == ignore if not understood 1032 return if $color < 0; # negative color == ignore if not understood
899 1033
900 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; 1034 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
901 1035
902 ## try to create single paragraphs of multiple lines sent by the server 1036 ## try to create single paragraphs of multiple lines sent by the server
903 # no longer neecssary with TRT servers 1037 # no longer neecssary with TRT servers
904 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1038 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
905 1039
906 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
907 for split /\n/, $text; 1040 for (split /\n/, $text) {
1041 ::message ({
1042 fg => $fg,
1043 markup => $_,
1044 type => $type,
1045 extra => [@extra],
1046 color_flags => $color, #d# ugly, kill
1047 });
1048
1049 $color &= ~NDI_CLEAR; # only clear once for multiline messages
1050 # actually, this is an ugly design. _we_ should control the channels,
1051 # not some random other widget, as the channels are clearly protocol-specific.
1052 # then we could also react to flags such as CLEAR without resorting to
1053 # hacks such as color_flags, above.
1054 }
908 1055
909 $self->{statusbox}->add ($text, 1056 $self->{statusbox}->add ($text,
910 group => $text, 1057 group => $text,
911 fg => $fg, 1058 fg => $fg,
912 timeout => $color >= 2 ? 180 : 10, 1059 timeout => $color >= 2 ? 180 : 10,
913 tooltip_font => $::FONT_FIXED, 1060 tooltip_font => $::FONT_FIXED,
914 ); 1061 ) if $type eq "info";
915 } 1062 }
916} 1063}
917 1064
918sub spell_add { 1065sub spell_add {
919 my ($self, $spell) = @_; 1066 my ($self, $spell) = @_;
… …
968 $self->{map_widget}->clr_commands; 1115 $self->{map_widget}->clr_commands;
969 1116
970 ::stop_game (); 1117 ::stop_game ();
971} 1118}
972 1119
973sub image_info {
974 my ($self, $numfaces) = @_;
975
976 $self->{num_faces} = $numfaces;
977 $self->{face_prefetch} = [1 .. $numfaces];
978 $self->face_prefetch;
979}
980
981sub face_prefetch {
982 my ($self) = @_;
983
984 return unless $::CFG->{face_prefetch};
985
986 if ($self->{num_faces}) {
987 return if @{ $self->{send_queue} || [] };
988 my $todo = @{ $self->{face_prefetch} }
989 or return;
990
991 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
992
993 $self->send ("requestinfo image_sums $face $face");
994
995 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
996 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
997 } elsif (!exists $self->{num_faces}) {
998 $self->send ("requestinfo image_info");
999
1000 $self->{num_faces} = 0;
1001
1002 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
1003 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
1004 }
1005}
1006
1007sub update_floorbox { 1120sub update_floorbox {
1008 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1121 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1009 return unless $::CONN; 1122 return unless $::CONN;
1010 1123
1011 $::FLOORBOX->clear; 1124 $::FLOORBOX->clear;
… …
1040 } 1153 }
1041 1154
1042 $::FLOORBOX->add_at (@add); 1155 $::FLOORBOX->add_at (@add);
1043 }); 1156 });
1044 1157
1045 $::WANT_REFRESH++; 1158 $::WANT_REFRESH->start;
1046} 1159}
1047 1160
1048sub set_opencont { 1161sub set_opencont {
1049 my ($conn, $tag, $name) = @_; 1162 my ($conn, $tag, $name) = @_;
1050 $conn->{open_container} = $tag; 1163 $conn->{open_container} = $tag;
1051 update_floorbox; 1164 update_floorbox;
1052 1165
1053 $::INV_RIGHT_HB->clear (); 1166 $::INVR_HB->clear ();
1054 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1167 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1055 1168
1056 if ($tag != 0) { # Floor isn't closable, is it? 1169 if ($tag != 0) { # Floor isn't closable, is it?
1057 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1170 $::INVR_HB->add (new CFPlus::UI::Button
1058 text => "Close container", 1171 text => "Close container",
1059 tooltip => "Close the currently open container (if one is open)", 1172 tooltip => "Close the currently open container (if one is open)",
1060 on_activate => sub { 1173 on_activate => sub {
1061 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1174 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1062 if $tag != 0; 1175 if $tag != 0;
1063 #if $CONN->{open_container} != 0;
1064 0 1176 0
1065 }, 1177 },
1066 ); 1178 );
1067 } 1179 }
1068 1180

Diff Legend

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