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.113 by root, Thu Jul 12 17:56:51 2007 UTC vs.
Revision 1.156 by root, Tue Aug 21 00:59:34 2007 UTC

… …
21 21
22 my $self = $class->SUPER::new (%arg, 22 my $self = $class->SUPER::new (%arg,
23 setup_req => { 23 setup_req => {
24 extmap => 1, 24 extmap => 1,
25 excmd => 1, 25 excmd => 1,
26 ywidget => 1, 26 xwidget1 => 1,#d#
27 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
28 }, 28 },
29 ); 29 );
30 30
31 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
48 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
49 @args 49 @args
50 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
52 52
53 $self->connect_ext (event_music => sub { 53 $self->connect_ext (ambient_music => sub {
54 my ($ev) = @_; 54 my ($songs) = @_;
55 55 &::audio_music_set_ambient ($songs);
56 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev->{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 my $pri = -100;
63 for my $face (@$faces) {
64 if (defined (my $chksum = $ev->{chksum}{$face})) {
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 ::message ({ markup => "starting to download song #$face, check your output-rate setting if your connection gets laggy." });
71 $self->ask_face ($face, $pri, undef, sub {
72 my $num = $_[0];
73 my $len = length $_[1];
74 my ($meta, $data) = unpack "(w/a*)*", $_[1];
75
76 CFPlus::DB::write_file $chksum, $data, sub { };
77 CFPlus::DB::put resmap => $chksum => $meta, sub { };
78
79 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
80 ::message ({ markup => "downloaded song #$face, size $len octets" });
81
82 &::audio_music_set ($self->{songs});
83 });
84 }
85
86 push @songs, $self->{music_map}{$face};
87 --$pri;
88 }
89
90 &::audio_music_set ($self->{songs} = \@songs);
91 }); 56 });
92 57
93 $self->connect_ext (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
94 my ($cap) = @_; 59 my (%cap) = @_;
95 60
61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want;
63
64 $self->send_exti_req (resource => "exp_table", sub {
65 my ($exp_table) = @_;
66
67 $self->register_face_handler ($exp_table, sub {
68 my ($face) = @_;
69
70 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
71
72 #TODO: update all interested parties
73 });
74
75 ()
76 });
77
96 if (my $ts = $cap->{tileset}) { 78 if (my $ts = $cap{tileset}) {
97 if (my ($default) = grep $_->[2] & 1, @$ts) { 79 if (my ($default) = grep $_->[2] & 1, @$ts) {
98 $self->{tileset} = $default; 80 $self->{tileset} = $default;
99 $self->{tilesize} = $default->[3]; 81 $self->{tilesize} = $default->[3];
100 $self->setup_req (tileset => $default->[0]); 82 $self->setup_req (tileset => $default->[0]);
101 83
… …
107 } 89 }
108 }); 90 });
109 91
110 $self->{json_coder} 92 $self->{json_coder}
111 ->convert_blessed 93 ->convert_blessed
112 ->filter_json_single_key_object (__widget_ref__ => sub { 94 ->filter_json_single_key_object (__w_ => sub {
113 $self->{widget}{$_[0]} 95 $self->{widget}{$_[0]}
114 }); 96 });
115 97
98 # widgetset new
116 $self->connect_ext (ws_n => sub { 99 $self->connect_ext (ws_n => sub {
117 my ($arg) = @_; 100 my ($id) = @_;
118 101
119 $self->{widgetset}{$arg{id}} = { 102 $self->{widgetset}{$id} = {
120 w => {}, 103 w => {},
121 }; 104 };
122 }); 105 });
123 106
107 # widgetset destroy
124 $self->connect_ext (ws_d => sub { 108 $self->connect_ext (ws_d => sub {
125 my ($arg) = @_; 109 my ($id) = @_;
126 110
127 my $ws = delete $self->{widgetset}{$arg{id}} 111 my $ws = delete $self->{widgetset}{$id}
128 or return; 112 or return;
129 113
130 $_->destroy 114 $_->destroy
131 for values %{$ws->{w}}; 115 for values %{$ws->{w}};
132 }); 116 });
133 117
118 # widgetset create
134 $self->connect_ext (ws_c => sub { 119 $self->connect_ext (ws_c => sub {
135 my ($arg) = @_; 120 my ($ws, $id, $class, $args) = @_;
136
137 my $args = $arg->{args} || {};
138 121
139 for my $ev (grep /^on_/, keys %$args) { 122 for my $ev (grep /^on_/, keys %$args) {
123 my $rid = $args->{$ev};
140 $args->{$ev} = sub { 124 $args->{$ev} = sub {
141 my $id = shift->{s_id}; 125 my $id = shift->{s_id};
142 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 126 $self->send_exti_msg (w_e => $id, $rid, @_);
143 127
144 1 128 1
145 }; 129 };
146 } 130 }
147 131
148 if (my $widget = eval { 132 $self->widget_associate (
133 $ws, $id => scalar eval {
149 local $SIG{__DIE__}; 134 local $SIG{__DIE__};
150 "CFPlus::UI::$arg->{class}"->new ( 135 "CFPlus::UI::$class"->new (%$args)
151 %$args,
152 s_ws => $arg->{ws},
153 s_id => $arg->{id},
154 )
155 } 136 }
137 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
138 });
139
140 # widgetset associate
141 $self->connect_ext (ws_a => sub {
142 my (%ass) = @_;
143
144 # everything that has a name, wether conceivably useful or not
145 my %wkw = (
146 root => $CFPlus::UI::ROOT,
147 tooltip => $CFPlus::UI::TOOLTIP,
148
149 mapwidget => $::MAPWIDGET,
150 buttonbar => $::BUTTONBAR,
151 metaserver => $::METASERVER,
152 buttonbar => $::BUTTONBAR,
153 login_button => $::LOGIN_BUTTON,
154 quit_dialog => $::QUIT_DIALOG,
155 host_entry => $::HOST_ENTRY,
156 metaserver => $::METASERVER,
157 server_info => $::SERVER_INFO,
158
159 setup_dialog => $::SETUP_DIALOG,
160 setup_notebook => $::SETUP_NOTEBOOK,
161 setup_server => $::SETUP_SERVER,
162 setup_keyboard => $::SETUP_KEYBOARD,
163
164 pl_notebook => $::PL_NOTEBOOK,
165 pl_window => $::PL_WINDOW,
166 inventory_page => $::INVENTORY_PAGE,
167 stats_page => $::STATS_PAGE,
168 skill_page => $::SKILL_PAGE,
169 spell_page => $::SPELL_PAGE,
170 spell_list => $::SPELL_LIST,
171
172 floorbox => $::FLOORBOX,
173 help_window => $::HELP_WINDOW,
174 message_window => $::MESSAGE_WINDOW,
175 statusbox => $::SDTATUSBOX,
176
177 inv => $::INV,
178 invr => $::INVR,
179 invr_hb => $::INVR_HB,
180
156 ) { 181 );
182
183 while (my ($id, $name) = each %ass) {
184 $self->widget_associate (undef, $id => $wkw{$name})
185 or warn "server failed to associate non-existent well-known widget $name\n";
186 }
187 });
188
189 # widget call
190 $self->connect_ext (w_c => sub {
191 my ($id, $rid, $method, @args) = @_;
192
157 $self->{widget}{$arg->{id}} 193 my $w = $self->{widget}{$id}
158 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 194 or return;
159 = $widget;
160 195
161 $widget->connect (on_destroy => sub { 196 if ($rid) {
162 my ($widget) = @_; 197 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
163
164 delete $self->{widget}{$widget->{s_id}};
165 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
166 });
167 } else { 198 } else {
168 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 199 $w->$method (@args);
169 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
170 } 200 }
171 }); 201 });
172 202
203 # widget set
173 $self->connect_ext (w_c => sub { 204 $self->connect_ext (w_s => sub {
174 my ($arg) = @_; 205 my ($id, $attr) = @_;
175 206
176 my $w = $self->{widget}{$arg->{id}} 207 my $w = $self->{widget}{$id}
177 or return; 208 or return;
178 my $m = $arg->{name};
179 209
180 my $a = $arg->{args} || []; 210 for (my $i = 0; $i < $#$attr; $i += 2) {
181 211 my ($member, $value) = @$attr[$i, $i+1];
182 if (exists $arg->{rid}) { 212 if (defined $value) {
183 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); 213 $w->{$member} = $value;
184 } else { 214 } else {
185 $w->$m (@$a); 215 delete $w->{$member};
186 } 216 }
217 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
218 }
187 }); 219 });
188 220
221 # widget get
189 $self->connect_ext (w_s => sub { 222 $self->connect_ext (w_g => sub {
190 my ($arg) = @_; 223 my ($id, $rid, $attr) = @_;
191 224
192 my $w = $self->{widget}{$arg->{id}} 225 my $w = $self->{widget}{$id}
193 or return; 226 or return;
194 227
195 $w->{$arg->{name}} = $arg->{value}; 228 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
196 }); 229 });
197 230
231 # message window
198 $self->connect_ext (w_g => sub { 232 $self->connect_ext (channel_info => sub {
199 my ($arg) = @_; 233 my ($info) = @_;
200 234 $self->{channels}->{$info->{id}} = $info;
201 my $w = $self->{widget}{$arg->{id}} 235 $::MESSAGE_WINDOW->add_channel ($info);
202 or return;
203
204 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
205 }); 236 });
206 237
238 # destroy widgets on logout
207 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 239 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
208 for my $ws (values %{delete $self->{widgetset} || {}}) { 240 for my $ws (values %{delete $self->{widgetset} || {}}) {
209 $_->destroy 241 $_->destroy
210 for values %{delete $ws->{w} || {}}; 242 for values %{delete $ws->{w} || {}};
211 } 243 }
… …
232 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 264 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
233 265
234 $self 266 $self
235} 267}
236 268
269sub widget_associate {
270 my ($self, $ws, $id, $widget) = @_;
271
272 if ($widget) {
273 $widget->{s_id} = $id;
274 $self->{widget}{$id} = $widget;
275
276 if ($ws) {
277 $widget->{s_ws} = $ws;
278 $self->{widgetset}{$ws}{w}{$id} = $widget;
279 }
280
281 $widget->connect (on_destroy => sub {
282 my ($widget) = @_;
283
284 delete $self->{widget}{$widget->{s_id}};
285 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
286 if exists $widget->{s_ws};
287 });
288
289 1
290 } else {
291 $self->send_exti_msg (w_e => $id, undef);
292
293 0
294 }
295}
296
297sub update_fx_want {
298 my ($self) = @_;
299
300 $self->send_exti_msg (fx_want => {
301 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
302 5 => !!$::CFG->{audio_enable}, # FT_SOUND
303 6 => 1, # FT_RSRC
304 });
305}
306
237sub logprint { 307sub logprint {
238 my ($self, @a) = @_; 308 my ($self, @a) = @_;
239 309
240 $self->{log_fh} ||= do { 310 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
241 my $path = "$Crossfire::VARDIR/log.$self->{host}";
242
243 open my $fh, ">>:utf8", $path
244 or die "Couldn't open logfile $path: $!";
245
246 $fh->autoflush (1);
247
248 $fh;
249 };
250
251 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
252
253 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
254 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
255
256 print {$self->{log_fh}} "$ts ", @a, "\n";
257} 311}
258 312
259sub _stat_numdiff { 313sub _stat_numdiff {
260 my ($self, $name, $old, $new) = @_; 314 my ($self, $name, $old, $new) = @_;
261 315
… …
424 my @skills = keys %{ $self->{skill_info} }; 478 my @skills = keys %{ $self->{skill_info} };
425 479
426 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 480 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
427 $sktbl->clear; 481 $sktbl->clear;
428 482
483 my @add;
484
485 push @add,
429 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 486 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
430 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 487 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
431 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 488 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
432 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 489 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
433 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 490 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
434 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 491 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
492 ;
435 493
436 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>";
437 495
438 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);
439 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);
… …
467 } 525 }
468 526
469 1 527 1
470 }; 528 };
471 529
530 push @add,
472 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 531 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
473 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 532 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
474 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 533 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
475 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 534 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
476 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 535 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
477 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 536 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
537 ;
478 538
479 $x++ and ($x, $y) = (0, $y + 1); 539 $x++ and ($x, $y) = (0, $y + 1);
480 } 540 }
541
542 $sktbl->add_at (@add);
481 } 543 }
482 544
483 for (grep exists $stats->{$_}, @skills) { 545 for (grep exists $stats->{$_}, @skills) {
484 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 546 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
485 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 547 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
518} 580}
519 581
520sub feed_map1a { 582sub feed_map1a {
521 my ($self, $data) = @_; 583 my ($self, $data) = @_;
522 584
523 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 585 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
586 my $delay;
587
588 for my $tile (@$missing) {
589 next if $self->{delay}{$tile};
590
591 $delay = 1;
592
593 if (my $tex = $::CONN->{texture}[$tile]) {
594 $tex->upload;
595 } else {
596 $self->{delay}{$tile} = 1;
597
598 # we assume the face is in-flight and will eventually come
599 push @{$self->{tile_cb}{$tile}}, sub {
600 delete $self->{delay}{$tile};
601 $_[0]->upload;
602 };
603 }
604 }
605
606 if ($delay) {
607 # delay the map drawing a tiny bit in the hope of getting the missing fetched
608 Event->timer (after => 0.03, cb => sub {
609 $_[0]->w->cancel;
610 $self->{map_widget}->update;
611 });
612 } else {
524 $self->{map_widget}->update; 613 $self->{map_widget}->update;
614 }
525} 615}
526 616
527sub magicmap { 617sub magicmap {
528 my ($self, $w, $h, $x, $y, $data) = @_; 618 my ($self, $w, $h, $x, $y, $data) = @_;
529 619
… …
536 my $map_info = delete $self->{map_info} 626 my $map_info = delete $self->{map_info}
537 or return; 627 or return;
538 628
539 my ($hash, $x, $y, $w, $h) = @$map_info; 629 my ($hash, $x, $y, $w, $h) = @$map_info;
540 630
541 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 631 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
632 $self->{map_cache_new}{$hash} = \$data;
542 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 633 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
543 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
544} 634}
545 635
546sub map_clear { 636sub map_clear {
547 my ($self) = @_; 637 my ($self) = @_;
548 638
… …
554} 644}
555 645
556sub bg_fetch { 646sub bg_fetch {
557 my ($self) = @_; 647 my ($self) = @_;
558 648
559 my $id; 649 my $tile;
560 650
561 do { 651 do {
562 $id = pop @{$self->{bg_fetch}} 652 $tile = pop @{$self->{bg_fetch}}
563 or return; 653 or return;
564 } while $self->{texture}[$id]; 654 } while $self->{texture}[$tile];
565 655
566 CFPlus::DB::get tilecache => $id, sub { 656 CFPlus::DB::get tilecache => $tile, sub {
567 my ($data) = @_; 657 my ($data) = @_;
568 658
569 return unless $self->{map}; # stop when destroyed 659 return unless $self->{map}; # stop when destroyed
570 660
571 $self->set_texture ($id => $data)
572 if defined $data; 661 if (defined $data) {
662 $self->have_tile ($tile, $data);
663 $self->{texture}[$tile]->upload;
664 }
573 665
574 $self->bg_fetch; 666 $self->bg_fetch;
575 }; 667 };
576} 668}
577 669
578sub load_map($$$) { 670sub load_map($$$) {
579 my ($self, $hash, $x, $y) = @_; 671 my ($self, $hash, $x, $y) = @_;
580 672
581 my $gen = $self->{map_change_gen}; 673 my $gen = $self->{map_change_gen};
582 674
583 CFPlus::DB::get $self->{mapcache} => $hash, sub { 675 my $cb = sub {
584 return unless $gen == $self->{map_change_gen}; 676 return unless $gen == $self->{map_change_gen};
585 677
586 my ($data) = @_; 678 my ($data) = @_;
587 679
588 if (defined $data) { 680 if (defined $data) {
681 $self->{map_cache_new}{$hash} = \$data;
682
589 $data = Compress::LZF::decompress $data; 683 my $data = Compress::LZF::decompress $data;
590 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
591 684
592 my $inprogress = @{ $self->{bg_fetch} || [] }; 685 my $inprogress = @{ $self->{bg_fetch} || [] };
593 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 686 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
594 $self->bg_fetch unless $inprogress; 687 $self->bg_fetch unless $inprogress;
595 } 688 }
596 }; 689 };
690
691 if (my $rdata = $self->{map_cache_old}{$hash}) {
692 $cb->($$rdata);
693 } else {
694 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
695 }
597} 696}
598 697
599# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 698# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
600# (server resource,s latency, bandwidth), so this hack is warranted. 699# (server resource,s latency, bandwidth), so this hack is warranted.
601# the right fix is to make real tiled maps with an overview file 700# the right fix is to make real tiled maps with an overview file
… …
694 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 793 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
695 794
696 $self->flush_map; 795 $self->flush_map;
697 796
698 ++$self->{map_change_gen}; 797 ++$self->{map_change_gen};
798 $self->{map_cache_old} = delete $self->{map_cache_new};
699 799
700 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 800 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
701 801
702 my $mapmapw = $self->{mapmap}->{w}; 802 my $mapmapw = $self->{mapmap}->{w};
703 my $mapmaph = $self->{mapmap}->{h}; 803 my $mapmaph = $self->{mapmap}->{h};
… …
722} 822}
723 823
724sub face_find { 824sub face_find {
725 my ($self, $facenum, $face, $cb) = @_; 825 my ($self, $facenum, $face, $cb) = @_;
726 826
727 my $hash = "$face->{chksum},$face->{name}"; 827 if ($face->{type} == 0) { # FT_FACE
728
729 my $id = CFPlus::DB::get_tile_id_sync $hash; 828 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
730 829
731 $face->{id} = $id; 830 $face->{id} = $id;
732 $self->{faceid}[$facenum] = $id;
733
734 $self->{map}->set_tileid ($facenum => $id); 831 $self->{map}->set_tileid ($facenum => $id);
735 832
736 CFPlus::DB::get tilecache => $id, $cb; 833 CFPlus::DB::get tilecache => $id, $cb;
834
835 } elsif ($face->{type} & 1) { # with metadata
836 CFPlus::DB::get res_meta => $face->{name}, $cb;
837
838 } else { # no metadata
839 CFPlus::DB::get res_data => $face->{name}, $cb;
840 }
737} 841}
738 842
739sub face_update { 843sub face_update {
740 my ($self, $facenum, $face, $changed) = @_; 844 my ($self, $facenum, $face, $changed) = @_;
741 845
846 if ($face->{type} == 0) {
847 # image, FT_FACE
742 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 848 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
743 if $changed; 849 if $changed;
744 850
745 $self->set_texture ($face->{id} => delete $face->{image}); 851 $self->have_tile ($face->{id}, delete $face->{data});
852
853 } elsif ($face->{type} & 1) {
854 # split metadata case, FT_MUSIC, FT_SOUND
855 if ($changed) { # new data
856 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
857 $face->{data} = $meta;
858
859 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
860 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
861 }
862
863 $face->{data} = $self->{json_coder}->decode ($face->{data});
864
865 ::add_license ($face);
866
867 if ($face->{type} == 3) { # FT_MUSIC
868 ::message ({ markup => "downloaded song #$facenum" })
869 if $changed;
870
871 &::audio_music_push ($facenum);
872 } elsif ($face->{type} == 5) { # FT_SOUND
873 ::message ({ markup => "downloaded sound #$facenum" })
874 if $changed;
875
876 &::audio_sound_push ($facenum);
877 }
878
879 } else {
880 # flat resource case, FT_RSRC
881 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
882 if $changed;
883 }
884
885 if (my $cbs = $self->{face_cb}{$facenum}) {
886 $_->($face, $changed) for @$cbs;
887 }
746} 888}
747 889
748sub smooth_update { 890sub smooth_update {
749 my ($self, $facenum, $face) = @_; 891 my ($self, $facenum, $face) = @_;
750 892
751 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 893 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
752} 894}
753 895
754sub set_texture { 896sub have_tile {
755 my ($self, $id, $data) = @_; 897 my ($self, $tile, $data) = @_;
756 898
757 $self->{texture}[$id] = my $tex = 899 return unless $self->{map};
900
901 my $tex = $self->{texture}[$tile] ||=
758 new_from_image CFPlus::Texture 902 new CFPlus::Texture
903 tile => $tile,
904 image => $data, delete_image => 1,
759 $data, minify => 1, mipmap => 1; 905 minify => 1, mipmap => 1;
760 906
761 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 907 if (my $cbs = delete $self->{tile_cb}{$tile}) {
762 $self->{map_widget}->update; 908 $_->($tex) for @$cbs;
909 }
910}
911
912# call in non-void context registers a temporary
913# hook with handle, otherwise its permanent
914sub on_face_change {
915 my ($self, $num, $cb) = @_;
916
917 push @{$self->{face_cb}{$num}}, $cb;
918
919 defined wantarray
920 ? CFPlus::guard {
921 @{$self->{face_cb}{$num}}
922 = grep $_ != $cb,
923 @{$self->{face_cb}{$num}};
924 }
925 : ()
926}
927
928# call in non-void context registers a temporary
929# hook with handle, otherwise its permanent
930sub register_face_handler {
931 my ($self, $num, $cb) = @_;
932
933 # invoke if available right now
934 $cb->($self->{face}[$num], 0)
935 unless exists $self->{face}[$num]{loading};
936
937 # future changes
938 $self->on_face_change ($num => $cb)
763} 939}
764 940
765sub sound_play { 941sub sound_play {
766 my ($self, $x, $y, $soundnum, $type) = @_; 942 my ($self, $type, $face, $dx, $dy, $vol) = @_;
767 943
768 $self->{sound_play}->($x, $y, $soundnum, $type); 944 &::audio_sound_play ($face, $dx, $dy, $vol)
945 unless $type & 1; # odd types are silent for future expansion
769} 946}
770 947
771my $LAST_QUERY; # server is stupid, stupid, stupid 948my $LAST_QUERY; # server is stupid, stupid, stupid
772 949
773sub query { 950sub query {
… …
838 $self->{$type} = $text; 1015 $self->{$type} = $text;
839 } else { 1016 } else {
840 $self->logprint ("msg: ", $text); 1017 $self->logprint ("msg: ", $text);
841 return if $color < 0; # negative color == ignore if not understood 1018 return if $color < 0; # negative color == ignore if not understood
842 1019
843 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1020 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
844 1021
845 ## try to create single paragraphs of multiple lines sent by the server 1022 ## try to create single paragraphs of multiple lines sent by the server
846 # no longer neecssary with TRT servers 1023 # no longer neecssary with TRT servers
847 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1024 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
848 1025
849 ::message ({ fg => $fg, markup => $_ }) 1026 ::message ({
1027 fg => $fg,
1028 markup => $_,
1029 type => $type,
1030 extra => [@extra],
1031 color_flags => $color
850 for split /\n/, $text; 1032 }) for split /\n/, $text;
851 1033
852 $self->{statusbox}->add ($text, 1034 $self->{statusbox}->add ($text,
853 group => $text, 1035 group => $text,
854 fg => $fg, 1036 fg => $fg,
855 timeout => $color >= 2 ? 180 : 10, 1037 timeout => $color >= 2 ? 180 : 10,
… …
911 $self->{map_widget}->clr_commands; 1093 $self->{map_widget}->clr_commands;
912 1094
913 ::stop_game (); 1095 ::stop_game ();
914} 1096}
915 1097
916sub image_info {
917 my ($self, $numfaces) = @_;
918
919 $self->{num_faces} = $numfaces;
920 $self->{face_prefetch} = [1 .. $numfaces];
921 $self->face_prefetch;
922}
923
924sub face_prefetch {
925 my ($self) = @_;
926
927 return unless $::CFG->{face_prefetch};
928
929 if ($self->{num_faces}) {
930 return if @{ $self->{send_queue} || [] };
931 my $todo = @{ $self->{face_prefetch} }
932 or return;
933
934 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
935
936 $self->send ("requestinfo image_sums $face $face");
937
938 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
939 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
940 } elsif (!exists $self->{num_faces}) {
941 $self->send ("requestinfo image_info");
942
943 $self->{num_faces} = 0;
944
945 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
946 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
947 }
948}
949
950sub update_floorbox { 1098sub update_floorbox {
951 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1099 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
952 return unless $::CONN; 1100 return unless $::CONN;
953 1101
954 $::FLOORBOX->clear; 1102 $::FLOORBOX->clear;
1103
1104 my @add;
955 1105
956 my $row; 1106 my $row;
957 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1107 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
958 if ($row < 6) { 1108 if ($row < 6) {
959 local $_->{face_widget}; # hack to force recreation of widget 1109 local $_->{face_widget}; # hack to force recreation of widget
960 local $_->{desc_widget}; # hack to force recreation of widget 1110 local $_->{desc_widget}; # hack to force recreation of widget
961 CFPlus::Item::update_widgets $_; 1111 CFPlus::Item::update_widgets $_;
962 1112
1113 push @add,
963 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1114 0, $row, $_->{face_widget},
964 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1115 1, $row, $_->{desc_widget};
965 1116
966 $row++; 1117 $row++;
967 } else { 1118 } else {
968 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1119 push @add, 1, $row, new CFPlus::UI::Button
969 text => "More...", 1120 text => "More...",
970 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1121 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
971 ); 1122 ;
972 last; 1123 last;
973 } 1124 }
974 } 1125 }
975 if ($::CONN->{open_container}) { 1126 if ($::CONN->{open_container}) {
976 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1127 push @add, 1, $row++, new CFPlus::UI::Button
977 text => "Close container", 1128 text => "Close container",
978 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1129 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
979 ); 1130 ;
980 } 1131 }
981 });
982 1132
1133 $::FLOORBOX->add_at (@add);
1134 });
1135
983 $::WANT_REFRESH++; 1136 $::WANT_REFRESH->start;
984} 1137}
985 1138
986sub set_opencont { 1139sub set_opencont {
987 my ($conn, $tag, $name) = @_; 1140 my ($conn, $tag, $name) = @_;
988 $conn->{open_container} = $tag; 1141 $conn->{open_container} = $tag;
989 update_floorbox; 1142 update_floorbox;
990 1143
991 $::INV_RIGHT_HB->clear (); 1144 $::INVR_HB->clear ();
992 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1145 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
993 1146
994 if ($tag != 0) { # Floor isn't closable, is it? 1147 if ($tag != 0) { # Floor isn't closable, is it?
995 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1148 $::INVR_HB->add (new CFPlus::UI::Button
996 text => "Close container", 1149 text => "Close container",
997 tooltip => "Close the currently open container (if one is open)", 1150 tooltip => "Close the currently open container (if one is open)",
998 on_activate => sub { 1151 on_activate => sub {
999 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1152 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1000 if $tag != 0; 1153 if $tag != 0;
1001 #if $CONN->{open_container} != 0;
1002 0 1154 0
1003 }, 1155 },
1004 ); 1156 );
1005 } 1157 }
1006 1158
… …
1105 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1257 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1106 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1258 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1107 . "map size $self->{mapw}×$self->{maph}\n" 1259 . "map size $self->{mapw}×$self->{maph}\n"
1108 ); 1260 );
1109 1261
1110 ::setup_build_button ($self->{editor_support}->{builder_ui});
1111} 1262}
1112 1263
1113sub logged_in { 1264sub logged_in {
1114 my ($self) = @_; 1265 my ($self) = @_;
1115 1266
1116 $self->send_ext_req (cfplus_support => version => 1, sub { 1267 $self->send_ext_req (cfplus_support => version => 2, sub {
1268 my (%msg) = @_;
1269
1117 $self->{cfplus_ext} = $_[0]{version}; 1270 $self->{cfplus_ext} = $msg{version};
1118 $self->update_server_info; 1271 $self->update_server_info;
1119 1272
1120 if ($self->{cfplus_ext} >= 2) { 1273 if ($self->{cfplus_ext} >= 2) {
1121 $self->send_ext_req ("editor_support", sub { 1274 $self->send_ext_req ("editor_support", sub {
1122 $self->{editor_support} = $_[0]; 1275 $self->{editor_support} = { @_ };
1123 $self->update_server_info; 1276 $self->update_server_info;
1124 1277
1125 0 1278 0
1126 }); 1279 });
1127 } 1280 }
… …
1135 $self->send_command ("output-count $::CFG->{output_count}"); 1288 $self->send_command ("output-count $::CFG->{output_count}");
1136 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1289 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1137 $self->send_command ("pickup $::CFG->{pickup}"); 1290 $self->send_command ("pickup $::CFG->{pickup}");
1138} 1291}
1139 1292
1140sub buildat {
1141 my ($self, $builditem, $x, $y) = @_;
1142
1143 if ($self->{cfplus_ext}) {
1144 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1145 }
1146}
1147
1148sub lookat { 1293sub lookat {
1149 my ($self, $x, $y) = @_; 1294 my ($self, $x, $y) = @_;
1150 1295
1151 if ($self->{cfplus_ext}) { 1296 if ($self->{cfplus_ext}) {
1152 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1297 $self->send_ext_req (lookat => $x, $y, sub {
1153 my ($msg) = @_; 1298 my (%msg) = @_;
1154 1299
1155 if (exists $msg->{npc_dialog}) { 1300 if (exists $msg{npc_dialog}) {
1156 # start npc chat dialog 1301 # start npc chat dialog
1157 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1302 $self->{npc_dialog} = new CFPlus::NPCDialog::
1158 dx => $x, 1303 token => $msg{npc_dialog},
1159 dy => $y,
1160 title => "$msg->{npc_dialog} (NPC)", 1304 title => "$msg{npc_dialog}[0] (NPC)",
1161 conn => $self, 1305 conn => $self,
1162 ; 1306 ;
1163 } 1307 }
1164 }); 1308 });
1165 } 1309 }
… …
1230 on_activate => sub { $this->destroy; 1 }, 1374 on_activate => sub { $this->destroy; 1 },
1231 ; 1375 ;
1232 1376
1233 $self->update_options; 1377 $self->update_options;
1234 1378
1235 $self->{id} = $self->{conn}->send_ext_req ( 1379 $self->{id} = "npc-channel-" . $self->{conn}->token;
1236 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1380 $self->{conn}->connect_ext ($self->{id} => sub {
1237 sub { $this && $this->feed (@_) } 1381 $this->feed (@_) if $this;
1238 ); 1382 });
1383
1384 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1239 1385
1240 $self->{entry}->grab_focus; 1386 $self->{entry}->grab_focus;
1241 1387
1242 $self->{textview}->add_paragraph ({ 1388 $self->{textview}->add_paragraph ({
1243 fg => [1, 1, 0, 1], 1389 fg => [1, 1, 0, 1],
… …
1266 ); 1412 );
1267 } 1413 }
1268} 1414}
1269 1415
1270sub feed { 1416sub feed {
1271 my ($self, $msg) = @_; 1417 my ($self, $type, @arg) = @_;
1272 1418
1273 CFPlus::weaken $self; 1419 CFPlus::weaken $self;
1274 1420
1275 if ($msg->{msgtype} eq "reply") { 1421 if ($type eq "update") {
1422 my (%info) = @arg;
1423
1276 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1424 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1277 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1425 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1278
1279 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1280 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1281 my @link;
1282 $text =~ s{
1283 ($match)
1284 }{
1285 my $kw = $1;
1286
1287 push @link, new CFPlus::UI::Label
1288 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1289 can_hover => 1,
1290 can_events => 1,
1291 padding_x => 0,
1292 padding_y => 0,
1293 on_button_up => sub {
1294 $self->send ($kw);
1295 };
1296
1297 "\x{fffc}"
1298 }giex;
1299 1426
1427 if (exists $info{msg}) {
1428 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1429 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1430 my @link;
1431 $text =~ s{
1432 ($match)
1433 }{
1434 my $kw = $1;
1435
1436 push @link, new CFPlus::UI::Label
1437 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1438 can_hover => 1,
1439 can_events => 1,
1440 padding_x => 0,
1441 padding_y => 0,
1442 on_button_up => sub {
1443 $self->send ($kw);
1444 };
1445
1446 "\x{fffc}"
1447 }giex;
1448
1300 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1449 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1301 $self->{textview}->scroll_to_bottom; 1450 $self->{textview}->scroll_to_bottom;
1451 }
1452
1302 $self->update_options; 1453 $self->update_options;
1303 } else { 1454 } else {
1304 $self->destroy; 1455 $self->destroy;
1305 } 1456 }
1306 1457
… …
1311 my ($self, $msg) = @_; 1462 my ($self, $msg) = @_;
1312 1463
1313 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1464 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1314 $self->{textview}->scroll_to_bottom; 1465 $self->{textview}->scroll_to_bottom;
1315 1466
1316 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1467 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1317} 1468}
1318 1469
1319sub destroy { 1470sub destroy {
1320 my ($self) = @_; 1471 my ($self) = @_;
1321 1472
1322 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1473 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1323 1474
1324 if ($self->{conn}) { 1475 if ($self->{conn}) {
1325 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1476 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1326 delete $self->{conn}{npc_dialog}; 1477 delete $self->{conn}{npc_dialog};
1327 $self->{conn}->disconnect_ext ($self->{id}); 1478 $self->{conn}->disconnect_ext ($self->{id});
1328 } 1479 }
1329 1480
1330 $self->SUPER::destroy; 1481 $self->SUPER::destroy;

Diff Legend

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