--- deliantra/Deliantra-Client/DC/Protocol.pm	2006/05/26 19:14:33	1.2
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2006/05/29 20:22:33	1.10
@@ -27,13 +27,14 @@
       my @args = split /\|/, $2;
       @args = (".*") unless @args;
 
-      my $text = CFClient::pod_to_pango $head2->content;
+      $_ = $_ eq ".*" ? "" : " $_"
+         for @args;
 
-      for my $arg (@args) {
-         $arg = $arg eq ".*" ? "" : " $arg";
+      my $text = CFClient::pod_to_pango $head2->content;
 
-         $self->{map_widget}->add_command ("$cmd$arg", $text);
-      }
+      $self->{map_widget}->add_command ("$cmd$_", $text)
+         for sort { (length $a) <=> (length $b) }
+                  @args;
    }
 
    $self->{noface} = new_from_file CFClient::Texture
@@ -54,7 +55,7 @@
 sub stats_update {
    my ($self, $stats) = @_;
 
-   if (my $exp = $stats->{CS_STAT_EXP64}) {
+   if (my $exp = $stats->{+CS_STAT_EXP64}) {
       my $diff = $exp - $self->{prev_exp};
       $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
          if exists $self->{prev_exp} && $diff;
@@ -67,10 +68,25 @@
 sub user_send {
    my ($self, $command) = @_;
 
+   if ($self->{record}) {
+      push @{$self->{record}}, $command;
+   }
+
    $self->send_command ($command);
    ::status $command;
 }
 
+sub start_record {
+   my ($self) = @_;
+
+   $self->{record} = [];
+}
+
+sub stop_record {
+   my ($self) = @_;
+   return delete $self->{record};
+}
+
 sub map_scroll {
    my ($self, $dx, $dy) = @_;
 
@@ -326,7 +342,12 @@
 
    my $dialog = new CFClient::UI::FancyFrame
       title => "Query",
-      child => my $vbox = new CFClient::UI::VBox;
+      child => my $vbox = new CFClient::UI::VBox,
+      on_visibility_change => sub {
+         my ($self, $visible) = @_;
+         $self->center if $visible;
+      },
+   ;
 
    $vbox->add (new CFClient::UI::Label
       max_w => $::WIDTH * 0.4,
@@ -337,7 +358,7 @@
       $vbox->add (my $hbox = new CFClient::UI::HBox);
       $hbox->add (new CFClient::UI::Button
          text => "No",
-         connect_activate => sub {
+         on_activate => sub {
             $self->send ("reply n");
             $dialog->destroy;
             $self->{map_widget}->focus_in;
@@ -345,7 +366,7 @@
       );
       $hbox->add (new CFClient::UI::Button
          text => "Yes",
-         connect_activate => sub {
+         on_activate => sub {
             $self->send ("reply y");
             $dialog->destroy;
          },
@@ -356,7 +377,7 @@
    } elsif ($flags & CS_QUERY_SINGLECHAR) {
       $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
       $vbox->add (my $entry = new CFClient::UI::Entry
-         connect_changed => sub {
+         on_changed => sub {
             $self->send ("reply $_[1]");
             $dialog->destroy;
          },
@@ -369,7 +390,7 @@
 
       $vbox->add (my $entry = new CFClient::UI::Entry
          $flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
-         connect_activate => sub {
+         on_activate => sub {
             $self->send ("reply $_[1]");
             $dialog->destroy;
          },
@@ -378,7 +399,7 @@
       $entry->focus_in;
    }
 
-   $dialog->show_centered;
+   $dialog->show;
 }
 
 sub drawinfo {
@@ -533,7 +554,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});
 }
 
@@ -621,4 +657,9 @@
    }
 }
 
+sub player_update {
+   my ($self, $player) = @_;
+   $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
+}
+
 1;