--- deliantra/Deliantra-Client/DC/MapWidget.pm	2006/05/30 07:13:08	1.44
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2006/06/03 21:59:55	1.48
@@ -72,19 +72,41 @@
 
          $self->update;
       };
+   } elsif ($ev->{button} == 1) {
+      my ($ox, $oy) = ($ev->{x}, $ev->{y});
+
+      my $fx = int ((($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale})) + 0.99);
+      my $fy = int ((($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale})) + 0.99);
+      $fx += $::MAP->x;
+      $fy += $::MAP->y;
+
+      $::CONN->send (sprintf "lookat %d %d", $fx, $fy);
+
+      warn "FOOX: $fx (".$::MAP->ox.")\n";
+      warn "FOOY: $fy (".$::MAP->oy.")\n";
    }
+
+   1
 }
 
 sub button_up {
    my ($self, $ev, $x, $y) = @_;
 
    delete $self->{motion};
+
+   1
 }
 
 sub mouse_motion {
    my ($self, $ev, $x, $y) = @_;
 
-   $self->{motion}->($ev, $x, $y) if $self->{motion};
+   if ($self->{motion}) {
+      $self->{motion}->($ev, $x, $y);
+   } else {
+      return 0;
+   }
+
+   1
 }
 
 sub size_request {
@@ -120,7 +142,7 @@
 sub key_down {
    my ($self, $ev) = @_;
 
-   return unless $::CONN;
+   return 0 unless $::CONN;
 
    my $mod = $ev->{mod};
    my $sym = $ev->{sym};
@@ -158,29 +180,47 @@
          $::CONN->user_send ("$DIR{$sym}[1]");
       }
    } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
-      CFClient::Recorder::start (1);
+      $::BIND_EDITOR->set_binding (undef, undef, [],
+         sub {
+            my ($mod, $sym, $cmds) = @_;
+            $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
+         });
+      $::BIND_EDITOR->start;
+      $::BIND_EDITOR->show;
    } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
-      CFClient::Recorder::stop (1);
+      $::BIND_EDITOR->stop;
+      $::BIND_EDITOR->ask_for_bind_and_commit;
+      $::BIND_EDITOR->hide;
    } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
       $::CONN->user_send ($_) for @$bind_cmd;
    } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
       $self->{completer}->key_down ($ev);
       $self->{completer}->show;
+   } else {
+      return 0;
    }
+
+   1
 }
 
 sub key_up {
    my ($self, $ev) = @_;
 
+   my $res = 0;
    my $mod = $ev->{mod};
    my $sym = $ev->{sym};
 
    if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
       $::CONN->user_send ("fire_stop");
+      $res = 1;
    }
+
    if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
       $::CONN->user_send ("run_stop");
+      $res = 1;
    }
+
+   $res
 }
 
 sub draw {
@@ -484,7 +524,7 @@
 sub key_down {
    my ($self, $ev) = @_;
 
-   $self->{entry}->key_down ($ev);
+   $self->{entry}->key_down ($ev)
 }
 
 sub update_labels {