--- deliantra/Deliantra-Client/DC/Protocol.pm	2006/07/30 13:16:44	1.69
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2006/08/18 01:01:01	1.79
@@ -14,38 +14,32 @@
 sub new {
    my $class = shift;
 
-   my $self = $class->SUPER::new (@_);
+   my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
 
    $self->{map_widget}->clr_commands;
 
-   my $cmd_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/command_help.pod", command_help => 1, sub {
-      my ($pom) = @_;
+   my @cmd_help = map {
+      $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
+         or die "unparseable command help: $_->{kw}[0]";
+
+      my $cmd = $1;
+      my @args = split /\|/, $2;
+      @args = (".*") unless @args;
+
+      my (undef, @par) = CFPlus::Pod::section_of $_;
+      my $text = CFPlus::Pod::as_label @par;
+
+      $_ = $_ eq ".*" ? "" : " $_"
+         for @args;
+
+      map ["$cmd$_", $text],
+         sort { (length $a) <=> (length $b) }
+            @args
+  } sort { $a->{par} <=> $b->{par} }
+         CFPlus::Pod::find command => "*";
 
-      my @cmd_help;
-
-      for my $head2 ($pom->head1->[-2]->head2) {
-         $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
-            or next;
-
-         my $cmd = $1;
-         my @args = split /\|/, $2;
-         @args = (".*") unless @args;
-
-         $_ = $_ eq ".*" ? "" : " $_"
-            for @args;
-
-         my $text = CFPlus::Pod::as_markup $head2->content;
-
-         push @cmd_help, ["$cmd$_", $text]
-            for sort { (length $a) <=> (length $b) }
-                     @args;
-      }
-
-      \@cmd_help
-   };
-
-   $self->{map_widget}->add_command (@$_)
-      for @$cmd_help;
+  $self->{map_widget}->add_command (@$_)
+     for @cmd_help;
 
    $self->{noface} = new_from_file CFPlus::Texture
       CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
@@ -53,11 +47,14 @@
    $self->{open_container} = 0;
 
    # "global"
-   $self->{tilecache} = CFPlus::db_table "tilecache";
-   $self->{facemap}   = CFPlus::db_table "facemap";
+   $self->{tilecache} = CFPlus::db_table "tilecache"
+      or die "tilecache: unable to open database table";
+   $self->{facemap}   = CFPlus::db_table "facemap"
+      or die "facemap: unable to open database table";
 
    # per server
-   $self->{mapcache}  = CFPlus::db_table "mapcache_$self->{host}_$self->{port}";
+   $self->{mapcache}  = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
+      or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
 
    $self
 }
@@ -267,7 +264,6 @@
 
       my @TOOLTIP_LVL  = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
       my @TOOLTIP_EXP  = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
-      my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
 
       my ($x, $y) = (0, 1);
       for (
@@ -303,7 +299,8 @@
             text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
          $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
             text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
-         $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME);
+         $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
+                      can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
 
          $x++ and ($x, $y) = (0, $y + 1);
       }
@@ -347,7 +344,7 @@
 sub feed_map1a {
    my ($self, $data) = @_;
 
-   $self->{map}->map1a_update ($data);
+   $self->{map}->map1a_update ($data, $self->{setup}{extmap});
    $self->{map_widget}->update;
 }
 
@@ -638,7 +635,7 @@
    $self->{statusbox}->add ($text,
       group        => $text,
       fg           => $color[$color],
-      timeout      => $color >= 2 ? 60 : 10,
+      timeout      => $color >= 2 ? 180 : 10,
       tooltip_font => $::FONT_FIXED,
    );
 }
@@ -672,25 +669,20 @@
 sub addme_success {
    my ($self) = @_;
 
-   my $skill_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
-      my ($pom) = @_;
-
-      my %skill_help;
-
-      for my $head2 ($pom->head1->[3]->head2) {
-         $skill_help{$head2->title} = CFPlus::Pod::as_markup $head2->content;
-      }
+   my %skill_help;
 
-      \%skill_help
+   for my $node (CFPlus::Pod::find skill_description => "*") {
+      my (undef, @par) = CFPlus::Pod::section_of $node;
+      $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
    };
-
+ 
    for my $skill (values %{$self->{skill_info}}) {
       $self->{map_widget}->add_command ("ready_skill $skill",
                                         (CFPlus::asxml "Ready the skill '$skill'\n\n")
-                                        . $skill_help->{$skill});
+                                        . $skill_help{$skill});
       $self->{map_widget}->add_command ("use_skill $skill",
                                         (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
-                                        . $skill_help->{$skill});
+                                        . $skill_help{$skill});
    }
 }
 
