--- deliantra/Deliantra-Client/DC/Protocol.pm	2006/07/22 12:18:02	1.62
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2006/10/08 21:22:30	1.86
@@ -1,62 +1,66 @@
-package CFClient::Protocol;
+package CFPlus::Protocol;
 
 use utf8;
 use strict;
 
 use Crossfire::Protocol::Constants;
 
-use CFClient;
-use CFClient::UI;
+use CFPlus;
+use CFPlus::UI;
+use CFPlus::Pod;
 
 use base 'Crossfire::Protocol::Base';
 
 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 = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub {
-      my ($pom) = @_;
-
-      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 = CFClient::pod_to_pango $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->{noface} = new_from_file CFClient::Texture
-      CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
+   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 => "*";
+
+  $self->{map_widget}->add_command (@$_)
+     for @cmd_help;
+
+   $self->{noface} = new_from_file CFPlus::Texture
+      CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
+
+   {
+      $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
+         CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
+      $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
+   }
 
    $self->{open_container} = 0;
 
    # "global"
-   $self->{tilecache} = CFClient::db_table "tilecache";
-   $self->{facemap}   = CFClient::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}  = CFClient::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
 }
@@ -244,7 +248,7 @@
    $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
    $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
  
-   $::STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
+   $self->update_weight;
 
    $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
       for keys %RES_TBL;
@@ -255,14 +259,19 @@
    if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
       $sktbl->clear;
 
-      $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1);
-      $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1);
-      $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1);
-      $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1);
-      $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1);
-      $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1);
+      $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
+      $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
+      $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
+      $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
+      $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
+      $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
+
+      my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
+
+      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 ($x, $y) = (1, 0);
+      my ($x, $y) = (0, 1);
       for (
          sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
          map [$_, $self->{skill_info}{$_}],
@@ -271,11 +280,33 @@
       ) {
          my ($idx, $name) = @$_;
 
-         $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label
-            text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]);
-         $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label
-            text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4);
-         $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name);
+         my $spell_cb = sub {
+            my ($widget, $ev) = @_;
+
+            if ($ev->{button} == 1) {
+               $::CONN->user_send ("ready_skill $name");
+            } elsif ($ev->{button} == 2) {
+               $::CONN->user_send ("use_skill $name");
+            } elsif ($ev->{button} == 3) {
+               (new CFPlus::UI::Menu
+                  items => [
+                     ["bind <i>ready_skill $name</i> to a key"   => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],
+                     ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],
+                  ],
+               )->popup ($ev);
+            } else {
+               return 0;
+            }
+
+            1
+         };
+
+         $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
+            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,
+                      can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
 
          $x++ and ($x, $y) = (0, $y + 1);
       }
@@ -319,7 +350,7 @@
 sub feed_map1a {
    my ($self, $data) = @_;
 
-   $self->{map}->map1a_update ($data);
+   $self->{map}->map1a_update ($data, $self->{setup}{extmap});
    $self->{map_widget}->update;
 }
 
@@ -499,7 +530,7 @@
       # create new id for face
       # I love transactions
       for (1..100) {
-         my $txn = $CFClient::DB_ENV->txn_begin;
+         my $txn = $CFPlus::DB_ENV->txn_begin;
          my $status = $self->{facemap}->db_get (id => $id);
          if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
             $id = ($id || 64) + 1;
@@ -513,7 +544,7 @@
          $txn->txn_abort;
       }
 
-      CFClient::fatal "maximum number of transaction retries reached - database problems?";
+      CFPlus::fatal "maximum number of transaction retries reached - database problems?";
    }
 
 gotid:
@@ -546,7 +577,7 @@
 
    $self->{texture}[$id] ||= do {
       my $tex =
-         new_from_image CFClient::Texture
+         new_from_image CFPlus::Texture
             $data, minify => 1, mipmap => 1;
 
       $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
@@ -594,23 +625,20 @@
 
    $self->logprint ("info: ", $text);
 
-   my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
-
    # try to create single paragraphs of multiple lines sent by the server
    $text =~ s/(?<=\S)\n(?=\w)/ /g;
 
-   $text = CFClient::UI::Label::escape $text;
+   $text = CFPlus::asxml $text;
    $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
    $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
 
-   $self->{logview}->add_paragraph ($color[$color], $_)
-      for map "$time $_", split /\n/, $text;
-   $self->{logview}->scroll_to_bottom;
+   ::message ({ fg => $color[$color], markup => $_ })
+      for split /\n/, $text;
 
    $self->{statusbox}->add ($text,
       group        => $text,
       fg           => $color[$color],
-      timeout      => $color >= 2 ? 60 : 10,
+      timeout      => $color >= 2 ? 180 : 10,
       tooltip_font => $::FONT_FIXED,
    );
 }
