--- deliantra/Deliantra-Client/DC/MapWidget.pm	2006/05/08 17:23:08	1.21
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2006/05/17 10:14:52	1.24
@@ -19,8 +19,6 @@
       @_
    );
 
-   $self->add_command ("killpets", "kills all your summoned and charmed creates");
-
    $self
 }
 
@@ -184,16 +182,17 @@
 
    my $mod = $ev->{mod};
    my $sym = $ev->{sym};
+   my $uni = $ev->{unicode};
 
    if ($sym == CFClient::SDLK_KP5) {
       $::CONN->user_send ("stay fire");
-   } elsif ($sym == ord ",") {
+   } elsif ($uni == ord ",") {
       $::CONN->user_send ("take");
-   } elsif ($sym == ord "a") {
+   } elsif ($uni == ord "\t") {
       $::CONN->user_send ("apply");
-   } elsif ($sym == ord "'") {
+   } elsif ($uni == ord "'") {
       $self->emit ('activate_console');
-   } elsif ($sym == ord "/") {
+   } elsif ($uni == ord "/") {
       $self->emit (activate_console => '/');
    } elsif (exists $DIR{$sym}) {
       if ($mod & CFClient::KMOD_SHIFT) {
@@ -212,14 +211,15 @@
             can_focus       => 1,
             connect_execute => sub {
                # todo: support callback instead of user_send
-               $::CONN->user_send ($_[1][1]);
+               $::CONN->user_send ($_[1]);
             },
             connect_close => sub {
                (delete $self->{command_widget})->hide;
                $self->focus_in;
             },
       ;
-      $self->{command_widget}->key_down ($ev);
+      $self->{command_widget}->key_down ($ev)
+         unless $ev->{unicode} == 20;
       return unless $self->{command_widget};
       $self->{command_widget}->show;
       $self->{command_widget}->focus_in;
@@ -243,12 +243,22 @@
 sub add_command {
    my ($self, $command, $tooltip, $widget, $cb) = @_;
 
-   (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
+   (my $data = $command) =~ s/\\//g;
 
-   $self->{command} = [
-      [$abbrev, $command, $tooltip, $widget, $cb],
-      grep $_->[1] ne $command, @{ $self->{command} },
-   ];
+   $tooltip =~ s/^\s+//;
+
+   $tooltip = "<big>" . (CFClient::UI::Label::escape $data) . "</big>\n\n"
+            . CFClient::UI::Label::escape $tooltip;
+
+   $tooltip =~ s/\s+$//;
+
+   $self->{command}{$command} = [$data, $tooltip, $widget, $cb];
+}
+
+sub clr_commands {
+   my ($self) = @_;
+
+   %{$self->{command}} = ();
 }
 
 package CFClient::MapWidget::MapMap;
@@ -336,20 +346,35 @@
 
 use CFClient::OpenGL;
 
-our @ISA = CFClient::UI::VBox::;
+our @ISA = CFClient::UI::Frame::;
 
 sub new {
    my $class = shift;
 
    my $self = $class->SUPER::new (
+      bg => [0, 0, 0, 0.8],
       @_,
-      children => [map
+   );
+
+   $self->add ($self->{vbox} = new CFClient::UI::VBox);
+
+   $self->{label} = [
+      map
          CFClient::UI::Label->new (
             can_hover  => 1,
             can_events => 1,
             fontsize   => $_,
-         ), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8
-      ],
+         ), (0.8) x 6
+   ];
+
+   $self->{entry} = new CFClient::UI::Entry
+      connect_changed => sub {
+         $self->update_labels;
+      };
+
+   $self->{vbox}->add (
+      $self->{entry},
+      @{$self->{label}},
    );
 
    $self
@@ -362,63 +387,130 @@
    $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
 }
 
+sub key_down {
+   my ($self, $ev) = @_;
+
+   if ($ev->{sym} == 13) {
+      if (exists $self->{select}) {
+         $self->emit (execute => $self->{select});
+         $self->emit ("close");
+      }
+   } elsif ($ev->{sym} == 27) {
+      $self->{entry}->set_text ("");
+      $self->emit ("close");
+      return;
+   } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
+      ++$self->{select_offset}
+         if $self->{select_offset} < $#{ $self->{last_match} || [] };
+      $self->update_labels;
+   } elsif ($ev->{sym} == CFClient::SDLK_UP) {
+      --$self->{select_offset}
+         if $self->{select_offset};
+      $self->update_labels;
+   } else {
+      #$self->{entry}{force_alloc} = 1;
+      $self->{entry}->key_down ($ev);
+   }
+}
+
 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 (2 < length $self->{search} and $_->[1] =~ $search_full) {
-         push @found, [$_->[1], $_];
+   my $text = $self->{entry}->get_text;
+
+   length $text
+      or return $self->emit ("close");
+
+   my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
+
+   if ($cmd ne $self->{last_search}) {
+      my $regexp = do {
+         my ($beg, @chr) = split //, lc $cmd;
+
+         # the following regex is used to match our "completion entry"
+         # to an actual command - the parentheses match kind of "overhead"
+         # - the more characters the parentheses match, the less attractive
+         # is the match.
+         my $regexp = "^\Q$beg\E"
+                    . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
+         qr<$regexp>
+      };
+
+      my @match;
+      my @penalty;
+
+      for (keys %{$self->{command}}) {
+         if (@penalty = $_ =~ $regexp) {
+            push @match, [$_, length join "", map "::$_", grep defined, @penalty];
+         }
       }
-   }
 
-   @found = sort { $a->[0] cmp $b->[0] } @found;
+      @match = map $self->{command}{$_->[0]},
+                  sort {
+                     $a->[1] <=> $b->[1]
+                        or (length $a->[0]) <=> (length $b->[0])
+                  } @match;
 
-   $self->{children}[0]->set_text ("$self->{search}_");
+      $self->{last_search} = $cmd;
+      $self->{last_match} = \@match;
 
-   for (0..5) {
-      $self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
-      $self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
+      $self->{select_offset} = 0;
    }
 
-   $self->{select} = $found[0][1]
-      if @found;
+   my @labels = @{ $self->{label} };
+   my @matches = @{ $self->{last_match} || [] };
 
-   if (@found > 6) {
-      $self->{children}[6]->set_text ("...");
+   if ($self->{select_offset}) {
+      splice @matches, 0, $self->{select_offset}, ();
+
+      my $label = shift @labels;
+      $label->set_text ("...");
+      $label->set_tooltip ("Use Cursor-Up to view previous matches");
    }
 
-   $self->check_size;
-}
+   for my $label (@labels) {
+      $label->{fg} = [1, 1, 1, 1];
+      $label->{bg} = [0, 0, 0, 0];
+   }
 
-sub key_down {
-   my ($self, $ev) = @_;
+   if (@matches) {
+      $self->{select} = "$matches[0][0]$arg";
 
-   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");
+      $labels[0]->{fg} = [0, 0, 0, 1];
+      $labels[0]->{bg} = [1, 1, 1, 0.8];
+   } else {
+      $self->{select} = "$cmd$arg";
+   }
+
+   for my $match (@matches) {
+      my $label = shift @labels;
+
+      if (@labels) {
+         $label->set_text ("$match->[0]$arg");
+         $label->set_tooltip ($match->[1]);
+      } else {
+         $label->set_text ("...");
+         $label->set_tooltip ("Use Cursor-Down to view more matches");
+         last;
       }
-   } 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");
+   for my $label (@labels) {
+      $label->set_text ("");
+      $label->set_tooltip ("");
+   }
+
+   $self->update;
+   ###
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   # hack
+   local $CFClient::UI::FOCUS = $self->{entry};
+
+   $self->SUPER::_draw;
 }
 
 1