--- deliantra/Deliantra-Client/DC/Protocol.pm	2007/08/22 22:44:45	1.166
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2007/12/27 19:12:19	1.185
@@ -1,20 +1,18 @@
-package CFPlus::Protocol;
+package DC::Protocol;
 
 use utf8;
 use strict;
 
-use Crossfire::Protocol::Constants;
+use Deliantra::Protocol::Constants;
 
-use CFPlus;
-use CFPlus::DB;
-use CFPlus::UI;
-use CFPlus::Pod;
-use CFPlus::Macro;
-use CFPlus::Item;
+use DC;
+use DC::DB;
+use DC::UI;
+use DC::Pod;
+use DC::Macro;
+use DC::Item;
 
-use Crossfire::Protocol::Base 0.95;
-
-use base 'Crossfire::Protocol::Base';
+use base 'Deliantra::Protocol::Base';
 
 sub new {
    my ($class, %arg) = @_;
@@ -23,7 +21,7 @@
       setup_req => {
          extmap => 1,
          excmd  => 1,
-         xwidget1 => 1,#d#
+         widget => 2,
          %{$arg{setup_req} || {}},
       },
    );
@@ -38,8 +36,8 @@
       my @args = split /\|/, $2;
       @args = (".*") unless @args;
 
-      my (undef, @par) = CFPlus::Pod::section_of $_;
-      my $text = CFPlus::Pod::as_label @par;
+      my (undef, @par) = DC::Pod::section_of $_;
+      my $text = DC::Pod::as_label @par;
 
       $_ = $_ eq ".*" ? "" : " $_"
          for @args;
@@ -48,12 +46,18 @@
          sort { (length $a) <=> (length $b) }
             @args
    } sort { $a->{par} <=> $b->{par} }
-          CFPlus::Pod::find command => "*";
+          DC::Pod::find command => "*";
 
    $self->{json_coder}
       ->convert_blessed
