--- deliantra/Deliantra-Client/DC/Protocol.pm	2006/05/29 19:30:28	1.9
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2006/06/05 01:59:59	1.18
@@ -270,7 +270,7 @@
       # I love transactions
       for (1..100) {
          my $txn = $CFClient::DB_ENV->txn_begin;
-         my $status = $self->{facemap}->db_get (id => $id, BerkeleyDB::DB_RMW);
+         my $status = $self->{facemap}->db_get (id => $id);
          if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
             $id = ($id || 16) + 1;
             if ($self->{facemap}->put (id => $id) == 0
@@ -280,7 +280,7 @@
                goto gotid;
             }
          }
-         $txn->abort;
+         $txn->txn_abort;
       }
 
       CFClient::fatal "maximum number of transaction retries reached - database problems?";
@@ -341,12 +341,10 @@
    $LAST_QUERY = $prompt;
 
    my $dialog = new CFClient::UI::FancyFrame
+      x     => "center",
+      y     => "center",
       title => "Query",
       child => my $vbox = new CFClient::UI::VBox,
-      on_visibility_change => sub {
-         my ($self, $visible) = @_;
-         $self->center if $visible;
-      },
    ;
 
    $vbox->add (new CFClient::UI::Label
@@ -433,7 +431,7 @@
    $self->{statusbox}->add ($text,
       group        => $text,
       fg           => $color[$color],
-      timeout      => 10,
+      timeout      => $color >= 2 ? 60 : 10,
       tooltip_font => $::FONT_FIXED,
    );
 }
@@ -449,20 +447,20 @@
 
    # TODO
    # create a widget dynamically, using spell face (CF::Protocol downloads them)
+   $::SETUP_SPELLS->add_spell ($spell);
+
    $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
    $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
 }
 
 sub spell_delete {
    my ($self, $spell) = @_;
+   $::SETUP_SPELLS->remove_spell ($spell);
 }
 
 sub addme_success {
    my ($self) = @_;
 
-   $self->send ("command output-sync $::CFG->{output_sync}");
-   $self->send ("command output-count $::CFG->{output_count}");
-
    my $parser = new Pod::POM;
    my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
 
@@ -554,7 +552,22 @@
 sub set_opencont {
    my ($conn, $tag, $name) = @_;
    $conn->{open_container} = $tag;
-   $::INVR_LBL->set_text ($name);
+
+   $::INV_RIGHT_HB->clear ();
+   $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name);
+
+   if ($tag != 0) { # Floor isn't closable, is it?
+      $::INV_RIGHT_HB->add (new CFClient::UI::Button
+         text     => "Close container",
+         tooltip  => "Close the currently open container (if one is open)",
+         on_activate => sub {
+            $::CONN->send ("apply $tag") # $::CONN->{open_container}")
+               if $tag != 0;
+            #if $CONN->{open_container} != 0;
+         },
+      );
+   }
+
    $::INVR->set_items ($conn->{container}{$tag});
 }
 
@@ -593,6 +606,8 @@
       update_container (0);
    } elsif ($tag == $self->{player}{tag}) {
       $::INV->set_items ($self->{container}{$tag})
+   } else {
+      update_container ($tag);
    }
 
 #   use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
@@ -610,7 +625,7 @@
       } elsif ($_->{container} == $self->{player}{tag}) {
          $::INV->set_items ($self->{container}{$self->{player}{tag}})
       } else {
-         update_container ($_->{tag});
+         update_container ($_->{container});
       }
    }
 }
@@ -645,6 +660,10 @@
 sub player_update {
    my ($self, $player) = @_;
    $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
+
+   # do it here because it is ignored earlier, and there is no "login" event
+   $self->send_command ("output-sync $::CFG->{output_sync}");
+   $self->send_command ("output-count $::CFG->{output_count}");
 }
 
 1;