--- deliantra/Deliantra-Client/DC.pm	2006/04/24 08:22:20	1.44
+++ deliantra/Deliantra-Client/DC.pm	2009/01/04 10:22:19	1.200
@@ -1,10 +1,10 @@
 =head1 NAME
 
-CFClient - undocumented utility garbage for our crossfire client
+DC - undocumented utility garbage for our deliantra client
 
 =head1 SYNOPSIS
 
- use CFClient;
+ use DC;
 
 =head1 DESCRIPTION
 
@@ -12,318 +12,264 @@
 
 =cut
 
-package CFClient;
-
-BEGIN {
-   $VERSION = '0.1';
-
-   use XSLoader;
-   XSLoader::load "CFClient", $VERSION;
-}
+package DC;
 
 use Carp ();
-use AnyEvent;
-use BerkeleyDB;
-use CFClient::OpenGL;
-
-our %GL_EXT;
-our $GL_VERSION;
-
-our $GL_NPOT;
-
-sub gl_init {
-   $GL_VERSION = gl_version * 1;
-   %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
-
-   $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
-
-   glEnable GL_TEXTURE_2D;
-   glEnable GL_COLOR_MATERIAL;
-   glShadeModel GL_FLAT;
-   glDisable GL_DEPTH_TEST;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
 
-   glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
+our $VERSION;
 
-   CFClient::Texture::restore_state ();
-}
-
-sub find_rcfile($) {
-   my $path;
-
-   for (@INC) {
-      $path = "$_/CFClient/resources/$_[0]";
-      return $path if -r $path;
-   }
+BEGIN {
+   $VERSION = '2.02';
 
-   die "FATAL: can't find required file $_[0]\n";
+   use XSLoader;
+   XSLoader::load "Deliantra::Client", $VERSION;
 }
 
-sub read_cfg {
-   my ($file) = @_;
+use utf8;
+use strict qw(vars subs);
 
-   open CFG, $file
-      or return;
+use Socket ();
+use AnyEvent ();
+use AnyEvent::Util ();
+use Pod::POM ();
+use File::Path ();
+use Storable (); # finally
+use Fcntl ();
+use JSON::XS qw(encode_json decode_json);
 
-   my $CFG;
+=item guard { BLOCK }
 
-   local $/;
-   $CFG = eval <CFG>;
+Returns an object that executes the given block as soon as it is destroyed.
 
-   $::CFG = $CFG;
+=cut
 
-   close CFG;
+sub guard(&) {
+   bless \(my $cb = $_[0]), "DC::Guard"
 }
 
-sub write_cfg {
-   my ($file) = @_;
+sub DC::Guard::DESTROY {
+   ${$_[0]}->()
+}
 
-   open CFG, ">$file"
-      or return;
+=item shorten $string[, $maxlength]
 
-   {
-      require Data::Dumper;
-      local $Data::Dumper::Purity = 1;
-      $::CFG->{VERSION} = $::VERSION;
-      print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
-   }
+=cut
 
-   close CFG;
+sub shorten($;$) {
+   my ($str, $len) = @_;
+   substr $str, $len, (length $str), "..." if $len + 3 <= length $str;
+   $str
 }
 
-mkdir "$Crossfire::VARDIR/pclient", 0777;
-
-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_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN,
-                    or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
+sub asxml($) {
+   local $_ = $_[0];
 
-sub db_table($) {
-   my ($table) = @_;
+   s/&/&amp;/g;
+   s/>/&gt;/g;
+   s/</&lt;/g;
 
-   $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
-   
-   new CFClient::Database
-      -Env      => $DB_ENV,
-      -Filename => $table,
-#      -Filename => "database",
-#      -Subname  => $table,
-      -Flags    => DB_CREATE | DB_UPGRADE,
-         or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
+   $_
 }
 
-package CFClient::Database;
+sub background(&;&) {
+   my ($bg, $cb) = @_;
 
-our @ISA = BerkeleyDB::Btree::;
+   my ($fh_r, $fh_w) = AnyEvent::Util::portable_socketpair
+     or die "unable to create background socketpair: $!";
 
-sub get($$) {
-   my $data;
+   my $pid = fork;
 
-   $_[0]->db_get ($_[1], $data) == 0
-      ? $data
-      : ()
-}
+   if (defined $pid && !$pid) {
+      local $SIG{__DIE__};
 
-my %DB_SYNC;
+      open STDOUT, ">&", $fh_w;
+      open STDERR, ">&", $fh_w;
+      close $fh_r;
+      close $fh_w;
 
-sub put($$$) {
-   my ($db, $key, $data) = @_;
+      $| = 1;
 
-   $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
+      eval { $bg->() };
 
-   $db->db_put ($key => $data)
-}
+      if ($@) {
+         my $msg = $@;
+         $msg =~ s/\n+/\n/;
+         warn "FATAL: $msg";
+         DC::_exit 1;
+      }
 
-package CFClient::Texture;
+      # 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.
+      DC::_exit 0;
+   }
 
-use strict;
+   close $fh_w;
 
-use Scalar::Util;
+   my $buffer;
 
-use CFClient::OpenGL;
+   my $w; $w = AnyEvent->io (fh => $fh_r, poll => 'r', cb => sub {
+      unless (sysread $fh_r, $buffer, 4096, length $buffer) {
+         undef $w;
+         $cb->();
+         return;
+      }
 
-my %TEXTURES;
+      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): " . DC::asxml $line,
+            });
+         }
+      }
+   });
+}
 