@@ -624,15 +652,15 @@
 sub spell_add {
    my ($self, $spell) = @_;
 
-   # try to create single paragraphs of multiple lines sent by the server
+   # 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_PAGE->add_spell ($spell);
 
-   $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
-   $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
+   $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
+   $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
 }
 
 sub spell_delete {
@@ -644,25 +672,20 @@
 sub addme_success {
    my ($self) = @_;
 
-   my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
-      my ($pom) = @_;
+   my %skill_help;
 
-      my %skill_help;
-
-      for my $head2 ($pom->head1->[3]->head2) {
-         $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content;
-      }
-
-      \%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",
-                                        (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
-                                        . $skill_help->{$skill});
+                                        (CFPlus::asxml "Ready the skill '$skill'\n\n")
+                                        . $skill_help{$skill});
       $self->{map_widget}->add_command ("use_skill $skill",
-                                        (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
-                                        . $skill_help->{$skill});
+                                        (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
+                                        . $skill_help{$skill});
    }
 }
 
@@ -696,20 +719,20 @@
 
       $self->send ("requestinfo image_sums $face $face");
 
-      $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
+      $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
          group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
    } elsif (!exists $self->{num_faces}) {
       $self->send ("requestinfo image_info");
 
       $self->{num_faces} = 0;
 
-      $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
+      $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
          group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
    }
 }
 
 sub update_floorbox {
-   $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {
+   $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
       return unless $::CONN;
 
       $::FLOORBOX->clear;
@@ -719,14 +742,14 @@
          if ($row < 6) {
             local $_->{face_widget}; # hack to force recreation of widget
             local $_->{desc_widget}; # hack to force recreation of widget
-            CFClient::Item::update_widgets $_;
+            CFPlus::Item::update_widgets $_;
 
             $::FLOORBOX->add (0, $row, $_->{face_widget});
             $::FLOORBOX->add (1, $row, $_->{desc_widget});
 
             $row++;
          } else {
-            $::FLOORBOX->add (1, $row, new CFClient::UI::Button
+            $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
                text        => "More...",
                on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
             );
@@ -734,7 +757,7 @@
          }
       }
       if ($::CONN->{open_container}) {
-         $::FLOORBOX->add (1, $row++, new CFClient::UI::Button
+         $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
             text        => "Close container",
             on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
          );
@@ -750,10 +773,10 @@
    update_floorbox;
 
    $::INV_RIGHT_HB->clear ();
-   $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name);
+   $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
 
    if ($tag != 0) { # Floor isn't closable, is it?
-      $::INV_RIGHT_HB->add (new CFClient::UI::Button
+      $::INV_RIGHT_HB->add (new CFPlus::UI::Button
          text     => "Close container",
          tooltip  => "Close the currently open container (if one is open)",
          on_activate => sub {
@@ -771,7 +794,7 @@
 sub update_containers {
    my ($self) = @_;
 
-   $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
+   $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
       my $todo = delete $self->{update_container}
          or return;
 
@@ -818,13 +841,13 @@
 
    #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
 
-   CFClient::Item::update_widgets $item;
+   CFPlus::Item::update_widgets $item;
 
    if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
       set_opencont ($::CONN, 0, "Floor");
 
    } elsif ($item->{flags} & F_OPEN) {
-      set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
+      set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
 
    } else {
       $self->{update_container}{$item->{container}}++;
@@ -834,7 +857,19 @@
 
 sub player_update {
    my ($self, $player) = @_;
-   $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
+
+   $self->update_weight;
+}
+
+sub update_weight {
+   my ($self) = @_;
+
+   my $weight = .001 * $self->{player}{weight};
+   my $limit  = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
+
+   $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
+   $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
+   $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
 }
 
 sub update_server_info {
@@ -847,6 +882,8 @@
     . "protocol version <tt>$self->{version}</tt>\n"
     . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
     . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
+    . "editing support $yesno[!!$self->{editor_support}]\n"
+    . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
     . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
       . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
     . "map size $self->{mapw}×$self->{maph}\n"
@@ -856,9 +893,20 @@
 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;
+
+      if ($self->{cfplus_ext} >= 2) {
+         $self->send_ext_req ("editor_support", sub {
+            $self->{editor_support} = $_[0];
+            $self->update_server_info;
+
+            0
+         });
+      }
+
+      0
    });
 
    $self->update_server_info;
@@ -872,15 +920,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 CFClient::NPCDialog::
+            $self->{npc_dialog} = new CFPlus::NPCDialog::
                dx    => $x,
                dy    => $y,
-               title => "$res{npc_dialog} (NPC)",
+               title => "$msg->{npc_dialog} (NPC)",
                conn  => $self,
             ;
          }
@@ -893,15 +941,15 @@
 sub destroy {
    my ($self) = @_;
 
-   $self->{npc_dialog}->destroy
+   (delete $self->{npc_dialog})->destroy
       if $self->{npc_dialog};
 
    $self->SUPER::destroy;
 }
 
-package CFClient::NPCDialog;
+package CFPlus::NPCDialog;
 
-our @ISA = 'CFClient::UI::FancyFrame';
+our @ISA = 'CFPlus::UI::Toplevel';
 
 sub new {
    my $class = shift;
@@ -914,24 +962,23 @@
       force_h => $::HEIGHT * 0.7,
       title   => "NPC Dialog",
       kw      => { hi => 0, yes => 0, no => 0 },
+      has_close_button => 1,
       @_,
    );
 
    Scalar::Util::weaken (my $this = $self);
 
+   $self->connect (delete => sub { $this->destroy; 1 });
+
    # better use a pane...
-   $self->add (my $hbox = new CFClient::UI::HBox);
-   $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);
+   $self->add (my $hbox = new CFPlus::UI::HBox);
+   $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
 
-   $hbox->add (my $vbox = new CFClient::UI::VBox);
+   $hbox->add (my $vbox = new CFPlus::UI::VBox);
 
-   $vbox->add (new CFClient::UI::Label text => "Message Entry:");
-   $vbox->add ($self->{entry} = new CFClient::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.",
+   $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
+   $vbox->add ($self->{entry} = new CFPlus::UI::Entry
+      tooltip     => "#npc_message_entry",
       on_activate => sub {
          my ($entry, $text) = @_;
 
@@ -944,23 +991,27 @@
       },
    );
 
-   $vbox->add ($self->{options} = new CFClient::UI::VBox);
+   $vbox->add ($self->{options} = new CFPlus::UI::VBox);
 
-   $self->{bye_button} = new CFClient::UI::Button
+   $self->{bye_button} = new CFPlus::UI::Button
       text        => "Bye (close)",
       tooltip     => "Use this button to end talking to the NPC. This also closes the dialog window.",
-      on_activate => sub { $this->destroy; 0 },
+      on_activate => sub { $this->destroy; 1 },
    ;
 
    $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;
 
-   $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
+   $self->{textview}->add_paragraph ({
+      fg     => [1, 1, 0, 1],
+      markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
+   });
 
    $self->show;
    $self
@@ -975,7 +1026,7 @@
    $self->{options}->add ($self->{bye_button});
 
    for my $kw (sort keys %{ $self->{kw} }) {
-      $self->{options}->add (new CFClient::UI::Button
+      $self->{options}->add (new CFPlus::UI::Button
          text => $kw,
          on_activate => sub {
             $self->send ($kw);
@@ -986,28 +1037,23 @@
 }
 
 sub feed {
-   my ($self, $data) = @_;
+   my ($self, $msg) = @_;
 
    Scalar::Util::weaken $self;
 
-   my ($type, $msg) = split / /, $data, 2;
+   if ($msg->{msgtype} eq "reply") {
+      $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
+      $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
 
-   if ($type eq "msg") {
-      my ($msg, @kw) = split /\x00/, $msg;
-
-      utf8::decode $_ for ($msg, @kw);
-      
-      $self->{kw}{$_} = 1 for @kw;
-
-      $msg = "\n" . CFClient::UI::Label::escape $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;
 
-         push @link, new CFClient::UI::Label
+         push @link, new CFPlus::UI::Label
             markup     => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
             can_hover  => 1,
             can_events => 1,
@@ -1017,10 +1063,10 @@
                $self->send ($kw);
             };
 
-         chr 0xfffc
+         "\x{fffc}"
       }giex;
       
-      $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
+      $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
       $self->{textview}->scroll_to_bottom;
       $self->update_options;
    } else {
@@ -1033,11 +1079,10 @@
 sub send {
    my ($self, $msg) = @_;
 
-   $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
+   $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 {
@@ -1045,11 +1090,14 @@
 
    #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;
 }
 
-1;
+1
+