--- deliantra/Deliantra-Client/DC.pm 2006/07/23 11:09:57 1.104
+++ deliantra/Deliantra-Client/DC.pm 2006/07/24 04:24:42 1.106
@@ -61,63 +61,14 @@
${$_[0]}->()
}
-package CFClient::PodToPango;
+sub asxml($) {
+ local $_ = $_[0];
-use base Pod::POM::View::Text;
+ s/&/&/g;
+ s/>/>/g;
+ s/</g;
-our $VERSION = 1; # bump if resultant formatting changes
-
-our $indent = 0;
-
-*view_seq_code =
-*view_seq_bold = sub { "$_[1]" };
-*view_seq_italic = sub { "$_[1]" };
-*view_seq_space =
-*view_seq_link =
-*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
-
-sub view_seq_text {
- my $text = $_[1];
- $text =~ s/\s+/ /g;
- CFClient::UI::Label::escape ($text)
-}
-
-sub view_item {
- ("\t" x ($indent / 4))
- . $_[1]->title->present ($_[0])
- . "\n\n"
- . $_[1]->content->present ($_[0])
-}
-
-sub view_verbatim {
- (join "",
- map +("\t" x ($indent / 2)) . "$_\n",
- split /\n/, CFClient::UI::Label::escape ($_[1]))
- . "\n"
-}
-
-sub view_textblock {
- ("\t" x ($indent / 2)) . "$_[1]\n\n"
-}
-
-sub view_head1 {
- "\n\n" . $_[1]->title->present ($_[0]) . "\n\n"
- . $_[1]->content->present ($_[0])
-};
-
-sub view_head2 {
- "\n" . $_[1]->title->present ($_[0]) . "\n\n"
- . $_[1]->content->present ($_[0])
-};
-
-sub view_head3 {
- "\n" . $_[1]->title->present ($_[0]) . "\n\n"
- . $_[1]->content->present ($_[0])
-};
-
-sub view_over {
- local $indent = $indent + $_[1]->indent;
- $_[1]->content->present ($_[0])
+ $_
}
package CFClient::Database;
@@ -223,51 +174,6 @@
or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
}
-my $pod_cache = db_table "pod_cache";
-
-sub load_pod($$$$) {
- my ($path, $filtertype, $filterversion, $filtercb) = @_;
-
- stat $path
- or die "$path: $!";
-
- my $phash = join ",", $filterversion, $CFClient::PodToPango::VERSION, (stat _)[7,9];
-
- my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } };
-
- return $pom if $chash eq $phash;
-
- my $pod = do {
- local $/;
- open my $pod, "<:utf8", $_[0]
- or die "$_[0]: $!";
- <$pod>
- };
-
- #utf8::downgrade $pod;
-
- $pom = $filtercb-> (Pod::POM->new->parse_text ($pod));
-
- $pod_cache->put ("$path/$filtertype" => Storable::nfreeze [$phash, $pom]);
-
- $pom
-}
-
-sub pod_to_pango($) {
- my ($pom) = @_;
-
- $pom->present ("CFClient::PodToPango")
-}
-
-sub pod_to_pango_list($) {
- my ($pom) = @_;
-
- [
- map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
- split /\n/, $pom->present ("CFClient::PodToPango")
- ]
-}
-
package CFClient::Layout;
$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub {
@@ -415,6 +321,10 @@
. "Right click - further options"
. "\n";
+ my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5]
+ : $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5]
+ : undef;
+
$self->{face_widget} ||= new CFClient::UI::Face
can_events => 1,
can_hover => 1,
@@ -422,6 +332,7 @@
animspeed => $self->{animspeed}, # TODO# must be set at creation time
on_button_down => $button_cb,
;
+ $self->{face_widget}{bg} = $bg;
$self->{face_widget}{face} = $self->{face};
$self->{face_widget}{anim} = $self->{anim};
$self->{face_widget}{animspeed} = $self->{animspeed};
@@ -440,6 +351,7 @@
on_button_down => $button_cb,
;
my $desc = CFClient::Item::desc_string $self;
+ $self->{desc_widget}{bg} = $bg;
$self->{desc_widget}->set_text ($desc);
$self->{desc_widget}->set_tooltip ("$desc.\n$tooltip_std");
@@ -450,8 +362,8 @@
align => 0,
on_button_down => $button_cb,
;
+ $self->{weight_widget}{bg} = $bg;
$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
-
$self->{weight_widget}->set_tooltip (
"Weight.\n"
. ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")