--- deliantra/Deliantra-Client/DC.pm 2006/05/26 18:28:23 1.70 +++ deliantra/Deliantra-Client/DC.pm 2006/07/04 23:23:31 1.97 @@ -26,6 +26,92 @@ use Carp (); use AnyEvent (); use BerkeleyDB; +use Pod::POM (); +use Scalar::Util (); +use Storable (); # finally + +package CFClient::PodToPango; + +use base Pod::POM::View::Text; + +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; + +our @ISA = BerkeleyDB::Btree::; + +sub get($$) { + my $data; + + $_[0]->db_get ($_[1], $data) == 0 + ? $data + : () +} + +my %DB_SYNC; + +sub put($$$) { + my ($db, $key, $data) = @_; + + $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); + + $db->db_put ($key => $data) +} + +package CFClient; sub find_rcfile($) { my $path; @@ -70,22 +156,32 @@ close CFG; } -mkdir "$Crossfire::VARDIR/pclient", 0777; +our $DB_ENV; + +{ + use strict; -our $DB_ENV = new BerkeleyDB::Env - -Home => "$Crossfire::VARDIR/pclient", - -Cachesize => 1_000_000, - -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt", + mkdir "$Crossfire::VARDIR/cfplus", 0777; + my $recover = $BerkeleyDB::db_version >= 4.4 + ? eval "DB_REGISTER | DB_RECOVER" + : 0; + + $DB_ENV = new BerkeleyDB::Env + -Home => "$Crossfire::VARDIR/cfplus", + -Cachesize => 1_000_000, + -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt", # -ErrPrefix => "DATABASE", - -Verbose => 1, - -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN, - or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error"; + -Verbose => 1, + -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover, + -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE, + or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error"; +} sub db_table($) { my ($table) = @_; $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; - + new CFClient::Database -Env => $DB_ENV, -Filename => $table, @@ -93,104 +189,66 @@ # -Subname => $table, -Property => DB_CHKSUM, -Flags => DB_CREATE | DB_UPGRADE, - or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; + or die "unable to create/open database table $_[0]: $BerkeleyDB::Error" } -sub pod_to_pango($) { - my ($pom) = @_; +my $pod_cache = db_table "pod_cache"; - $pom->present ("CFClient::PodToPango") -} +sub load_pod($$$$) { + my ($path, $filtertype, $filterversion, $filtercb) = @_; -sub pod_to_pango_list($) { - my ($pom) = @_; + stat $path + or die "$path: $!"; - [ - map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "], - split /\n/, $pom->present ("CFClient::PodToPango") - ] -} + my $phash = join ",", $filterversion, $CFClient::PodToPango::VERSION, (stat _)[7,9]; -package CFClient::PodToPango; + my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } }; -use base Pod::POM::View::Text; + return $pom if $chash eq $phash; -our $indent = 0; + my $pod = do { + local $/; + open my $pod, "<:utf8", $_[0] + or die "$_[0]: $!"; + <$pod> + }; -*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]) }; + #utf8::downgrade $pod; -sub view_seq_text { - my $text = $_[1]; - $text =~ s/\s+/ /g; - CFClient::UI::Label::escape ($text) -} + $pom = $filtercb-> (Pod::POM->new->parse_text ($pod)); -sub view_item { - ("\t" x ($indent / 4)) - . $_[1]->title->present ($_[0]) - . "\n" - . $_[1]->content->present ($_[0]) -} + $pod_cache->put ("$path/$filtertype" => Storable::nfreeze [$phash, $pom]); -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" + $pom } -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 pod_to_pango($) { + my ($pom) = @_; -sub view_over { - local $indent = $indent + $_[1]->indent; - $_[1]->content->present ($_[0]) + $pom->present ("CFClient::PodToPango") } -package CFClient::Database; - -our @ISA = BerkeleyDB::Btree::; - -sub get($$) { - my $data; +sub pod_to_pango_list($) { + my ($pom) = @_; - $_[0]->db_get ($_[1], $data) == 0 - ? $data - : () + [ + map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "], + split /\n/, $pom->present ("CFClient::PodToPango") + ] } -my %DB_SYNC; +package CFClient::Layout; -sub put($$$) { - my ($db, $key, $data) = @_; +$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub { + clear_font_cache; +}; - $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); +package CFClient::Item; - $db->db_put ($key => $data) -} +use strict; +use Crossfire::Protocol::Constants; -package CFClient::Item; +my $last_enter_count = 1; sub desc_string { my ($self) = @_; @@ -200,19 +258,19 @@ ? $self->{name} : "$self->{nrof} × $self->{name_pl}"; - $self->{flags} & Crossfire::Protocol::F_OPEN + $self->{flags} & F_OPEN and $desc .= " (open)"; - $self->{flags} & Crossfire::Protocol::F_APPLIED + $self->{flags} & F_APPLIED and $desc .= " (applied)"; - $self->{flags} & Crossfire::Protocol::F_UNPAID + $self->{flags} & F_UNPAID and $desc .= " (unpaid)"; - $self->{flags} & Crossfire::Protocol::F_MAGIC + $self->{flags} & F_MAGIC and $desc .= " (magic)"; - $self->{flags} & Crossfire::Protocol::F_CURSED + $self->{flags} & F_CURSED and $desc .= " (cursed)"; - $self->{flags} & Crossfire::Protocol::F_DAMNED + $self->{flags} & F_DAMNED and $desc .= " (damned)"; - $self->{flags} & Crossfire::Protocol::F_LOCKED + $self->{flags} & F_LOCKED and $desc .= " *"; $desc @@ -226,20 +284,49 @@ $weight < 0 ? "?" : $weight * 0.001 } +sub do_n_dialog { + my ($cb) = @_; + + my $w = new CFClient::UI::FancyFrame; + $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center"); + $vb->add (new CFClient::UI::Label text => "Enter item count:"); + $vb->add (my $entry = new CFClient::UI::Entry + text => $last_enter_count, + on_activate => sub { + my ($entry) = @_; + $last_enter_count = $entry->get_text; + $cb->($last_enter_count); + $w->hide; + $w = undef; + } + ); + $entry->grab_focus; + $w->show; + +} + sub update_widgets { my ($self) = @_; + # necessary to avoid cyclic references + Scalar::Util::weaken $self; + my $button_cb = sub { my (undef, $ev, $x, $y) = @_; - if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { - my $targ = $::CONN->{player}{tag}; + my $targ = $::CONN->{player}{tag}; - if ($self->{container} == $::CONN->{player}{tag}) { - $targ = $::CONN->{open_container}; - } + if ($self->{container} == $::CONN->{player}{tag}) { + $targ = $::CONN->{open_container}; + } - $::CONN->send ("move $targ $self->{tag} 0"); + if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { + $::CONN->send ("move $targ $self->{tag} 0") + if $targ || !($self->{flags} & F_LOCKED); + } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) { + $self->{flags} & F_LOCKED + ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) + : $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) } elsif ($ev->{button} == 1) { $::CONN->send ("examine $self->{tag}"); } elsif ($ev->{button} == 2) { @@ -250,13 +337,18 @@ ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }], ["apply", sub { $::CONN->send ("apply $self->{tag}") }], ( - $self->{flags} & Crossfire::Protocol::F_LOCKED + $self->{flags} & F_LOCKED ? ( ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], ) : ( ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }], + ["move n", + sub { + do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") }) + } + ] ) ), ); @@ -271,6 +363,7 @@ . "Left click - examine item\n" . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n" . "Middle click - apply\n" + . "Shift-Middle click - lock/unlock\n" . "Right click - further options" . "\n"; @@ -279,7 +372,7 @@ can_hover => 1, anim => $self->{anim}, animspeed => $self->{animspeed}, # TODO# must be set at creation time - connect_button_down => $button_cb, + on_button_down => $button_cb, ; $self->{face_widget}{face} = $self->{face}; $self->{face_widget}{anim} = $self->{anim}; @@ -296,7 +389,7 @@ can_hover => 1, ellipsise => 2, align => -1, - connect_button_down => $button_cb, + on_button_down => $button_cb, ; my $desc = CFClient::Item::desc_string $self; $self->{desc_widget}->set_text ($desc); @@ -307,7 +400,7 @@ can_hover => 1, ellipsise => 0, align => 0, - connect_button_down => $button_cb, + on_button_down => $button_cb, ; $self->{weight_widget}->set_text (CFClient::Item::weight_string $self);