--- deliantra/Deliantra-Client/DC.pm 2006/04/07 18:20:13 1.3
+++ deliantra/Deliantra-Client/DC.pm 2006/12/06 00:04:13 1.132
@@ -1,10 +1,10 @@
=head1 NAME
-Crossfire::Client - undocumented utility garbage for our crossfire client
+CFPlus - undocumented utility garbage for our crossfire client
=head1 SYNOPSIS
- use Crossfire::Client;
+ use CFPlus;
=head1 DESCRIPTION
@@ -12,99 +12,499 @@
=cut
-package Crossfire::Client;
+package CFPlus;
+
+use Carp ();
BEGIN {
- $VERSION = '0.1';
+ $VERSION = '0.97';
use XSLoader;
- XSLoader::load "Crossfire::Client", $VERSION;
+ XSLoader::load "CFPlus", $VERSION;
}
-package Crossfire::Client::Texture;
+use utf8;
-use Scalar::Util;
+use AnyEvent ();
+use BerkeleyDB;
+use Pod::POM ();
+use Scalar::Util ();
+use Storable (); # finally
-use SDL::OpenGL;
+BEGIN {
+ use Crossfire::Protocol::Base ();
+ *to_json = \&Crossfire::Protocol::Base::to_json;
+ *from_json = \&Crossfire::Protocol::Base::from_json;
+}
-my @textures;
+=item guard { BLOCK }
-sub new_from_file {
- my ($class, $path) = @_;
+Returns an object that executes the given block as soon as it is destroyed.
- open my $fh, "<:raw", $path
- or die "$path: $!";
+=cut
- local $/;
- $class->new_from_data (<$fh>)
+sub guard(&) {
+ bless \(my $cb = $_[0]), "CFPlus::Guard"
+}
+
+sub CFPlus::Guard::DESTROY {
+ ${$_[0]}->()
}
-sub new_from_image {
- my ($class, $image) = @_;
+sub asxml($) {
+ local $_ = $_[0];
- my $self = bless {
- image => $data,
- };
+ s/&/&/g;
+ s/>/>/g;
+ s/</g;
- push @textures, $self;
- Scalar::Util::weaken $textures[-1];
+ $_
+}
- $self->upload;
+sub socketpipe() {
+ socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
+ or die "cannot establish bidiretcional pipe: $!\n";
- $self
+ ($fh1, $fh2)
}
-sub upload {
- my ($self) = @_;
+sub background(&;&) {
+ my ($bg, $cb) = @_;
+
+ my ($fh_r, $fh_w) = CFPlus::socketpipe;
+
+ my $pid = fork;
- return unless $SDL::App::USING_OPENGL;
+ if (defined $pid && !$pid) {
+ local $SIG{__DIE__};
- my ($data, $width, $height);
+ open STDOUT, ">&", $fh_w;
+ open STDERR, ">&", $fh_w;
+ close $fh_r;
+ close $fh_w;
+
+ $| = 1;
+
+ 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,
+ });
+ }
+ }
+ });
+}
+
+sub background_msg {
+ my ($msg) = @_;
+
+ $msg = "\x{e877}json_msg " . to_json $msg;
+ $msg =~ s/\n//g;
+ utf8::encode $msg;
+ print $msg, "\n";
+}
- if (exists $self->{data}) {
- ($data, $width, $height) = ($self->{data}, $self->{width}, $self->{height});
+package CFPlus::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) = @_;
+
+ 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 CFPlus;
+
+sub find_rcfile($) {
+ my $path;
+
+ for (grep !ref, @INC) {
+ $path = "$_/CFPlus/resources/$_[0]";
+ return $path if -r $path;
+ }
+
+ die "FATAL: can't find required file $_[0]\n";
+}
+
+sub read_cfg {
+ my ($file) = @_;
+
+ open my $fh, $file
+ or return;
+
+ local $/;
+ my $CFG = <$fh>;
+
+ if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
+ require YAML;
+ utf8::decode $CFG;
+ $::CFG = YAML::Load ($CFG);
+ } elsif ($CFG =~ /^\{/) {
+ $::CFG = from_json $CFG;
} else {
- my $pb = new Gtk2::Gdk::PixbufLoader;
- $pb->write ($self->{data});
- $pb->close;
+ $::CFG = eval $CFG; ## todo comaptibility cruft
+ }
+}
+
+sub write_cfg {
+ my ($file) = @_;
- $pb = $pb->get_pixbuf;
- $pb = $pb->add_alpha (0, 0, 0, 0);
+ $::CFG->{VERSION} = $::VERSION;
- ($data, $width, $height) = ($pb->get_pixels, $pb->get_width, $pb->get_height);
+ open my $fh, ">:utf8", $file
+ or return;
+ print $fh to_json $::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 {
+ ()
}
+}
- ($self->{name}) = @{glGenTextures 1};
+sub set_proxy {
+ my $proxy = http_proxy
+ or return;
- glBindTexture GL_TEXTURE_2D, $self->{name};
+ $ENV{http_proxy} = $proxy;
+}
- glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
- glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;
- glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
- glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
+sub lwp_useragent {
+ require LWP::UserAgent;
- glTexImage2D GL_TEXTURE_2D, 0,
- GL_RGBA8,
- $width, $height,
- 0,
- GL_RGBA,
- GL_UNSIGNED_BYTE,
- $data;
+ CFPlus::set_proxy;
+
+ my $ua = LWP::UserAgent->new (
+ agent => "cfplus $VERSION",
+ keep_alive => 1,
+ env_proxy => 1,
+ timeout => 30,
+ );
}
-sub DESTROY {
- my ($self) = @_;
+sub lwp_check($) {
+ my ($res) = @_;
+
+ $res->is_error
+ and die $res->status_line;
+
+ $res
+}
+
+our $DB_ENV;
+our $DB_STATE;
- return unless exists $self->{name};
+sub db_table($) {
+ my ($table) = @_;
- glDeleteTextures delete $self->{name};
+ $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
+
+ new CFPlus::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"
+}
+
+{
+ use strict;
+
+ my $HOME = "$Crossfire::VARDIR/cfplus-$BerkeleyDB::db_version";
+
+ mkdir $HOME, 0777;
+ my $recover = $BerkeleyDB::db_version >= 4.4
+ ? eval "DB_REGISTER | DB_RECOVER"
+ : 0;
+
+ $DB_ENV = new BerkeleyDB::Env
+ -Home => $HOME,
+ -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 $HOME: $BerkeleyDB::Error";
+
+ $DB_STATE = db_table "state";
}
-push @::GLINIT, sub {
- $_->upload
- for grep $_, @textures;
+package CFPlus::Layout;
+
+$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
+ reset_glyph_cache;
};
+package CFPlus::Item;
+
+use strict;
+use Crossfire::Protocol::Constants;
+
+my $last_enter_count = 1;
+
+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 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->destroy;
+
+ 0
+ },
+ on_escape => sub { $w->destroy; 1 },
+ );
+ $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) = @_;
+
+ my $targ = $::CONN->{player}{tag};
+
+ if ($self->{container} == $::CONN->{player}{tag}) {
+ $targ = $::CONN->{open_container};
+ }
+
+ 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} & 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})
+ } 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");
+ }
+ ],
+ ["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
+ ? (
+ ["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]") })
+ }
+ ]
+ )
+ ),
+ ["bind apply $self->{name} to a key" => sub { $::BIND_EDITOR->do_quick_binding (["apply $self->{name}"]) }],
+ );
+
+ CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
+ }
+
+ 1
+ };
+
+ 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";
+
+ 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};
+ $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 CFPlus::UI::Label
+ can_events => 1,
+ can_hover => 1,
+ ellipsise => 2,
+ align => -1,
+ on_button_down => $button_cb,
+ ;
+ 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 CFPlus::UI::Label
+ can_events => 1,
+ can_hover => 1,
+ ellipsise => 0,
+ align => 0,
+ on_button_down => $button_cb,
+ ;
+ $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. ")
+ . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
+ . "\n\n$tooltip_std"
+ );
+}
+
1;
=back