--- deliantra/Deliantra-Client/DC.pm	2007/04/16 20:35:28	1.143
+++ deliantra/Deliantra-Client/DC.pm	2009/12/04 14:36:22	1.208
@@ -1,10 +1,10 @@
 =head1 NAME
 
-CFPlus - undocumented utility garbage for our crossfire client
+DC - undocumented utility garbage for our deliantra client
 
 =head1 SYNOPSIS
 
- use CFPlus;
+ use DC;
 
 =head1 DESCRIPTION
 
@@ -12,44 +12,31 @@
 
 =cut
 
-package CFPlus;
+package DC;
 
 use Carp ();
 
+our $VERSION;
+
 BEGIN {
-   $VERSION = '0.97';
+   $VERSION = '2.06';
 
    use XSLoader;
-   XSLoader::load "CFPlus", $VERSION;
+   XSLoader::load "Deliantra::Client", $VERSION;
 }
 
 use utf8;
+use strict qw(vars subs);
 
+use Socket ();
 use AnyEvent ();
+use AnyEvent::Util ();
 use Pod::POM ();
 use File::Path ();
 use Storable (); # finally
 use Fcntl ();
-
-BEGIN {
-   use Crossfire::Protocol::Base ();
-   *to_json   = \&Crossfire::Protocol::Base::to_json;
-   *from_json = \&Crossfire::Protocol::Base::from_json;
-}
-
-=item guard { BLOCK }
-
-Returns an object that executes the given block as soon as it is destroyed.
-
-=cut
-
-sub guard(&) {
-   bless \(my $cb = $_[0]), "CFPlus::Guard"
-}
-
-sub CFPlus::Guard::DESTROY {
-   ${$_[0]}->()
-}
+use JSON::XS qw(encode_json decode_json);
+use Guard qw(guard);
 
 =item shorten $string[, $maxlength]
 
@@ -71,17 +58,11 @@
    $_
 }
 
-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)
-}
-
 sub background(&;&) {
    my ($bg, $cb) = @_;
 
-   my ($fh_r, $fh_w) = CFPlus::socketpipe;
+   my ($fh_r, $fh_w) = AnyEvent::Util::portable_socketpair
+     or die "unable to create background socketpair: $!";
 
    my $pid = fork;
 
@@ -101,13 +82,13 @@
          my $msg = $@;
          $msg =~ s/\n+/\n/;
          warn "FATAL: $msg";
-         CFPlus::_exit 1;
+         DC::_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;
+      DC::_exit 0;
    }
 
    close $fh_w;
@@ -129,7 +110,7 @@
             $cb->(JSON::XS->new->allow_nonref->decode ($1));
          } else {
             ::message ({
-               markup => "background($pid): " . CFPlus::asxml $line,
+               markup => "background($pid): " . DC::asxml $line,
             });
          }
       }
@@ -145,47 +126,80 @@
    print $msg, "\n";
 }
 
-package CFPlus;
+package DC;
+
+our $RC_THEME;
+our %THEME;
+our @RC_PATH;
+our $RC_BASE;
+
+for (grep !ref, @INC) {
+   $RC_BASE = "$_/Deliantra/Client/private/resources";
+   last if -d $RC_BASE;
+}
 
 sub find_rcfile($) {
    my $path;
 
-   for (grep !ref, @INC) {
-      $path = "$_/CFPlus/resources/$_[0]";
-      return $path if -r $path;
+   for (@RC_PATH, "") {
+      $path = "$RC_BASE/$_/$_[0]";
+      return $path if -e $path;
    }
 
-   die "FATAL: can't find required file $_[0]\n";
+   die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
 }
 
-sub read_cfg {
+sub load_json($) {
    my ($file) = @_;
 
    open my $fh, $file
       or return;
 
    local $/;
-   my $CFG = <$fh>;
+   eval { JSON::XS->new->utf8->relaxed->decode (<$fh>) }
+}
 
-   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 set_theme($) {
+   return if $RC_THEME eq $_[0];
+   $RC_THEME = $_[0];
+
+   # kind of hacky, find the main theme file, then load all theme files and merge them
+
+   %THEME = ();
+   @RC_PATH = "theme-$RC_THEME";
+
+   my $theme = load_json find_rcfile "theme.json"
+      or die "FATAL: theme resource file not found";
+
+   @RC_PATH = @{ $theme->{path} } if $theme->{path};
+
+   for (@RC_PATH, "") {
+      my $theme = load_json "$RC_BASE/$_/theme.json"
+         or next;
+
+      %THEME = ( %$theme, %THEME );
    }
 }
 
-sub write_cfg {
+sub read_cfg {
    my ($file) = @_;
 
+   $::CFG = (load_json $file) || (load_json "$file.bak");
+}
+
+sub write_cfg {
+   my $file = "$Deliantra::VARDIR/client.cf";
+
    $::CFG->{VERSION} = $::VERSION;
+   $::CFG->{layout}  = DC::UI::get_layout ();
 
-   open my $fh, ">:utf8", $file
+   open my $fh, ">:utf8", "$file~"
       or return;
-   print $fh to_json $::CFG;
+   print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
+   close $fh;
+
+   rename $file, "$file.bak";
+   rename "$file~", $file;
 }
 
 sub http_proxy {
@@ -210,10 +224,10 @@
 sub lwp_useragent {
    require LWP::UserAgent;
    
-   CFPlus::set_proxy;
+   DC::set_proxy;
 
    my $ua = LWP::UserAgent->new (
-      agent      => "cfplus $VERSION",
+      agent      => "deliantra $VERSION",
       keep_alive => 1,
       env_proxy  => 1,
       timeout    => 30,
@@ -238,13 +252,16 @@
    } else {
       fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
    }
-
 }
 
-package CFPlus::Layout;
+package DC::Layout;
+
+$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
+   glyph_cache_restore;
+};
 
-$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
-   reset_glyph_cache;
+$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
+   glyph_cache_backup;
 };
 
 1;