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.100 by root, Tue Apr 10 11:12:53 2007 UTC vs.
Revision 1.153 by root, Mon Aug 13 14:24:17 2007 UTC

… …
15use Crossfire::Protocol::Base 0.95; 15use Crossfire::Protocol::Base 0.95;
16 16
17use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
18 18
19sub new { 19sub new {
20 my $class = shift; 20 my ($class, %arg) = @_;
21 21
22 my $self = $class->SUPER::new (@_, 22 my $self = $class->SUPER::new (%arg,
23 setup_req => { 23 setup_req => {
24 extmap => 1, 24 extmap => 1,
25 smoothing => 1, 25 excmd => 1,
26 ywidget => 1,#d#
27 %{$arg{setup_req} || {}},
26 }, 28 },
27 ); 29 );
28 30
29 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
30 32
… …
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 $args->{$ev} = sub {
110 my $id = shift->{s_id};
111 $self->send_exti_msg (w_e => $id, $ev, \@_);
112
113 1
114 };
115 }
116
117 if (my $widget = eval {
118 local $SIG{__DIE__};
119 "CFPlus::UI::$class"->new (
120 %$args,
121 s_ws => $ws,
122 s_id => $id,
123 )
124 }
125 ) {
126 $self->{widget}{$id}
127 = $self->{widgetset}{$ws}{w}{$id}
128 = $widget;
129
130 $widget->connect (on_destroy => sub {
131 my ($widget) = @_;
132
133 delete $self->{widget}{$widget->{s_id}};
134 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
135 });
136 } else {
137 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
138 $self->send_exti_msg (w_e => $id, "destroy");
139 }
140 });
141
142 # widget call
143 $self->connect_ext (w_c => sub {
144 my ($id, $rid, $method, $args) = @_;
145
146 my $w = $self->{widget}{$id}
147 or return;
148
149 $args ||= [];
150
151 if ($rid) {
152 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
153 } else {
154 $w->$method (@$args);
155 }
156 });
157
158 # widget set
159 $self->connect_ext (w_s => sub {
160 my ($id, $attr) = @_;
161
162 my $w = $self->{widget}{$id}
163 or return;
164
165 for (my $i = 0; $i < $#$attr; $i += 2) {
166 my ($member, $value) = @$attr[$i, $i+1];
167 if (defined $value) {
168 $w->{$member} = $value;
169 } else {
170 delete $w->{$member};
171 }
172 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
173 }
174 });
175
176 # widget get
177 $self->connect_ext (w_g => sub {
178 my ($id, $rid, $attr) = @_;
179
180 my $w = $self->{widget}{$id}
181 or return;
182
183 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
184 });
185
186 # message window
187 $self->connect_ext (channel_info => sub {
188 my ($info) = @_;
189 $self->{channels}->{$info->{id}} = $info;
190 $::MESSAGE_WINDOW->add_channel ($info);
191 });
192
193 # destroy widgets on logout
194 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
195 for my $ws (values %{delete $self->{widgetset} || {}}) {
196 $_->destroy
197 for values %{delete $ws->{w} || {}};
198 }
199 });
200
68 $self->{map_widget}->add_command (@$_) 201 $self->{map_widget}->add_command (@$_)
69 for @cmd_help; 202 for @cmd_help;
70 203
71 { 204 {
72 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 205 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
… …
86 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 219 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
87 220
88 $self 221 $self
89} 222}
90 223
224sub update_fx_want {
225 my ($self) = @_;
226
227 $self->send_exti_msg (fx_want => {
228 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
229 5 => !!$::CFG->{audio_enable}, # FT_SOUND
230 });
231}
232
91sub logprint { 233sub logprint {
92 my ($self, @a) = @_; 234 my ($self, @a) = @_;
93 235
94 $self->{log_fh} ||= do { 236 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} 237}
112 238
113sub _stat_numdiff { 239sub _stat_numdiff {
114 my ($self, $name, $old, $new) = @_; 240 my ($self, $name, $old, $new) = @_;
115 241
… …
248 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 374 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
249 $::GAUGES->{food} ->set_value ($fo, $fo_m); 375 $::GAUGES->{food} ->set_value ($fo, $fo_m);
250 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 376 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
251 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 377 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
252 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 378 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
253 my $rng = $stats->{+CS_STAT_RANGE}; 379 $::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}; 380 my $title = $stats->{+CS_STAT_TITLE};
257 $title =~ s/^Player: //; 381 $title =~ s/^Player: //;
258 $::STATWIDS->{title} ->set_text ("Title: " . $title); 382 $::STATWIDS->{title} ->set_text ("Title: " . $title);
259 383
260 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 384 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
280 my @skills = keys %{ $self->{skill_info} }; 404 my @skills = keys %{ $self->{skill_info} };
281 405
282 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 406 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
283 $sktbl->clear; 407 $sktbl->clear;
284 408
409 my @add;
410
411 push @add,
285 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 412 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
286 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 413 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
287 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 414 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
288 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 415 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
289 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 416 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
290 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 417 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
418 ;
291 419
292 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 420 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
293 421
294 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 422 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); 423 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
323 } 451 }
324 452
325 1 453 1
326 }; 454 };
327 455
456 push @add,
328 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 457 $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); 458 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 459 $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); 460 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, 461 $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); 462 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
463 ;
334 464
335 $x++ and ($x, $y) = (0, $y + 1); 465 $x++ and ($x, $y) = (0, $y + 1);
336 } 466 }
467
468 $sktbl->add_at (@add);
337 } 469 }
338 470
339 for (grep exists $stats->{$_}, @skills) { 471 for (grep exists $stats->{$_}, @skills) {
340 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 472 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
341 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 473 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
374} 506}
375 507
376sub feed_map1a { 508sub feed_map1a {
377 my ($self, $data) = @_; 509 my ($self, $data) = @_;
378 510
379 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 511 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
512 my $delay;
513
514 for my $tile (@$missing) {
515 next if $self->{delay}{$tile};
516
517 $delay = 1;
518
519 if (my $tex = $::CONN->{texture}[$tile]) {
520 $tex->upload;
521 } else {
522 $self->{delay}{$tile} = 1;
523
524 # we assume the face is in-flight and will eventually come
525 push @{$self->{face_cb}{$tile}}, sub {
526 delete $self->{delay}{$tile};
527 $_[0]->upload;
528 };
529 }
530 }
531
532 if ($delay) {
533 # delay the map drawing a tiny bit in the hope of getting the missing fetched
534 Event->timer (after => 0.03, cb => sub {
535 $_[0]->w->cancel;
536 $self->{map_widget}->update;
537 });
538 } else {
380 $self->{map_widget}->update; 539 $self->{map_widget}->update;
540 }
381} 541}
382 542
383sub magicmap { 543sub magicmap {
384 my ($self, $w, $h, $x, $y, $data) = @_; 544 my ($self, $w, $h, $x, $y, $data) = @_;
385 545
… …
392 my $map_info = delete $self->{map_info} 552 my $map_info = delete $self->{map_info}
393 or return; 553 or return;
394 554
395 my ($hash, $x, $y, $w, $h) = @$map_info; 555 my ($hash, $x, $y, $w, $h) = @$map_info;
396 556
397 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 557 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
558 $self->{map_cache_new}{$hash} = \$data;
398 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 559 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
399 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
400} 560}
401 561
402sub map_clear { 562sub map_clear {
403 my ($self) = @_; 563 my ($self) = @_;
404 564
… …
417 do { 577 do {
418 $id = pop @{$self->{bg_fetch}} 578 $id = pop @{$self->{bg_fetch}}
419 or return; 579 or return;
420 } while $self->{texture}[$id]; 580 } while $self->{texture}[$id];
421 581
422 CFPlus::DB::get tilecache => $id, sub { 582 CFPlus::DB::exists tilecache => $id, sub {
423 my ($data) = @_; 583 my ($exists) = @_;
424 584
425 return unless $self->{map}; # stop when destroyed 585 return unless $self->{map}; # stop when destroyed
426 586
427 $self->set_texture ($id => $data) 587 if ($exists) {
428 if defined $data; 588 $self->have_tile ($id);
589 $self->{texture}[$id]->upload;
590 }
429 591
430 $self->bg_fetch; 592 $self->bg_fetch;
431 }; 593 };
432} 594}
433 595
434sub load_map($$$) { 596sub load_map($$$) {
435 my ($self, $hash, $x, $y) = @_; 597 my ($self, $hash, $x, $y) = @_;
436 598
437 my $gen = $self->{map_change_gen}; 599 my $gen = $self->{map_change_gen};
438 600
439 CFPlus::DB::get $self->{mapcache} => $hash, sub { 601 my $cb = sub {
440 return unless $gen == $self->{map_change_gen}; 602 return unless $gen == $self->{map_change_gen};
441 603
442 my ($data) = @_; 604 my ($data) = @_;
443 605
444 if (defined $data) { 606 if (defined $data) {
607 $self->{map_cache_new}{$hash} = \$data;
608
445 $data = Compress::LZF::decompress $data; 609 my $data = Compress::LZF::decompress $data;
446 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
447 610
448 my $inprogress = @{ $self->{bg_fetch} || [] }; 611 my $inprogress = @{ $self->{bg_fetch} || [] };
449 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 612 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
450 $self->bg_fetch unless $inprogress; 613 $self->bg_fetch unless $inprogress;
451 } 614 }
452 }; 615 };
616
617 if (my $rdata = $self->{map_cache_old}{$hash}) {
618 $cb->($$rdata);
619 } else {
620 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
621 }
453} 622}
454 623
455# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 624# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
456# (server resource,s latency, bandwidth), so this hack is warranted. 625# (server resource,s latency, bandwidth), so this hack is warranted.
457# the right fix is to make real tiled maps with an overview file 626# the right fix is to make real tiled maps with an overview file
… …
550 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 719 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
551 720
552 $self->flush_map; 721 $self->flush_map;
553 722
554 ++$self->{map_change_gen}; 723 ++$self->{map_change_gen};
724 $self->{map_cache_old} = delete $self->{map_cache_new};
555 725
556 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 726 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
557 727
558 my $mapmapw = $self->{mapmap}->{w}; 728 my $mapmapw = $self->{mapmap}->{w};
559 my $mapmaph = $self->{mapmap}->{h}; 729 my $mapmaph = $self->{mapmap}->{h};
… …
578} 748}
579 749
580sub face_find { 750sub face_find {
581 my ($self, $facenum, $face, $cb) = @_; 751 my ($self, $facenum, $face, $cb) = @_;
582 752
583 my $hash = "$face->{chksum},$face->{name}"; 753 if ($face->{type} == 0) { # FT_FACE
584
585 my $id = CFPlus::DB::get_tile_id_sync $hash; 754 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
586 755
587 $face->{id} = $id; 756 $face->{id} = $id;
588 $self->{faceid}[$facenum] = $id; 757 $self->{faceid}[$facenum] = $id;
589 758
590 $self->{map}->set_tileid ($facenum => $id); 759 $self->{map}->set_tileid ($facenum => $id);
591 760
592 CFPlus::DB::get tilecache => $id, $cb; 761 CFPlus::DB::get tilecache => $id, $cb;
762
763 } elsif ($face->{type} & 1) { # with metadata
764 CFPlus::DB::get res_meta => $face->{name}, $cb;
765 }
593} 766}
594 767
595sub face_update { 768sub face_update {
596 my ($self, $facenum, $face, $changed) = @_; 769 my ($self, $facenum, $face, $changed) = @_;
597 770
771 if ($face->{type} == 0) { # FT_FACE
598 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 772 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
599 if $changed; 773 if $changed;
600 774
601 $self->set_texture ($face->{id} => delete $face->{image}); 775 $self->have_tile ($face->{id});
776
777 } elsif ($face->{type} & 1) { # split metadata
778 if ($changed) { # new data
779 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
780 $face->{meta} = $self->{json_coder}->decode ($meta_json);
781
782 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
783 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
784 } else {
785 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
786 }
787
788 ::add_license ($face);
789
790 if ($face->{type} == 3) { # FT_MUSIC
791 $self->{music_meta}{$facenum} = $face;
792
793 ::message ({ markup => "downloaded song #$facenum" })
794 if $changed;
795
796 &::audio_music_push ($facenum);
797 } elsif ($face->{type} == 5) { # FT_SOUND
798 $self->{sound_meta}{$facenum} = $face;
799
800 ::message ({ markup => "downloaded sound #$facenum" })
801 if $changed;
802
803 &::audio_sound_push ($facenum);
804 }
805
806 }
602} 807}
603 808
604sub smooth_update { 809sub smooth_update {
605 my ($self, $facenum, $face) = @_; 810 my ($self, $facenum, $face) = @_;
606 811
607 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 812 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
608} 813}
609 814
610sub set_texture { 815sub have_tile {
816 my ($self, $tile) = @_;
817
818 return unless $self->{map};
819
820 my $tex = $self->{texture}[$tile] ||=
821 new CFPlus::Texture
822 tile => $tile, minify => 1, mipmap => 1, delay => 1;
823
824 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
825}
826
827sub connect_face_update {
611 my ($self, $id, $data) = @_; 828 my ($self, $id, $cb) = @_;
612 829
613 $self->{texture}[$id] = my $tex = 830 push @{$self->{face_cb}{$id}}, $cb;
614 new_from_image CFPlus::Texture
615 $data, minify => 1, mipmap => 1;
616 831
617 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 832 CFPlus::guard {
618 $self->{map_widget}->update; 833 @{$self->{face_cb}{$id}}
834 = grep $_ != $cb,
835 @{$self->{face_cb}{$id}};
836 }
619} 837}
620 838
621sub sound_play { 839sub sound_play {
622 my ($self, $x, $y, $soundnum, $type) = @_; 840 my ($self, $type, $face, $dx, $dy, $vol) = @_;
623 841
624 $self->{sound_play}->($x, $y, $soundnum, $type); 842 &::audio_sound_play ($face, $dx, $dy, $vol)
843 unless $type & 1; # odd types are silent for future expansion
625} 844}
626 845
627my $LAST_QUERY; # server is stupid, stupid, stupid 846my $LAST_QUERY; # server is stupid, stupid, stupid
628 847
629sub query { 848sub query {
… …
633 $LAST_QUERY = $prompt; 852 $LAST_QUERY = $prompt;
634 853
635 $self->{query}-> ($self, $flags, $prompt); 854 $self->{query}-> ($self, $flags, $prompt);
636} 855}
637 856
638sub drawinfo { 857sub sanitise_xml($) {
639 my ($self, $color, $text) = @_; 858 local $_ = shift;
640 859
641 my @color = ( 860 # we now weed out all tags we do not support
861 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
862 # now all entities
863 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
864
865 # handle some elements
866 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
867 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
868
869 $_
870}
871
872our %NAME_TO_COLOR = (
873 black => 0,
874 white => 1,
875 darkblue => 2,
876 red => 3,
877 orange => 4,
878 lightblue => 5,
879 darkorange => 6,
880 green => 7,
881 darkgreen => 8,
882 grey => 9,
883 brown => 10,
884 yellow => 11,
885 tan => 12,
886);
887
888our @CF_COLOR = (
642 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 889 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
643 [1.00, 1.00, 1.00], 890 [1.00, 1.00, 1.00],
644 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 891 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
645 [1.00, 0.00, 0.00], 892 [1.00, 0.00, 0.00],
646 [1.00, 0.54, 0.00], 893 [1.00, 0.54, 0.00],
647 [0.11, 0.56, 1.00], 894 [0.11, 0.56, 1.00],
648 [0.93, 0.46, 0.00], 895 [0.93, 0.46, 0.00],
649 [0.18, 0.54, 0.34], 896 [0.18, 0.54, 0.34],
650 [0.56, 0.73, 0.56], 897 [0.56, 0.73, 0.56],
651 [0.80, 0.80, 0.80], 898 [0.80, 0.80, 0.80],
652 [0.75, 0.61, 0.20], 899 [0.75, 0.61, 0.20],
653 [0.99, 0.77, 0.26], 900 [0.99, 0.77, 0.26],
654 [0.74, 0.65, 0.41], 901 [0.74, 0.65, 0.41],
655 ); 902);
656 903
657 my $fg = $color[$color % @color]; 904sub msg {
905 my ($self, $color, $type, $text, @extra) = @_;
658 906
907 $text = sanitise_xml $text;
908
909 if (my $cb = $self->{cb_msg}{$type}) {
910 $_->($self, $color, $type, $text, @extra) for values %$cb;
911 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
912 $type =~ s/-/_/g;
913 $self->{$type} = $text;
914 } else {
659 $self->logprint ("info: ", $text); 915 $self->logprint ("msg: ", $text);
916 return if $color < 0; # negative color == ignore if not understood
660 917
918 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
919
661 # try to create single paragraphs of multiple lines sent by the server 920 ## try to create single paragraphs of multiple lines sent by the server
921 # no longer neecssary with TRT servers
662 $text =~ s/(?<=\S)\n(?=\w)/ /g; 922 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
663 923
664 $text = CFPlus::asxml $text; 924 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
665 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
666 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
667
668 ::message ({ fg => $fg, markup => $_ })
669 for split /\n/, $text; 925 for split /\n/, $text;
670 926
671 $self->{statusbox}->add ($text, 927 $self->{statusbox}->add ($text,
672 group => $text, 928 group => $text,
673 fg => $fg, 929 fg => $fg,
674 timeout => $color >= 2 ? 180 : 10, 930 timeout => $color >= 2 ? 180 : 10,
675 tooltip_font => $::FONT_FIXED, 931 tooltip_font => $::FONT_FIXED,
676 ); 932 );
677} 933 }
678
679sub drawextinfo {
680 my ($self, $color, $type, $subtype, $message) = @_;
681
682 $self->drawinfo ($color, $message);
683} 934}
684 935
685sub spell_add { 936sub spell_add {
686 my ($self, $spell) = @_; 937 my ($self, $spell) = @_;
687 938
… …
735 $self->{map_widget}->clr_commands; 986 $self->{map_widget}->clr_commands;
736 987
737 ::stop_game (); 988 ::stop_game ();
738} 989}
739 990
740sub image_info {
741 my ($self, $numfaces) = @_;
742
743 $self->{num_faces} = $numfaces;
744 $self->{face_prefetch} = [1 .. $numfaces];
745 $self->face_prefetch;
746}
747
748sub face_prefetch {
749 my ($self) = @_;
750
751 return unless $::CFG->{face_prefetch};
752
753 if ($self->{num_faces}) {
754 return if @{ $self->{send_queue} || [] };
755 my $todo = @{ $self->{face_prefetch} }
756 or return;
757
758 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
759
760 $self->send ("requestinfo image_sums $face $face");
761
762 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
763 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
764 } elsif (!exists $self->{num_faces}) {
765 $self->send ("requestinfo image_info");
766
767 $self->{num_faces} = 0;
768
769 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
770 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
771 }
772}
773
774sub update_floorbox { 991sub update_floorbox {
775 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 992 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
776 return unless $::CONN; 993 return unless $::CONN;
777 994
778 $::FLOORBOX->clear; 995 $::FLOORBOX->clear;
996
997 my @add;
779 998
780 my $row; 999 my $row;
781 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1000 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
782 if ($row < 6) { 1001 if ($row < 6) {
783 local $_->{face_widget}; # hack to force recreation of widget 1002 local $_->{face_widget}; # hack to force recreation of widget
784 local $_->{desc_widget}; # hack to force recreation of widget 1003 local $_->{desc_widget}; # hack to force recreation of widget
785 CFPlus::Item::update_widgets $_; 1004 CFPlus::Item::update_widgets $_;
786 1005
1006 push @add,
787 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1007 0, $row, $_->{face_widget},
788 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1008 1, $row, $_->{desc_widget};
789 1009
790 $row++; 1010 $row++;
791 } else { 1011 } else {
792 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1012 push @add, 1, $row, new CFPlus::UI::Button
793 text => "More...", 1013 text => "More...",
794 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1014 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
795 ); 1015 ;
796 last; 1016 last;
797 } 1017 }
798 } 1018 }
799 if ($::CONN->{open_container}) { 1019 if ($::CONN->{open_container}) {
800 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1020 push @add, 1, $row++, new CFPlus::UI::Button
801 text => "Close container", 1021 text => "Close container",
802 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1022 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
803 ); 1023 ;
804 } 1024 }
805 });
806 1025
1026 $::FLOORBOX->add_at (@add);
1027 });
1028
807 $::WANT_REFRESH++; 1029 $::WANT_REFRESH->start;
808} 1030}
809 1031
810sub set_opencont { 1032sub set_opencont {
811 my ($conn, $tag, $name) = @_; 1033 my ($conn, $tag, $name) = @_;
812 $conn->{open_container} = $tag; 1034 $conn->{open_container} = $tag;
… …
920 $::SERVER_INFO->set_markup ( 1142 $::SERVER_INFO->set_markup (
921 "server <tt>$self->{host}:$self->{port}</tt>\n" 1143 "server <tt>$self->{host}:$self->{port}</tt>\n"
922 . "protocol version <tt>$self->{version}</tt>\n" 1144 . "protocol version <tt>$self->{version}</tt>\n"
923 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1145 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
924 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1146 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1147 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
925 . "editing support $yesno[!!$self->{editor_support}]\n" 1148 . "editing support $yesno[!!$self->{editor_support}]\n"
926 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1149 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1150 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
927 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1151 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
928 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1152 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
929 . "map size $self->{mapw}×$self->{maph}\n" 1153 . "map size $self->{mapw}×$self->{maph}\n"
930 ); 1154 );
931 1155
932 ::setup_build_button ($self->{editor_support}->{builder_ui});
933} 1156}
934 1157
935sub logged_in { 1158sub logged_in {
936 my ($self) = @_; 1159 my ($self) = @_;
937 1160
938 $self->send_ext_req (cfplus_support => version => 1, sub { 1161 $self->send_ext_req (cfplus_support => version => 2, sub {
1162 my (%msg) = @_;
1163
939 $self->{cfplus_ext} = $_[0]{version}; 1164 $self->{cfplus_ext} = $msg{version};
940 $self->update_server_info; 1165 $self->update_server_info;
941 1166
942 if ($self->{cfplus_ext} >= 2) { 1167 if ($self->{cfplus_ext} >= 2) {
943 $self->send_ext_req ("editor_support", sub { 1168 $self->send_ext_req ("editor_support", sub {
944 $self->{editor_support} = $_[0]; 1169 $self->{editor_support} = { @_ };
945 $self->update_server_info; 1170 $self->update_server_info;
946 1171
947 0 1172 0
948 }); 1173 });
949 } 1174 }
… …
957 $self->send_command ("output-count $::CFG->{output_count}"); 1182 $self->send_command ("output-count $::CFG->{output_count}");
958 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1183 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
959 $self->send_command ("pickup $::CFG->{pickup}"); 1184 $self->send_command ("pickup $::CFG->{pickup}");
960} 1185}
961 1186
962sub buildat {
963 my ($self, $builditem, $x, $y) = @_;
964
965 if ($self->{cfplus_ext}) {
966 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
967 }
968}
969
970sub lookat { 1187sub lookat {
971 my ($self, $x, $y) = @_; 1188 my ($self, $x, $y) = @_;
972 1189
973 if ($self->{cfplus_ext}) { 1190 if ($self->{cfplus_ext}) {
974 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1191 $self->send_ext_req (lookat => $x, $y, sub {
975 my ($msg) = @_; 1192 my (%msg) = @_;
976 1193
977 if (exists $msg->{npc_dialog}) { 1194 if (exists $msg{npc_dialog}) {
978 # start npc chat dialog 1195 # start npc chat dialog
979 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1196 $self->{npc_dialog} = new CFPlus::NPCDialog::
980 dx => $x, 1197 token => $msg{npc_dialog},
981 dy => $y,
982 title => "$msg->{npc_dialog} (NPC)", 1198 title => "$msg{npc_dialog}[0] (NPC)",
983 conn => $self, 1199 conn => $self,
984 ; 1200 ;
985 } 1201 }
986 }); 1202 });
987 } 1203 }
… …
994 1210
995 (delete $self->{npc_dialog})->destroy 1211 (delete $self->{npc_dialog})->destroy
996 if $self->{npc_dialog}; 1212 if $self->{npc_dialog};
997 1213
998 $self->SUPER::destroy; 1214 $self->SUPER::destroy;
1215
1216 %$self = ();
999} 1217}
1000 1218
1001package CFPlus::NPCDialog; 1219package CFPlus::NPCDialog;
1002 1220
1003our @ISA = 'CFPlus::UI::Toplevel'; 1221our @ISA = 'CFPlus::UI::Toplevel';
… …
1050 on_activate => sub { $this->destroy; 1 }, 1268 on_activate => sub { $this->destroy; 1 },
1051 ; 1269 ;
1052 1270
1053 $self->update_options; 1271 $self->update_options;
1054 1272
1055 $self->{id} = $self->{conn}->send_ext_req ( 1273 $self->{id} = "npc-channel-" . $self->{conn}->token;
1056 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1274 $self->{conn}->connect_ext ($self->{id} => sub {
1057 sub { $this && $this->feed (@_) } 1275 $this->feed (@_) if $this;
1058 ); 1276 });
1277
1278 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1059 1279
1060 $self->{entry}->grab_focus; 1280 $self->{entry}->grab_focus;
1061 1281
1062 $self->{textview}->add_paragraph ({ 1282 $self->{textview}->add_paragraph ({
1063 fg => [1, 1, 0, 1], 1283 fg => [1, 1, 0, 1],
… …
1086 ); 1306 );
1087 } 1307 }
1088} 1308}
1089 1309
1090sub feed { 1310sub feed {
1091 my ($self, $msg) = @_; 1311 my ($self, $type, @arg) = @_;
1092 1312
1093 CFPlus::weaken $self; 1313 CFPlus::weaken $self;
1094 1314
1095 if ($msg->{msgtype} eq "reply") { 1315 if ($type eq "update") {
1316 my (%info) = @arg;
1317
1096 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1318 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1097 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1319 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1098
1099 my $text = "\n" . CFPlus::asxml $msg->{msg};
1100 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1101 my @link;
1102 $text =~ s{
1103 ($match)
1104 }{
1105 my $kw = $1;
1106
1107 push @link, new CFPlus::UI::Label
1108 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1109 can_hover => 1,
1110 can_events => 1,
1111 padding_x => 0,
1112 padding_y => 0,
1113 on_button_up => sub {
1114 $self->send ($kw);
1115 };
1116
1117 "\x{fffc}"
1118 }giex;
1119 1320
1321 if (exists $info{msg}) {
1322 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1323 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1324 my @link;
1325 $text =~ s{
1326 ($match)
1327 }{
1328 my $kw = $1;
1329
1330 push @link, new CFPlus::UI::Label
1331 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1332 can_hover => 1,
1333 can_events => 1,
1334 padding_x => 0,
1335 padding_y => 0,
1336 on_button_up => sub {
1337 $self->send ($kw);
1338 };
1339
1340 "\x{fffc}"
1341 }giex;
1342
1120 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1343 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1121 $self->{textview}->scroll_to_bottom; 1344 $self->{textview}->scroll_to_bottom;
1345 }
1346
1122 $self->update_options; 1347 $self->update_options;
1123 } else { 1348 } else {
1124 $self->destroy; 1349 $self->destroy;
1125 } 1350 }
1126 1351
… …
1131 my ($self, $msg) = @_; 1356 my ($self, $msg) = @_;
1132 1357
1133 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1358 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1134 $self->{textview}->scroll_to_bottom; 1359 $self->{textview}->scroll_to_bottom;
1135 1360
1136 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1361 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1137} 1362}
1138 1363
1139sub destroy { 1364sub destroy {
1140 my ($self) = @_; 1365 my ($self) = @_;
1141 1366
1142 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1367 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1143 1368
1144 if ($self->{conn}) { 1369 if ($self->{conn}) {
1145 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1370 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1146 delete $self->{conn}{npc_dialog}; 1371 delete $self->{conn}{npc_dialog};
1147 $self->{conn}->disconnect_ext ($self->{id}); 1372 $self->{conn}->disconnect_ext ($self->{id});
1148 } 1373 }
1149 1374
1150 $self->SUPER::destroy; 1375 $self->SUPER::destroy;

Diff Legend

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