-sub new {
-   my ($class, %data) = @_;
+sub background_msg {
+   my ($msg) = @_;
 
-   my $self = bless {
-      internalformat => GL_RGBA,
-      format         => GL_RGBA,
-      type           => GL_UNSIGNED_BYTE,
-      %data,
-   }, $class;
+   $msg = "\x{e877}json_msg " . JSON::XS->new->allow_nonref->encode ($msg);
+   $msg =~ s/\n//g;
+   utf8::encode $msg;
+   print $msg, "\n";
+}
 
-   Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
+package DC;
 
-   $self->upload;
+our $RC_THEME;
+our %THEME;
+our @RC_PATH;
+our $RC_BASE;
 
-   $self
+for (grep !ref, @INC) {
+   $RC_BASE = "$_/Deliantra/Client/private/resources";
+   last if -d $RC_BASE;
 }
 
-sub new_from_image {
-   my ($class, $image, %arg) = @_;
+sub find_rcfile($) {
+   my $path;
+
+   for (@RC_PATH, "") {
+      $path = "$RC_BASE/$_/$_[0]";
+      return $path if -r $path;
+   }
 
-   $class->new (image => $image, %arg)
+   die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
 }
 
-sub new_from_file {
-   my ($class, $path, %arg) = @_;
+sub load_json($) {
+   my ($file) = @_;
 
-   open my $fh, "<:raw", $path
-      or die "$path: $!";
+   open my $fh, $file
+      or return;
 
    local $/;
-   $class->new_from_image (<$fh>, %arg)
+   JSON::XS->new->utf8->relaxed->decode (<$fh>)
 }
 
-#sub new_from_surface {
-#   my ($class, $surface) = @_;
-#
-#   $surface->rgba;
-#
-#   $class->new (
-#      data   => $surface->pixels,
-#      w      => $surface->width,
-#      h      => $surface->height,
-#   )
-#}
+sub set_theme($) {
+   return if $RC_THEME eq $_[0];
+   $RC_THEME = $_[0];
 
-sub new_from_layout {
-   my ($class, $layout, %arg) = @_;
+   # kind of hacky, find the main theme file, then load all theme files and merge them
 
-   my ($w, $h, $data) = $layout->render;
+   %THEME = ();
+   @RC_PATH = "theme-$RC_THEME";
 
-   $class->new (
-      w              => $w,
-      h              => $h,
-      data           => $data,
-      format         => GL_ALPHA,
-      internalformat => GL_ALPHA,
-      type           => GL_UNSIGNED_BYTE,
-      %arg,
-   )
-}
+   my $theme = load_json find_rcfile "theme.json"
+      or die "FATAL: theme resource file not found";
 
-sub new_from_opengl {
-   my ($class, $w, $h, $cb) = @_;
+   @RC_PATH = @{ $theme->{path} } if $theme->{path};
 
-   $class->new (w => $w, h => $h, render_cb => $cb)
-}
+   for (@RC_PATH, "") {
+      my $theme = load_json "$RC_BASE/$_/theme.json"
+         or next;
 
-sub topot {
-   (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
+      %THEME = ( %$theme, %THEME );
+   }
 }
 
-sub upload {
-   my ($self) = @_;
+sub read_cfg {
+   my ($file) = @_;
 
-   return unless $GL_VERSION;
+   $::CFG = load_json $file;
+}
 
-   my $data;
+sub write_cfg {
+   my $file = "$Deliantra::VARDIR/client.cf";
+
+   $::CFG->{VERSION} = $::VERSION;
 
-   if (exists $self->{data}) {
-      $data = $self->{data};
+   open my $fh, ">:utf8", $file
+      or return;
+   print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
+}
 
-   } 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});
+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->{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 && $th) {
-      $tw = $th = 1;
-      $data = "\x00" x 64;
-   }
+sub set_proxy {
+   my $proxy = http_proxy
+      or return;
 
-   $self->{minified} = [CFClient::average $tw, $th, $data]
-      if $self->{minify};
+   $ENV{http_proxy} = $proxy;
+}
 
-   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});
-      }
-   }
+sub lwp_useragent {
+   require LWP::UserAgent;
+   
+   DC::set_proxy;
 
-   $self->{s} = $self->{w} / $tw;
-   $self->{t} = $self->{h} / $th;
+   my $ua = LWP::UserAgent->new (
+      agent      => "deliantra $VERSION",
+      keep_alive => 1,
+      env_proxy  => 1,
+      timeout    => 30,
+   );
+}
 