@@ -896,9 +888,11 @@
 sub logged_in {
    my ($self) = @_;
 
-   $self->send_ext_req (cfplus_support => "1", sub {
-      $self->{cfplus_ext} = $_[0];
+   $self->send_ext_req (cfplus_support => version => 1, sub {
+      $self->{cfplus_ext} = $_[0]{version};
       $self->update_server_info;
+
+      0
    });
 
    $self->update_server_info;
@@ -912,15 +906,15 @@
    my ($self, $x, $y) = @_;
 
    if ($self->{cfplus_ext}) {
-      $self->send_ext_req (lookat => "$x $y", sub {
-         my %res = split /\x00/, $_[0];
+      $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
+         my ($msg) = @_;
 
-         if (exists $res{npc_dialog}) {
+         if (exists $msg->{npc_dialog}) {
             # start npc chat dialog
             $self->{npc_dialog} = new CFPlus::NPCDialog::
                dx    => $x,
                dy    => $y,
-               title => "$res{npc_dialog} (NPC)",
+               title => "$msg->{npc_dialog} (NPC)",
                conn  => $self,
             ;
          }
@@ -933,7 +927,7 @@
 sub destroy {
    my ($self) = @_;
 
-   $self->{npc_dialog}->destroy
+   (delete $self->{npc_dialog})->destroy
       if $self->{npc_dialog};
 
    $self->SUPER::destroy;
@@ -941,7 +935,7 @@
 
 package CFPlus::NPCDialog;
 
-our @ISA = 'CFPlus::UI::FancyFrame';
+our @ISA = 'CFPlus::UI::Toplevel';
 
 sub new {
    my $class = shift;
@@ -970,11 +964,7 @@
 
    $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
    $vbox->add ($self->{entry} = new CFPlus::UI::Entry
-      tooltip     => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"
-                   . "Sometimes you have to tell an NPC something you cannot find out during "
-                   . "a normal conversation (such as a password). In those cases you have to use "
-                   . "this text entry. You can also enter responses manually instead of using the response "
-                   . "buttons below.",
+      tooltip     => "#npc_message_entry",
       on_activate => sub {
          my ($entry, $text) = @_;
 
@@ -997,9 +987,10 @@
 
    $self->update_options;
 
-   $self->{token} = $self->{conn}->ext_token;
-   $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
-   $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
+   $self->{id} = $self->{conn}->send_ext_req (
+      npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
+      sub { $this && $this->feed (@_) }
+   );
 
    $self->{entry}->grab_focus;
 
@@ -1032,23 +1023,18 @@
 }
 
 sub feed {
-   my ($self, $data) = @_;
+   my ($self, $msg) = @_;
 
    Scalar::Util::weaken $self;
 
-   my ($type, $msg) = split / /, $data, 2;
-
-   if ($type eq "msg") {
-      my ($msg, @kw) = split /\x00/, $msg;
+   if ($msg->{msgtype} eq "reply") {
+      $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
+      $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
 
-      utf8::decode $_ for ($msg, @kw);
-      
-      $self->{kw}{$_} = 1 for @kw;
-
-      $msg = "\n" . CFPlus::UI::asxml $msg;
+      my $text = "\n" . CFPlus::asxml $msg->{msg};
       my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
       my @link;
-      $msg =~ s{
+      $text =~ s{
          ($match)
       }{
          my $kw = $1;
@@ -1063,10 +1049,10 @@
                $self->send ($kw);
             };
 
-         chr 0xfffc
+         "\x{fffc}"
       }giex;
       
-      $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link });
+      $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
       $self->{textview}->scroll_to_bottom;
       $self->update_options;
    } else {
@@ -1082,8 +1068,7 @@
    $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
    $self->{textview}->scroll_to_bottom;
 
-   utf8::encode $msg;
-   $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
+   $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
 }
 
 sub destroy {
@@ -1091,9 +1076,11 @@
 
    #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
 
-   $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token};
-   delete $self->{conn}{npc_dialog};
-   $self->{conn}->disconnect_ext ($self->{token});
+   if ($self->{conn}) {
+      $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
+      delete $self->{conn}{npc_dialog};
+      $self->{conn}->disconnect_ext ($self->{id});
+   }
 
    $self->SUPER::destroy;
 }