--- deliantra/Deliantra-Client/DC/MapWidget.pm	2006/04/20 21:28:50	1.7
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2006/04/24 11:45:17	1.13
@@ -27,13 +27,6 @@
    $self->SUPER::DESTROY;
 }
 
-sub key_down {
-   print "MAPKEYDOWN\n";
-}
-
-sub key_up {
-}
-
 sub button_down {
    my ($self, $ev, $x, $y) = @_;
 
@@ -89,11 +82,13 @@
       glNewList $self->{list};
 
       if ($::MAP) {
-         my $sw = int $::WIDTH  / 32;
-         my $sh = int $::HEIGHT / 32;
+         my $sw = int $::WIDTH  / (32 * $::CFG->{map_scale});
+         my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale});
 
-         my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
-         my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
+         glScale $::CFG->{map_scale}, $::CFG->{map_scale};
+
+         my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
+         my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
 
          glTranslate $sx0 - 32, $sy0 - 32, 0;
 
@@ -226,7 +221,7 @@
    } elsif ($sym == ord "'") {
       $self->emit ('activate_console');
    } elsif ($sym == ord "/") {
-      $self->emit ('activate_console' => '/');
+      $self->emit (activate_console => '/');
    } elsif (exists $DIR{$sym}) {
       if ($mod & CFClient::KMOD_SHIFT) {
          $self->{shft}++;
@@ -237,6 +232,24 @@
       } else {
          $::CONN->user_send ("$DIR{$sym}[1]");
       }
+   } elsif ($ev->{unicode}) {
+      $self->{command_widget} ||=
+         new CFClient::MapWidget::Command::
+            command => $self->{command},
+            can_focus       => 1,
+            connect_execute => sub {
+               # todo: support callback instead of user_send
+               $::CONN->user_send ($_[1][1]);
+            },
+            connect_close => sub {
+               (delete $self->{command_widget})->hide;
+               $self->focus_in;
+            },
+      ;
+      $self->{command_widget}->key_down ($ev);
+      return unless $self->{command_widget};
+      $self->{command_widget}->show;
+      $self->{command_widget}->focus_in;
    }
 }
 
@@ -255,10 +268,102 @@
 }
 
 sub add_command {
-   my ($self, $command, $widget, $cb) = @_;
+   my ($self, $command, $tooltip, $widget, $cb) = @_;
 
    (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
-   warn "$command|$abbrev|$widget\n";#d#
+
+   push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb];
+}
+
+package CFClient::MapWidget::Command;
+
+use strict;
+
+use CFClient::OpenGL;
+
+our @ISA = CFClient::UI::VBox::;
+
+sub new {
+   my $class = shift;
+
+   my $self = $class->SUPER::new (
+      @_,
+      children => [map
+         CFClient::UI::Label->new (
+            can_hover  => 1,
+            can_events => 1,
+            fontsize   => $_,
+         ), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8
+      ],
+   );
+
+   $self
+}
+
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+
+   $self->SUPER::size_allocate ($w, $h);
+   $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
+}
+
+sub update_labels {
+   my ($self) = @_;
+
+   my $command = $self->{command};
+   my $search_abbrev = qr/^\Q$self->{search}/;
+   my $search_full   = qr/\Q$self->{search}/;
+
+   my @found;
+
+   for (@$command) {
+      if ($_->[0] =~ $search_abbrev) {
+         push @found, [$_->[0], $_];
+      } elsif ($_[1] =~ $search_full) {
+         push @found, [$_->[1], $_];
+      }
+   }
+
+   @found = sort { $a->[0] cmp $b->[0] } @found;
+
+   $self->{children}[0]->set_text ("$self->{search}_");
+
+   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]
+      if @found;
+
+   if (@found > 6) {
+      $self->{children}[6]->set_text ("...");
+   }
+
+   $self->check_size;
+}
+
+sub key_down {
+   my ($self, $ev) = @_;
+
+   if ($ev->{sym} == 8) {
+      substr $self->{search}, -1, 1, "";
+      $self->update_labels;
+   } elsif ($ev->{sym} == 13) {
+      if (exists $self->{select}) {
+         $self->emit (execute => $self->{select});
+         $self->emit ("close");
+      }
+   } elsif ($ev->{sym} == 27) {
+      $self->emit ("close");
+      return;
+   } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {
+      $self->{search} .= chr $ev->{unicode};
+      $self->update_labels;
+   }
+
+   length $self->{search}
+      or $self->emit ("close");
 }
 
 1