--- deliantra/Deliantra-Client/DC.pm	2006/04/07 18:20:13	1.3
+++ deliantra/Deliantra-Client/DC.pm	2007/10/14 20:08:26	1.153
@@ -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,97 +12,234 @@
 
 =cut
 
-package Crossfire::Client;
+package CFPlus;
+
+use Carp ();
 
 BEGIN {
-   $VERSION = '0.1';
+   $VERSION = '0.992';
 
    use XSLoader;
-   XSLoader::load "Crossfire::Client", $VERSION;
+   XSLoader::load "CFPlus", $VERSION;
 }
 
-package Crossfire::Client::Texture;
+use utf8;
 
-use Scalar::Util;
+use AnyEvent ();
+use Pod::POM ();
+use File::Path ();
+use Storable (); # finally
+use Fcntl ();
+use JSON::XS qw(to_json from_json);
 
-use SDL::OpenGL;
+=item guard { BLOCK }
 
-my @textures;
+Returns an object that executes the given block as soon as it is destroyed.
 
-sub new_from_file {
-   my ($class, $path) = @_;
+=cut
 
-   open my $fh, "<:raw", $path
-      or die "$path: $!";
+sub guard(&) {
+   bless \(my $cb = $_[0]), "CFPlus::Guard"
+}
 
-   local $/;
-   $class->new_from_data (<$fh>)
+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];
+
+   s/&/&amp;/g;
+   s/>/&gt;/g;
+   s/</&lt;/g;
+
+   $_
 }
 
-sub new_from_image {
-   my ($class, $image) = @_;
+sub socketpipe() {
+   socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
+      or die "cannot establish bidirectional pipe: $!\n";
 
-   my $self = bless {
-      image => $data,
-   };
+   ($fh1, $fh2)
+}
+
+sub background(&;&) {
+   my ($bg, $cb) = @_;
+
+   my ($fh_r, $fh_w) = CFPlus::socketpipe;
+
+   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;
 
-   push @textures, $self;
-   Scalar::Util::weaken $textures[-1];
+      eval { $bg->() };
 
-   $self->upload;
+      if ($@) {
+         my $msg = $@;
+         $msg =~ s/\n+/\n/;
+         warn "FATAL: $msg";
+         CFPlus::_exit 1;
+      }
 
-   $self
+      # 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->(JSON::XS->new->allow_nonref->decode ($1));
+         } else {
+            ::message ({
+               markup => "background($pid): " . CFPlus::asxml $line,
+            });
+         }
+      }
+   });
 }
 
-sub upload {
-   my ($self) = @_;
+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";
+}
 
-   return unless $SDL::App::USING_OPENGL;
+package CFPlus;
 
-   my ($data, $width, $height);
+sub find_rcfile($) {
+   my $path;
 
-   if (exists $self->{data}) {
-      ($data, $width, $height) = ($self->{data}, $self->{width}, $self->{height});
+   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
+   }
+}
 
-      $pb = $pb->get_pixbuf;
-      $pb = $pb->add_alpha (0, 0, 0, 0);
+sub write_cfg {
+   my ($file) = @_;
+
+   $::CFG->{VERSION} = $::VERSION;
+
+   open my $fh, ">:utf8", $file
+      or return;
+   print $fh to_json $::CFG;
+}
 
-      ($data, $width, $height) = ($pb->get_pixels, $pb->get_width, $pb->get_height);
+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 lwp_check($) {
+   my ($res) = @_;
+
+   $res->is_error
+      and die $res->status_line;
+
+   $res
 }
 
-sub DESTROY {
-   my ($self) = @_;
+sub fh_nonblocking($$) {
+   my ($fh, $nb) = @_;
 
-   return unless exists $self->{name};
+   if ($^O eq "MSWin32") {
+      $nb = (! ! $nb) + 0;
+      ioctl $fh, 0x8004667e, \$nb; # FIONBIO
+   } else {
+      fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
+   }
 
-   glDeleteTextures delete $self->{name};
 }
 
-push @::GLINIT, sub {
-   $_->upload
-      for grep $_, @textures;
+package CFPlus::Layout;
+
+$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
+   reset_glyph_cache;
 };
 
 1;