--- deliantra/Deliantra-Client/DC.pm 2006/05/23 00:26:17 1.58 +++ deliantra/Deliantra-Client/DC.pm 2007/08/30 07:08:17 1.148 @@ -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,385 +12,235 @@ =cut -package CFClient; +package CFPlus; + +use Carp (); BEGIN { - $VERSION = '0.1'; + $VERSION = '0.983'; use XSLoader; - XSLoader::load "CFClient", $VERSION; + XSLoader::load "CFPlus", $VERSION; } -use Carp (); -use AnyEvent (); -use BerkeleyDB; +use utf8; -use CFClient::OpenGL; - -our %GL_EXT; -our $GL_VERSION; - -our $GL_NPOT; -our $GL_DEBUG = 1; +use AnyEvent (); +use Pod::POM (); +use File::Path (); +use Storable (); # finally +use Fcntl (); +use JSON::XS qw(to_json from_json); -sub gl_init { - $GL_VERSION = gl_version * 1; - %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; +=item guard { BLOCK } - $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2; +Returns an object that executes the given block as soon as it is destroyed. - glDisable GL_COLOR_MATERIAL; - glShadeModel GL_FLAT; - glDisable GL_DITHER; - glDisable GL_DEPTH_TEST; - glDepthMask 0; - glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST; +=cut - CFClient::Texture::restore_state (); +sub guard(&) { + bless \(my $cb = $_[0]), "CFPlus::Guard" } -sub gl_check { - return unless $GL_DEBUG; - - if (my $error = glGetError) { - Carp::cluck sprintf "opengl error %x while %s", $error, &sprintf(@_); - } +sub CFPlus::Guard::DESTROY { + ${$_[0]}->() } -sub find_rcfile($) { - my $path; +=item shorten $string[, $maxlength] - for (grep !ref, @INC) { - $path = "$_/CFClient/resources/$_[0]"; - return $path if -r $path; - } +=cut - die "FATAL: can't find required file $_[0]\n"; +sub shorten($;$) { + my ($str, $len) = @_; + substr $str, $len, (length $str), "..." if $len + 3 <= length $str; + $str } -sub read_cfg { - my ($file) = @_; - - open CFG, $file - or return; - - my $CFG; +sub asxml($) { + local $_ = $_[0]; - local $/; - $CFG = eval ; - - $::CFG = $CFG; + s/&/&/g; + s/>/>/g; + s/$file" - or return; +sub socketpipe() { + socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC + or die "cannot establish bidirectional pipe: $!\n"; - { - require Data::Dumper; - local $Data::Dumper::Purity = 1; - $::CFG->{VERSION} = $::VERSION; - print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]); - } - - close CFG; + ($fh1, $fh2) } -mkdir "$Crossfire::VARDIR/pclient", 0777; +sub background(&;&) { + my ($bg, $cb) = @_; -our $DB_ENV = new BerkeleyDB::Env - -Home => "$Crossfire::VARDIR/pclient", - -Cachesize => 1_000_000, - -ErrFile => "$Crossfire::VARDIR/pclient/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"; + my ($fh_r, $fh_w) = CFPlus::socketpipe; -sub db_table($) { - my ($table) = @_; + my $pid = fork; - $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; - - 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"; -} + if (defined $pid && !$pid) { + local $SIG{__DIE__}; -sub pod_to_pango($) { - my ($pom) = @_; + open STDOUT, ">&", $fh_w; + open STDERR, ">&", $fh_w; + close $fh_r; + close $fh_w; - $pom->present ("CFClient::PodToPango") -} - -package CFClient::PodToPango; + $| = 1; -use base Pod::POM::View::Text; + eval { $bg->() }; -our $indent = 0; + if ($@) { + my $msg = $@; + $msg =~ s/\n+/\n/; + warn "FATAL: $msg"; + CFPlus::_exit 1; + } -*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]) }; + # 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; + } -sub view_seq_text { - my $text = $_[1]; - $text =~ s/\s+/ /g; - CFClient::UI::Label::escape ($text) -} + close $fh_w; -sub view_item { - ("\t" x ($indent / 4)) - . $_[1]->title->present ($_[0]) - . "\n" - . $_[1]->content->present ($_[0]) -} + my $buffer; -sub view_verbatim { - (join "", - map +("\t" x ($indent / 2)) . "$_\n", - split /\n/, CFClient::UI::Label::escape ($_[1])) - . "\n" -} + my $w; $w = AnyEvent->io (fh => $fh_r, poll => 'r', cb => sub { + unless (sysread $fh_r, $buffer, 4096, length $buffer) { + undef $w; + $cb->(); + return; + } -sub view_textblock { - ("\t" x ($indent / 2)) . "$_[1]\n\n" + 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, + }); + } + } + }); } -sub view_head2 { - "" . $_[1]->title->present ($_[0]) . "\n\n" - . $_[1]->content->present ($_[0]) -}; +sub background_msg { + my ($msg) = @_; -sub view_over { - local $indent = $indent + $_[1]->indent; - $_[1]->content->present ($_[0]) + $msg = "\x{e877}json_msg " . JSON::XS->new->allow_nonref->encode ($msg); + $msg =~ s/\n//g; + utf8::encode $msg; + print $msg, "\n"; } -package CFClient::Database; +package CFPlus; -our @ISA = BerkeleyDB::Btree::; +sub find_rcfile($) { + my $path; -sub get($$) { - my $data; + for (grep !ref, @INC) { + $path = "$_/CFPlus/resources/$_[0]"; + return $path if -r $path; + } - $_[0]->db_get ($_[1], $data) == 0 - ? $data - : () + die "FATAL: can't find required file $_[0]\n"; } -my %DB_SYNC; +sub read_cfg { + my ($file) = @_; -sub put($$$) { - my ($db, $key, $data) = @_; + open my $fh, $file + or return; - $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); + local $/; + my $CFG = <$fh>; - $db->db_put ($key => $data) + 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 + } } -package CFClient::Texture; - -use strict; - -use Scalar::Util; - -use CFClient::OpenGL; - -my %TEXTURES; - -sub new { - my ($class, %data) = @_; - - my $self = bless { - internalformat => GL_RGBA, - format => GL_RGBA, - type => GL_UNSIGNED_BYTE, - %data, - }, $class; - - Scalar::Util::weaken ($TEXTURES{$self+0} = $self); +sub write_cfg { + my ($file) = @_; - $self->upload; + $::CFG->{VERSION} = $::VERSION; - $self + open my $fh, ">:utf8", $file + or return; + print $fh to_json $::CFG; } -sub new_from_image { - my ($class, $image, %arg) = @_; +sub http_proxy { + my @proxy = win32_proxy_info; - $class->new (image => $image, %arg) + 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 new_from_file { - my ($class, $path, %arg) = @_; - - open my $fh, "<:raw", $path - or die "$path: $!"; +sub set_proxy { + my $proxy = http_proxy + or return; - local $/; - $class->new_from_image (<$fh>, %arg) + $ENV{http_proxy} = $proxy; } -#sub new_from_surface { -# my ($class, $surface) = @_; -# -# $surface->rgba; -# -# $class->new ( -# data => $surface->pixels, -# w => $surface->width, -# h => $surface->height, -# ) -#} - -sub new_from_layout { - my ($class, $layout, %arg) = @_; - - my ($w, $h, $data, $format, $internalformat) = $layout->render; +sub lwp_useragent { + require LWP::UserAgent; + + CFPlus::set_proxy; - $class->new ( - w => $w, - h => $h, - data => $data, - format => $format, - internalformat => $format, - type => GL_UNSIGNED_BYTE, - %arg, - ) + my $ua = LWP::UserAgent->new ( + agent => "cfplus $VERSION", + keep_alive => 1, + env_proxy => 1, + timeout => 30, + ); } -sub new_from_opengl { - my ($class, $w, $h, $cb) = @_; +sub lwp_check($) { + my ($res) = @_; - $class->new (w => $w || 1, h => $h || 1, render_cb => $cb) -} + $res->is_error + and die $res->status_line; -sub topot { - (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] + $res } -sub upload { - my ($self) = @_; - - return unless $GL_VERSION; - - my $data; +sub fh_nonblocking($$) { + my ($fh, $nb) = @_; - if (exists $self->{data}) { - $data = $self->{data}; - - } elsif (exists $self->{render_cb}) { - glViewport 0, 0, $self->{w}, $self->{h}; - glMatrixMode GL_PROJECTION; - glLoadIdentity; - glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000; - glMatrixMode GL_MODELVIEW; - glLoadIdentity; - $self->{render_cb}->($self, $self->{w}, $self->{h}); - - } else { - ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type}) - = CFClient::load_image_inline $self->{image}; - } - - my ($tw, $th) = @$self{qw(w h)}; - - unless ($tw > 0 && $th > 0) { - $tw = $th = 1; - $data = "\x00" x 64; - } - - $self->{minified} = [CFClient::average $tw, $th, $data] - if $self->{minify}; - - unless ($GL_NPOT) { - # TODO: does not work for zero-sized textures - $tw = topot $tw; - $th = topot $th; - - if (($tw != $self->{w} || $th != $self->{h}) && defined $data) { - my $bpp = (length $data) / ($self->{w} * $self->{h}); - $data = pack "(a" . ($tw * $bpp) . ")*", - unpack "(a" . ($self->{w} * $bpp) . ")*", $data; - $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); - } - } - - $self->{s} = $self->{w} / $tw; - $self->{t} = $self->{h} / $th; - - $self->{name} ||= glGenTexture; - - glBindTexture GL_TEXTURE_2D, $self->{name}; - - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; - - if ($::FAST) { - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST; - } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) { - # alternatively check for 0x8191 - glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR; - } else { - glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap}; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR; - } - - glGetError; - - if (defined $data) { - glTexImage2D GL_TEXTURE_2D, 0, - $self->{internalformat}, - $tw, $th, - 0, - $self->{format}, - $self->{type}, - $data; - CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x", - $tw, $th, $self->{internalformat}, $self->{format}, $self->{type}; + if ($^O eq "MSWin32") { + $nb = (! ! $nb) + 0; + ioctl $fh, 0x8004667e, \$nb; # FIONBIO } else { - glCopyTexImage2D GL_TEXTURE_2D, 0, - $self->{internalformat}, - 0, 0, - $tw, $th, - 0; - CFClient::gl_check "copying to texture %dx%d if=%x", - $tw, $th, $self->{internalformat}; + fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0; } - glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side } -sub DESTROY { - my ($self) = @_; - - delete $TEXTURES{$self+0}; - - glDeleteTexture delete $self->{name} - if $self->{name}; -} +package CFPlus::Layout; -sub restore_state { - $_->upload - for values %TEXTURES; -} +$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { + reset_glyph_cache; +}; 1;