--- deliantra/Deliantra-Client/DC/MapWidget.pm	2006/06/15 15:33:58	1.61
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2006/06/21 12:59:23	1.67
@@ -40,7 +40,7 @@
                  . "Typing the initial letters of words (or just any letters) displays guesses "
                  . "for commands you might want to use.\n"
                  . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
-                 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
+                 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
    ;
 
    $self
@@ -64,16 +64,16 @@
    %{$self->{completer}{command}} = ();
 }
 
-sub button_down {
+sub invoke_button_down {
    my ($self, $ev, $x, $y) = @_;
 
    return unless $::CONN;
 
-   $self->focus_in;
+   $self->grab_focus;
 
    if ($ev->{button} == 1) {
-      my $x = CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
-      my $y = CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
+      my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
+      my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
 
       $x -= int 0.5 * $self->{sw};
       $y -= int 0.5 * $self->{sh};
@@ -100,7 +100,7 @@
    1
 }
 
-sub button_up {
+sub invoke_button_up {
    my ($self, $ev, $x, $y) = @_;
 
    delete $self->{motion};
@@ -108,7 +108,7 @@
    1
 }
 
-sub mouse_motion {
+sub invoke_mouse_motion {
    my ($self, $ev, $x, $y) = @_;
 
    if ($self->{motion}) {
@@ -122,8 +122,8 @@
 
 sub size_request {
    (
-      1 + 32 * int $::WIDTH  / 32,
-      1 + 32 * int $::HEIGHT / 32,
+      32 * CFClient::ceil $::WIDTH  / 32,
+      32 * CFClient::ceil $::HEIGHT / 32,
    )
 }
 
@@ -150,7 +150,7 @@
    CFClient::SDLK_LEFT,  [7, "west"],
 );
 
-sub key_down {
+sub invoke_key_down {
    my ($self, $ev) = @_;
 
    return 0 unless $::CONN;
@@ -197,7 +197,7 @@
       $::BIND_EDITOR->set_binding (undef, undef, [],
          sub {
             my ($mod, $sym, $cmds) = @_;
-            $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
+            $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
          });
       $::BIND_EDITOR->start;
       $::BIND_EDITOR->show;
@@ -205,10 +205,10 @@
       $::BIND_EDITOR->stop;
       $::BIND_EDITOR->ask_for_bind_and_commit;
       $::BIND_EDITOR->hide;
-   } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
+   } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
       $::CONN->user_send ($_) for @$bind_cmd;
    } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
-      $self->{completer}->key_down ($ev);
+      $self->{completer}->invoke_key_down ($ev);
       $self->{completer}->show;
    } else {
       return 0;
@@ -217,7 +217,7 @@
    1
 }
 
-sub key_up {
+sub invoke_key_up {
    my ($self, $ev) = @_;
 
    my $res = 0;
@@ -253,8 +253,8 @@
 sub set_magicmap {
    my ($self, $w, $h, $x, $y, $data) = @_;
 
-   $x += - $::MAP->x - int 0.5 * $::MAP->w;
-   $y += - $::MAP->y - int 0.5 * $::MAP->h;
+   $x -= $::MAP->ox + int 0.5 * $::MAP->w;
+   $y -= $::MAP->oy + int 0.5 * $::MAP->h;
 
    $self->{magicmap} = [$x, $y, $w, $h, $data];
 
@@ -334,8 +334,8 @@
       if ($self->{magicmap}) {
          my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
 
-         $x += $::MAP->x - $sx + int 0.5 * ($::MAP->w - $sw + 1);
-         $y += $::MAP->y - $sy + int 0.5 * ($::MAP->h - $sh + 1);
+         $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
+         $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
 
          glTranslate - $x - 1, - $y - 1;
          glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
@@ -382,11 +382,12 @@
    ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
 }
 
-sub size_allocate {
+sub invoke_size_allocate {
    my ($self, $w, $h) = @_;
 
-   $self->SUPER::size_allocate ($w, $h);
    $self->update;
+
+   1
 }
 
 sub update {
@@ -481,6 +482,7 @@
    $self->{entry} = new CFClient::UI::Entry
       on_changed => sub {
          $self->update_labels;
+         0
       },
       on_button_down => sub {
          my ($entry, $ev, $x, $y) = @_;
@@ -488,7 +490,7 @@
          if ($ev->{button} == 3) {
             (new CFClient::UI::Menu
                items => [
-                  ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }]
+                  ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
                ],
             )->popup ($ev);
             return 1;
@@ -513,7 +515,6 @@
          } elsif ($ev->{sym} == 27) {
             $self->{hist_ptr} = 0;
             $self->hide;
-            return;
          } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
             if ($self->{hist_ptr} > 1) {
                $self->{hist_ptr}--;
@@ -563,18 +564,19 @@
    $self->show;
 }
 
-sub size_allocate {
+sub invoke_size_allocate {
    my ($self, $w, $h) = @_;
 
-   $self->SUPER::size_allocate ($w, $h);
    $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
+
+   $self->SUPER::invoke_size_allocate ($w, $h)
 }
 
 sub show {
    my ($self) = @_;
 
    $self->SUPER::show;
-   $self->{entry}->focus_in;
+   $self->{entry}->grab_focus;
 }
 
 sub hide {
@@ -584,10 +586,10 @@
    $self->{entry}->set_text ("");
 }
 
-sub key_down {
+sub invoke_key_down {
    my ($self, $ev) = @_;
 
-   $self->{entry}->key_down ($ev)
+   $self->{entry}->emit (key_down => $ev)
 }
 
 sub update_labels {
@@ -684,7 +686,6 @@
    }
 
    $self->update;
-   ###
 }
 
 sub _draw {