--- deliantra/Deliantra-Client/DC/Protocol.pm 2007/08/22 21:27:13 1.164
+++ deliantra/Deliantra-Client/DC/Protocol.pm 2008/12/07 16:20:44 1.206
@@ -1,20 +1,26 @@
-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 'Deliantra::Protocol::Base';
-use base 'Crossfire::Protocol::Base';
+our $TEX_DIALOGUE = new_from_resource DC::Texture
+ "dialogue.png", minify => 1, mipmap => 1;
+
+our $TEX_NOFACE = new_from_resource DC::Texture
+ "noface.png", minify => 1, mipmap => 1;
+
+sub MIN_TEXTURE_UNUSED() { 1 }#d#
sub new {
my ($class, %arg) = @_;
@@ -23,7 +29,7 @@
setup_req => {
extmap => 1,
excmd => 1,
- xwidget1 => 1,#d#
+ widget => 2,
%{$arg{setup_req} || {}},
},
);
@@ -31,15 +37,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) = 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;
@@ -47,13 +53,19 @@
map ["$cmd$_", $text],
sort { (length $a) <=> (length $b) }
@args
- } sort { $a->{par} <=> $b->{par} }
- CFPlus::Pod::find command => "*";
+ } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
+ 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
@@ -62,23 +74,42 @@
$_->destroy
for values %{delete $ws->{w} || {}};
}
+
+ delete $self->{items};
+ $::INV->clear;
+ $::INVR->clear;
+ $::INVR_HB->clear;
+ $::FLOORBOX->clear;
});
$self->{map_widget}->add_command (@$_)
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 = $TEX_DIALOGUE;
$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 = $TEX_NOFACE;
$self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
}
+# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
+# $self->{expire_w} = EV::timer 1, 1, sub {
+# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
+#
+# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) {
+# warn DC::SvREFCNT $self->{texture}[$_];
+# $self->{texture}[$_]->unload;
+# warn "expire texture $_\n";#d#
+# }
+#
+# ($self->{expire_count} += $count) < @{ $self->{texture} }
+# or $self->{expire_count} = DC::DB::FIRST_TILE_ID;
+# warn "count is $count\n";#d#
+# };
+
$self->{open_container} = 0;
# per server
@@ -100,7 +131,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 +170,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 +213,60 @@
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") {
+ $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
@@ -213,8 +275,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,
@@ -242,6 +304,7 @@
floorbox => $::FLOORBOX,
help_window => $::HELP_WINDOW,
message_window => $::MESSAGE_WINDOW,
+ message_dist => $::MESSAGE_DIST,
statusbox => $::SDTATUSBOX,
inv => $::INV,
@@ -250,20 +313,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,19 +351,19 @@
# 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
sub ext_channel_info {
my ($self, $info) = @_;
$self->{channels}->{$info->{id}} = $info;
- $::MESSAGE_WINDOW->add_channel ($info);
+ $::MESSAGE_DIST->add_channel ($info);
}
#############################################################################
@@ -309,7 +371,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 {
@@ -403,7 +465,7 @@
my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
) {
my $msg = "stat change: " . (join " ", @diffs);
- $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
+ $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
}
$self->update_stats_window ($stats, $prev);
@@ -491,19 +553,19 @@
$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"),
+ 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;
- my $TOOLTIP_ALL = "\n\nLeft click - ready skill\nMiddle click - use spell\nRight click - further options";
+ my $TOOLTIP_ALL = "\n\nLeft click - ready skill\nMiddle click - use skill\nRight click - further options";
my @TOOLTIP_LVL = (tooltip => "Level. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
my @TOOLTIP_EXP = (tooltip => "Experience. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
@@ -520,11 +582,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 ready_skill $shortname to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
- ["bind use_skill $shortname to a key" => sub { CFPlus::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 {
@@ -536,19 +598,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, align => 0,
+ can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
];
push @add,
@@ -568,7 +630,7 @@
my ($idx, $name) = @$_;
my $val = $stats->{$idx};
- next if $prev->{$idx}[1] == $val->[1];
+ next if $prev->{$idx}[1] eq $val->[1];
my $sw = $self->{skillwid}{$idx};
$sw->[0]->set_text (::formsep ($val->[1]));
@@ -580,14 +642,6 @@
}
}
-sub macro_send {
- my ($self, $macro) = @_;
-
- for my $cmd (@{ $macro->{action} }) {
- $self->send_command ($cmd);
- }
-}
-
sub user_send {
my ($self, $command) = @_;
@@ -596,7 +650,6 @@
$self->logprint ("send: ", $command);
$self->send_command ($command);
- ::status ($command);
}
sub record {
@@ -608,7 +661,7 @@
sub map_scroll {
my ($self, $dx, $dy) = @_;
- $self->{map}->scroll ($dx, $dy);
+ $self->{map_widget}->scroll ($dx, $dy);
}
sub feed_map1a {
@@ -622,12 +675,12 @@
$delay = 1;
- if (my $tex = $::CONN->{texture}[$tile]) {
+ if (my $tex = $self->{texture}[$tile]) {
$tex->upload;
} else {
$self->{delay}{$tile} = 1;
- # we assume the face is in-flight and will eventually come
+ # we assume the face is in-flight and will eventually arrive
push @{$self->{tile_cb}{$tile}}, sub {
delete $self->{delay}{$tile};
$_[0]->upload;
@@ -636,12 +689,11 @@
}
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;
+ # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
+ EV::once undef, 0, 0.03, sub {
$self->{map_widget}->update
if $self->{map_widget};
- });
+ };
} else {
$self->{map_widget}->update;
}
@@ -656,20 +708,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;
- CFPlus::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;
@@ -686,7 +744,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
@@ -700,36 +758,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) = @_;
+ $map_info->[1] = \$_[0];
- if (defined $data) {
- $self->{map_cache_new}{$hash} = \$data;
-
- 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 {
- CFPlus::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) = @_;
@@ -764,7 +820,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) = @_;
@@ -810,7 +866,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];
@@ -828,7 +884,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);
@@ -850,7 +906,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);
}
@@ -858,18 +914,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;
}
}
@@ -878,7 +934,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});
@@ -889,29 +945,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;
}
@@ -932,7 +984,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;
@@ -950,7 +1002,7 @@
push @{$self->{face_cb}{$num}}, $cb;
defined wantarray
- ? CFPlus::guard {
+ ? DC::guard {
@{$self->{face_cb}{$num}}
= grep $_ != $cb,
@{$self->{face_cb}{$num}};
@@ -995,7 +1047,11 @@
local $_ = shift;
# we now weed out all tags we do not support
- s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g;
+ s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
+ }{
+ "<"
+ }gex;
+
# now all entities
s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g;
@@ -1003,6 +1059,8 @@
s/(.*?)<\/fg>/$2<\/span>/gs;
s/(.*?)<\/fg>/$2<\/span>/gs;
+ s/\s+$//;
+
$_
}
@@ -1059,19 +1117,25 @@
#$text =~ s/(?<=\S)\n(?=\w)/ /g;
::message ({
- fg => $fg,
- markup => $_,
- type => $type,
- extra => [@extra],
- color_flags => $color
- }) for split /\n/, $text;
+ fg => $fg,
+ markup => $text,
+ 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";
}
}
@@ -1085,8 +1149,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 {
@@ -1107,17 +1171,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->[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",
- (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});
}
}
@@ -1131,7 +1195,7 @@
}
sub update_floorbox {
- $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
+ $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
return unless $::CONN;
$::FLOORBOX->clear;
@@ -1139,11 +1203,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
- CFPlus::Item::update_widgets $_;
+ DC::Item::update_widgets $_;
push @add,
0, $row, $_->{face_widget},
@@ -1151,7 +1216,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 },
;
@@ -1159,7 +1224,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}") }
;
@@ -1168,7 +1233,7 @@
$::FLOORBOX->add_at (@add);
});
- $::WANT_REFRESH->start;
+ $::WANT_REFRESH = 1;
}
sub set_opencont {
@@ -1176,11 +1241,11 @@
$conn->{open_container} = $tag;
update_floorbox;
- $::INVR_HB->clear ();
- $::INVR_HB->add (new CFPlus::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 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 {
@@ -1197,7 +1262,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;
@@ -1242,15 +1307,15 @@
sub item_update {
my ($self, $item) = @_;
- #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
-
- CFPlus::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}, CFPlus::Item::desc_string $item);
+ set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
} else {
$self->{update_container}{$item->{container}}++;
@@ -1271,7 +1336,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);
}
@@ -1289,7 +1354,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"
);
@@ -1319,10 +1384,11 @@
$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}");
+
+ $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
+ DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#
}
sub lookat {
@@ -1334,7 +1400,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,
@@ -1357,9 +1423,9 @@
%$self = ();
}
-package CFPlus::NPCDialog;
+package DC::NPCDialog;
-our @ISA = 'CFPlus::UI::Toplevel';
+our @ISA = 'DC::UI::Toplevel';
sub new {
my $class = shift;
@@ -1376,18 +1442,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) = @_;
@@ -1401,9 +1467,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 },
@@ -1432,13 +1498,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);
@@ -1451,7 +1517,7 @@
sub feed {
my ($self, $type, @arg) = @_;
- CFPlus::weaken $self;
+ DC::weaken $self;
if ($type eq "update") {
my (%info) = @arg;
@@ -1460,7 +1526,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{
@@ -1468,7 +1534,7 @@
}{
my $kw = $1;
- push @link, new CFPlus::UI::Label
+ push @link, new DC::UI::Label
markup => "$kw",
can_hover => 1,
can_events => 1,
@@ -1496,7 +1562,12 @@
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);