--- deliantra/Deliantra-Client/DC.pm 2006/07/23 16:11:12 1.105 +++ deliantra/Deliantra-Client/DC.pm 2007/11/14 23:50:29 1.158 @@ -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,40 +12,25 @@ =cut -package CFClient; +package CFPlus; + +use Carp (); BEGIN { - $VERSION = '0.1'; + $VERSION = '0.9956'; 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 - -our %STAT_TOOLTIP = ( - Str => "Physical Strength, determines damage dealt with weapons, how much you can carry, and how often you can attack", - Dex => "Dexterity, your physical agility. Determines chance of being hit and affects armor class and speed", - Con => "Constitution, physical health and toughness. Determines how many healthpoints you can have", - Int => "Intelligence, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have", - Wis => "Wisdom, the ability to learn and use divine magic (prayers). Determines how many grace points you can have", - Pow => "Power, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up", - Cha => "Charisma, how well you are received by NPCs. Affects buying and selling prices in shops.", - - Wc => "Weapon Class, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72.", - Ac => "Armour Class, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases.", - Dam => "Damage, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack.", - Arm => "Armour, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance.", - Spd => "Speed, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed.", - WSp => "Weapon Speed, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed.", -); +use Fcntl (); +use JSON::XS qw(to_json from_json); =item guard { BLOCK } @@ -54,13 +39,23 @@ =cut sub guard(&) { - bless \(my $cb = $_[0]), "CFClient::Guard" + bless \(my $cb = $_[0]), "CFPlus::Guard" } -sub CFClient::Guard::DESTROY { +sub CFPlus::Guard::DESTROY { ${$_[0]}->() } +=item shorten $string[, $maxlength] + +=cut + +sub shorten($;$) { + my ($str, $len) = @_; + substr $str, $len, (length $str), "..." if $len + 3 <= length $str; + $str +} + sub asxml($) { local $_ = $_[0]; @@ -71,35 +66,87 @@ $_ } -package CFClient::Database; +sub socketpipe() { + socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC + or die "cannot establish bidirectional pipe: $!\n"; + + ($fh1, $fh2) +} -our @ISA = BerkeleyDB::Btree::; +sub background(&;&) { + my ($bg, $cb) = @_; -sub get($$) { - my $data; + my ($fh_r, $fh_w) = CFPlus::socketpipe; - $_[0]->db_get ($_[1], $data) == 0 - ? $data - : () -} + 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; -my %DB_SYNC; + eval { $bg->() }; -sub put($$$) { - my ($db, $key, $data) = @_; + 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; - $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); + my $buffer; - $db->db_put ($key => $data) + 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->(JSON::XS->new->allow_nonref->decode ($1)); + } else { + ::message ({ + markup => "background($pid): " . CFPlus::asxml $line, + }); + } + } + }); } -package CFClient; +sub background_msg { + my ($msg) = @_; + + $msg = "\x{e877}json_msg " . JSON::XS->new->allow_nonref->encode ($msg); + $msg =~ s/\n//g; + utf8::encode $msg; + print $msg, "\n"; +} + +package CFPlus; sub find_rcfile($) { my $path; for (grep !ref, @INC) { - $path = "$_/CFClient/resources/$_[0]"; + $path = "$_/CFPlus/resources/$_[0]"; return $path if -r $path; } @@ -109,262 +156,91 @@ 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" - or return; + $::CFG->{VERSION} = $::VERSION; - { - require Data::Dumper; - local $Data::Dumper::Purity = 1; - $::CFG->{VERSION} = $::VERSION; - print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]); - } - - close CFG; + open my $fh, ">:utf8", $file + or return; + print $fh to_json $::CFG; } -our $DB_ENV; - -{ - use strict; +sub http_proxy { + my @proxy = win32_proxy_info; - 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 | $recover, - -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE, - or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error"; + 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 db_table($) { - my ($table) = @_; - - $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; +sub set_proxy { + my $proxy = http_proxy + or return; - new CFClient::Database - -Env => $DB_ENV, - -Filename => $table, -# -Filename => "database", -# -Subname => $table, - -Property => DB_CHKSUM, - -Flags => DB_CREATE | DB_UPGRADE, - or die "unable to create/open database table $_[0]: $BerkeleyDB::Error" + $ENV{http_proxy} = $proxy; } -package CFClient::Layout; - -$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub { - reset_glyph_cache; -}; - -package CFClient::Item; - -use strict; -use Crossfire::Protocol::Constants; - -my $last_enter_count = 1; +sub lwp_useragent { + require LWP::UserAgent; + + CFPlus::set_proxy; -sub desc_string { - my ($self) = @_; - - my $desc = - $self->{nrof} < 2 - ? $self->{name} - : "$self->{nrof} × $self->{name_pl}"; - - $self->{flags} & F_OPEN - and $desc .= " (open)"; - $self->{flags} & F_APPLIED - and $desc .= " (applied)"; - $self->{flags} & F_UNPAID - and $desc .= " (unpaid)"; - $self->{flags} & F_MAGIC - and $desc .= " (magic)"; - $self->{flags} & F_CURSED - and $desc .= " (cursed)"; - $self->{flags} & F_DAMNED - and $desc .= " (damned)"; - $self->{flags} & F_LOCKED - and $desc .= " *"; - - $desc -} - -sub weight_string { - my ($self) = @_; - - my $weight = ($self->{nrof} || 1) * $self->{weight}; - - $weight < 0 ? "?" : $weight * 0.001 -} - -sub do_n_dialog { - my ($cb) = @_; - - my $w = new CFClient::UI::FancyFrame - on_delete => sub { $_[0]->destroy; 1 }, - has_close_button => 1, - ; - - $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->destroy; - - 0 - }, - on_escape => sub { $w->destroy; 1 }, + my $ua = LWP::UserAgent->new ( + agent => "cfplus $VERSION", + keep_alive => 1, + env_proxy => 1, + timeout => 30, ); - $entry->grab_focus; - $w->show; } -sub update_widgets { - my ($self) = @_; +sub lwp_check($) { + my ($res) = @_; - # necessary to avoid cyclic references - Scalar::Util::weaken $self; + $res->is_error + and die $res->status_line; - my $button_cb = sub { - my (undef, $ev, $x, $y) = @_; - - my $targ = $::CONN->{player}{tag}; + $res +} - if ($self->{container} == $::CONN->{player}{tag}) { - $targ = $::CONN->{open_container}; - } +sub fh_nonblocking($$) { + my ($fh, $nb) = @_; - 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) { - $::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 @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"); - } - ], - ["apply", sub { $::CONN->send ("apply $self->{tag}") }], - ( - $self->{flags} & F_LOCKED - ? ( - ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], - ) - : ( - ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], - ["$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]") }) - } - ] - ) - ), - ); + if ($^O eq "MSWin32") { + $nb = (! ! $nb) + 0; + ioctl $fh, 0x8004667e, \$nb; # FIONBIO + } else { + fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0; + } - CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); - } +} - 1 - }; +package CFPlus::Layout; - my $tooltip_std = "" - . "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"; - - $self->{face_widget} ||= new CFClient::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}{face} = $self->{face}; - $self->{face_widget}{anim} = $self->{anim}; - $self->{face_widget}{animspeed} = $self->{animspeed}; - $self->{face_widget}->set_tooltip ( - "Face/Animation.\n" - . "Item uses face #$self->{face}. " - . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ") - . "\n\n$tooltip_std" - ); - - $self->{desc_widget} ||= new CFClient::UI::Label - can_events => 1, - can_hover => 1, - ellipsise => 2, - align => -1, - on_button_down => $button_cb, - ; - my $desc = CFClient::Item::desc_string $self; - $self->{desc_widget}->set_text ($desc); - $self->{desc_widget}->set_tooltip ("$desc.\n$tooltip_std"); - - $self->{weight_widget} ||= new CFClient::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}->set_tooltip ( - "Weight.\n" - . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ") - . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") - . "\n\n$tooltip_std" - ); -} +$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { + reset_glyph_cache; +}; 1;