--- deliantra/Deliantra-Client/DC.pm	2006/10/09 01:06:36	1.123
+++ deliantra/Deliantra-Client/DC.pm	2006/12/07 03:54:47	1.134
@@ -17,21 +17,12 @@
 use Carp ();
 
 BEGIN {
-   $VERSION = '0.52';
+   $VERSION = '0.97';
 
    use XSLoader;
    XSLoader::load "CFPlus", $VERSION;
 }
 
-BEGIN {
-   $SIG{__DIE__} = sub {
-      return if CFPlus::in_destruct;
-      #CFPlus::fatal $_[0];#d#
-      CFPlus::error Carp::longmess $_[0];#d#
-      die;#d#
-   };
-}
-
 use utf8;
 
 use AnyEvent ();
@@ -40,6 +31,12 @@
 use Scalar::Util ();
 use Storable (); # finally
 
+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.
@@ -54,6 +51,16 @@
    ${$_[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];
 
@@ -71,20 +78,15 @@
    ($fh1, $fh2)
 }
 
-sub background(&) {
-   my ($cb) = @_;
+sub background(&;&) {
+   my ($bg, $cb) = @_;
 
    my ($fh_r, $fh_w) = CFPlus::socketpipe;
 
    my $pid = fork;
 
    if (defined $pid && !$pid) {
-      $SIG{__DIE__} = sub {
-         my $msg = $_[0];
-         $msg =~ s/\n+/\n/;
-         warn "FATAL: $msg";
-         CFPlus::_exit 99;
-      };
+      local $SIG{__DIE__};
 
       open STDOUT, ">&", $fh_w;
       open STDERR, ">&", $fh_w;
@@ -93,34 +95,56 @@
 
       $| = 1;
 
-      $cb->();
+      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;
+      CFPlus::_exit 0;
    }
 
    close $fh_w;
 
    my $buffer;
 
-   Event->io (fd => $fh_r, poll => 'r', cb => sub {
+   my $w; $w = AnyEvent->io (fh => $fh_r, poll => 'r', cb => sub {
       unless (sysread $fh_r, $buffer, 4096, length $buffer) {
-         $_[0]->w->cancel;
-         $buffer .= "done\n";
+         undef $w;
+         $cb->();
+         return;
       }
 
       while ($buffer =~ s/^(.*)\n//) {
          my $line = $1;
+         $line =~ s/\s+$//;
          utf8::decode $line;
-         ::message ({
-            markup => "editor($pid): " . CFPlus::asxml $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";
+}
+
 package CFPlus::Database;
 
 our @ISA = BerkeleyDB::Btree::;
@@ -161,12 +185,6 @@
    die "FATAL: can't find required file $_[0]\n";
 }
 
-BEGIN {
-   use Crossfire::Protocol::Base ();
-   *to_json   = \&Crossfire::Protocol::Base::to_json;
-   *from_json = \&Crossfire::Protocol::Base::from_json;
-}
-
 sub read_cfg {
    my ($file) = @_;
 
@@ -216,6 +234,28 @@
    $ENV{http_proxy} = $proxy;
 }
 
+sub lwp_useragent {
+   require LWP::UserAgent;
+   
+   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
+}
+
 our $DB_ENV;
 our $DB_STATE;
 
@@ -237,20 +277,22 @@
 {
    use strict;
 
-   mkdir "$Crossfire::VARDIR/cfplus", 0777;
+   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 => "$Crossfire::VARDIR/cfplus",
+                    -Home => $HOME,
                     -Cachesize => 1_000_000,
-                    -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
+                    -ErrFile => "$HOME/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 $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
+                       or die "unable to create/open database home $HOME: $BerkeleyDB::Error";
 
    $DB_STATE = db_table "state";
 }
@@ -361,6 +403,8 @@
             $move_prefix = "take";
          }
 
+         my $shortname = CFPlus::shorten $self->{name}, 14;
+
          my @menu_items = (
             ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
             ["mark",    sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
@@ -405,6 +449,7 @@
                   ]
                )
             ),
+            ["bind <i>apply $shortname</i> to a key"   => sub { $::BIND_EDITOR->do_quick_binding (["apply $self->{name}"]) }],
          );
 
          CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);