--- deliantra/Deliantra-Client/DC/MapWidget.pm	2006/04/24 03:19:42	1.10
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2006/04/24 13:12:32	1.17
@@ -1,6 +1,7 @@
 package CFClient::MapWidget;
 
 use strict;
+use utf8;
 
 use List::Util qw(min max);
 
@@ -82,9 +83,10 @@
       glNewList $self->{list};
 
       if ($::MAP) {
-         my $sw = int $::WIDTH  / (32 * $::CFG->{map_scale});
-         my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale});
+         my $sw = int $::WIDTH  / (32 * $::CFG->{map_scale}) + 0.99;
+         my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
 
+         glPushMatrix;
          glScale $::CFG->{map_scale}, $::CFG->{map_scale};
 
          my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
@@ -145,6 +147,8 @@
            glEnable GL_TEXTURE_2D;
            glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
 
+           glPopMatrix;
+
            $self->{mapmap_texture} =
               new CFClient::Texture
                  w    => $w,
@@ -216,6 +220,8 @@
 
    if ($sym == CFClient::SDLK_KP5) {
       $::CONN->user_send ("stay fire");
+   } elsif ($sym == ord ",") {
+      $::CONN->user_send ("take");
    } elsif ($sym == ord "a") {
       $::CONN->user_send ("apply");
    } elsif ($sym == ord "'") {
@@ -238,7 +244,8 @@
             command => $self->{command},
             can_focus       => 1,
             connect_execute => sub {
-               $::CONN->user_send ($_[1]);
+               # todo: support callback instead of user_send
+               $::CONN->user_send ($_[1][1]);
             },
             connect_close => sub {
                (delete $self->{command_widget})->hide;
@@ -246,6 +253,7 @@
             },
       ;
       $self->{command_widget}->key_down ($ev);
+      return unless $self->{command_widget};
       $self->{command_widget}->show;
       $self->{command_widget}->focus_in;
    }
@@ -266,12 +274,11 @@
 }
 
 sub add_command {
-   my ($self, $command, $widget, $cb) = @_;
+   my ($self, $command, $tooltip, $widget, $cb) = @_;
 
    (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
 
-   push @{$self->{command}}, [$abbrev, $command];
-   #warn "$command|$abbrev|$widget\n";#d#
+   push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb];
 }
 
 package CFClient::MapWidget::Command;
@@ -289,8 +296,9 @@
       @_,
       children => [map
          CFClient::UI::Label->new (
-            can_hover => 1,
-            fontsize  => $_,
+            can_hover  => 1,
+            can_events => 1,
+            fontsize   => $_,
          ), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8
       ],
    );
@@ -317,7 +325,7 @@
    for (@$command) {
       if ($_->[0] =~ $search_abbrev) {
          push @found, [$_->[0], $_];
-      } elsif ($_[1] =~ $search_full) {
+      } elsif ($_->[1] =~ $search_full) {
          push @found, [$_->[1], $_];
       }
    }
@@ -328,9 +336,10 @@
 
    for (0..5) {
       $self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
+      $self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
    }
 
-   $self->{select} = $found[0][1][1]
+   $self->{select} = $found[0][1]
       if @found;
 
    if (@found > 6) {
@@ -353,6 +362,7 @@
       }
    } elsif ($ev->{sym} == 27) {
       $self->emit ("close");
+      return;
    } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {
       $self->{search} .= chr $ev->{unicode};
       $self->update_labels;