--- deliantra/Deliantra-Client/DC/MapWidget.pm	2006/05/25 02:23:14	1.38
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2006/05/28 02:31:03	1.41
@@ -41,9 +41,7 @@
    (my $data = $command) =~ s/\\//g;
 
    $tooltip =~ s/^\s+//;
-
    $tooltip = "<big>$data</big>\n\n$tooltip";
-
    $tooltip =~ s/\s+$//;
 
    $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
@@ -138,7 +136,7 @@
       $::CONN->user_send ($self->{completer}{last_command})
          if exists $self->{completer}{last_command};
    } elsif ($uni == ord "\t") {
-      # TODO: toggle inventory
+      $::INV_WINDOW->toggle_visibility;
    } elsif ($sym == CFClient::SDLK_KP_PLUS  || $uni == ord "+") {
       $::CONN->user_send ("rotateshoottype +");
    } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
@@ -206,7 +204,7 @@
          my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
 
          if ($::CFG->{fow_enable}) {
-            if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
+            if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
                glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
                glConvolutionFilter2D (
                   GL_CONVOLUTION_2D,
@@ -408,10 +406,10 @@
    ];
 
    $self->{entry} = new CFClient::UI::Entry
-      connect_changed => sub {
+      on_changed => sub {
          $self->update_labels;
       },
-      connect_key_down => sub {
+      on_key_down => sub {
          my ($entry, $ev) = @_;
 
          my $self = $entry->{parent}{parent};
@@ -523,11 +521,11 @@
                      sort {
                         $a->[1] <=> $b->[1]
                            or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
-                           or (length $a->[0]) <=> (length $b->[0])
+                           or (length $b->[0]) <=> (length $a->[0])
                      } @match;
       }
 
-      $self->{last_search} = $cmd;
+      $self->{last_search} = $text;
       $self->{last_match} = \@match;
 
       $self->{select_offset} = 0;