-      ->filter_json_single_key_object (__w_ => sub {
+      ->filter_json_single_key_object ("\fw" => sub {
          $self->{widget}{$_[0]}
+      })
+      ->filter_json_single_key_object ("\fc" => sub {
+         my ($id) = @_;
+         sub {
+            $self->send_exti_msg (w_e => $id, @_);
+         }
       });
 
    # destroy widgets on logout
@@ -68,14 +72,14 @@
       for @cmd_help;
 
    {
-      $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
-         CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
+      $self->{dialogue} = my $tex = new_from_file DC::Texture
+         DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
       $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
    }
 
    {
-     $self->{noface} = my $tex = new_from_file CFPlus::Texture
-        CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
+     $self->{noface} = my $tex = new_from_file DC::Texture
+        DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
       $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
    }
 
@@ -100,7 +104,6 @@
 sub ext_capabilities {
    my ($self, %cap) = @_;
 
-   #$self->send ("setup sound 0"); # we use a different protocol
    $self->update_fx_want;
 
    $self->send_exti_req (resource => "exp_table", sub {
@@ -140,29 +143,23 @@
 sub widget_associate {
    my ($self, $ws, $id, $widget) = @_;
 
-   if ($widget) {
-      $widget->{s_id} = $id;
-      $self->{widget}{$id} = $widget;
-
-      if ($ws) {
-         $widget->{s_ws} = $ws;
-         $self->{widgetset}{$ws}{w}{$id} = $widget;
-      }
+   $widget ||= new DC::UI::Bin;
 
-      $widget->connect (on_destroy => sub {
-         my ($widget) = @_;
+   $widget->{s_id} = $id;
+   $self->{widget}{$id} = $widget;
 
-         delete $self->{widget}{$widget->{s_id}};
-         delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
-            if exists $widget->{s_ws};
-      });
+   if ($ws) {
+      $widget->{s_ws} = $ws;
+      $self->{widgetset}{$ws}{w}{$id} = $widget;
+   }
 
-      1
-   } else {
-      $self->send_exti_msg (w_e => $id, undef);
+   $widget->connect (on_destroy => sub {
+      my ($widget) = @_;
 
-      0
-   }
+      delete $self->{widget}{$widget->{s_id}};
+      delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
+         if exists $widget->{s_ws};
+   });
 }
 
 # widgetset new
@@ -189,22 +186,55 @@
 sub ext_ws_c {
    my ($self, $ws, $id, $class, $args) = @_;
 
-   for my $ev (grep /^on_/, keys %$args) {
-      my $rid = $args->{$ev};
-      $args->{$ev} = sub {
-         my $id = shift->{s_id};
-         $self->send_exti_msg (w_e => $id, $rid, @_);
-
-         1
-      };
-   }
-
    $self->widget_associate (
       $ws, $id => scalar eval {
          local $SIG{__DIE__};
-         "CFPlus::UI::$class"->new (%$args)
+         "DC::UI::$class"->new (%$args)
+      }
+   );
+}
+
+# widgetset create template
+sub ext_ws_ct {
+   my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
+
+   $done_cb ||= sub { };
+
+   my $parse_list; $parse_list = sub {
+      my ($list) = @_;
+      my @w;
+
+      while (@$list) {
+         my ($class, $args) = splice @$list, 0, 2;
+         my $name = delete $args->{s_id};
+         my $cl   = delete $args->{s_cl};
+         my $cfg  = delete $cfg->{$name};
+         my $id   = delete $cfg->{id};
+         my $w    = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
+                       or next;
+
+         $self->widget_associate ($ws, $id, $w)
+            if $id;
+
+         $w->add ($parse_list->($cl))
+            if $cl;
+
+         push @w, $w;
       }
-   ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
+
+      @w
+   };
+
+   # either array reference, or face #
+   if ($type eq "inline") {
+      $parse_list->($template);
+      $done_cb->();
+   } elsif ($type eq "face") {
+      #...
+      $done_cb->(0);
+   } else {
+      $done_cb->(0);
+   }
 }
 
 # widgetset associate
@@ -213,8 +243,8 @@
 
    # everything that has a name, wether conceivably useful or not
    my %wkw = (
-      root           => $CFPlus::UI::ROOT,
-      tooltip        => $CFPlus::UI::TOOLTIP,
+      root           => $DC::UI::ROOT,
+      tooltip        => $DC::UI::TOOLTIP,
 
       mapwidget      => $::MAPWIDGET,
       buttonbar      => $::BUTTONBAR,
@@ -250,20 +280,19 @@
    );
 
    while (my ($id, $name) = each %ass) {
-      $self->widget_associate (undef, $id => $wkw{$name})
-         or warn "server failed to associate non-existent well-known widget $name\n";
+      $self->widget_associate (undef, $id => $wkw{$name});
    }
 }
 
 # widget call
 sub ext_w_c {
-   my ($self, $id, $rid, $method, @args) = @_;
+   my ($self, $id, $rcb, $method, @args) = @_;
 
    my $w = $self->{widget}{$id}
       or return;
 
-   if ($rid) {
-      $self->send_exti_msg (w_r => $rid, $w->$method (@args));
+   if ($rcb) {
+      $rcb->($w->$method (@args));
    } else {
       $w->$method (@args);
    }
@@ -289,12 +318,12 @@
 
 # widget get
 sub ext_w_g {
-   my ($self, $id, $rid, $attr) = @_;
+   my ($self, $id, $rid, @attr) = @_;
 
    my $w = $self->{widget}{$id}
       or return;
 
-   $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
+   $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
 }
 
 # message window
@@ -309,7 +338,7 @@
 sub logprint {
    my ($self, @a) = @_;
 
-   CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
+   DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
 }
 
 sub _stat_numdiff {
@@ -491,14 +520,14 @@
       $sktbl->clear;
 
       my $sw = $self->{skillwid}{""} ||= [
-         0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
-         1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
-         2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
-         3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
-         4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
-         5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
-         6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
-         7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
+         0, 0, (new DC::UI::Label text => "Experience", align => 1),
+         1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
+         2, 0, (new DC::UI::Label text => "Progress", align => 0),
+         3, 0, (new DC::UI::Label text => "Skill", expand => 1),
+         4, 0, (new DC::UI::Label text => "Experience", align => 1),
+         5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
+         6, 0, (new DC::UI::Label text => "Progress", align => 0),
+         7, 0, (new DC::UI::Label text => "Skill", expand => 1),
       ];
 
       my @add = @$sw;
@@ -520,11 +549,11 @@
             } elsif ($ev->{button} == 2) {
                $::CONN->user_send ("use_skill $name");
             } elsif ($ev->{button} == 3) {
-               my $shortname = CFPlus::shorten $name, 14;
-               (new CFPlus::UI::Menu
+               my $shortname = DC::shorten $name, 14;
+               (new DC::UI::Menu
                   items => [
-                     ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
-                     ["bind <i>use_skill $shortname</i> to a key"   => sub { CFPlus::Macro::quick_macro ["use_skill $name"]   }],
+                     ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
+                     ["bind <i>use_skill $shortname</i> to a key"   => sub { DC::Macro::quick_macro ["use_skill $name"]   }],
                   ],
                )->popup ($ev);
             } else {
@@ -536,19 +565,19 @@
 
          my $sw = $self->{skillwid}{$idx} ||= [
             # exp
-            (new CFPlus::UI::Label
+            (new DC::UI::Label
              align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
 
             # level
-            (new CFPlus::UI::Label
+            (new DC::UI::Label
              text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
 
             # progress
-            (new CFPlus::UI::ExperienceProgress),
+            (new DC::UI::ExperienceProgress),
 
             # label
-            (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),
+            (new DC::UI::Label text => $name, on_button_down => $spell_cb,
+             can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
          ];
 
          push @add,
@@ -580,14 +609,6 @@
    }
 }
 
-sub macro_send {
-   my ($self, $macro) = @_;
-
-   for my $cmd (@{ $macro->{action} }) {
-      $self->send_command ($cmd);
-   }
-}
-
 sub user_send {
    my ($self, $command) = @_;
 
@@ -636,11 +657,10 @@
 
    if ($delay) {
       # delay the map drawing a tiny bit in the hope of getting the missing fetched
-      Event->timer (after => 0.03, cb => sub {
-         $_[0]->w->cancel;
+      EV::once undef, 0, 0.03, sub {
          $self->{map_widget}->update
             if $self->{map_widget};
-      });
+      };
    } else {
       $self->{map_widget}->update;
    }
@@ -662,7 +682,7 @@
 
    my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
    $self->{map_cache_new}{$hash} = \$data;
-   CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
+   DC::DB::put $self->{mapcache} => $hash => $data, sub { };
 }
 
 sub map_clear {
@@ -685,7 +705,7 @@
          or return;
    } while $self->{texture}[$tile];
 
-   CFPlus::DB::get tilecache => $tile, sub {
+   DC::DB::get tilecache => $tile, sub {
       my ($data) = @_;
 
       return unless $self->{map}; # stop when destroyed
@@ -723,7 +743,7 @@
    if (my $rdata = $self->{map_cache_old}{$hash}) {
       $cb->($$rdata);
    } else {
-      CFPlus::DB::get $self->{mapcache} => $hash, $cb;
+      DC::DB::get $self->{mapcache} => $hash, $cb;
    }
 }
 
@@ -857,18 +877,18 @@
    my ($self, $facenum, $face, $cb) = @_;
 
    if ($face->{type} == 0) { # FT_FACE
-      my $id = CFPlus::DB::get_tile_id_sync $face->{name};
+      my $id = DC::DB::get_tile_id_sync $face->{name};
 
       $face->{id} = $id;
       $self->{map}->set_tileid ($facenum => $id);
 
-      CFPlus::DB::get tilecache => $id, $cb;
+      DC::DB::get tilecache => $id, $cb;
 
    } elsif ($face->{type} & 1) { # with metadata
-      CFPlus::DB::get res_meta => $face->{name}, $cb;
+      DC::DB::get res_meta => $face->{name}, $cb;
 
    } else { # no metadata
-      CFPlus::DB::get res_data => $face->{name}, $cb;
+      DC::DB::get res_data => $face->{name}, $cb;
    }
 }
 
@@ -877,7 +897,7 @@
 
    if ($face->{type} == 0) {
       # image, FT_FACE
-      CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
+      DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
          if $changed;
 
       $self->have_tile ($face->{id}, delete $face->{data});
@@ -888,29 +908,25 @@
          my ($meta, $data) = unpack "(w/a*)*", $face->{data};
          $face->{data} = $meta;
 
-         CFPlus::DB::put res_data => $face->{name} => $data, sub { };
-         CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
+         # rely on strict ordering here and also on later fetch
+         DC::DB::put res_data => $face->{name} => $data, sub { };
+         DC::DB::put res_meta => $face->{name} => $meta, sub { };
       }
 
       $face->{data} = $self->{json_coder}->decode ($face->{data});
-
       ::add_license ($face);
+      ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
+         if $changed;
 
       if ($face->{type} == 3) { # FT_MUSIC
-         ::message ({ markup => "downloaded song #$facenum" })
-            if $changed;
-
          &::audio_music_push ($facenum);
       } elsif ($face->{type} == 5) { # FT_SOUND
-         ::message ({ markup => "downloaded sound #$facenum" })
-            if $changed;
-
          &::audio_sound_push ($facenum);
       }
 
    } else {
       # flat resource case, FT_RSRC
-      CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
+      DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
          if $changed;
    }
 
@@ -931,7 +947,7 @@
    return unless $self->{map};
 
    my $tex = $self->{texture}[$tile] ||=
-      new CFPlus::Texture
+      new DC::Texture
          tile => $tile,
          image => $data, delete_image => 1,
          minify => 1, mipmap => 1;
@@ -949,7 +965,7 @@
    push @{$self->{face_cb}{$num}}, $cb;
 
    defined wantarray
-      ? CFPlus::guard {
+      ? DC::guard {
            @{$self->{face_cb}{$num}}
               = grep $_ != $cb,
                    @{$self->{face_cb}{$num}};
@@ -994,7 +1010,11 @@
    local $_ = shift;
 
    # we now weed out all tags we do not support
-   s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
+   s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
+   }{
+      "&lt;"
+   }gex;
+
    # now all entities
    s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
 
@@ -1057,20 +1077,28 @@
       # no longer neecssary with TRT servers
       #$text =~ s/(?<=\S)\n(?=\w)/ /g;
 
-      ::message ({
-         fg          => $fg,
-         markup      => $_,
-         type        => $type,
-         extra       => [@extra],
-         color_flags => $color
-      }) for split /\n/, $text;
+      for (split /\n/, $text) {
+         ::message ({
+            fg     => $fg,
+            markup => $_,
+            type   => $type,
+            extra  => [@extra],
+            color_flags => $color, #d# ugly, kill
+         });
+
+         $color &= ~NDI_CLEAR; # only clear once for multiline messages
+         # actually, this is an ugly design. _we_ should control the channels,
+         # not some random other widget, as the channels are clearly protocol-specific.
+         # then we could also react to flags such as CLEAR without resorting to
+         # hacks such as color_flags, above.
+      }
 
       $self->{statusbox}->add ($text,
          group        => $text,
          fg           => $fg,
          timeout      => $color >= 2 ? 180 : 10,
          tooltip_font => $::FONT_FIXED,
-      );
+      ) if $type eq "info";
    }
 }
 
@@ -1084,8 +1112,8 @@
 
    $::SPELL_LIST->add_spell ($spell);
 
-   $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
-   $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
+   $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
+   $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
 }
 
 sub spell_delete {
@@ -1106,17 +1134,17 @@
 
    my %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 $node (DC::Pod::find skill_description => "*") {
+      my (undef, @par) = DC::Pod::section_of $node;
+      $skill_help{$node->{kw}[0]} = DC::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")
+                                        (DC::asxml "Ready the skill '$skill'\n\n")
                                         . $skill_help{$skill});
       $self->{map_widget}->add_command ("use_skill $skill",
-                                        (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
+                                        (DC::asxml "Immediately use the skill '$skill'\n\n")
                                         . $skill_help{$skill});
    }
 }
@@ -1130,7 +1158,7 @@
 }
 
 sub update_floorbox {
-   $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
+   $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
       return unless $::CONN;
 
       $::FLOORBOX->clear;
@@ -1142,7 +1170,7 @@
          if ($row < 6) {
             local $_->{face_widget}; # hack to force recreation of widget
             local $_->{desc_widget}; # hack to force recreation of widget
-            CFPlus::Item::update_widgets $_;
+            DC::Item::update_widgets $_;
 
             push @add,
                0, $row, $_->{face_widget},
@@ -1150,7 +1178,7 @@
 
             $row++;
          } else {
-            push @add, 1, $row, new CFPlus::UI::Button
+            push @add, 1, $row, new DC::UI::Button
                text        => "More...",
                on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
             ;
@@ -1158,7 +1186,7 @@
          }
       }
       if ($::CONN->{open_container}) {
-         push @add, 1, $row++, new CFPlus::UI::Button
+         push @add, 1, $row++, new DC::UI::Button
             text        => "Close container",
             on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
          ;
@@ -1167,7 +1195,7 @@
       $::FLOORBOX->add_at (@add);
    });
 
-   $::WANT_REFRESH->start;
+   $::WANT_REFRESH = 1;
 }
 
 sub set_opencont {
@@ -1176,10 +1204,10 @@
    update_floorbox;
 
    $::INVR_HB->clear ();
-   $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
+   $::INVR_HB->add (new DC::UI::Label align => 0, expand => 1, text => $name);
 
    if ($tag != 0) { # Floor isn't closable, is it?
-      $::INVR_HB->add (new CFPlus::UI::Button
+      $::INVR_HB->add (new DC::UI::Button
          text     => "Close container",
          tooltip  => "Close the currently open container (if one is open)",
          on_activate => sub {
@@ -1196,7 +1224,7 @@
 sub update_containers {
    my ($self) = @_;
 
-   $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
+   $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
       my $todo = delete $self->{update_container}
          or return;
 
@@ -1243,13 +1271,13 @@
 
    #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
 
-   CFPlus::Item::update_widgets $item;
+   DC::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}, CFPlus::Item::desc_string $item);
+      set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
 
    } else {
       $self->{update_container}{$item->{container}}++;
@@ -1318,8 +1346,6 @@
 
    $self->update_server_info;
 
-   $self->send_command ("output-sync $::CFG->{output_sync}");
-   $self->send_command ("output-count $::CFG->{output_count}");
    $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
    $self->send_command ("pickup $::CFG->{pickup}");
 }
@@ -1333,7 +1359,7 @@
 
          if (exists $msg{npc_dialog}) {
             # start npc chat dialog
-            $self->{npc_dialog} = new CFPlus::NPCDialog::
+            $self->{npc_dialog} = new DC::NPCDialog::
                token => $msg{npc_dialog},
                title => "$msg{npc_dialog}[0] (NPC)",
                conn  => $self,
@@ -1356,9 +1382,9 @@
    %$self = ();
 }
 
-package CFPlus::NPCDialog;
+package DC::NPCDialog;
 
-our @ISA = 'CFPlus::UI::Toplevel';
+our @ISA = 'DC::UI::Toplevel';
 
 sub new {
    my $class = shift;
@@ -1375,18 +1401,18 @@
       @_,
    );
 
-   CFPlus::weaken (my $this = $self);
+   DC::weaken (my $this = $self);
 
    $self->connect (delete => sub { $this->destroy; 1 });
 
    # better use a pane...
-   $self->add (my $hbox = new CFPlus::UI::HBox);
-   $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
+   $self->add (my $hbox = new DC::UI::HBox);
+   $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
 
-   $hbox->add (my $vbox = new CFPlus::UI::VBox);
+   $hbox->add (my $vbox = new DC::UI::VBox);
 
-   $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
-   $vbox->add ($self->{entry} = new CFPlus::UI::Entry
+   $vbox->add (new DC::UI::Label text => "Message Entry:");
+   $vbox->add ($self->{entry} = new DC::UI::Entry
       tooltip     => "#npc_message_entry",
       on_activate => sub {
          my ($entry, $text) = @_;
@@ -1400,9 +1426,9 @@
       },
    );
 
-   $vbox->add ($self->{options} = new CFPlus::UI::VBox);
+   $vbox->add ($self->{options} = new DC::UI::VBox);
 
-   $self->{bye_button} = new CFPlus::UI::Button
+   $self->{bye_button} = new DC::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; 1 },
@@ -1431,13 +1457,13 @@
 sub update_options {
    my ($self) = @_;
 
-   CFPlus::weaken $self;
+   DC::weaken $self;
 
    $self->{options}->clear;
    $self->{options}->add ($self->{bye_button});
 
    for my $kw (sort keys %{ $self->{kw} }) {
-      $self->{options}->add (new CFPlus::UI::Button
+      $self->{options}->add (new DC::UI::Button
          text => $kw,
          on_activate => sub {
             $self->send ($kw);
@@ -1450,7 +1476,7 @@
 sub feed {
    my ($self, $type, @arg) = @_;
 
-   CFPlus::weaken $self;
+   DC::weaken $self;
 
    if ($type eq "update") {
       my (%info) = @arg;
@@ -1459,7 +1485,7 @@
       $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
       
       if (exists $info{msg}) {
-         my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
+         my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
          my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
          my @link;
          $text =~ s{
@@ -1467,7 +1493,7 @@
          }{
             my $kw = $1;
 
-            push @link, new CFPlus::UI::Label
+            push @link, new DC::UI::Label
                markup     => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
                can_hover  => 1,
                can_events => 1,
@@ -1495,7 +1521,7 @@
 sub send {
    my ($self, $msg) = @_;
 
-   $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
+   $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
    $self->{textview}->scroll_to_bottom;
 
    $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);