-   glGetError;
+sub lwp_check($) {
+   my ($res) = @_;
 
-   $self->{name} ||= glGenTexture;
+   $res->is_error
+      and die $res->status_line;
 
-   glBindTexture GL_TEXTURE_2D, $self->{name};
+   $res
+}
 
-   glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
-   glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
+sub fh_nonblocking($$) {
+   my ($fh, $nb) = @_;
 
-   if ($::FAST) {
-      glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
-      glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
+   if ($^O eq "MSWin32") {
+      $nb = (! ! $nb) + 0;
+      ioctl $fh, 0x8004667e, \$nb; # FIONBIO
    } 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, $self->{mipmap} ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR;
-   }
-   
-   if (defined $data) {
-      glTexImage2D GL_TEXTURE_2D, 0,
-                   $self->{internalformat},
-                   $tw, $th, # need to pad texture first
-                   0,
-                   $self->{format},
-                   $self->{type},
-                   $data;
-      if (my $error = glGetError) {
-         Carp::cluck sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x",
-                      $error, $tw, $th, $self->{internalformat},  $self->{format}, $self->{type};
-      }
-   } else {
-      glCopyTexImage2D GL_TEXTURE_2D, 0,
-                   $self->{internalformat},
-                   0, 0,
-                   $tw, $th,
-                   0;
-      if (my $error = glGetError) {
-         Carp::cluck sprintf "texture upload error: %x %dx%d i=%x",
-                      $error, $tw, $th, $self->{internalformat};
-      }
+      fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
    }
 }
 
-sub DESTROY {
-   my ($self) = @_;
-
-   delete $TEXTURES{$self+0};
+package DC::Layout;
 
-   glDeleteTexture delete $self->{name}
-      if $self->{name};
-}
+$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
+   glyph_cache_restore;
+};
 
-sub restore_state{
-   $_->upload
-      for values %TEXTURES;
+$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
+   glyph_cache_backup;
 };
 
 1;