--- deliantra/Deliantra-Client/DC/Protocol.pm 2012/11/04 02:14:11 1.222 +++ deliantra/Deliantra-Client/DC/Protocol.pm 2012/11/21 13:23:10 1.228 @@ -9,7 +9,6 @@ use DC; use DC::DB; use DC::UI; -use DC::Pod; use DC::Macro; use DC::Item; @@ -36,44 +35,32 @@ $self->update_fx_want; - my $guard = $self->addme_guard; - $self->send_exti_req (resource => "exp_table", sub { - my ($idx) = @_; + my $exp_guard = $self->addme_guard; + my $skl_guard = $self->addme_guard; + my $spl_guard = $self->addme_guard; + $self->send_exti_req (resource => qw(exp_table skill_info spell_paths), sub { + my ($exp, $skl, $spl) = @_; - $self->register_face_handler ($idx, sub { + $self->register_face_handler ($exp, sub { my ($face) = @_; - undef $guard; + undef $exp_guard; $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data}); $_->() for values %{ $self->{on_exp_update} }; }); - () - }); - - my $guard = $self->addme_guard; - $self->send_exti_req (resource => "skill_info", sub { - my ($idx) = @_; - - $self->register_face_handler ($idx, sub { + $self->register_face_handler ($skl, sub { my ($face) = @_; - undef $guard; + undef $skl_guard; my $info = $self->{json_coder}->decode (delete $face->{data}); $self->{skill_info} = { map { CS_STAT_SKILLINFO + $_ => $info->[$_][0] } 0 .. $#$info }; }); - () - }); - - my $guard = $self->addme_guard; - $self->send_exti_req (resource => "spell_paths", sub { - my ($idx) = @_; - - $self->register_face_handler ($idx, sub { + $self->register_face_handler ($spl, sub { my ($face) = @_; - undef $guard; + undef $spl_guard; my $info = $self->{json_coder}->decode (delete $face->{data}); $self->{spell_paths} = { map { (1 << $_) => $info->[$_][0] } 0 .. $#$info }; }); @@ -81,27 +68,7 @@ () }); - $self->{map_widget}->clr_commands; - - my @cmd_help = map { - $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x - or die "unparseable command help: $_->[DC::Pod::N_KW][0]"; - - my $cmd = $1; - my @args = split /\|/, $2; - @args = (".*") unless @args; - - my (undef, @par) = DC::Pod::section_of $_; - my $text = DC::Pod::as_label @par; - - $_ = $_ eq ".*" ? "" : " $_" - for @args; - - map ["$cmd$_", $text], - sort { (length $a) <=> (length $b) } - @args - } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] } - DC::Pod::find command => "*"; + $::COMPLETER->reset; $self->{json_coder} ->convert_blessed @@ -129,9 +96,6 @@ $::FLOORBOX->clear; }); - $self->{map_widget}->add_command (@$_) - for @cmd_help; - { $self->{dialogue} = my $tex = $TEX_DIALOGUE; $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); @@ -165,6 +129,9 @@ $self } + #$self->send_exti_req (nickmon => 1, sub { use Data::Dump; ddx \@_ });#d# +#sub ext_nicklist { shift; use Data::Dump; ddx \@_; } #d# + sub update_fx_want { my ($self) = @_; @@ -197,6 +164,22 @@ &::audio_music_set_ambient ($songs); } +sub ext_command_list { + my ($self, @faces) = @_; + + my $handler = $self->{command_facehandler} = {}; + my $commands = $::COMPLETER->{command_list} = {}; + + for my $idx (@faces) { + $handler->{$idx} = $self->register_face_handler ($idx, sub { + my ($face) = @_; + + $commands->{$idx} = + $face->{cache} ||= $self->{json_coder}->decode ($face->{data}); + }); + } +} + ############################################################################# sub widget_associate { @@ -645,7 +628,7 @@ # label (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0, - can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), + can_events => 1, can_hover => 1, tooltip => "#(skill/$name)$TOOLTIP_ALL"), ]; push @add, @@ -1078,27 +1061,6 @@ $self->{query}->($self, $flags, $prompt); } -sub sanitise_xml($) { - local $_ = shift; - - # we now weed out all tags we do not support - s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>) - }{ - "<" - }gex; - - # now all entities - s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; - - # handle some elements - s/(.*?)<\/fg>/$2<\/span>/gs; - s/(.*?)<\/fg>/$2<\/span>/gs; - - s/\s+$//; - - $_ -} - our %NAME_TO_COLOR = ( black => 0, white => 1, @@ -1117,8 +1079,8 @@ our @CF_COLOR = ( [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], - [1.00, 1.00, 1.00], - [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] + [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], + [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55], [1.00, 0.00, 0.00], [1.00, 0.54, 0.00], [0.11, 0.56, 1.00], @@ -1134,7 +1096,7 @@ sub msg { my ($self, $color, $type, $text, @extra) = @_; - $text = sanitise_xml $text; + $text = DC::sanitise_cfxml $text; if (my $cb = $self->{cb_msg}{$type}) { $_->($self, $color, $type, $text, @extra) for values %$cb; @@ -1173,21 +1135,15 @@ sub spell_add { my ($self, $spell) = @_; - # try to create single paragraphs out of the multiple lines sent by the server - $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; - $spell->{message} =~ s/\n+$//; - $spell->{message} ||= "Server did not provide a description for this spell."; - $::SPELL_LIST->add_spell ($spell); - - $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message}); - $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message}); + delete $::COMPLETER->{command_list}{spells}; } sub spell_delete { my ($self, $spell) = @_; $::SPELL_LIST->remove_spell ($spell); + delete $::COMPLETER->{command_list}{spells}; } sub setup { @@ -1197,30 +1153,10 @@ $::MAP->resize ($self->{mapw}, $self->{maph}); } -sub addme_success { - my ($self) = @_; - - my %skill_help; - - for my $node (DC::Pod::find skill_description => "*") { - my (undef, @par) = DC::Pod::section_of $node; - $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par; - }; - - for my $skill (values %{$self->{skill_info}}) { - $self->{map_widget}->add_command ("ready_skill $skill", - (DC::asxml "Ready the skill '$skill'\n\n") - . $skill_help{$skill}); - $self->{map_widget}->add_command ("use_skill $skill", - (DC::asxml "Immediately use the skill '$skill'\n\n") - . $skill_help{$skill}); - } -} - sub eof { my ($self) = @_; - $self->{map_widget}->clr_commands; + $::COMPLETER->reset; ::stop_game (); } @@ -1551,7 +1487,7 @@ $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; if (exists $info{msg}) { - my $text = "\n" . DC::Protocol::sanitise_xml $info{msg}; + my $text = "\n" . DC::sanitise_cfxml $info{msg}; my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; my @link; $text =~ s{