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.103 by root, Mon Apr 23 19:17:41 2007 UTC vs.
Revision 1.155 by root, Fri Aug 17 21:18:01 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 xwidget1 => 1,#d#
26 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
27 }, 28 },
28 ); 29 );
29 30
30 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
47 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
48 @args 49 @args
49 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
50 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
51 52
53 $self->connect_ext (ambient_music => sub {
54 my ($songs) = @_;
55 &::audio_music_set_ambient ($songs);
56 });
57
52 $self->connect_ext (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
53 my ($cap) = @_; 59 my (%cap) = @_;
54 60
61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want;
63
55 if (my $ts = $cap->{tileset}) { 64 if (my $ts = $cap{tileset}) {
56 if (my ($default) = grep $_->[2] & 1, @$ts) { 65 if (my ($default) = grep $_->[2] & 1, @$ts) {
57 $self->{tileset} = $default; 66 $self->{tileset} = $default;
58 $self->{tilesize} = $default->[3]; 67 $self->{tilesize} = $default->[3];
59 $self->setup_req (tileset => $default->[0]); 68 $self->setup_req (tileset => $default->[0]);
60 69
… …
64 $self->setup_req (mapsize => "${w}x${h}"); 73 $self->setup_req (mapsize => "${w}x${h}");
65 } 74 }
66 } 75 }
67 }); 76 });
68 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
69 $self->{map_widget}->add_command (@$_) 232 $self->{map_widget}->add_command (@$_)
70 for @cmd_help; 233 for @cmd_help;
71 234
72 { 235 {
73 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 236 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
… …
87 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 250 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
88 251
89 $self 252 $self
90} 253}
91 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
92sub logprint { 292sub logprint {
93 my ($self, @a) = @_; 293 my ($self, @a) = @_;
94 294
95 $self->{log_fh} ||= do { 295 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
96 my $path = "$Crossfire::VARDIR/log.$self->{host}";
97
98 open my $fh, ">>:utf8", $path
99 or die "Couldn't open logfile $path: $!";
100
101 $fh->autoflush (1);
102
103 $fh;
104 };
105
106 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
107
108 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
109 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
110
111 print {$self->{log_fh}} "$ts ", @a, "\n";
112} 296}
113 297
114sub _stat_numdiff { 298sub _stat_numdiff {
115 my ($self, $name, $old, $new) = @_; 299 my ($self, $name, $old, $new) = @_;
116 300
… …
249 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 433 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
250 $::GAUGES->{food} ->set_value ($fo, $fo_m); 434 $::GAUGES->{food} ->set_value ($fo, $fo_m);
251 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 435 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
252 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 436 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
253 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 437 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
254 my $rng = $stats->{+CS_STAT_RANGE}; 438 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
255 $rng =~ s/^Range: //; # thank you so much dear server
256 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
257 my $title = $stats->{+CS_STAT_TITLE}; 439 my $title = $stats->{+CS_STAT_TITLE};
258 $title =~ s/^Player: //; 440 $title =~ s/^Player: //;
259 $::STATWIDS->{title} ->set_text ("Title: " . $title); 441 $::STATWIDS->{title} ->set_text ("Title: " . $title);
260 442
261 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 443 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
281 my @skills = keys %{ $self->{skill_info} }; 463 my @skills = keys %{ $self->{skill_info} };
282 464
283 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 465 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
284 $sktbl->clear; 466 $sktbl->clear;
285 467
468 my @add;
469
470 push @add,
286 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 471 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
287 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 472 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
288 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 473 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
289 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 474 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
290 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 475 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
291 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 476 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
477 ;
292 478
293 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>";
294 480
295 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);
296 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);
… …
324 } 510 }
325 511
326 1 512 1
327 }; 513 };
328 514
515 push @add,
329 $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
330 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),
331 $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
332 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),
333 $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,
334 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 ;
335 523
336 $x++ and ($x, $y) = (0, $y + 1); 524 $x++ and ($x, $y) = (0, $y + 1);
337 } 525 }
526
527 $sktbl->add_at (@add);
338 } 528 }
339 529
340 for (grep exists $stats->{$_}, @skills) { 530 for (grep exists $stats->{$_}, @skills) {
341 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 531 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
342 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 532 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
375} 565}
376 566
377sub feed_map1a { 567sub feed_map1a {
378 my ($self, $data) = @_; 568 my ($self, $data) = @_;
379 569
380 $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 {
381 $self->{map_widget}->update; 598 $self->{map_widget}->update;
599 }
382} 600}
383 601
384sub magicmap { 602sub magicmap {
385 my ($self, $w, $h, $x, $y, $data) = @_; 603 my ($self, $w, $h, $x, $y, $data) = @_;
386 604
… …
393 my $map_info = delete $self->{map_info} 611 my $map_info = delete $self->{map_info}
394 or return; 612 or return;
395 613
396 my ($hash, $x, $y, $w, $h) = @$map_info; 614 my ($hash, $x, $y, $w, $h) = @$map_info;
397 615
398 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;
399 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 618 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
400 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
401} 619}
402 620
403sub map_clear { 621sub map_clear {
404 my ($self) = @_; 622 my ($self) = @_;
405 623
… …
418 do { 636 do {
419 $id = pop @{$self->{bg_fetch}} 637 $id = pop @{$self->{bg_fetch}}
420 or return; 638 or return;
421 } while $self->{texture}[$id]; 639 } while $self->{texture}[$id];
422 640
423 CFPlus::DB::get tilecache => $id, sub { 641 CFPlus::DB::exists tilecache => $id, sub {
424 my ($data) = @_; 642 my ($exists) = @_;
425 643
426 return unless $self->{map}; # stop when destroyed 644 return unless $self->{map}; # stop when destroyed
427 645
428 $self->set_texture ($id => $data) 646 if ($exists) {
429 if defined $data; 647 $self->have_tile ($id);
648 $self->{texture}[$id]->upload;
649 }
430 650
431 $self->bg_fetch; 651 $self->bg_fetch;
432 }; 652 };
433} 653}
434 654
435sub load_map($$$) { 655sub load_map($$$) {
436 my ($self, $hash, $x, $y) = @_; 656 my ($self, $hash, $x, $y) = @_;
437 657
438 my $gen = $self->{map_change_gen}; 658 my $gen = $self->{map_change_gen};
439 659
440 CFPlus::DB::get $self->{mapcache} => $hash, sub { 660 my $cb = sub {
441 return unless $gen == $self->{map_change_gen}; 661 return unless $gen == $self->{map_change_gen};
442 662
443 my ($data) = @_; 663 my ($data) = @_;
444 664
445 if (defined $data) { 665 if (defined $data) {
666 $self->{map_cache_new}{$hash} = \$data;
667
446 $data = Compress::LZF::decompress $data; 668 my $data = Compress::LZF::decompress $data;
447 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
448 669
449 my $inprogress = @{ $self->{bg_fetch} || [] }; 670 my $inprogress = @{ $self->{bg_fetch} || [] };
450 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 671 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
451 $self->bg_fetch unless $inprogress; 672 $self->bg_fetch unless $inprogress;
452 } 673 }
453 }; 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 }
454} 681}
455 682
456# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 683# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
457# (server resource,s latency, bandwidth), so this hack is warranted. 684# (server resource,s latency, bandwidth), so this hack is warranted.
458# 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
… …
551 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 778 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
552 779
553 $self->flush_map; 780 $self->flush_map;
554 781
555 ++$self->{map_change_gen}; 782 ++$self->{map_change_gen};
783 $self->{map_cache_old} = delete $self->{map_cache_new};
556 784
557 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 785 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
558 786
559 my $mapmapw = $self->{mapmap}->{w}; 787 my $mapmapw = $self->{mapmap}->{w};
560 my $mapmaph = $self->{mapmap}->{h}; 788 my $mapmaph = $self->{mapmap}->{h};
… …
579} 807}
580 808
581sub face_find { 809sub face_find {
582 my ($self, $facenum, $face, $cb) = @_; 810 my ($self, $facenum, $face, $cb) = @_;
583 811
584 my $hash = "$face->{chksum},$face->{name}"; 812 if ($face->{type} == 0) { # FT_FACE
585
586 my $id = CFPlus::DB::get_tile_id_sync $hash; 813 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
587 814
588 $face->{id} = $id; 815 $face->{id} = $id;
589 $self->{faceid}[$facenum] = $id; 816 $self->{faceid}[$facenum] = $id;
590 817
591 $self->{map}->set_tileid ($facenum => $id); 818 $self->{map}->set_tileid ($facenum => $id);
592 819
593 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 }
594} 825}
595 826
596sub face_update { 827sub face_update {
597 my ($self, $facenum, $face, $changed) = @_; 828 my ($self, $facenum, $face, $changed) = @_;
598 829
830 if ($face->{type} == 0) { # FT_FACE
599 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 831 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
600 if $changed; 832 if $changed;
601 833
602 $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 }
603} 866}
604 867
605sub smooth_update { 868sub smooth_update {
606 my ($self, $facenum, $face) = @_; 869 my ($self, $facenum, $face) = @_;
607 870
608 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 871 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
609} 872}
610 873
611sub 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 {
612 my ($self, $id, $data) = @_; 887 my ($self, $id, $cb) = @_;
613 888
614 $self->{texture}[$id] = my $tex = 889 push @{$self->{face_cb}{$id}}, $cb;
615 new_from_image CFPlus::Texture
616 $data, minify => 1, mipmap => 1;
617 890
618 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 891 CFPlus::guard {
619 $self->{map_widget}->update; 892 @{$self->{face_cb}{$id}}
893 = grep $_ != $cb,
894 @{$self->{face_cb}{$id}};
895 }
620} 896}
621 897
622sub sound_play { 898sub sound_play {
623 my ($self, $x, $y, $soundnum, $type) = @_; 899 my ($self, $type, $face, $dx, $dy, $vol) = @_;
624 900
625 $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
626} 903}
627 904
628my $LAST_QUERY; # server is stupid, stupid, stupid 905my $LAST_QUERY; # server is stupid, stupid, stupid
629 906
630sub query { 907sub query {
… …
633 $prompt = $LAST_QUERY unless length $prompt; 910 $prompt = $LAST_QUERY unless length $prompt;
634 $LAST_QUERY = $prompt; 911 $LAST_QUERY = $prompt;
635 912
636 $self->{query}-> ($self, $flags, $prompt); 913 $self->{query}-> ($self, $flags, $prompt);
637} 914}
915
916sub sanitise_xml($) {
917 local $_ = shift;
918
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);
638 946
639our @CF_COLOR = ( 947our @CF_COLOR = (
640 [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],
641 [1.00, 1.00, 1.00], 949 [1.00, 1.00, 1.00],
642 [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]
… …
650 [0.75, 0.61, 0.20], 958 [0.75, 0.61, 0.20],
651 [0.99, 0.77, 0.26], 959 [0.99, 0.77, 0.26],
652 [0.74, 0.65, 0.41], 960 [0.74, 0.65, 0.41],
653); 961);
654 962
655sub drawinfo { 963sub msg {
656 my ($self, $color, $text) = @_; 964 my ($self, $color, $type, $text, @extra) = @_;
657 965
658 my $fg = $CF_COLOR[$color % @CF_COLOR]; 966 $text = sanitise_xml $text;
659 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 {
660 $self->logprint ("info: ", $text); 974 $self->logprint ("msg: ", $text);
975 return if $color < 0; # negative color == ignore if not understood
661 976
977 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
978
662 ## 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
663 # no longer neecssary with TRT servers 980 # no longer neecssary with TRT servers
664 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 981 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
665 982
666 $text = CFPlus::asxml $text; 983 ::message ({
667 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 984 fg => $fg,
668 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 985 markup => $_,
669 986 type => $type,
670 ::message ({ fg => $fg, markup => $_ }) 987 extra => [@extra],
988 color_flags => $color
671 for split /\n/, $text; 989 }) for split /\n/, $text;
672 990
673 $self->{statusbox}->add ($text, 991 $self->{statusbox}->add ($text,
674 group => $text, 992 group => $text,
675 fg => $fg, 993 fg => $fg,
676 timeout => $color >= 2 ? 180 : 10, 994 timeout => $color >= 2 ? 180 : 10,
677 tooltip_font => $::FONT_FIXED, 995 tooltip_font => $::FONT_FIXED,
678 ); 996 );
679} 997 }
680
681sub drawextinfo {
682 my ($self, $color, $type, $subtype, $message) = @_;
683
684 $self->drawinfo ($color, $message);
685} 998}
686 999
687sub spell_add { 1000sub spell_add {
688 my ($self, $spell) = @_; 1001 my ($self, $spell) = @_;
689 1002
… …
737 $self->{map_widget}->clr_commands; 1050 $self->{map_widget}->clr_commands;
738 1051
739 ::stop_game (); 1052 ::stop_game ();
740} 1053}
741 1054
742sub image_info {
743 my ($self, $numfaces) = @_;
744
745 $self->{num_faces} = $numfaces;
746 $self->{face_prefetch} = [1 .. $numfaces];
747 $self->face_prefetch;
748}
749
750sub face_prefetch {
751 my ($self) = @_;
752
753 return unless $::CFG->{face_prefetch};
754
755 if ($self->{num_faces}) {
756 return if @{ $self->{send_queue} || [] };
757 my $todo = @{ $self->{face_prefetch} }
758 or return;
759
760 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
761
762 $self->send ("requestinfo image_sums $face $face");
763
764 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
765 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
766 } elsif (!exists $self->{num_faces}) {
767 $self->send ("requestinfo image_info");
768
769 $self->{num_faces} = 0;
770
771 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
772 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
773 }
774}
775
776sub update_floorbox { 1055sub update_floorbox {
777 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1056 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
778 return unless $::CONN; 1057 return unless $::CONN;
779 1058
780 $::FLOORBOX->clear; 1059 $::FLOORBOX->clear;
1060
1061 my @add;
781 1062
782 my $row; 1063 my $row;
783 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} }) {
784 if ($row < 6) { 1065 if ($row < 6) {
785 local $_->{face_widget}; # hack to force recreation of widget 1066 local $_->{face_widget}; # hack to force recreation of widget
786 local $_->{desc_widget}; # hack to force recreation of widget 1067 local $_->{desc_widget}; # hack to force recreation of widget
787 CFPlus::Item::update_widgets $_; 1068 CFPlus::Item::update_widgets $_;
788 1069
1070 push @add,
789 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1071 0, $row, $_->{face_widget},
790 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1072 1, $row, $_->{desc_widget};
791 1073
792 $row++; 1074 $row++;
793 } else { 1075 } else {
794 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1076 push @add, 1, $row, new CFPlus::UI::Button
795 text => "More...", 1077 text => "More...",
796 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1078 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
797 ); 1079 ;
798 last; 1080 last;
799 } 1081 }
800 } 1082 }
801 if ($::CONN->{open_container}) { 1083 if ($::CONN->{open_container}) {
802 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1084 push @add, 1, $row++, new CFPlus::UI::Button
803 text => "Close container", 1085 text => "Close container",
804 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1086 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
805 ); 1087 ;
806 } 1088 }
807 });
808 1089
1090 $::FLOORBOX->add_at (@add);
1091 });
1092
809 $::WANT_REFRESH++; 1093 $::WANT_REFRESH->start;
810} 1094}
811 1095
812sub set_opencont { 1096sub set_opencont {
813 my ($conn, $tag, $name) = @_; 1097 my ($conn, $tag, $name) = @_;
814 $conn->{open_container} = $tag; 1098 $conn->{open_container} = $tag;
815 update_floorbox; 1099 update_floorbox;
816 1100
817 $::INV_RIGHT_HB->clear (); 1101 $::INVR_HB->clear ();
818 $::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);
819 1103
820 if ($tag != 0) { # Floor isn't closable, is it? 1104 if ($tag != 0) { # Floor isn't closable, is it?
821 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1105 $::INVR_HB->add (new CFPlus::UI::Button
822 text => "Close container", 1106 text => "Close container",
823 tooltip => "Close the currently open container (if one is open)", 1107 tooltip => "Close the currently open container (if one is open)",
824 on_activate => sub { 1108 on_activate => sub {
825 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1109 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
826 if $tag != 0; 1110 if $tag != 0;
827 #if $CONN->{open_container} != 0;
828 0 1111 0
829 }, 1112 },
830 ); 1113 );
831 } 1114 }
832 1115
… …
922 $::SERVER_INFO->set_markup ( 1205 $::SERVER_INFO->set_markup (
923 "server <tt>$self->{host}:$self->{port}</tt>\n" 1206 "server <tt>$self->{host}:$self->{port}</tt>\n"
924 . "protocol version <tt>$self->{version}</tt>\n" 1207 . "protocol version <tt>$self->{version}</tt>\n"
925 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1208 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
926 . "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"
927 . "editing support $yesno[!!$self->{editor_support}]\n" 1211 . "editing support $yesno[!!$self->{editor_support}]\n"
928 . "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"
929 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1214 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
930 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1215 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
931 . "map size $self->{mapw}×$self->{maph}\n" 1216 . "map size $self->{mapw}×$self->{maph}\n"
932 ); 1217 );
933 1218
934 ::setup_build_button ($self->{editor_support}->{builder_ui});
935} 1219}
936 1220
937sub logged_in { 1221sub logged_in {
938 my ($self) = @_; 1222 my ($self) = @_;
939 1223
940 $self->send_ext_req (cfplus_support => version => 1, sub { 1224 $self->send_ext_req (cfplus_support => version => 2, sub {
1225 my (%msg) = @_;
1226
941 $self->{cfplus_ext} = $_[0]{version}; 1227 $self->{cfplus_ext} = $msg{version};
942 $self->update_server_info; 1228 $self->update_server_info;
943 1229
944 if ($self->{cfplus_ext} >= 2) { 1230 if ($self->{cfplus_ext} >= 2) {
945 $self->send_ext_req ("editor_support", sub { 1231 $self->send_ext_req ("editor_support", sub {
946 $self->{editor_support} = $_[0]; 1232 $self->{editor_support} = { @_ };
947 $self->update_server_info; 1233 $self->update_server_info;
948 1234
949 0 1235 0
950 }); 1236 });
951 } 1237 }
… …
959 $self->send_command ("output-count $::CFG->{output_count}"); 1245 $self->send_command ("output-count $::CFG->{output_count}");
960 $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;
961 $self->send_command ("pickup $::CFG->{pickup}"); 1247 $self->send_command ("pickup $::CFG->{pickup}");
962} 1248}
963 1249
964sub buildat {
965 my ($self, $builditem, $x, $y) = @_;
966
967 if ($self->{cfplus_ext}) {
968 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
969 }
970}
971
972sub lookat { 1250sub lookat {
973 my ($self, $x, $y) = @_; 1251 my ($self, $x, $y) = @_;
974 1252
975 if ($self->{cfplus_ext}) { 1253 if ($self->{cfplus_ext}) {
976 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1254 $self->send_ext_req (lookat => $x, $y, sub {
977 my ($msg) = @_; 1255 my (%msg) = @_;
978 1256
979 if (exists $msg->{npc_dialog}) { 1257 if (exists $msg{npc_dialog}) {
980 # start npc chat dialog 1258 # start npc chat dialog
981 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1259 $self->{npc_dialog} = new CFPlus::NPCDialog::
982 dx => $x, 1260 token => $msg{npc_dialog},
983 dy => $y,
984 title => "$msg->{npc_dialog} (NPC)", 1261 title => "$msg{npc_dialog}[0] (NPC)",
985 conn => $self, 1262 conn => $self,
986 ; 1263 ;
987 } 1264 }
988 }); 1265 });
989 } 1266 }
… …
996 1273
997 (delete $self->{npc_dialog})->destroy 1274 (delete $self->{npc_dialog})->destroy
998 if $self->{npc_dialog}; 1275 if $self->{npc_dialog};
999 1276
1000 $self->SUPER::destroy; 1277 $self->SUPER::destroy;
1278
1279 %$self = ();
1001} 1280}
1002 1281
1003package CFPlus::NPCDialog; 1282package CFPlus::NPCDialog;
1004 1283
1005our @ISA = 'CFPlus::UI::Toplevel'; 1284our @ISA = 'CFPlus::UI::Toplevel';
… …
1052 on_activate => sub { $this->destroy; 1 }, 1331 on_activate => sub { $this->destroy; 1 },
1053 ; 1332 ;
1054 1333
1055 $self->update_options; 1334 $self->update_options;
1056 1335
1057 $self->{id} = $self->{conn}->send_ext_req ( 1336 $self->{id} = "npc-channel-" . $self->{conn}->token;
1058 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1337 $self->{conn}->connect_ext ($self->{id} => sub {
1059 sub { $this && $this->feed (@_) } 1338 $this->feed (@_) if $this;
1060 ); 1339 });
1340
1341 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1061 1342
1062 $self->{entry}->grab_focus; 1343 $self->{entry}->grab_focus;
1063 1344
1064 $self->{textview}->add_paragraph ({ 1345 $self->{textview}->add_paragraph ({
1065 fg => [1, 1, 0, 1], 1346 fg => [1, 1, 0, 1],
… …
1088 ); 1369 );
1089 } 1370 }
1090} 1371}
1091 1372
1092sub feed { 1373sub feed {
1093 my ($self, $msg) = @_; 1374 my ($self, $type, @arg) = @_;
1094 1375
1095 CFPlus::weaken $self; 1376 CFPlus::weaken $self;
1096 1377
1097 if ($msg->{msgtype} eq "reply") { 1378 if ($type eq "update") {
1379 my (%info) = @arg;
1380
1098 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1381 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1099 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1382 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1100
1101 my $text = "\n" . CFPlus::asxml $msg->{msg};
1102 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1103 my @link;
1104 $text =~ s{
1105 ($match)
1106 }{
1107 my $kw = $1;
1108
1109 push @link, new CFPlus::UI::Label
1110 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1111 can_hover => 1,
1112 can_events => 1,
1113 padding_x => 0,
1114 padding_y => 0,
1115 on_button_up => sub {
1116 $self->send ($kw);
1117 };
1118
1119 "\x{fffc}"
1120 }giex;
1121 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
1122 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1406 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1123 $self->{textview}->scroll_to_bottom; 1407 $self->{textview}->scroll_to_bottom;
1408 }
1409
1124 $self->update_options; 1410 $self->update_options;
1125 } else { 1411 } else {
1126 $self->destroy; 1412 $self->destroy;
1127 } 1413 }
1128 1414
… …
1133 my ($self, $msg) = @_; 1419 my ($self, $msg) = @_;
1134 1420
1135 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1421 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1136 $self->{textview}->scroll_to_bottom; 1422 $self->{textview}->scroll_to_bottom;
1137 1423
1138 $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);
1139} 1425}
1140 1426
1141sub destroy { 1427sub destroy {
1142 my ($self) = @_; 1428 my ($self) = @_;
1143 1429
1144 #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
1145 1431
1146 if ($self->{conn}) { 1432 if ($self->{conn}) {
1147 $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};
1148 delete $self->{conn}{npc_dialog}; 1434 delete $self->{conn}{npc_dialog};
1149 $self->{conn}->disconnect_ext ($self->{id}); 1435 $self->{conn}->disconnect_ext ($self->{id});
1150 } 1436 }
1151 1437
1152 $self->SUPER::destroy; 1438 $self->SUPER::destroy;

Diff Legend

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