--- deliantra/Deliantra-Client/DC.pm	2006/05/31 07:40:33	1.83
+++ deliantra/Deliantra-Client/DC.pm	2006/06/02 16:27:27	1.86
@@ -206,6 +206,8 @@
 use strict;
 use Crossfire::Protocol::Constants;
 
+my $last_enter_count = 1;
+
 sub desc_string {
    my ($self) = @_;
 
@@ -240,21 +242,46 @@
    $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->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) {
+         $self->{flags} & F_LOCKED
+            ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
+            : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
       } elsif ($ev->{button} == 1) {
          $::CONN->send ("examine $self->{tag}");
       } elsif ($ev->{button} == 2) {
@@ -272,6 +299,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]") })
+                     }
+                  ]
                )
             ),
          );
@@ -286,6 +318,7 @@
                    . "Left click - examine item\n"
                    . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
                    . "Middle click - apply\n"
+                   . "Shift-Middle click - lock/unlock\n"
                    . "Right click - further options"
                    . "</small>\n";
 
@@ -337,27 +370,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/;
@@ -441,6 +474,47 @@
    return $mods . CFClient::SDL_GetKeyName ($sym);
 }
 
+package CFClient::Pickup;
+# some pickup constants
+sub PU_NOTHING { 0x00000000 }
+
+sub PU_DEBUG { 0x10000000 }
+sub PU_INHIBIT { 0x20000000 }
+sub PU_STOP { 0x40000000 }
+sub PU_NEWMODE { 0x80000000 }
+
+sub PU_RATIO { 0x0000000F }
+
+sub PU_FOOD { 0x00000010 }
+sub PU_DRINK { 0x00000020 }
+sub PU_VALUABLES { 0x00000040 }
+sub PU_BOW { 0x00000080 }
+
+sub PU_ARROW { 0x00000100 }
+sub PU_HELMET { 0x00000200 }
+sub PU_SHIELD { 0x00000400 }
+sub PU_ARMOUR { 0x00000800 }
+
+sub PU_BOOTS { 0x00001000 }
+sub PU_GLOVES { 0x00002000 }
+sub PU_CLOAK { 0x00004000 }
+sub PU_KEY { 0x00008000 }
+
+sub PU_MISSILEWEAPON { 0x00010000 }
+sub PU_ALLWEAPON { 0x00020000 }
+sub PU_MAGICAL { 0x00040000 }
+sub PU_POTION { 0x00080000 }
+
+sub PU_SPELLBOOK { 0x00100000 }
+sub PU_SKILLSCROLL { 0x00200000 }
+sub PU_READABLES { 0x00400000 }
+sub PU_MAGIC_DEVICE { 0x00800000 }
+
+sub PU_NOT_CURSED { 0x01000000 }
+
+sub PU_JEWELS { 0x02000000 }
+
+
 1;
 
 =back