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.102 by root, Wed Apr 18 18:16:16 2007 UTC vs.
Revision 1.155 by root, Fri Aug 17 21:18:01 2007 UTC

… …
20 my ($class, %arg) = @_; 20 my ($class, %arg) = @_;
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,
26 xwidget1 => 1,#d#
25 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
26 }, 28 },
27 ); 29 );
28 30
29 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
46 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
47 @args 49 @args
48 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
49 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
50 52
53 $self->connect_ext (ambient_music => sub {
54 my ($songs) = @_;
55 &::audio_music_set_ambient ($songs);
56 });
57
51 $self->connect_ext (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
52 my ($cap) = @_; 59 my (%cap) = @_;
53 60
61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want;
63
54 if (my $ts = $cap->{tileset}) { 64 if (my $ts = $cap{tileset}) {
55 if (my ($default) = grep $_->[2] & 1, @$ts) { 65 if (my ($default) = grep $_->[2] & 1, @$ts) {
56 $self->{tileset} = $default; 66 $self->{tileset} = $default;
57 $self->{tilesize} = $default->[3]; 67 $self->{tilesize} = $default->[3];
58 $self->setup_req (tileset => $default->[0]); 68 $self->setup_req (tileset => $default->[0]);
59 69
… …
63 $self->setup_req (mapsize => "${w}x${h}"); 73 $self->setup_req (mapsize => "${w}x${h}");
64 } 74 }
65 } 75 }
66 }); 76 });
67 77
78 $self->{json_coder}
79 ->convert_blessed
80 ->filter_json_single_key_object (__w_ => sub {
81 $self->{widget}{$_[0]}
82 });
83
84 # widgetset new
85 $self->connect_ext (ws_n => sub {
86 my ($id) = @_;
87
88 $self->{widgetset}{$id} = {
89 w => {},
90 };
91 });
92
93 # widgetset destroy
94 $self->connect_ext (ws_d => sub {
95 my ($id) = @_;
96
97 my $ws = delete $self->{widgetset}{$id}
98 or return;
99
100 $_->destroy
101 for values %{$ws->{w}};
102 });
103
104 # widgetset create
105 $self->connect_ext (ws_c => sub {
106 my ($ws, $id, $class, $args) = @_;
107
108 for my $ev (grep /^on_/, keys %$args) {
109 my $rid = $args->{$ev};
110 $args->{$ev} = sub {
111 my $id = shift->{s_id};
112 $self->send_exti_msg (w_e => $id, $rid, @_);
113
114 1
115 };
116 }
117
118 $self->widget_associate (
119 $ws, $id => scalar eval {
120 local $SIG{__DIE__};
121 "CFPlus::UI::$class"->new (%$args)
122 }
123 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
124 });
125
126 # widgetset associate
127 $self->connect_ext (ws_a => sub {
128 my (%ass) = @_;
129
130 # everything that has a name, wether conceivably useful or not
131 my %wkw = (
132 root => $CFPlus::UI::ROOT,
133 tooltip => $CFPlus::UI::TOOLTIP,
134
135 mapwidget => $::MAPWIDGET,
136 buttonbar => $::BUTTONBAR,
137 metaserver => $::METASERVER,
138 buttonbar => $::BUTTONBAR,
139 login_button => $::LOGIN_BUTTON,
140 quit_dialog => $::QUIT_DIALOG,
141 host_entry => $::HOST_ENTRY,
142 metaserver => $::METASERVER,
143 server_info => $::SERVER_INFO,
144
145 setup_dialog => $::SETUP_DIALOG,
146 setup_notebook => $::SETUP_NOTEBOOK,
147 setup_server => $::SETUP_SERVER,
148 setup_keyboard => $::SETUP_KEYBOARD,
149
150 pl_notebook => $::PL_NOTEBOOK,
151 pl_window => $::PL_WINDOW,
152 inventory_page => $::INVENTORY_PAGE,
153 stats_page => $::STATS_PAGE,
154 skill_page => $::SKILL_PAGE,
155 spell_page => $::SPELL_PAGE,
156 spell_list => $::SPELL_LIST,
157
158 floorbox => $::FLOORBOX,
159 help_window => $::HELP_WINDOW,
160 message_window => $::MESSAGE_WINDOW,
161 statusbox => $::SDTATUSBOX,
162
163 inv => $::INV,
164 invr => $::INVR,
165 invr_hb => $::INVR_HB,
166
167 );
168
169 while (my ($id, $name) = each %ass) {
170 $self->widget_associate (undef, $id => $wkw{$name})
171 or warn "server failed to associate non-existent well-known widget $name\n";
172 }
173 });
174
175 # widget call
176 $self->connect_ext (w_c => sub {
177 my ($id, $rid, $method, @args) = @_;
178
179 my $w = $self->{widget}{$id}
180 or return;
181
182 if ($rid) {
183 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
184 } else {
185 $w->$method (@args);
186 }
187 });
188
189 # widget set
190 $self->connect_ext (w_s => sub {
191 my ($id, $attr) = @_;
192
193 my $w = $self->{widget}{$id}
194 or return;
195
196 for (my $i = 0; $i < $#$attr; $i += 2) {
197 my ($member, $value) = @$attr[$i, $i+1];
198 if (defined $value) {
199 $w->{$member} = $value;
200 } else {
201 delete $w->{$member};
202 }
203 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
204 }
205 });
206
207 # widget get
208 $self->connect_ext (w_g => sub {
209 my ($id, $rid, $attr) = @_;
210
211 my $w = $self->{widget}{$id}
212 or return;
213
214 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
215 });
216
217 # message window
218 $self->connect_ext (channel_info => sub {
219 my ($info) = @_;
220 $self->{channels}->{$info->{id}} = $info;
221 $::MESSAGE_WINDOW->add_channel ($info);
222 });
223
224 # destroy widgets on logout
225 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
226 for my $ws (values %{delete $self->{widgetset} || {}}) {
227 $_->destroy
228 for values %{delete $ws->{w} || {}};
229 }
230 });
231
68 $self->{map_widget}->add_command (@$_) 232 $self->{map_widget}->add_command (@$_)
69 for @cmd_help; 233 for @cmd_help;
70 234
71 { 235 {
72 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 236 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
… …
86 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 250 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
87 251
88 $self 252 $self
89} 253}
90 254
255sub widget_associate {
256 my ($self, $ws, $id, $widget) = @_;
257
258 if ($widget) {
259 $widget->{s_id} = $id;
260 $self->{widget}{$id} = $widget;
261
262 if ($ws) {
263 $widget->{s_ws} = $ws;
264 $self->{widgetset}{$ws}{w}{$id} = $widget;
265 }
266
267 $widget->connect (on_destroy => sub {
268 my ($widget) = @_;
269
270 delete $self->{widget}{$widget->{s_id}};
271 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
272 if exists $widget->{s_ws};
273 });
274
275 1
276 } else {
277 $self->send_exti_msg (w_e => $id, undef);
278
279 0
280 }
281}
282
283sub update_fx_want {
284 my ($self) = @_;
285
286 $self->send_exti_msg (fx_want => {
287 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
288 5 => !!$::CFG->{audio_enable}, # FT_SOUND
289 });
290}
291
91sub logprint { 292sub logprint {
92 my ($self, @a) = @_; 293 my ($self, @a) = @_;
93 294
94 $self->{log_fh} ||= do { 295 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
95 my $path = "$Crossfire::VARDIR/log.$self->{host}";
96
97 open my $fh, ">>:utf8", $path
98 or die "Couldn't open logfile $path: $!";
99
100 $fh->autoflush (1);
101
102 $fh;
103 };
104
105 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
106
107 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
108 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
109
110 print {$self->{log_fh}} "$ts ", @a, "\n";
111} 296}
112 297
113sub _stat_numdiff { 298sub _stat_numdiff {
114 my ($self, $name, $old, $new) = @_; 299 my ($self, $name, $old, $new) = @_;
115 300
… …
248 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 433 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
249 $::GAUGES->{food} ->set_value ($fo, $fo_m); 434 $::GAUGES->{food} ->set_value ($fo, $fo_m);
250 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 435 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
251 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 436 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
252 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 437 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
253 my $rng = $stats->{+CS_STAT_RANGE}; 438 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
254 $rng =~ s/^Range: //; # thank you so much dear server
255 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
256 my $title = $stats->{+CS_STAT_TITLE}; 439 my $title = $stats->{+CS_STAT_TITLE};
257 $title =~ s/^Player: //; 440 $title =~ s/^Player: //;
258 $::STATWIDS->{title} ->set_text ("Title: " . $title); 441 $::STATWIDS->{title} ->set_text ("Title: " . $title);
259 442
260 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 443 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
280 my @skills = keys %{ $self->{skill_info} }; 463 my @skills = keys %{ $self->{skill_info} };
281 464
282 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 465 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
283 $sktbl->clear; 466 $sktbl->clear;
284 467
468 my @add;
469
470 push @add,
285 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 471 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
286 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 472 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
287 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 473 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
288 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 474 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
289 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 475 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
290 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 476 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
477 ;
291 478
292 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 479 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
293 480
294 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 481 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
295 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 482 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
323 } 510 }
324 511
325 1 512 1
326 }; 513 };
327 514
515 push @add,
328 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 516 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
329 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 517 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
330 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 518 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
331 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 519 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
332 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 520 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
333 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 521 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
522 ;
334 523
335 $x++ and ($x, $y) = (0, $y + 1); 524 $x++ and ($x, $y) = (0, $y + 1);
336 } 525 }
526
527 $sktbl->add_at (@add);
337 } 528 }
338 529
339 for (grep exists $stats->{$_}, @skills) { 530 for (grep exists $stats->{$_}, @skills) {
340 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 531 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
341 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 532 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
374} 565}
375 566
376sub feed_map1a { 567sub feed_map1a {
377 my ($self, $data) = @_; 568 my ($self, $data) = @_;
378 569
379 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 570 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
571 my $delay;
572
573 for my $tile (@$missing) {
574 next if $self->{delay}{$tile};
575
576 $delay = 1;
577
578 if (my $tex = $::CONN->{texture}[$tile]) {
579 $tex->upload;
580 } else {
581 $self->{delay}{$tile} = 1;
582
583 # we assume the face is in-flight and will eventually come
584 push @{$self->{face_cb}{$tile}}, sub {
585 delete $self->{delay}{$tile};
586 $_[0]->upload;
587 };
588 }
589 }
590
591 if ($delay) {
592 # delay the map drawing a tiny bit in the hope of getting the missing fetched
593 Event->timer (after => 0.03, cb => sub {
594 $_[0]->w->cancel;
595 $self->{map_widget}->update;
596 });
597 } else {
380 $self->{map_widget}->update; 598 $self->{map_widget}->update;
599 }
381} 600}
382 601
383sub magicmap { 602sub magicmap {
384 my ($self, $w, $h, $x, $y, $data) = @_; 603 my ($self, $w, $h, $x, $y, $data) = @_;
385 604
… …
392 my $map_info = delete $self->{map_info} 611 my $map_info = delete $self->{map_info}
393 or return; 612 or return;
394 613
395 my ($hash, $x, $y, $w, $h) = @$map_info; 614 my ($hash, $x, $y, $w, $h) = @$map_info;
396 615
397 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 616 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
617 $self->{map_cache_new}{$hash} = \$data;
398 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 618 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
399 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
400} 619}
401 620
402sub map_clear { 621sub map_clear {
403 my ($self) = @_; 622 my ($self) = @_;
404 623
… …
417 do { 636 do {
418 $id = pop @{$self->{bg_fetch}} 637 $id = pop @{$self->{bg_fetch}}
419 or return; 638 or return;
420 } while $self->{texture}[$id]; 639 } while $self->{texture}[$id];
421 640
422 CFPlus::DB::get tilecache => $id, sub { 641 CFPlus::DB::exists tilecache => $id, sub {
423 my ($data) = @_; 642 my ($exists) = @_;
424 643
425 return unless $self->{map}; # stop when destroyed 644 return unless $self->{map}; # stop when destroyed
426 645
427 $self->set_texture ($id => $data) 646 if ($exists) {
428 if defined $data; 647 $self->have_tile ($id);
648 $self->{texture}[$id]->upload;
649 }
429 650
430 $self->bg_fetch; 651 $self->bg_fetch;
431 }; 652 };
432} 653}
433 654
434sub load_map($$$) { 655sub load_map($$$) {
435 my ($self, $hash, $x, $y) = @_; 656 my ($self, $hash, $x, $y) = @_;
436 657
437 my $gen = $self->{map_change_gen}; 658 my $gen = $self->{map_change_gen};
438 659
439 CFPlus::DB::get $self->{mapcache} => $hash, sub { 660 my $cb = sub {
440 return unless $gen == $self->{map_change_gen}; 661 return unless $gen == $self->{map_change_gen};
441 662
442 my ($data) = @_; 663 my ($data) = @_;
443 664
444 if (defined $data) { 665 if (defined $data) {
666 $self->{map_cache_new}{$hash} = \$data;
667
445 $data = Compress::LZF::decompress $data; 668 my $data = Compress::LZF::decompress $data;
446 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
447 669
448 my $inprogress = @{ $self->{bg_fetch} || [] }; 670 my $inprogress = @{ $self->{bg_fetch} || [] };
449 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 671 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
450 $self->bg_fetch unless $inprogress; 672 $self->bg_fetch unless $inprogress;
451 } 673 }
452 }; 674 };
675
676 if (my $rdata = $self->{map_cache_old}{$hash}) {
677 $cb->($$rdata);
678 } else {
679 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
680 }
453} 681}
454 682
455# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 683# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
456# (server resource,s latency, bandwidth), so this hack is warranted. 684# (server resource,s latency, bandwidth), so this hack is warranted.
457# the right fix is to make real tiled maps with an overview file 685# the right fix is to make real tiled maps with an overview file
… …
550 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 778 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
551 779
552 $self->flush_map; 780 $self->flush_map;
553 781
554 ++$self->{map_change_gen}; 782 ++$self->{map_change_gen};
783 $self->{map_cache_old} = delete $self->{map_cache_new};
555 784
556 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 785 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
557 786
558 my $mapmapw = $self->{mapmap}->{w}; 787 my $mapmapw = $self->{mapmap}->{w};
559 my $mapmaph = $self->{mapmap}->{h}; 788 my $mapmaph = $self->{mapmap}->{h};
… …
578} 807}
579 808
580sub face_find { 809sub face_find {
581 my ($self, $facenum, $face, $cb) = @_; 810 my ($self, $facenum, $face, $cb) = @_;
582 811
583 my $hash = "$face->{chksum},$face->{name}"; 812 if ($face->{type} == 0) { # FT_FACE
584
585 my $id = CFPlus::DB::get_tile_id_sync $hash; 813 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
586 814
587 $face->{id} = $id; 815 $face->{id} = $id;
588 $self->{faceid}[$facenum] = $id; 816 $self->{faceid}[$facenum] = $id;
589 817
590 $self->{map}->set_tileid ($facenum => $id); 818 $self->{map}->set_tileid ($facenum => $id);
591 819
592 CFPlus::DB::get tilecache => $id, $cb; 820 CFPlus::DB::get tilecache => $id, $cb;
821
822 } elsif ($face->{type} & 1) { # with metadata
823 CFPlus::DB::get res_meta => $face->{name}, $cb;
824 }
593} 825}
594 826
595sub face_update { 827sub face_update {
596 my ($self, $facenum, $face, $changed) = @_; 828 my ($self, $facenum, $face, $changed) = @_;
597 829
830 if ($face->{type} == 0) { # FT_FACE
598 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 831 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
599 if $changed; 832 if $changed;
600 833
601 $self->set_texture ($face->{id} => delete $face->{image}); 834 $self->have_tile ($face->{id});
835
836 } elsif ($face->{type} & 1) { # split metadata
837 if ($changed) { # new data
838 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
839 $face->{meta} = $self->{json_coder}->decode ($meta_json);
840
841 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
842 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
843 } else {
844 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
845 }
846
847 ::add_license ($face);
848
849 if ($face->{type} == 3) { # FT_MUSIC
850 $self->{music_meta}{$facenum} = $face;
851
852 ::message ({ markup => "downloaded song #$facenum" })
853 if $changed;
854
855 &::audio_music_push ($facenum);
856 } elsif ($face->{type} == 5) { # FT_SOUND
857 $self->{sound_meta}{$facenum} = $face;
858
859 ::message ({ markup => "downloaded sound #$facenum" })
860 if $changed;
861
862 &::audio_sound_push ($facenum);
863 }
864
865 }
602} 866}
603 867
604sub smooth_update { 868sub smooth_update {
605 my ($self, $facenum, $face) = @_; 869 my ($self, $facenum, $face) = @_;
606 870
607 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 871 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
608} 872}
609 873
610sub set_texture { 874sub have_tile {
875 my ($self, $tile) = @_;
876
877 return unless $self->{map};
878
879 my $tex = $self->{texture}[$tile] ||=
880 new CFPlus::Texture
881 tile => $tile, minify => 1, mipmap => 1, delay => 1;
882
883 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
884}
885
886sub connect_face_update {
611 my ($self, $id, $data) = @_; 887 my ($self, $id, $cb) = @_;
612 888
613 $self->{texture}[$id] = my $tex = 889 push @{$self->{face_cb}{$id}}, $cb;
614 new_from_image CFPlus::Texture
615 $data, minify => 1, mipmap => 1;
616 890
617 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 891 CFPlus::guard {
618 $self->{map_widget}->update; 892 @{$self->{face_cb}{$id}}
893 = grep $_ != $cb,
894 @{$self->{face_cb}{$id}};
895 }
619} 896}
620 897
621sub sound_play { 898sub sound_play {
622 my ($self, $x, $y, $soundnum, $type) = @_; 899 my ($self, $type, $face, $dx, $dy, $vol) = @_;
623 900
624 $self->{sound_play}->($x, $y, $soundnum, $type); 901 &::audio_sound_play ($face, $dx, $dy, $vol)
902 unless $type & 1; # odd types are silent for future expansion
625} 903}
626 904
627my $LAST_QUERY; # server is stupid, stupid, stupid 905my $LAST_QUERY; # server is stupid, stupid, stupid
628 906
629sub query { 907sub query {
… …
633 $LAST_QUERY = $prompt; 911 $LAST_QUERY = $prompt;
634 912
635 $self->{query}-> ($self, $flags, $prompt); 913 $self->{query}-> ($self, $flags, $prompt);
636} 914}
637 915
638sub drawinfo { 916sub sanitise_xml($) {
639 my ($self, $color, $text) = @_; 917 local $_ = shift;
640 918
641 my @color = ( 919 # we now weed out all tags we do not support
920 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
921 # now all entities
922 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
923
924 # handle some elements
925 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
926 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
927
928 $_
929}
930
931our %NAME_TO_COLOR = (
932 black => 0,
933 white => 1,
934 darkblue => 2,
935 red => 3,
936 orange => 4,
937 lightblue => 5,
938 darkorange => 6,
939 green => 7,
940 darkgreen => 8,
941 grey => 9,
942 brown => 10,
943 yellow => 11,
944 tan => 12,
945);
946
947our @CF_COLOR = (
642 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 948 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
643 [1.00, 1.00, 1.00], 949 [1.00, 1.00, 1.00],
644 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 950 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
645 [1.00, 0.00, 0.00], 951 [1.00, 0.00, 0.00],
646 [1.00, 0.54, 0.00], 952 [1.00, 0.54, 0.00],
647 [0.11, 0.56, 1.00], 953 [0.11, 0.56, 1.00],
648 [0.93, 0.46, 0.00], 954 [0.93, 0.46, 0.00],
649 [0.18, 0.54, 0.34], 955 [0.18, 0.54, 0.34],
650 [0.56, 0.73, 0.56], 956 [0.56, 0.73, 0.56],
651 [0.80, 0.80, 0.80], 957 [0.80, 0.80, 0.80],
652 [0.75, 0.61, 0.20], 958 [0.75, 0.61, 0.20],
653 [0.99, 0.77, 0.26], 959 [0.99, 0.77, 0.26],
654 [0.74, 0.65, 0.41], 960 [0.74, 0.65, 0.41],
655 ); 961);
656 962
657 my $fg = $color[$color % @color]; 963sub msg {
964 my ($self, $color, $type, $text, @extra) = @_;
658 965
966 $text = sanitise_xml $text;
967
968 if (my $cb = $self->{cb_msg}{$type}) {
969 $_->($self, $color, $type, $text, @extra) for values %$cb;
970 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
971 $type =~ s/-/_/g;
972 $self->{$type} = $text;
973 } else {
659 $self->logprint ("info: ", $text); 974 $self->logprint ("msg: ", $text);
975 return if $color < 0; # negative color == ignore if not understood
660 976
977 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
978
661 ## try to create single paragraphs of multiple lines sent by the server 979 ## try to create single paragraphs of multiple lines sent by the server
662 # no longer neecssary with TRT servers 980 # no longer neecssary with TRT servers
663 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 981 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
664 982
665 $text = CFPlus::asxml $text; 983 ::message ({
666 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 984 fg => $fg,
667 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 985 markup => $_,
668 986 type => $type,
669 ::message ({ fg => $fg, markup => $_ }) 987 extra => [@extra],
988 color_flags => $color
670 for split /\n/, $text; 989 }) for split /\n/, $text;
671 990
672 $self->{statusbox}->add ($text, 991 $self->{statusbox}->add ($text,
673 group => $text, 992 group => $text,
674 fg => $fg, 993 fg => $fg,
675 timeout => $color >= 2 ? 180 : 10, 994 timeout => $color >= 2 ? 180 : 10,
676 tooltip_font => $::FONT_FIXED, 995 tooltip_font => $::FONT_FIXED,
677 ); 996 );
678} 997 }
679
680sub drawextinfo {
681 my ($self, $color, $type, $subtype, $message) = @_;
682
683 $self->drawinfo ($color, $message);
684} 998}
685 999
686sub spell_add { 1000sub spell_add {
687 my ($self, $spell) = @_; 1001 my ($self, $spell) = @_;
688 1002
… …
736 $self->{map_widget}->clr_commands; 1050 $self->{map_widget}->clr_commands;
737 1051
738 ::stop_game (); 1052 ::stop_game ();
739} 1053}
740 1054
741sub image_info {
742 my ($self, $numfaces) = @_;
743
744 $self->{num_faces} = $numfaces;
745 $self->{face_prefetch} = [1 .. $numfaces];
746 $self->face_prefetch;
747}
748
749sub face_prefetch {
750 my ($self) = @_;
751
752 return unless $::CFG->{face_prefetch};
753
754 if ($self->{num_faces}) {
755 return if @{ $self->{send_queue} || [] };
756 my $todo = @{ $self->{face_prefetch} }
757 or return;
758
759 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
760
761 $self->send ("requestinfo image_sums $face $face");
762
763 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
764 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
765 } elsif (!exists $self->{num_faces}) {
766 $self->send ("requestinfo image_info");
767
768 $self->{num_faces} = 0;
769
770 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
771 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
772 }
773}
774
775sub update_floorbox { 1055sub update_floorbox {
776 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1056 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
777 return unless $::CONN; 1057 return unless $::CONN;
778 1058
779 $::FLOORBOX->clear; 1059 $::FLOORBOX->clear;
1060
1061 my @add;
780 1062
781 my $row; 1063 my $row;
782 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1064 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
783 if ($row < 6) { 1065 if ($row < 6) {
784 local $_->{face_widget}; # hack to force recreation of widget 1066 local $_->{face_widget}; # hack to force recreation of widget
785 local $_->{desc_widget}; # hack to force recreation of widget 1067 local $_->{desc_widget}; # hack to force recreation of widget
786 CFPlus::Item::update_widgets $_; 1068 CFPlus::Item::update_widgets $_;
787 1069
1070 push @add,
788 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1071 0, $row, $_->{face_widget},
789 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1072 1, $row, $_->{desc_widget};
790 1073
791 $row++; 1074 $row++;
792 } else { 1075 } else {
793 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1076 push @add, 1, $row, new CFPlus::UI::Button
794 text => "More...", 1077 text => "More...",
795 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1078 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
796 ); 1079 ;
797 last; 1080 last;
798 } 1081 }
799 } 1082 }
800 if ($::CONN->{open_container}) { 1083 if ($::CONN->{open_container}) {
801 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1084 push @add, 1, $row++, new CFPlus::UI::Button
802 text => "Close container", 1085 text => "Close container",
803 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1086 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
804 ); 1087 ;
805 } 1088 }
806 });
807 1089
1090 $::FLOORBOX->add_at (@add);
1091 });
1092
808 $::WANT_REFRESH++; 1093 $::WANT_REFRESH->start;
809} 1094}
810 1095
811sub set_opencont { 1096sub set_opencont {
812 my ($conn, $tag, $name) = @_; 1097 my ($conn, $tag, $name) = @_;
813 $conn->{open_container} = $tag; 1098 $conn->{open_container} = $tag;
814 update_floorbox; 1099 update_floorbox;
815 1100
816 $::INV_RIGHT_HB->clear (); 1101 $::INVR_HB->clear ();
817 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1102 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
818 1103
819 if ($tag != 0) { # Floor isn't closable, is it? 1104 if ($tag != 0) { # Floor isn't closable, is it?
820 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1105 $::INVR_HB->add (new CFPlus::UI::Button
821 text => "Close container", 1106 text => "Close container",
822 tooltip => "Close the currently open container (if one is open)", 1107 tooltip => "Close the currently open container (if one is open)",
823 on_activate => sub { 1108 on_activate => sub {
824 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1109 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
825 if $tag != 0; 1110 if $tag != 0;
826 #if $CONN->{open_container} != 0;
827 0 1111 0
828 }, 1112 },
829 ); 1113 );
830 } 1114 }
831 1115
… …
921 $::SERVER_INFO->set_markup ( 1205 $::SERVER_INFO->set_markup (
922 "server <tt>$self->{host}:$self->{port}</tt>\n" 1206 "server <tt>$self->{host}:$self->{port}</tt>\n"
923 . "protocol version <tt>$self->{version}</tt>\n" 1207 . "protocol version <tt>$self->{version}</tt>\n"
924 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1208 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
925 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1209 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1210 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
926 . "editing support $yesno[!!$self->{editor_support}]\n" 1211 . "editing support $yesno[!!$self->{editor_support}]\n"
927 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1212 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1213 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
928 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1214 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
929 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1215 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
930 . "map size $self->{mapw}×$self->{maph}\n" 1216 . "map size $self->{mapw}×$self->{maph}\n"
931 ); 1217 );
932 1218
933 ::setup_build_button ($self->{editor_support}->{builder_ui});
934} 1219}
935 1220
936sub logged_in { 1221sub logged_in {
937 my ($self) = @_; 1222 my ($self) = @_;
938 1223
939 $self->send_ext_req (cfplus_support => version => 1, sub { 1224 $self->send_ext_req (cfplus_support => version => 2, sub {
1225 my (%msg) = @_;
1226
940 $self->{cfplus_ext} = $_[0]{version}; 1227 $self->{cfplus_ext} = $msg{version};
941 $self->update_server_info; 1228 $self->update_server_info;
942 1229
943 if ($self->{cfplus_ext} >= 2) { 1230 if ($self->{cfplus_ext} >= 2) {
944 $self->send_ext_req ("editor_support", sub { 1231 $self->send_ext_req ("editor_support", sub {
945 $self->{editor_support} = $_[0]; 1232 $self->{editor_support} = { @_ };
946 $self->update_server_info; 1233 $self->update_server_info;
947 1234
948 0 1235 0
949 }); 1236 });
950 } 1237 }
… …
958 $self->send_command ("output-count $::CFG->{output_count}"); 1245 $self->send_command ("output-count $::CFG->{output_count}");
959 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1246 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
960 $self->send_command ("pickup $::CFG->{pickup}"); 1247 $self->send_command ("pickup $::CFG->{pickup}");
961} 1248}
962 1249
963sub buildat {
964 my ($self, $builditem, $x, $y) = @_;
965
966 if ($self->{cfplus_ext}) {
967 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
968 }
969}
970
971sub lookat { 1250sub lookat {
972 my ($self, $x, $y) = @_; 1251 my ($self, $x, $y) = @_;
973 1252
974 if ($self->{cfplus_ext}) { 1253 if ($self->{cfplus_ext}) {
975 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1254 $self->send_ext_req (lookat => $x, $y, sub {
976 my ($msg) = @_; 1255 my (%msg) = @_;
977 1256
978 if (exists $msg->{npc_dialog}) { 1257 if (exists $msg{npc_dialog}) {
979 # start npc chat dialog 1258 # start npc chat dialog
980 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1259 $self->{npc_dialog} = new CFPlus::NPCDialog::
981 dx => $x, 1260 token => $msg{npc_dialog},
982 dy => $y,
983 title => "$msg->{npc_dialog} (NPC)", 1261 title => "$msg{npc_dialog}[0] (NPC)",
984 conn => $self, 1262 conn => $self,
985 ; 1263 ;
986 } 1264 }
987 }); 1265 });
988 } 1266 }
… …
995 1273
996 (delete $self->{npc_dialog})->destroy 1274 (delete $self->{npc_dialog})->destroy
997 if $self->{npc_dialog}; 1275 if $self->{npc_dialog};
998 1276
999 $self->SUPER::destroy; 1277 $self->SUPER::destroy;
1278
1279 %$self = ();
1000} 1280}
1001 1281
1002package CFPlus::NPCDialog; 1282package CFPlus::NPCDialog;
1003 1283
1004our @ISA = 'CFPlus::UI::Toplevel'; 1284our @ISA = 'CFPlus::UI::Toplevel';
… …
1051 on_activate => sub { $this->destroy; 1 }, 1331 on_activate => sub { $this->destroy; 1 },
1052 ; 1332 ;
1053 1333
1054 $self->update_options; 1334 $self->update_options;
1055 1335
1056 $self->{id} = $self->{conn}->send_ext_req ( 1336 $self->{id} = "npc-channel-" . $self->{conn}->token;
1057 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1337 $self->{conn}->connect_ext ($self->{id} => sub {
1058 sub { $this && $this->feed (@_) } 1338 $this->feed (@_) if $this;
1059 ); 1339 });
1340
1341 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1060 1342
1061 $self->{entry}->grab_focus; 1343 $self->{entry}->grab_focus;
1062 1344
1063 $self->{textview}->add_paragraph ({ 1345 $self->{textview}->add_paragraph ({
1064 fg => [1, 1, 0, 1], 1346 fg => [1, 1, 0, 1],
… …
1087 ); 1369 );
1088 } 1370 }
1089} 1371}
1090 1372
1091sub feed { 1373sub feed {
1092 my ($self, $msg) = @_; 1374 my ($self, $type, @arg) = @_;
1093 1375
1094 CFPlus::weaken $self; 1376 CFPlus::weaken $self;
1095 1377
1096 if ($msg->{msgtype} eq "reply") { 1378 if ($type eq "update") {
1379 my (%info) = @arg;
1380
1097 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1381 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1098 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1382 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1099
1100 my $text = "\n" . CFPlus::asxml $msg->{msg};
1101 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1102 my @link;
1103 $text =~ s{
1104 ($match)
1105 }{
1106 my $kw = $1;
1107
1108 push @link, new CFPlus::UI::Label
1109 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1110 can_hover => 1,
1111 can_events => 1,
1112 padding_x => 0,
1113 padding_y => 0,
1114 on_button_up => sub {
1115 $self->send ($kw);
1116 };
1117
1118 "\x{fffc}"
1119 }giex;
1120 1383
1384 if (exists $info{msg}) {
1385 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1386 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1387 my @link;
1388 $text =~ s{
1389 ($match)
1390 }{
1391 my $kw = $1;
1392
1393 push @link, new CFPlus::UI::Label
1394 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1395 can_hover => 1,
1396 can_events => 1,
1397 padding_x => 0,
1398 padding_y => 0,
1399 on_button_up => sub {
1400 $self->send ($kw);
1401 };
1402
1403 "\x{fffc}"
1404 }giex;
1405
1121 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1406 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1122 $self->{textview}->scroll_to_bottom; 1407 $self->{textview}->scroll_to_bottom;
1408 }
1409
1123 $self->update_options; 1410 $self->update_options;
1124 } else { 1411 } else {
1125 $self->destroy; 1412 $self->destroy;
1126 } 1413 }
1127 1414
… …
1132 my ($self, $msg) = @_; 1419 my ($self, $msg) = @_;
1133 1420
1134 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1421 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1135 $self->{textview}->scroll_to_bottom; 1422 $self->{textview}->scroll_to_bottom;
1136 1423
1137 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1424 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1138} 1425}
1139 1426
1140sub destroy { 1427sub destroy {
1141 my ($self) = @_; 1428 my ($self) = @_;
1142 1429
1143 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1430 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1144 1431
1145 if ($self->{conn}) { 1432 if ($self->{conn}) {
1146 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1433 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1147 delete $self->{conn}{npc_dialog}; 1434 delete $self->{conn}{npc_dialog};
1148 $self->{conn}->disconnect_ext ($self->{id}); 1435 $self->{conn}->disconnect_ext ($self->{id});
1149 } 1436 }
1150 1437
1151 $self->SUPER::destroy; 1438 $self->SUPER::destroy;

Diff Legend

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