--- deliantra/Deliantra-Client/DC.pm	2006/08/14 04:34:40	1.114
+++ deliantra/Deliantra-Client/DC.pm	2006/10/01 14:48:50	1.122
@@ -14,16 +14,26 @@
 
 package CFPlus;
 
+use Carp ();
+
 BEGIN {
-   $VERSION = '0.2';
+   $VERSION = '0.52';
 
    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 Carp ();
 use AnyEvent ();
 use BerkeleyDB;
 use Pod::POM ();
@@ -71,7 +81,12 @@
 sub put($$$) {
    my ($db, $key, $data) = @_;
 
-   $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
+   my $hkey = $db + 0;
+   Scalar::Util::weaken $db;
+   $DB_SYNC{$hkey} ||= AnyEvent->timer (after => 5, cb => sub {
+      delete $DB_SYNC{$hkey};
+      $db->db_sync if $db;
+   });
 
    $db->db_put ($key => $data)
 }
@@ -125,7 +140,42 @@
    print $fh to_json $::CFG;
 }
 
+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 {
+     ()
+   }
+}
+
+sub set_proxy {
+   my $proxy = http_proxy
+      or return;
+
+   $ENV{http_proxy} = $proxy;
+}
+
 our $DB_ENV;
+our $DB_STATE;
+
+sub db_table($) {
+   my ($table) = @_;
+
+   $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
+
+   new CFPlus::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"
+}
 
 {
    use strict;
@@ -144,21 +194,8 @@
                     -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";
-}
-
-sub db_table($) {
-   my ($table) = @_;
 
-   $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
-
-   new CFPlus::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"
+   $DB_STATE = db_table "state";
 }
 
 package CFPlus::Layout;
@@ -291,7 +328,8 @@
                      my ($entry, $txt) = @_;
                      $::CONN->send ("mark ". pack "N", $self->{tag});
                      $::CONN->send ("command rename to <$txt>");
-                  });
+                  }, $self->{name},
+                  "If you input no name or erase the current custom name, the custom name will be unset");
                }
             ],
             ["apply",   sub { $::CONN->send ("apply $self->{tag}") }],