--- deliantra/Deliantra-Client/DC/Protocol.pm 2007/12/26 20:46:39 1.182
+++ deliantra/Deliantra-Client/DC/Protocol.pm 2008/05/20 02:49:56 1.198
@@ -1,16 +1,16 @@
-package dc::Protocol;
+package DC::Protocol;
use utf8;
use strict;
use Deliantra::Protocol::Constants;
-use dc;
-use dc::DB;
-use dc::UI;
-use dc::Pod;
-use dc::Macro;
-use dc::Item;
+use DC;
+use DC::DB;
+use DC::UI;
+use DC::Pod;
+use DC::Macro;
+use DC::Item;
use base 'Deliantra::Protocol::Base';
@@ -21,7 +21,7 @@
setup_req => {
extmap => 1,
excmd => 1,
- widget => 1,
+ widget => 2,
%{$arg{setup_req} || {}},
},
);
@@ -29,15 +29,15 @@
$self->{map_widget}->clr_commands;
my @cmd_help = map {
- $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
- or die "unparseable command help: $_->{kw}[0]";
+ $_->[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;
+ my (undef, @par) = DC::Pod::section_of $_;
+ my $text = DC::Pod::as_label @par;
$_ = $_ eq ".*" ? "" : " $_"
for @args;
@@ -45,8 +45,8 @@
map ["$cmd$_", $text],
sort { (length $a) <=> (length $b) }
@args
- } sort { $a->{par} <=> $b->{par} }
- dc::Pod::find command => "*";
+ } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
+ DC::Pod::find command => "*";
$self->{json_coder}
->convert_blessed
@@ -66,20 +66,25 @@
$_->destroy
for values %{delete $ws->{w} || {}};
}
+
+ delete $self->{items};
+ $::INV->clear;
+ $::INVR_HB->clear;
+ $::FLOORBOX->clear;
});
$self->{map_widget}->add_command (@$_)
for @cmd_help;
{
- $self->{dialogue} = my $tex = new_from_file dc::Texture
- dc::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 dc::Texture
- dc::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}});
}
@@ -104,7 +109,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 {
@@ -144,7 +148,7 @@
sub widget_associate {
my ($self, $ws, $id, $widget) = @_;
- $widget ||= new dc::UI::Bin;
+ $widget ||= new DC::UI::Bin;
$widget->{s_id} = $id;
$self->{widget}{$id} = $widget;
@@ -190,19 +194,67 @@
$self->widget_associate (
$ws, $id => scalar eval {
local $SIG{__DIE__};
- "dc::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;
+ }
+
+ @w
+ };
+
+ # either array reference, or face #
+ if ($type eq "inline") {
+ $done_cb->();
+ $parse_list->($template);
+ } elsif ($type eq "face") {
+ my $handler; $handler = $self->register_face_handler ($template, sub {
+ my ($face) = @_;
+
+ undef $handler;
+ $done_cb->();
+ $parse_list->($self->{json_coder}->decode ($face->{data}));
+ });
+ } else {
+ $done_cb->(0);
+ }
+}
+
# widgetset associate
sub ext_ws_a {
my ($self, %ass) = @_;
# everything that has a name, wether conceivably useful or not
my %wkw = (
- root => $dc::UI::ROOT,
- tooltip => $dc::UI::TOOLTIP,
+ root => $DC::UI::ROOT,
+ tooltip => $DC::UI::TOOLTIP,
mapwidget => $::MAPWIDGET,
buttonbar => $::BUTTONBAR,
@@ -230,6 +282,7 @@
floorbox => $::FLOORBOX,
help_window => $::HELP_WINDOW,
message_window => $::MESSAGE_WINDOW,
+ message_dist => $::MESSAGE_DIST,
statusbox => $::SDTATUSBOX,
inv => $::INV,
@@ -288,7 +341,7 @@
sub ext_channel_info {
my ($self, $info) = @_;
$self->{channels}->{$info->{id}} = $info;
- $::MESSAGE_WINDOW->add_channel ($info);
+ $::MESSAGE_DIST->add_channel ($info);
}
#############################################################################
@@ -296,7 +349,7 @@
sub logprint {
my ($self, @a) = @_;
- dc::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
+ DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
}
sub _stat_numdiff {
@@ -478,14 +531,14 @@
$sktbl->clear;
my $sw = $self->{skillwid}{""} ||= [
- 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),
+ 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"),
+ 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
+ 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"),
+ 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
];
my @add = @$sw;
@@ -507,11 +560,11 @@
} elsif ($ev->{button} == 2) {
$::CONN->user_send ("use_skill $name");
} elsif ($ev->{button} == 3) {
- my $shortname = dc::shorten $name, 14;
- (new dc::UI::Menu
+ my $shortname = DC::shorten $name, 14;
+ (new DC::UI::Menu
items => [
- ["bind ready_skill $shortname to a key" => sub { dc::Macro::quick_macro ["ready_skill $name"] }],
- ["bind use_skill $shortname to a key" => sub { dc::Macro::quick_macro ["use_skill $name"] }],
+ ["bind ready_skill $shortname to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
+ ["bind use_skill $shortname to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
],
)->popup ($ev);
} else {
@@ -523,19 +576,19 @@
my $sw = $self->{skillwid}{$idx} ||= [
# exp
- (new dc::UI::Label
+ (new DC::UI::Label
align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
# level
- (new dc::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 dc::UI::ExperienceProgress),
+ (new DC::UI::ExperienceProgress),
# label
- (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),
+ (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),
];
push @add,
@@ -633,20 +686,26 @@
sub flush_map {
my ($self) = @_;
- my $map_info = delete $self->{map_info}
- or return;
+ return unless $self->{map_info};
+
+ for my $map_info (values %{ $self->{map_cache} || {} }) {
+ my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
- my ($hash, $x, $y, $w, $h) = @$map_info;
+ my $data = $self->{map}->get_rect ($x, $y, $w, $h);
- my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
- $self->{map_cache_new}{$hash} = \$data;
- dc::DB::put $self->{mapcache} => $hash => $data, sub { };
+ if ($data ne $$rdata) {
+ $map_info->[1] = \$data;
+ my $cdata = Compress::LZF::compress $data;
+ DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
+ }
+ }
}
sub map_clear {
my ($self) = @_;
$self->flush_map;
+ delete $self->{map_info};
delete $self->{neigh_map};
$self->{map}->clear;
@@ -663,7 +722,7 @@
or return;
} while $self->{texture}[$tile];
- dc::DB::get tilecache => $tile, sub {
+ DC::DB::get tilecache => $tile, sub {
my ($data) = @_;
return unless $self->{map}; # stop when destroyed
@@ -677,36 +736,34 @@
};
}
-sub load_map($$$) {
- my ($self, $hash, $x, $y) = @_;
+sub load_map($$$$$$) {
+ my ($self, $hash, $x, $y, $w, $h) = @_;
- my $gen = $self->{map_change_gen};
+ my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
my $cb = sub {
- return unless $gen == $self->{map_change_gen};
-
- my ($data) = @_;
-
- if (defined $data) {
- $self->{map_cache_new}{$hash} = \$data;
+ $map_info->[1] = \$_[0];
- my $data = Compress::LZF::decompress $data;
-
- my $inprogress = @{ $self->{bg_fetch} || [] };
- unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
- $self->bg_fetch unless $inprogress;
- }
+ my $inprogress = @{ $self->{bg_fetch} || [] };
+ unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
+ $self->bg_fetch unless $inprogress;
};
- if (my $rdata = $self->{map_cache_old}{$hash}) {
- $cb->($$rdata);
+ if (my $map_info = $self->{map_cache_old}{$hash}) {
+ $cb->(${ $map_info->[1] });
} else {
- dc::DB::get $self->{mapcache} => $hash, $cb;
+ my $gen = $self->{map_change_gen};
+
+ DC::DB::get $self->{mapcache} => $hash, sub {
+ return unless $gen == $self->{map_change_gen};
+ return unless defined $_[0];
+ $cb->(Compress::LZF::decompress $_[0]);
+ };
}
}
# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
-# (server resource,s latency, bandwidth), so this hack is warranted.
+# (server resources, latency, bandwidth), so this hack is warranted.
# the right fix is to make real tiled maps with an overview file
sub send_mapinfo {
my ($self, $data, $cb) = @_;
@@ -741,7 +798,7 @@
# this method does a "flood fill" into every tile direction
# it assumes that tiles are arranged in a rectangular grid,
# i.e. a map is the same as the left of the right map etc.
-# failure to comply are harmless and result in display errors
+# failure to comply is harmless and results in display errors
# at worst.
sub flood_fill {
my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
@@ -787,7 +844,7 @@
$x += $self->{map}->ox;
$y += $self->{map}->oy;
- $self->load_map ($hash, $x, $y)
+ $self->load_map ($hash, $x, $y, $w, $h)
unless $self->{neigh_map}{$hash}[5]++;#d#
$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
@@ -805,7 +862,7 @@
$self->flush_map;
++$self->{map_change_gen};
- $self->{map_cache_old} = delete $self->{map_cache_new};
+ $self->{map_cache_old} = delete $self->{map_cache};
my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
@@ -827,7 +884,7 @@
(my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
$::STATWIDS->{map}->set_text ("Map: " . $map);
- $self->load_map ($hash, $x, $y);
+ $self->load_map ($hash, $x, $y, $w, $h);
$self->flood_fill (0, 0, 0, "", $hash, $flags);
}
@@ -835,18 +892,18 @@
my ($self, $facenum, $face, $cb) = @_;
if ($face->{type} == 0) { # FT_FACE
- my $id = dc::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);
- dc::DB::get tilecache => $id, $cb;
+ DC::DB::get tilecache => $id, $cb;
} elsif ($face->{type} & 1) { # with metadata
- dc::DB::get res_meta => $face->{name}, $cb;
+ DC::DB::get res_meta => $face->{name}, $cb;
} else { # no metadata
- dc::DB::get res_data => $face->{name}, $cb;
+ DC::DB::get res_data => $face->{name}, $cb;
}
}
@@ -855,7 +912,7 @@
if ($face->{type} == 0) {
# image, FT_FACE
- dc::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});
@@ -867,13 +924,13 @@
$face->{data} = $meta;
# 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 { };
+ 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}." })
+ ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
if $changed;
if ($face->{type} == 3) { # FT_MUSIC
@@ -884,7 +941,7 @@
} else {
# flat resource case, FT_RSRC
- dc::DB::put res_data => $face->{name} => $face->{data}, sub { }
+ DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
if $changed;
}
@@ -905,7 +962,7 @@
return unless $self->{map};
my $tex = $self->{texture}[$tile] ||=
- new dc::Texture
+ new DC::Texture
tile => $tile,
image => $data, delete_image => 1,
minify => 1, mipmap => 1;
@@ -923,7 +980,7 @@
push @{$self->{face_cb}{$num}}, $cb;
defined wantarray
- ? dc::guard {
+ ? DC::guard {
@{$self->{face_cb}{$num}}
= grep $_ != $cb,
@{$self->{face_cb}{$num}};
@@ -980,6 +1037,8 @@
s/(.*?)<\/fg>/$2<\/span>/gs;
s/(.*?)<\/fg>/$2<\/span>/gs;
+ s/\s+$//;
+
$_
}
@@ -1070,8 +1129,8 @@
$::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});
+ $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 {
@@ -1092,17 +1151,17 @@
my %skill_help;
- 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 $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")
+ (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")
+ (DC::asxml "Immediately use the skill '$skill'\n\n")
. $skill_help{$skill});
}
}
@@ -1116,7 +1175,7 @@
}
sub update_floorbox {
- $dc::UI::ROOT->on_refresh ($::FLOORBOX => sub {
+ $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
return unless $::CONN;
$::FLOORBOX->clear;
@@ -1124,11 +1183,12 @@
my @add;
my $row;
- for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
+ for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
+ next if $_->{tag} & 0x80000000;
if ($row < 6) {
local $_->{face_widget}; # hack to force recreation of widget
local $_->{desc_widget}; # hack to force recreation of widget
- dc::Item::update_widgets $_;
+ DC::Item::update_widgets $_;
push @add,
0, $row, $_->{face_widget},
@@ -1136,7 +1196,7 @@
$row++;
} else {
- push @add, 1, $row, new dc::UI::Button
+ push @add, 1, $row, new DC::UI::Button
text => "More...",
on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
;
@@ -1144,7 +1204,7 @@
}
}
if ($::CONN->{open_container}) {
- push @add, 1, $row++, new dc::UI::Button
+ push @add, 1, $row++, new DC::UI::Button
text => "Close container",
on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
;
@@ -1161,11 +1221,11 @@
$conn->{open_container} = $tag;
update_floorbox;
- $::INVR_HB->clear ();
- $::INVR_HB->add (new dc::UI::Label align => 0, expand => 1, text => $name);
+ $::INVR_HB->clear;
+ $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
if ($tag != 0) { # Floor isn't closable, is it?
- $::INVR_HB->add (new dc::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 {
@@ -1182,7 +1242,7 @@
sub update_containers {
my ($self) = @_;
- $dc::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;
@@ -1227,15 +1287,15 @@
sub item_update {
my ($self, $item) = @_;
- #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
-
- dc::Item::update_widgets $item;
+ #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
+ 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}, dc::Item::desc_string $item);
+ set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
} else {
$self->{update_container}{$item->{container}}++;
@@ -1256,7 +1316,7 @@
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->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
$::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
}
@@ -1274,7 +1334,7 @@
. "editing support $yesno[!!$self->{editor_support}]\n"
. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
- . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
+ . "client support $yesno[$self->{cfplus_ext} > 0]"
. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
. "map size $self->{mapw}×$self->{maph}\n"
);
@@ -1317,7 +1377,7 @@
if (exists $msg{npc_dialog}) {
# start npc chat dialog
- $self->{npc_dialog} = new dc::NPCDialog::
+ $self->{npc_dialog} = new DC::NPCDialog::
token => $msg{npc_dialog},
title => "$msg{npc_dialog}[0] (NPC)",
conn => $self,
@@ -1340,9 +1400,9 @@
%$self = ();
}
-package dc::NPCDialog;
+package DC::NPCDialog;
-our @ISA = 'dc::UI::Toplevel';
+our @ISA = 'DC::UI::Toplevel';
sub new {
my $class = shift;
@@ -1359,18 +1419,18 @@
@_,
);
- dc::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 dc::UI::HBox);
- $hbox->add ($self->{textview} = new dc::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 dc::UI::VBox);
+ $hbox->add (my $vbox = new DC::UI::VBox);
- $vbox->add (new dc::UI::Label text => "Message Entry:");
- $vbox->add ($self->{entry} = new dc::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) = @_;
@@ -1384,9 +1444,9 @@
},
);
- $vbox->add ($self->{options} = new dc::UI::VBox);
+ $vbox->add ($self->{options} = new DC::UI::VBox);
- $self->{bye_button} = new dc::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 },
@@ -1415,13 +1475,13 @@
sub update_options {
my ($self) = @_;
- dc::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 dc::UI::Button
+ $self->{options}->add (new DC::UI::Button
text => $kw,
on_activate => sub {
$self->send ($kw);
@@ -1434,7 +1494,7 @@
sub feed {
my ($self, $type, @arg) = @_;
- dc::weaken $self;
+ DC::weaken $self;
if ($type eq "update") {
my (%info) = @arg;
@@ -1443,7 +1503,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::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{
@@ -1451,7 +1511,7 @@
}{
my $kw = $1;
- push @link, new dc::UI::Label
+ push @link, new DC::UI::Label
markup => "$kw",
can_hover => 1,
can_events => 1,
@@ -1479,7 +1539,7 @@
sub send {
my ($self, $msg) = @_;
- $self->{textview}->add_paragraph ({ markup => "\n" . dc::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);