--- deliantra/Deliantra-Client/DC/Protocol.pm	2006/06/15 13:40:02	1.35
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2006/06/24 00:24:09	1.43
@@ -85,8 +85,6 @@
    $fh->flush;
 }
 
-
-
 sub stats_update {
    my ($self, $stats) = @_;
 
@@ -136,6 +134,12 @@
    $self->{map_widget}->update;
 }
 
+sub magicmap {
+   my ($self, $w, $h, $x, $y, $data) = @_;
+
+   $self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
+}
+
 sub flush_map {
    my ($self) = @_;
 
@@ -156,6 +160,7 @@
    delete $self->{neigh_map};
 
    $self->{map}->clear;
+   delete $self->{map_widget}{magicmap};
 }
 
 
@@ -409,8 +414,9 @@
    $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
    $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
 
-   $self->{logview}->add_paragraph ($color[$color],
-      join "\n", map "$time $_", split /\n/, $text);
+   $self->{logview}->add_paragraph ($color[$color], $_)
+      for map "$time $_", split /\n/, $text;
+   $self->{logview}->scroll_to_bottom;
 
    $self->{statusbox}->add ($text,
       group        => $text,
@@ -532,7 +538,7 @@
          } else {
             $::FLOORBOX->add (1, $row, new CFClient::UI::Button
                text        => "More...",
-               on_activate => sub { $::INV_WINDOW->toggle_visibility },
+               on_activate => sub { $::INV_WINDOW->toggle_visibility; 0 },
             );
             last;
          }
@@ -557,6 +563,7 @@
             $::CONN->send ("apply $tag") # $::CONN->{open_container}")
                if $tag != 0;
             #if $CONN->{open_container} != 0;
+            0
          },
       );
    }
@@ -758,15 +765,17 @@
 
          $entry->set_text ("");
          $this->send ($text);
+
+         0
       },
    );
 
    $vbox->add ($self->{options} = new CFClient::UI::VBox);
 
-   $self->{close_button} = new CFClient::UI::Button
+   $self->{bye_button} = new CFClient::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 },
+      on_activate => sub { $this->destroy; 0 },
    ;
 
    $self->update_options;
@@ -775,7 +784,7 @@
    $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
    $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
 
-   $self->{entry}->focus_in;
+   $self->{entry}->grab_focus;
 
    $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
 
@@ -789,13 +798,14 @@
    Scalar::Util::weaken $self;
 
    $self->{options}->clear;
-   $self->{options}->add ($self->{close_button});
+   $self->{options}->add ($self->{bye_button});
 
    for my $kw (sort keys %{ $self->{kw} }) {
       $self->{options}->add (new CFClient::UI::Button
          text => $kw,
          on_activate => sub {
             $self->send ($kw);
+            0
          },
       );
    }
@@ -804,17 +814,37 @@
 sub feed {
    my ($self, $data) = @_;
 
+   Scalar::Util::weaken $self;
+
    my ($type, $msg) = split / /, $data, 2;
 
    if ($type eq "msg") {
       my ($msg, @kw) = split /\x00/, $msg;
       $self->{kw}{$_} = 1 for @kw;
 
-      $msg = CFClient::UI::Label::escape $msg;
+      $msg = "\n" . CFClient::UI::Label::escape $msg;
       my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
-      $msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh.
+      my @link;
+      $msg =~ s{
+         ($match)
+      }{
+         my $kw = $1;
+
+         push @link, new CFClient::UI::Label
+            markup     => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
+            can_hover  => 1,
+            can_events => 1,
+            padding_x  => 0,
+            padding_y  => 0,
+            on_button_up => sub {
+               $self->send ($kw);
+            };
+
+         chr 0xfffc
+      }giex;
       
-      $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg");
+      $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
+      $self->{textview}->scroll_to_bottom;
       $self->update_options;
    } else {
       $self->destroy;
@@ -828,12 +858,13 @@
 
    $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
    $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
+   $self->{textview}->scroll_to_bottom;
 }
 
 sub destroy {
    my ($self) = @_;
 
-   #Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1
+   #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
 
    delete $self->{conn}{npc_dialog};
    $self->{conn}->disconnect_ext ($self->{token});