--- deliantra/Deliantra-Client/DC/MapWidget.pm	2006/04/24 06:05:35	1.12
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2006/05/17 15:18:57	1.25
@@ -1,6 +1,7 @@
 package CFClient::MapWidget;
 
 use strict;
+use utf8;
 
 use List::Util qw(min max);
 
@@ -11,12 +12,14 @@
 sub new {
    my $class = shift;
 
-   $class->SUPER::new (
+   my $self = $class->SUPER::new (
       z         => -1,
       can_focus => 1,
       list      => glGenList,
       @_
-   )
+   );
+
+   $self
 }
 
 sub DESTROY {
@@ -82,14 +85,15 @@
       glNewList $self->{list};
 
       if ($::MAP) {
-         my $sw = int $::WIDTH  / (32 * $::CFG->{map_scale});
-         my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale});
-
-         glScale $::CFG->{map_scale}, $::CFG->{map_scale};
+         my $sw = int $::WIDTH  / (32 * $::CFG->{map_scale}) + 0.99;
+         my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
 
          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;
 
+         glPushMatrix;
+         glScale $::CFG->{map_scale}, $::CFG->{map_scale};
+
          glTranslate $sx0 - 32, $sy0 - 32, 0;
 
          my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
@@ -131,44 +135,7 @@
             glDisable GL_BLEND;
          }
 
-         # HACK BEGIN
-         {
-           glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
-
-           glTranslate 0, 30;
-           my ($w, $h) = (250, 250);
-
-           my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
-
-           glEnable GL_BLEND;
-           glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-           glEnable GL_TEXTURE_2D;
-           glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
-
-           $self->{mapmap_texture} =
-              new CFClient::Texture
-                 w    => $w,
-                 h    => $h,
-                 data => $::MAP->mapmap (- $w * 0.5, - $h * 0.5, $w, $h),
-                 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
-
-           $self->{mapmap_texture}->draw_quad (0, 0);
-
-           glDisable GL_TEXTURE_2D;
-
-           glTranslate 0.375, 0.375;
-
-           glColor 1, 1, 0, 1;
-           glBegin GL_LINE_LOOP;
-           glVertex $w * 0.5 - $sx      , $h * 0.5 - $sy      ;
-           glVertex $w * 0.5 - $sx      , $h * 0.5 - $sy + $sh;
-           glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy + $sh;
-           glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy      ;
-           glEnd;
-           
-           glDisable GL_BLEND;
-         }
-         # HACK END
+         glPopMatrix;
       }
 
       glEndList;
@@ -211,16 +178,21 @@
 sub key_down {
    my ($self, $ev) = @_;
 
+   return unless $::CONN;
+
    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 "a") {
+   } elsif ($uni == ord ",") {
+      $::CONN->user_send ("take");
+   } 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) {
@@ -239,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;
@@ -270,9 +243,100 @@
 sub add_command {
    my ($self, $command, $tooltip, $widget, $cb) = @_;
 
-   (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
+   (my $data = $command) =~ s/\\//g;
+
+   $tooltip =~ s/^\s+//;
+
+   $tooltip = "<big>$data</big>\n\n$tooltip";
+
+   $tooltip =~ s/\s+$//;
 
-   push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb];
+   $self->{command}{$command} = [$data, $tooltip, $widget, $cb];
+}
+
+sub clr_commands {
+   my ($self) = @_;
+
+   %{$self->{command}} = ();
+}
+
+package CFClient::MapWidget::MapMap;
+
+our @ISA = CFClient::UI::Base::;
+
+use Time::HiRes qw(time);
+use CFClient::OpenGL;
+
+sub size_request {
+   ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
+}
+
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+
+   $self->SUPER::size_allocate ($w, $h);
+   $self->update;
+}
+
+sub update {
+   my ($self) = @_;
+
+   delete $self->{texture_atime};
+   $self->SUPER::update;
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   $::MAP or return;
+
+   my ($w, $h) = @$self{qw(w h)};
+
+   my $sw = int $::WIDTH  / (32 * $::CFG->{map_scale}) + 0.99;
+   my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
+
+   my $sx = int $::CFG->{map_shift_x} / 32;
+   my $sy = int $::CFG->{map_shift_y} / 32;
+
+   my $ox = 0.5 * ($w - $sw);
+   my $oy = 0.5 * ($h - $sh);
+
+   glEnable GL_BLEND;
+   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+   glEnable GL_TEXTURE_2D;
+   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+
+   if ($self->{texture_atime} < time) {
+      $self->{texture_atime} = time + 1/3;
+
+      $self->{texture} =
+         new CFClient::Texture
+            w    => $w,
+            h    => $h,
+            data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
+            type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
+   }
+
+   $self->{texture}->draw_quad (0, 0);
+
+   glDisable GL_TEXTURE_2D;
+
+   glTranslate 0.375, 0.375;
+
+   #TODO: map scale is completely borked
+
+   my $x0 = int $ox - $sx + 0.5;
+   my $y0 = int $oy - $sy + 0.5;
+
+   glColor 1, 1, 0, 1;
+   glBegin GL_LINE_LOOP;
+   glVertex $x0      , $y0      ;
+   glVertex $x0      , $y0 + $sh;
+   glVertex $x0 + $sw, $y0 + $sh;
+   glVertex $x0 + $sw, $y0      ;
+   glEnd;
+   
+   glDisable GL_BLEND;
 }
 
 package CFClient::MapWidget::Command;
@@ -281,20 +345,36 @@
 
 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
-      ],
+            can_hover     => 1,
+            can_events    => 1,
+            tooltip_width => 0.33,
+            fontsize      => $_,
+         ), (0.8) x 6
+   ];
+
+   $self->{entry} = new CFClient::UI::Entry
+      connect_changed => sub {
+         $self->update_labels;
+      };
+
+   $self->{vbox}->add (
+      $self->{entry},
+      @{$self->{label}},
    );
 
    $self
@@ -307,62 +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 ($_[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 ($self->{select_offset}) {
+      splice @matches, 0, $self->{select_offset}, ();
 
-   if (@found > 6) {
-      $self->{children}[6]->set_text ("...");
+      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");
-   } 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