ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.125 by root, Sat Jul 21 15:04:27 2007 UTC vs.
Revision 1.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 if (my $faces = $ev->{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
74
75 if (defined $meta_json) {
76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
80 } else {
81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82 $self->ask_face ($face, -100 - $pri, undef, sub {
83 my $len = length $_[1];
84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
85
86 CFPlus::DB::write_file $path, $data, sub {
87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
96 });
97 }
98 }
99 }
100 }
101
102 if (my $play = $ev->{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104 }
105 }); 56 });
106 57
107 $self->connect_ext (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
108 my ($cap) = @_; 59 my (%cap) = @_;
109 60
61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want;
63
64 $self->send_exti_req (resource => "exp_table", sub {
65 my ($exp_table) = @_;
66
67 $self->register_face_handler ($exp_table, sub {
68 my ($face) = @_;
69
70 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
71
72 #TODO: update all interested parties
73 });
74
75 ()
76 });
77
110 if (my $ts = $cap->{tileset}) { 78 if (my $ts = $cap{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) { 79 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default; 80 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3]; 81 $self->{tilesize} = $default->[3];
114 $self->setup_req (tileset => $default->[0]); 82 $self->setup_req (tileset => $default->[0]);
115 83
… …
121 } 89 }
122 }); 90 });
123 91
124 $self->{json_coder} 92 $self->{json_coder}
125 ->convert_blessed 93 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub { 94 ->filter_json_single_key_object (__w_ => sub {
127 $self->{widget}{$_[0]} 95 $self->{widget}{$_[0]}
128 }); 96 });
129 97
130 # widgetset new 98 # widgetset new
131 $self->connect_ext (ws_n => sub { 99 $self->connect_ext (ws_n => sub {
132 my ($arg) = @_; 100 my ($id) = @_;
133 101
134 $self->{widgetset}{$arg{id}} = { 102 $self->{widgetset}{$id} = {
135 w => {}, 103 w => {},
136 }; 104 };
137 }); 105 });
138 106
139 # widgetset destroy 107 # widgetset destroy
140 $self->connect_ext (ws_d => sub { 108 $self->connect_ext (ws_d => sub {
141 my ($arg) = @_; 109 my ($id) = @_;
142 110
143 my $ws = delete $self->{widgetset}{$arg{id}} 111 my $ws = delete $self->{widgetset}{$id}
144 or return; 112 or return;
145 113
146 $_->destroy 114 $_->destroy
147 for values %{$ws->{w}}; 115 for values %{$ws->{w}};
148 }); 116 });
149 117
150 # widgetset destroy 118 # widgetset create
151 $self->connect_ext (ws_c => sub { 119 $self->connect_ext (ws_c => sub {
152 my ($arg) = @_; 120 my ($ws, $id, $class, $args) = @_;
153
154 my $args = $arg->{args} || {};
155 121
156 for my $ev (grep /^on_/, keys %$args) { 122 for my $ev (grep /^on_/, keys %$args) {
123 my $rid = $args->{$ev};
157 $args->{$ev} = sub { 124 $args->{$ev} = sub {
158 my $id = shift->{s_id}; 125 my $id = shift->{s_id};
159 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 126 $self->send_exti_msg (w_e => $id, $rid, @_);
160 127
161 1 128 1
162 }; 129 };
163 } 130 }
164 131
165 if (my $widget = eval { 132 $self->widget_associate (
133 $ws, $id => scalar eval {
166 local $SIG{__DIE__}; 134 local $SIG{__DIE__};
167 "CFPlus::UI::$arg->{class}"->new ( 135 "CFPlus::UI::$class"->new (%$args)
168 %$args,
169 s_ws => $arg->{ws},
170 s_id => $arg->{id},
171 )
172 } 136 }
173 ) {
174 $self->{widget}{$arg->{id}}
175 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
176 = $widget;
177
178 $widget->connect (on_destroy => sub {
179 my ($widget) = @_;
180
181 delete $self->{widget}{$widget->{s_id}};
182 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
183 });
184 } else {
185 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 137 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 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
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";
187 } 186 }
188 }); 187 });
189 188
190 # widget call 189 # widget call
191 $self->connect_ext (w_c => sub { 190 $self->connect_ext (w_c => sub {
192 my ($arg) = @_; 191 my ($id, $rid, $method, @args) = @_;
193 192
194 my $w = $self->{widget}{$arg->{id}} 193 my $w = $self->{widget}{$id}
195 or return; 194 or return;
196 my $m = $arg->{name};
197 195
198 my $a = $arg->{args} || []; 196 if ($rid) {
199
200 if (exists $arg->{rid}) {
201 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); 197 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
202 } else { 198 } else {
203 $w->$m (@$a); 199 $w->$method (@args);
204 } 200 }
205 }); 201 });
206 202
207 # widget set 203 # widget set
208 $self->connect_ext (w_s => sub { 204 $self->connect_ext (w_s => sub {
209 my ($arg) = @_; 205 my ($id, $attr) = @_;
210 206
211 my $w = $self->{widget}{$arg->{id}} 207 my $w = $self->{widget}{$id}
212 or return; 208 or return;
213 209
214 $w->{$_->[0]} = $_->[1] 210 for (my $i = 0; $i < $#$attr; $i += 2) {
215 for @{ $arg->{attr} }; 211 my ($member, $value) = @$attr[$i, $i+1];
212 if (defined $value) {
213 $w->{$member} = $value;
214 } else {
215 delete $w->{$member};
216 }
217 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
218 }
216 }); 219 });
217 220
218 # widget get 221 # widget get
219 $self->connect_ext (w_g => sub { 222 $self->connect_ext (w_g => sub {
220 my ($arg) = @_; 223 my ($id, $rid, $attr) = @_;
221 224
222 my $w = $self->{widget}{$arg->{id}} 225 my $w = $self->{widget}{$id}
223 or return; 226 or return;
224 227
225 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{attr}}]); 228 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
229 });
230
231 # message window
232 $self->connect_ext (channel_info => sub {
233 my ($info) = @_;
234 $self->{channels}->{$info->{id}} = $info;
235 $::MESSAGE_WINDOW->add_channel ($info);
226 }); 236 });
227 237
228 # destroy widgets on logout 238 # destroy widgets on logout
229 $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 {
230 for my $ws (values %{delete $self->{widgetset} || {}}) { 240 for my $ws (values %{delete $self->{widgetset} || {}}) {
… …
254 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 264 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
255 265
256 $self 266 $self
257} 267}
258 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
259sub logprint { 307sub logprint {
260 my ($self, @a) = @_; 308 my ($self, @a) = @_;
261 309
262 $self->{log_fh} ||= do { 310 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
263 my $path = "$Crossfire::VARDIR/log.$self->{host}";
264
265 open my $fh, ">>:utf8", $path
266 or die "Couldn't open logfile $path: $!";
267
268 $fh->autoflush (1);
269
270 $fh;
271 };
272
273 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
274
275 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
276 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
277
278 print {$self->{log_fh}} "$ts ", @a, "\n";
279} 311}
280 312
281sub _stat_numdiff { 313sub _stat_numdiff {
282 my ($self, $name, $old, $new) = @_; 314 my ($self, $name, $old, $new) = @_;
283 315
… …
548} 580}
549 581
550sub feed_map1a { 582sub feed_map1a {
551 my ($self, $data) = @_; 583 my ($self, $data) = @_;
552 584
553 $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 {
554 $self->{map_widget}->update; 613 $self->{map_widget}->update;
614 }
555} 615}
556 616
557sub magicmap { 617sub magicmap {
558 my ($self, $w, $h, $x, $y, $data) = @_; 618 my ($self, $w, $h, $x, $y, $data) = @_;
559 619
… …
566 my $map_info = delete $self->{map_info} 626 my $map_info = delete $self->{map_info}
567 or return; 627 or return;
568 628
569 my ($hash, $x, $y, $w, $h) = @$map_info; 629 my ($hash, $x, $y, $w, $h) = @$map_info;
570 630
571 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;
572 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 633 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
573 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
574} 634}
575 635
576sub map_clear { 636sub map_clear {
577 my ($self) = @_; 637 my ($self) = @_;
578 638
… …
584} 644}
585 645
586sub bg_fetch { 646sub bg_fetch {
587 my ($self) = @_; 647 my ($self) = @_;
588 648
589 my $id; 649 my $tile;
590 650
591 do { 651 do {
592 $id = pop @{$self->{bg_fetch}} 652 $tile = pop @{$self->{bg_fetch}}
593 or return; 653 or return;
594 } while $self->{texture}[$id]; 654 } while $self->{texture}[$tile];
595 655
596 CFPlus::DB::get tilecache => $id, sub { 656 CFPlus::DB::get tilecache => $tile, sub {
597 my ($data) = @_; 657 my ($data) = @_;
598 658
599 return unless $self->{map}; # stop when destroyed 659 return unless $self->{map}; # stop when destroyed
600 660
601 $self->set_texture ($id => $data)
602 if defined $data; 661 if (defined $data) {
662 $self->have_tile ($tile, $data);
663 $self->{texture}[$tile]->upload;
664 }
603 665
604 $self->bg_fetch; 666 $self->bg_fetch;
605 }; 667 };
606} 668}
607 669
608sub load_map($$$) { 670sub load_map($$$) {
609 my ($self, $hash, $x, $y) = @_; 671 my ($self, $hash, $x, $y) = @_;
610 672
611 my $gen = $self->{map_change_gen}; 673 my $gen = $self->{map_change_gen};
612 674
613 CFPlus::DB::get $self->{mapcache} => $hash, sub { 675 my $cb = sub {
614 return unless $gen == $self->{map_change_gen}; 676 return unless $gen == $self->{map_change_gen};
615 677
616 my ($data) = @_; 678 my ($data) = @_;
617 679
618 if (defined $data) { 680 if (defined $data) {
681 $self->{map_cache_new}{$hash} = \$data;
682
619 $data = Compress::LZF::decompress $data; 683 my $data = Compress::LZF::decompress $data;
620 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
621 684
622 my $inprogress = @{ $self->{bg_fetch} || [] }; 685 my $inprogress = @{ $self->{bg_fetch} || [] };
623 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 686 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
624 $self->bg_fetch unless $inprogress; 687 $self->bg_fetch unless $inprogress;
625 } 688 }
626 }; 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 }
627} 696}
628 697
629# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 698# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
630# (server resource,s latency, bandwidth), so this hack is warranted. 699# (server resource,s latency, bandwidth), so this hack is warranted.
631# 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
… …
724 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 793 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
725 794
726 $self->flush_map; 795 $self->flush_map;
727 796
728 ++$self->{map_change_gen}; 797 ++$self->{map_change_gen};
798 $self->{map_cache_old} = delete $self->{map_cache_new};
729 799
730 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 800 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
731 801
732 my $mapmapw = $self->{mapmap}->{w}; 802 my $mapmapw = $self->{mapmap}->{w};
733 my $mapmaph = $self->{mapmap}->{h}; 803 my $mapmaph = $self->{mapmap}->{h};
… …
752} 822}
753 823
754sub face_find { 824sub face_find {
755 my ($self, $facenum, $face, $cb) = @_; 825 my ($self, $facenum, $face, $cb) = @_;
756 826
757 my $hash = "$face->{chksum},$face->{name}"; 827 if ($face->{type} == 0) { # FT_FACE
758
759 my $id = CFPlus::DB::get_tile_id_sync $hash; 828 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
760 829
761 $face->{id} = $id; 830 $face->{id} = $id;
762 $self->{faceid}[$facenum] = $id;
763
764 $self->{map}->set_tileid ($facenum => $id); 831 $self->{map}->set_tileid ($facenum => $id);
765 832
766 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 }
767} 841}
768 842
769sub face_update { 843sub face_update {
770 my ($self, $facenum, $face, $changed) = @_; 844 my ($self, $facenum, $face, $changed) = @_;
771 845
846 if ($face->{type} == 0) {
847 # image, FT_FACE
772 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 848 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
773 if $changed; 849 if $changed;
774 850
775 $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 }
776} 888}
777 889
778sub smooth_update { 890sub smooth_update {
779 my ($self, $facenum, $face) = @_; 891 my ($self, $facenum, $face) = @_;
780 892
781 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 893 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
782} 894}
783 895
784sub set_texture { 896sub have_tile {
785 my ($self, $id, $data) = @_; 897 my ($self, $tile, $data) = @_;
786 898
787 return unless $self->{map}; 899 return unless $self->{map};
788 900
789 $self->{texture}[$id] = my $tex = 901 my $tex = $self->{texture}[$tile] ||=
790 new_from_image CFPlus::Texture 902 new CFPlus::Texture
903 tile => $tile,
904 image => $data, delete_image => 1,
791 $data, minify => 1, mipmap => 1; 905 minify => 1, mipmap => 1;
792 906
793 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 907 if (my $cbs = delete $self->{tile_cb}{$tile}) {
794 $self->{map_widget}->update; 908 $_->($tex) for @$cbs;
795 909 }
796 $_->() for @{(delete $self->{face_cb}{$id}) || []};
797} 910}
798 911
799sub connect_face_update { 912# call in non-void context registers a temporary
913# hook with handle, otherwise its permanent
914sub on_face_change {
800 my ($self, $id, $cb) = @_; 915 my ($self, $num, $cb) = @_;
801 916
802 push @{$self->{face_cb}{$id}}, $cb; 917 push @{$self->{face_cb}{$num}}, $cb;
803 918
919 defined wantarray
804 CFPlus::guard { 920 ? CFPlus::guard {
805 @{$self->{face_cb}{$id}} 921 @{$self->{face_cb}{$num}}
806 = grep $_ != $cb, 922 = grep $_ != $cb,
807 @{$self->{face_cb}{$id}}; 923 @{$self->{face_cb}{$num}};
808 } 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)
809} 939}
810 940
811sub sound_play { 941sub sound_play {
812 my ($self, $x, $y, $soundnum, $type) = @_; 942 my ($self, $type, $face, $dx, $dy, $vol) = @_;
813 943
814 $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
815} 946}
816 947
817my $LAST_QUERY; # server is stupid, stupid, stupid 948my $LAST_QUERY; # server is stupid, stupid, stupid
818 949
819sub query { 950sub query {
… …
884 $self->{$type} = $text; 1015 $self->{$type} = $text;
885 } else { 1016 } else {
886 $self->logprint ("msg: ", $text); 1017 $self->logprint ("msg: ", $text);
887 return if $color < 0; # negative color == ignore if not understood 1018 return if $color < 0; # negative color == ignore if not understood
888 1019
889 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1020 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
890 1021
891 ## 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
892 # no longer neecssary with TRT servers 1023 # no longer neecssary with TRT servers
893 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1024 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
894 1025
895 ::message ({ fg => $fg, markup => $_ }) 1026 ::message ({
1027 fg => $fg,
1028 markup => $_,
1029 type => $type,
1030 extra => [@extra],
1031 color_flags => $color
896 for split /\n/, $text; 1032 }) for split /\n/, $text;
897 1033
898 $self->{statusbox}->add ($text, 1034 $self->{statusbox}->add ($text,
899 group => $text, 1035 group => $text,
900 fg => $fg, 1036 fg => $fg,
901 timeout => $color >= 2 ? 180 : 10, 1037 timeout => $color >= 2 ? 180 : 10,
… …
957 $self->{map_widget}->clr_commands; 1093 $self->{map_widget}->clr_commands;
958 1094
959 ::stop_game (); 1095 ::stop_game ();
960} 1096}
961 1097
962sub image_info {
963 my ($self, $numfaces) = @_;
964
965 $self->{num_faces} = $numfaces;
966 $self->{face_prefetch} = [1 .. $numfaces];
967 $self->face_prefetch;
968}
969
970sub face_prefetch {
971 my ($self) = @_;
972
973 return unless $::CFG->{face_prefetch};
974
975 if ($self->{num_faces}) {
976 return if @{ $self->{send_queue} || [] };
977 my $todo = @{ $self->{face_prefetch} }
978 or return;
979
980 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
981
982 $self->send ("requestinfo image_sums $face $face");
983
984 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
985 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
986 } elsif (!exists $self->{num_faces}) {
987 $self->send ("requestinfo image_info");
988
989 $self->{num_faces} = 0;
990
991 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
992 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
993 }
994}
995
996sub update_floorbox { 1098sub update_floorbox {
997 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1099 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
998 return unless $::CONN; 1100 return unless $::CONN;
999 1101
1000 $::FLOORBOX->clear; 1102 $::FLOORBOX->clear;
… …
1029 } 1131 }
1030 1132
1031 $::FLOORBOX->add_at (@add); 1133 $::FLOORBOX->add_at (@add);
1032 }); 1134 });
1033 1135
1034 $::WANT_REFRESH++; 1136 $::WANT_REFRESH->start;
1035} 1137}
1036 1138
1037sub set_opencont { 1139sub set_opencont {
1038 my ($conn, $tag, $name) = @_; 1140 my ($conn, $tag, $name) = @_;
1039 $conn->{open_container} = $tag; 1141 $conn->{open_container} = $tag;
1040 update_floorbox; 1142 update_floorbox;
1041 1143
1042 $::INV_RIGHT_HB->clear (); 1144 $::INVR_HB->clear ();
1043 $::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);
1044 1146
1045 if ($tag != 0) { # Floor isn't closable, is it? 1147 if ($tag != 0) { # Floor isn't closable, is it?
1046 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1148 $::INVR_HB->add (new CFPlus::UI::Button
1047 text => "Close container", 1149 text => "Close container",
1048 tooltip => "Close the currently open container (if one is open)", 1150 tooltip => "Close the currently open container (if one is open)",
1049 on_activate => sub { 1151 on_activate => sub {
1050 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1152 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1051 if $tag != 0; 1153 if $tag != 0;
1052 #if $CONN->{open_container} != 0;
1053 0 1154 0
1054 }, 1155 },
1055 ); 1156 );
1056 } 1157 }
1057 1158
… …
1156 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1257 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1157 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1258 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1158 . "map size $self->{mapw}×$self->{maph}\n" 1259 . "map size $self->{mapw}×$self->{maph}\n"
1159 ); 1260 );
1160 1261
1161 ::setup_build_button ($self->{editor_support}->{builder_ui});
1162} 1262}
1163 1263
1164sub logged_in { 1264sub logged_in {
1165 my ($self) = @_; 1265 my ($self) = @_;
1166 1266
1167 $self->send_ext_req (cfplus_support => version => 1, sub { 1267 $self->send_ext_req (cfplus_support => version => 2, sub {
1268 my (%msg) = @_;
1269
1168 $self->{cfplus_ext} = $_[0]{version}; 1270 $self->{cfplus_ext} = $msg{version};
1169 $self->update_server_info; 1271 $self->update_server_info;
1170 1272
1171 if ($self->{cfplus_ext} >= 2) { 1273 if ($self->{cfplus_ext} >= 2) {
1172 $self->send_ext_req ("editor_support", sub { 1274 $self->send_ext_req ("editor_support", sub {
1173 $self->{editor_support} = $_[0]; 1275 $self->{editor_support} = { @_ };
1174 $self->update_server_info; 1276 $self->update_server_info;
1175 1277
1176 0 1278 0
1177 }); 1279 });
1178 } 1280 }
… …
1186 $self->send_command ("output-count $::CFG->{output_count}"); 1288 $self->send_command ("output-count $::CFG->{output_count}");
1187 $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;
1188 $self->send_command ("pickup $::CFG->{pickup}"); 1290 $self->send_command ("pickup $::CFG->{pickup}");
1189} 1291}
1190 1292
1191sub buildat {
1192 my ($self, $builditem, $x, $y) = @_;
1193
1194 if ($self->{cfplus_ext}) {
1195 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1196 }
1197}
1198
1199sub lookat { 1293sub lookat {
1200 my ($self, $x, $y) = @_; 1294 my ($self, $x, $y) = @_;
1201 1295
1202 if ($self->{cfplus_ext}) { 1296 if ($self->{cfplus_ext}) {
1203 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1297 $self->send_ext_req (lookat => $x, $y, sub {
1204 my ($msg) = @_; 1298 my (%msg) = @_;
1205 1299
1206 if (exists $msg->{npc_dialog}) { 1300 if (exists $msg{npc_dialog}) {
1207 # start npc chat dialog 1301 # start npc chat dialog
1208 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1302 $self->{npc_dialog} = new CFPlus::NPCDialog::
1209 dx => $x, 1303 token => $msg{npc_dialog},
1210 dy => $y,
1211 title => "$msg->{npc_dialog} (NPC)", 1304 title => "$msg{npc_dialog}[0] (NPC)",
1212 conn => $self, 1305 conn => $self,
1213 ; 1306 ;
1214 } 1307 }
1215 }); 1308 });
1216 } 1309 }
… …
1281 on_activate => sub { $this->destroy; 1 }, 1374 on_activate => sub { $this->destroy; 1 },
1282 ; 1375 ;
1283 1376
1284 $self->update_options; 1377 $self->update_options;
1285 1378
1286 $self->{id} = $self->{conn}->send_ext_req ( 1379 $self->{id} = "npc-channel-" . $self->{conn}->token;
1287 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1380 $self->{conn}->connect_ext ($self->{id} => sub {
1288 sub { $this && $this->feed (@_) } 1381 $this->feed (@_) if $this;
1289 ); 1382 });
1383
1384 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1290 1385
1291 $self->{entry}->grab_focus; 1386 $self->{entry}->grab_focus;
1292 1387
1293 $self->{textview}->add_paragraph ({ 1388 $self->{textview}->add_paragraph ({
1294 fg => [1, 1, 0, 1], 1389 fg => [1, 1, 0, 1],
… …
1317 ); 1412 );
1318 } 1413 }
1319} 1414}
1320 1415
1321sub feed { 1416sub feed {
1322 my ($self, $msg) = @_; 1417 my ($self, $type, @arg) = @_;
1323 1418
1324 CFPlus::weaken $self; 1419 CFPlus::weaken $self;
1325 1420
1326 if ($msg->{msgtype} eq "reply") { 1421 if ($type eq "update") {
1422 my (%info) = @arg;
1423
1327 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1424 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1328 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1425 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1329
1330 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1331 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1332 my @link;
1333 $text =~ s{
1334 ($match)
1335 }{
1336 my $kw = $1;
1337
1338 push @link, new CFPlus::UI::Label
1339 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1340 can_hover => 1,
1341 can_events => 1,
1342 padding_x => 0,
1343 padding_y => 0,
1344 on_button_up => sub {
1345 $self->send ($kw);
1346 };
1347
1348 "\x{fffc}"
1349 }giex;
1350 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
1351 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1449 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1352 $self->{textview}->scroll_to_bottom; 1450 $self->{textview}->scroll_to_bottom;
1451 }
1452
1353 $self->update_options; 1453 $self->update_options;
1354 } else { 1454 } else {
1355 $self->destroy; 1455 $self->destroy;
1356 } 1456 }
1357 1457
… …
1362 my ($self, $msg) = @_; 1462 my ($self, $msg) = @_;
1363 1463
1364 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1464 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1365 $self->{textview}->scroll_to_bottom; 1465 $self->{textview}->scroll_to_bottom;
1366 1466
1367 $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);
1368} 1468}
1369 1469
1370sub destroy { 1470sub destroy {
1371 my ($self) = @_; 1471 my ($self) = @_;
1372 1472
1373 #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
1374 1474
1375 if ($self->{conn}) { 1475 if ($self->{conn}) {
1376 $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};
1377 delete $self->{conn}{npc_dialog}; 1477 delete $self->{conn}{npc_dialog};
1378 $self->{conn}->disconnect_ext ($self->{id}); 1478 $self->{conn}->disconnect_ext ($self->{id});
1379 } 1479 }
1380 1480
1381 $self->SUPER::destroy; 1481 $self->SUPER::destroy;

Diff Legend

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