--- deliantra/Deliantra-Client/DC.pm	2006/05/31 07:13:50	1.82
+++ deliantra/Deliantra-Client/DC.pm	2006/06/01 05:04:34	1.85
@@ -80,7 +80,6 @@
    my $recover = $BerkeleyDB::db_version >= 4.4 
                  ? eval "DB_REGISTER | DB_RECOVER"
                  : 0;
-                 warn $recover;
 
    $DB_ENV = new BerkeleyDB::Env
                     -Home => "$Crossfire::VARDIR/cfplus",
@@ -207,6 +206,8 @@
 use strict;
 use Crossfire::Protocol::Constants;
 
+my $last_enter_count = 1;
+
 sub desc_string {
    my ($self) = @_;
 
@@ -241,19 +242,40 @@
    $weight < 0 ? "?" : $weight * 0.001
 }
 
+sub do_n_dialog {
+   my ($cb) = @_;
+
+   my $w = new CFClient::UI::FancyFrame;
+   $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
+   $vb->add (new CFClient::UI::Label text => "Enter item count:");
+   $vb->add (my $entry = new CFClient::UI::Entry
+      text => $last_enter_count,
+      on_activate => sub {
+         my ($entry) = @_;
+         $last_enter_count = $entry->get_text;
+         $cb->($last_enter_count);
+         $w->hide;
+         $w = undef;
+      }
+   );
+   $entry->focus_in;
+   $w->show;
+
+}
+
 sub update_widgets {
    my ($self) = @_;
 
    my $button_cb = sub {
       my (undef, $ev, $x, $y) = @_;
 
-      if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
-         my $targ = $::CONN->{player}{tag};
+      my $targ = $::CONN->{player}{tag};
 
-         if ($self->{container} == $::CONN->{player}{tag}) {
-            $targ = $::CONN->{open_container};
-         }
+      if ($self->{container} == $::CONN->{player}{tag}) {
+         $targ = $::CONN->{open_container};
+      }
 
+      if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
          $::CONN->send ("move $targ $self->{tag} 0")
             if $targ || !($self->{flags} & F_LOCKED);
       } elsif ($ev->{button} == 1) {
@@ -273,6 +295,11 @@
                : (
                   ["lock",   sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
                   ["drop",   sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
+                  ["move n", 
+                     sub {
+                        do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
+                     }
+                  ]
                )
             ),
          );
@@ -338,27 +365,27 @@
 package CFClient::Binder;
 
 my @ALLOWED_MODIFIER_KEYS = (
-   (CFClient::SDLK_LSHIFT),
-   (CFClient::SDLK_LCTRL ),
-   (CFClient::SDLK_LALT  ),
-   (CFClient::SDLK_LMETA ),
-
-   (CFClient::SDLK_RSHIFT),
-   (CFClient::SDLK_RCTRL ),
-   (CFClient::SDLK_RALT  ),
-   (CFClient::SDLK_RMETA ),
+   CFClient::SDLK_LSHIFT,
+   CFClient::SDLK_LCTRL ,
+   CFClient::SDLK_LALT  ,
+   CFClient::SDLK_LMETA ,
+
+   CFClient::SDLK_RSHIFT,
+   CFClient::SDLK_RCTRL ,
+   CFClient::SDLK_RALT  ,
+   CFClient::SDLK_RMETA ,
 );
 
 my %ALLOWED_MODIFIERS = (
-   (CFClient::KMOD_LSHIFT) => "LSHIFT",
-   (CFClient::KMOD_LCTRL ) => "LCTRL",
-   (CFClient::KMOD_LALT  ) => "LALT",
-   (CFClient::KMOD_LMETA ) => "LMETA",
-
-   (CFClient::KMOD_RSHIFT) => "RSHIFT",
-   (CFClient::KMOD_RCTRL ) => "RCTRL",
-   (CFClient::KMOD_RALT  ) => "RALT",
-   (CFClient::KMOD_RMETA ) => "RMETA",
+   CFClient::KMOD_LSHIFT => "LSHIFT",
+   CFClient::KMOD_LCTRL  => "LCTRL",
+   CFClient::KMOD_LALT   => "LALT",
+   CFClient::KMOD_LMETA  => "LMETA",
+
+   CFClient::KMOD_RSHIFT => "RSHIFT",
+   CFClient::KMOD_RCTRL  => "RCTRL",
+   CFClient::KMOD_RALT   => "RALT",
+   CFClient::KMOD_RMETA  => "RMETA",
 );
 
 my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;