--- deliantra/Deliantra-Client/DC.pm 2006/06/05 21:10:03 1.89
+++ deliantra/Deliantra-Client/DC.pm 2006/12/07 15:57:13 1.135
@@ -1,10 +1,10 @@
=head1 NAME
-CFClient - undocumented utility garbage for our crossfire client
+CFPlus - undocumented utility garbage for our crossfire client
=head1 SYNOPSIS
- use CFClient;
+ use CFPlus;
=head1 DESCRIPTION
@@ -12,83 +12,141 @@
=cut
-package CFClient;
+package CFPlus;
+
+use Carp ();
BEGIN {
- $VERSION = '0.1';
+ $VERSION = '0.97';
use XSLoader;
- XSLoader::load "CFClient", $VERSION;
+ XSLoader::load "CFPlus", $VERSION;
}
use utf8;
-use Carp ();
use AnyEvent ();
use BerkeleyDB;
use Pod::POM ();
+use Scalar::Util ();
+use File::Path ();
use Storable (); # finally
-package CFClient::PodToPango;
+BEGIN {
+ use Crossfire::Protocol::Base ();
+ *to_json = \&Crossfire::Protocol::Base::to_json;
+ *from_json = \&Crossfire::Protocol::Base::from_json;
+}
-use base Pod::POM::View::Text;
+=item guard { BLOCK }
-our $VERSION = 1; # bump if resultant formatting changes
+Returns an object that executes the given block as soon as it is destroyed.
-our $indent = 0;
+=cut
-*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 guard(&) {
+ bless \(my $cb = $_[0]), "CFPlus::Guard"
+}
-sub view_seq_text {
- my $text = $_[1];
- $text =~ s/\s+/ /g;
- CFClient::UI::Label::escape ($text)
+sub CFPlus::Guard::DESTROY {
+ ${$_[0]}->()
}
-sub view_item {
- ("\t" x ($indent / 4))
- . $_[1]->title->present ($_[0])
- . "\n"
- . $_[1]->content->present ($_[0])
+=item shorten $string[, $maxlength]
+
+=cut
+
+sub shorten($;$) {
+ my ($str, $len) = @_;
+ substr $str, $len, (length $str), "..." if $len + 3 <= length $str;
+ $str
}
-sub view_verbatim {
- (join "",
- map +("\t" x ($indent / 2)) . "$_\n",
- split /\n/, CFClient::UI::Label::escape ($_[1]))
- . "\n"
+sub asxml($) {
+ local $_ = $_[0];
+
+ s/&/&/g;
+ s/>/>/g;
+ s/</g;
+
+ $_
}
-sub view_textblock {
- ("\t" x ($indent / 2)) . "$_[1]\n\n"
+sub socketpipe() {
+ socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
+ or die "cannot establish bidiretcional pipe: $!\n";
+
+ ($fh1, $fh2)
}
-sub view_head1 {
- "\n\n" . $_[1]->title->present ($_[0]) . "\n\n"
- . $_[1]->content->present ($_[0])
-};
+sub background(&;&) {
+ my ($bg, $cb) = @_;
-sub view_head2 {
- "\n" . $_[1]->title->present ($_[0]) . "\n\n"
- . $_[1]->content->present ($_[0])
-};
+ my ($fh_r, $fh_w) = CFPlus::socketpipe;
-sub view_head3 {
- "\n" . $_[1]->title->present ($_[0]) . "\n\n"
- . $_[1]->content->present ($_[0])
-};
+ my $pid = fork;
+
+ if (defined $pid && !$pid) {
+ local $SIG{__DIE__};
+
+ open STDOUT, ">&", $fh_w;
+ open STDERR, ">&", $fh_w;
+ close $fh_r;
+ close $fh_w;
+
+ $| = 1;
-sub view_over {
- local $indent = $indent + $_[1]->indent;
- $_[1]->content->present ($_[0])
+ eval { $bg->() };
+
+ if ($@) {
+ my $msg = $@;
+ $msg =~ s/\n+/\n/;
+ warn "FATAL: $msg";
+ CFPlus::_exit 1;
+ }
+
+ # win32 is fucked up, of course. exit will clean stuff up,
+ # which destroys our database etc. _exit will exit ALL
+ # forked processes, because of the dreaded fork emulation.
+ CFPlus::_exit 0;
+ }
+
+ close $fh_w;
+
+ my $buffer;
+
+ my $w; $w = AnyEvent->io (fh => $fh_r, poll => 'r', cb => sub {
+ unless (sysread $fh_r, $buffer, 4096, length $buffer) {
+ undef $w;
+ $cb->();
+ return;
+ }
+
+ while ($buffer =~ s/^(.*)\n//) {
+ my $line = $1;
+ $line =~ s/\s+$//;
+ utf8::decode $line;
+ if ($line =~ /^\x{e877}json_msg (.*)$/s) {
+ $cb->(from_json $1);
+ } else {
+ ::message ({
+ markup => "background($pid): " . CFPlus::asxml $line,
+ });
+ }
+ }
+ });
}
-package CFClient::Database;
+sub background_msg {
+ my ($msg) = @_;
+
+ $msg = "\x{e877}json_msg " . to_json $msg;
+ $msg =~ s/\n//g;
+ utf8::encode $msg;
+ print $msg, "\n";
+}
+
+package CFPlus::Database;
our @ISA = BerkeleyDB::Btree::;
@@ -105,18 +163,23 @@
sub put($$$) {
my ($db, $key, $data) = @_;
- $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
+ my $hkey = $db + 0;
+ Scalar::Util::weaken $db;
+ $DB_SYNC{$hkey} ||= AnyEvent->timer (after => 5, cb => sub {
+ delete $DB_SYNC{$hkey};
+ $db->db_sync if $db;
+ });
$db->db_put ($key => $data)
}
-package CFClient;
+package CFPlus;
sub find_rcfile($) {
my $path;
for (grep !ref, @INC) {
- $path = "$_/CFClient/resources/$_[0]";
+ $path = "$_/CFPlus/resources/$_[0]";
return $path if -r $path;
}
@@ -126,62 +189,83 @@
sub read_cfg {
my ($file) = @_;
- open CFG, $file
+ open my $fh, $file
or return;
- my $CFG;
-
local $/;
- $CFG = eval ;
+ my $CFG = <$fh>;
- $::CFG = $CFG;
-
- close CFG;
+ if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
+ require YAML;
+ utf8::decode $CFG;
+ $::CFG = YAML::Load ($CFG);
+ } elsif ($CFG =~ /^\{/) {
+ $::CFG = from_json $CFG;
+ } else {
+ $::CFG = eval $CFG; ## todo comaptibility cruft
+ }
}
sub write_cfg {
my ($file) = @_;
- open CFG, ">$file"
+ $::CFG->{VERSION} = $::VERSION;
+
+ open my $fh, ">:utf8", $file
or return;
+ print $fh to_json $::CFG;
+}
- {
- require Data::Dumper;
- local $Data::Dumper::Purity = 1;
- $::CFG->{VERSION} = $::VERSION;
- print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
+sub http_proxy {
+ my @proxy = win32_proxy_info;
+
+ if (@proxy) {
+ "http://" . (@proxy < 2 ? "" : @proxy < 3 ? "$proxy[1]\@" : "$proxy[1]:$proxy[2]\@") . $proxy[0]
+ } elsif (exists $ENV{http_proxy}) {
+ $ENV{http_proxy}
+ } else {
+ ()
}
+}
+
+sub set_proxy {
+ my $proxy = http_proxy
+ or return;
- close CFG;
+ $ENV{http_proxy} = $proxy;
}
-our $DB_ENV;
+sub lwp_useragent {
+ require LWP::UserAgent;
+
+ CFPlus::set_proxy;
-{
- use strict;
+ my $ua = LWP::UserAgent->new (
+ agent => "cfplus $VERSION",
+ keep_alive => 1,
+ env_proxy => 1,
+ timeout => 30,
+ );
+}
- mkdir "$Crossfire::VARDIR/cfplus", 0777;
- my $recover = $BerkeleyDB::db_version >= 4.4
- ? eval "DB_REGISTER | DB_RECOVER"
- : 0;
+sub lwp_check($) {
+ my ($res) = @_;
- $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 | $recover,
- -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
- or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
+ $res->is_error
+ and die $res->status_line;
+
+ $res
}
+our $DB_ENV;
+our $DB_STATE;
+
sub db_table($) {
my ($table) = @_;
$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
- new CFClient::Database
+ new CFPlus::Database
-Env => $DB_ENV,
-Filename => $table,
# -Filename => "database",
@@ -191,52 +275,43 @@
or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
}
-my $pod_cache = db_table "pod_cache";
+our $DB_HOME = "$Crossfire::VARDIR/cfplus";
-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>
- };
+sub open_db {
+ use strict;
- #utf8::downgrade $pod;
+ mkdir $DB_HOME, 0777;
+ my $recover = $BerkeleyDB::db_version >= 4.4
+ ? eval "DB_REGISTER | DB_RECOVER"
+ : 0;
- $pom = $filtercb-> (Pod::POM->new->parse_text ($pod));
+ $DB_ENV = new BerkeleyDB::Env
+ -Home => $DB_HOME,
+ -Cachesize => 1_000_000,
+ -ErrFile => "$DB_HOME/errorlog.txt",
+# -ErrPrefix => "DATABASE",
+ -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 $DB_HOME: $BerkeleyDB::Error";
- $pod_cache->put ("$path/$filtertype" => Storable::nfreeze [$phash, $pom]);
+ $DB_STATE = db_table "state";
- $pom
+ 1
}
-sub pod_to_pango($) {
- my ($pom) = @_;
-
- $pom->present ("CFClient::PodToPango")
+unless (eval { open_db }) {
+ File::Path::rmtree $DB_HOME;
+ open_db;
}
-sub pod_to_pango_list($) {
- my ($pom) = @_;
+package CFPlus::Layout;
- [
- map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
- split /\n/, $pom->present ("CFClient::PodToPango")
- ]
-}
+$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
+ reset_glyph_cache;
+};
-package CFClient::Item;
+package CFPlus::Item;
use strict;
use Crossfire::Protocol::Constants;
@@ -280,27 +355,36 @@
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
+ my $w = new CFPlus::UI::Toplevel
+ on_delete => sub { $_[0]->destroy; 1 },
+ has_close_button => 1,
+ ;
+
+ $w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center");
+ $vb->add (new CFPlus::UI::Label text => "Enter item count:");
+ $vb->add (my $entry = new CFPlus::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;
- }
+ $w->destroy;
+
+ 0
+ },
+ on_escape => sub { $w->destroy; 1 },
);
- $entry->focus_in;
+ $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) = @_;
@@ -310,10 +394,10 @@
$targ = $::CONN->{open_container};
}
- if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
+ if (($ev->{mod} & CFPlus::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) {
+ } elsif (($ev->{mod} & CFPlus::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})
@@ -322,9 +406,41 @@
} elsif ($ev->{button} == 2) {
$::CONN->send ("apply $self->{tag}");
} elsif ($ev->{button} == 3) {
+ my $move_prefix = $::CONN->{open_container} ? 'put' : 'drop';
+ if ($self->{container} == $::CONN->{open_container}) {
+ $move_prefix = "take";
+ }
+
+ my $shortname = CFPlus::shorten $self->{name}, 14;
+
my @menu_items = (
["examine", sub { $::CONN->send ("examine $self->{tag}") }],
["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
+ ["ignite/thaw", # first try of an easier use of flint&steel
+ sub {
+ $::CONN->send ("mark ". pack "N", $self->{tag});
+ $::CONN->send ("command apply flint and steel");
+ }
+ ],
+ ["inscribe", # first try of an easier use of flint&steel
+ sub {
+ &::open_string_query ("Text to inscribe", sub {
+ my ($entry, $txt) = @_;
+ $::CONN->send ("mark ". pack "N", $self->{tag});
+ $::CONN->send ("command use_skill inscription $txt");
+ });
+ }
+ ],
+ ["rename", # first try of an easier use of flint&steel
+ sub {
+ &::open_string_query ("Rename item to:", sub {
+ my ($entry, $txt) = @_;
+ $::CONN->send ("mark ". pack "N", $self->{tag});
+ $::CONN->send ("command rename to <$txt>");
+ }, $self->{name},
+ "If you input no name or erase the current custom name, the custom name will be unset");
+ }
+ ],
["apply", sub { $::CONN->send ("apply $self->{tag}") }],
(
$self->{flags} & F_LOCKED
@@ -333,17 +449,18 @@
)
: (
["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
- ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
- ["move n",
+ ["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }],
+ ["$move_prefix <n>",
sub {
do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
}
]
)
),
+ ["bind apply $shortname to a key" => sub { $::BIND_EDITOR->do_quick_binding (["apply $self->{name}"]) }],
);
- CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
+ CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
}
1
@@ -357,13 +474,18 @@
. "Right click - further options"
. "\n";
- $self->{face_widget} ||= new CFClient::UI::Face
+ 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 CFPlus::UI::Face
can_events => 1,
can_hover => 1,
anim => $self->{anim},
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};
@@ -374,26 +496,27 @@
. "\n\n$tooltip_std"
);
- $self->{desc_widget} ||= new CFClient::UI::Label
+ $self->{desc_widget} ||= new CFPlus::UI::Label
can_events => 1,
can_hover => 1,
ellipsise => 2,
align => -1,
on_button_down => $button_cb,
;
- my $desc = CFClient::Item::desc_string $self;
+ my $desc = CFPlus::Item::desc_string $self;
+ $self->{desc_widget}{bg} = $bg;
$self->{desc_widget}->set_text ($desc);
$self->{desc_widget}->set_tooltip ("$desc.\n$tooltip_std");
- $self->{weight_widget} ||= new CFClient::UI::Label
+ $self->{weight_widget} ||= new CFPlus::UI::Label
can_events => 1,
can_hover => 1,
ellipsise => 0,
align => 0,
on_button_down => $button_cb,
;
- $self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
-
+ $self->{weight_widget}{bg} = $bg;
+ $self->{weight_widget}->set_text (CFPlus::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. ")
@@ -402,154 +525,6 @@
);
}
-package CFClient::Binder;
-
-my @ALLOWED_MODIFIER_KEYS = (
- CFClient::SDLK_LSHIFT,
- CFClient::SDLK_LCTRL ,
- CFClient::SDLK_LALT ,
- CFClient::SDLK_LMETA ,
-
- CFClient::SDLK_RSHIFT,
- CFClient::SDLK_RCTRL ,
- CFClient::SDLK_RALT ,
- CFClient::SDLK_RMETA ,
-);
-
-my %ALLOWED_MODIFIERS = (
- CFClient::KMOD_LSHIFT => "LSHIFT",
- CFClient::KMOD_LCTRL => "LCTRL",
- CFClient::KMOD_LALT => "LALT",
- CFClient::KMOD_LMETA => "LMETA",
-
- CFClient::KMOD_RSHIFT => "RSHIFT",
- CFClient::KMOD_RCTRL => "RCTRL",
- CFClient::KMOD_RALT => "RALT",
- CFClient::KMOD_RMETA => "RMETA",
-);
-
-my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
-my @DIRECT_BIND_KEYS = (
- CFClient::SDLK_F1,
- CFClient::SDLK_F2,
- CFClient::SDLK_F3,
- CFClient::SDLK_F4,
- CFClient::SDLK_F5,
- CFClient::SDLK_F6,
- CFClient::SDLK_F7,
- CFClient::SDLK_F8,
- CFClient::SDLK_F9,
- CFClient::SDLK_F10,
- CFClient::SDLK_F11,
- CFClient::SDLK_F12,
- CFClient::SDLK_F13,
- CFClient::SDLK_F14,
- CFClient::SDLK_F15,
-);
-
-# this binding dialog asks for a key-combo to be pressed
-# and if successful it calls the $cb with $mod and $sym as args.
-sub open_binding_dialog {
- my ($cb) = @_;
-
- my $w = new CFClient::UI::FancyFrame
- title => "Bind Action",
- x => "center",
- y => "center";
-
- $w->add (my $vb = new CFClient::UI::VBox);
- $vb->add (new CFClient::UI::Label
- text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
- ."You can only bind 0-9 and F1-F15 without modifiers."
- );
- $vb->add (my $entry = new CFClient::UI::Entry
- text => "",
- on_key_down => sub {
- my ($entry, $ev) = @_;
-
- my $mod = $ev->{mod};
- my $sym = $ev->{sym};
-
- # XXX: This seems a little bit hackisch to me, but i have to ignore them
- if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
- return;
- }
-
- if ($mod == CFClient::KMOD_NONE
- and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
- and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
- {
- $::STATUSBOX->add (
- "Can't bind key ".CFClient::SDL_GetKeyName ($sym)
- ." directly without modifier! It would damage the completer handling."
- );
- return;
- }
-
- $entry->focus_out;
-
- $cb->($mod, $sym);
-
- $w->destroy
- });
-
- $entry->focus_in;
- $w->show;
-}
-
-sub keycombo_to_name {
- my ($mod, $sym) = @_;
-
- my $mods = join '+',
- map { $ALLOWED_MODIFIERS{$_} }
- grep { ($_ + 0) & ($mod + 0) }
- keys %ALLOWED_MODIFIERS;
- $mods .= "+" if $mods ne '';
-
- return $mods . CFClient::SDL_GetKeyName ($sym);
-}
-
-package CFClient::Pickup;
-# some pickup constants
-sub PU_NOTHING { 0x00000000 }
-
-sub PU_DEBUG { 0x10000000 }
-sub PU_INHIBIT { 0x20000000 }
-sub PU_STOP { 0x40000000 }
-sub PU_NEWMODE { 0x80000000 }
-
-sub PU_RATIO { 0x0000000F }
-
-sub PU_FOOD { 0x00000010 }
-sub PU_DRINK { 0x00000020 }
-sub PU_VALUABLES { 0x00000040 }
-sub PU_BOW { 0x00000080 }
-
-sub PU_ARROW { 0x00000100 }
-sub PU_HELMET { 0x00000200 }
-sub PU_SHIELD { 0x00000400 }
-sub PU_ARMOUR { 0x00000800 }
-
-sub PU_BOOTS { 0x00001000 }
-sub PU_GLOVES { 0x00002000 }
-sub PU_CLOAK { 0x00004000 }
-sub PU_KEY { 0x00008000 }
-
-sub PU_MISSILEWEAPON { 0x00010000 }
-sub PU_ALLWEAPON { 0x00020000 }
-sub PU_MAGICAL { 0x00040000 }
-sub PU_POTION { 0x00080000 }
-
-sub PU_SPELLBOOK { 0x00100000 }
-sub PU_SKILLSCROLL { 0x00200000 }
-sub PU_READABLES { 0x00400000 }
-sub PU_MAGIC_DEVICE { 0x00800000 }
-
-sub PU_NOT_CURSED { 0x01000000 }
-
-sub PU_JEWELS { 0x02000000 }
-
-
1;
=back