--- deliantra/Deliantra-Client/DC/MapWidget.pm	2006/05/23 21:14:41	1.34
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2006/05/27 20:46:54	1.40
@@ -19,15 +19,40 @@
       @_
    );
 
+   $self->{completer} = new CFClient::MapWidget::Command::
+      command   => $self->{command},
+      can_focus => 1,
+      tooltip   => "<b>The Command Completer</b>\n\n"
+                 . "This is your central interface to send text commands to the server. "
+                 . "To enter a verbatim command to send to the server, just type the command, "
+                 . "followed by a space, and press return. "
+                 . "Typing the initial letters of words (or just any letters) displays guesses "
+                 . "for commands you might want to use.\n"
+                 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
+                 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
+   ;
+
    $self
 }
 
-sub DESTROY {
-   my $self = shift;
+sub add_command {
+   my ($self, $command, $tooltip, $widget, $cb) = @_;
 
-   glDeleteList $self->{list};
+   (my $data = $command) =~ s/\\//g;
 
-   $self->SUPER::DESTROY;
+   $tooltip =~ s/^\s+//;
+
+   $tooltip = "<big>$data</big>\n\n$tooltip";
+
+   $tooltip =~ s/\s+$//;
+
+   $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
+}
+
+sub clr_commands {
+   my ($self) = @_;
+
+   %{$self->{completer}{command}} = ();
 }
 
 sub button_down {
@@ -78,11 +103,90 @@
    $self->SUPER::update;
 }
 
+my %DIR = (
+   CFClient::SDLK_KP8, [1, "north"],
+   CFClient::SDLK_KP9, [2, "northeast"],
+   CFClient::SDLK_KP6, [3, "east"],
+   CFClient::SDLK_KP3, [4, "southeast"],
+   CFClient::SDLK_KP2, [5, "south"],
+   CFClient::SDLK_KP1, [6, "southwest"],
+   CFClient::SDLK_KP4, [7, "west"],
+   CFClient::SDLK_KP7, [8, "northwest"],
+
+   CFClient::SDLK_UP,    [1, "north"],
+   CFClient::SDLK_RIGHT, [3, "east"],
+   CFClient::SDLK_DOWN,  [5, "south"],
+   CFClient::SDLK_LEFT,  [7, "west"],
+);
+
+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 ($uni == ord ",") {
+      $::CONN->user_send ("take");
+   } elsif ($uni == ord " ") {
+      $::CONN->user_send ("apply");
+   } elsif ($uni == ord ".") {
+      $::CONN->user_send ($self->{completer}{last_command})
+         if exists $self->{completer}{last_command};
+   } elsif ($uni == ord "\t") {
+      # TODO: toggle inventory
+   } elsif ($sym == CFClient::SDLK_KP_PLUS  || $uni == ord "+") {
+      $::CONN->user_send ("rotateshoottype +");
+   } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
+      $::CONN->user_send ("rotateshoottype -");
+   } elsif ($uni == ord '"') {
+      $self->{completer}->set_prefix ("$::CFG->{say_command} ");
+      $self->{completer}->show;
+   } elsif ($uni == ord "'") {
+      $self->{completer}->set_prefix ("");
+      $self->{completer}->show;
+   } elsif (exists $DIR{$sym}) {
+      if ($mod & CFClient::KMOD_SHIFT) {
+         $self->{shft}++;
+         $::CONN->user_send ("fire $DIR{$sym}[0]");
+      } elsif ($mod & CFClient::KMOD_CTRL) {
+         $self->{ctrl}++;
+         $::CONN->user_send ("run $DIR{$sym}[0]");
+      } else {
+         $::CONN->user_send ("$DIR{$sym}[1]");
+      }
+   } elsif ($ev->{unicode}) {
+      $self->{completer}->key_down ($ev);
+      $self->{completer}->show;
+   }
+}
+
+sub key_up {
+   my ($self, $ev) = @_;
+
+   my $mod = $ev->{mod};
+   my $sym = $ev->{sym};
+
+   if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
+      $::CONN->user_send ("fire_stop");
+   }
+   if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
+      $::CONN->user_send ("run_stop");
+   }
+}
+
 sub draw {
    my ($self) = @_;
 
+   my $focused = $CFClient::UI::FOCUS == $self
+                 || $CFClient::UI::FOCUS == $self->{completer}{entry};
+
    return
-      unless $CFClient::UI::FOCUS == $self || !$::FAST;
+      unless $focused || !$::FAST;
 
    if (delete $self->{need_update}) {
       glNewList $self->{list};
@@ -102,7 +206,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,
@@ -117,14 +221,14 @@
                glEnable GL_CONVOLUTION_2D;
             }
 
+            $self->{fow_texture_name} ||= glGenTexture;
             # try to re-use the texture name: TODO improve texture class instead
-            my $prev_name = ((delete $self->{fow_texture}) || {})->{name};
 
             $self->{fow_texture} = new CFClient::Texture
                w              => $w,
                h              => $h,
                data           => $data,
-               name           => $prev_name, # a bit hackish
+               name           => $self->{fow_texture_name},
                internalformat => GL_ALPHA,
                format         => GL_ALPHA;
 
@@ -150,7 +254,7 @@
    glPopMatrix;
 
    # TNT2 emulates logops in software (or worse :)
-   if ($CFClient::UI::FOCUS == $self) {
+   if ($focused) {
       (delete $self->{out_of_focus})->destroy
          if $self->{out_of_focus};
    } else {
@@ -165,132 +269,35 @@
       glEnd;
       glDisable GL_BLEND;
 
-      $self->{out_of_focus} ||= do {
-         my $label = new CFClient::UI::Label
-            x         => 0,
-            y         => 0,
-            z         => 1,
-            ellipsise => 0,
-            text      => "map out of focus (click map to play)";
-
-         $label->show;
-         $label->update;
-
-         $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
-            $label->move (
-               ($::WIDTH  - $label->{w}) * 0.5,
-               ($::HEIGHT - $label->{h}) * 0.5,
-            );
-         });
-
-         $label
-      };
-   }
-}
-
-my %DIR = (
-   CFClient::SDLK_KP8, [1, "north"],
-   CFClient::SDLK_KP9, [2, "northeast"],
-   CFClient::SDLK_KP6, [3, "east"],
-   CFClient::SDLK_KP3, [4, "southeast"],
-   CFClient::SDLK_KP2, [5, "south"],
-   CFClient::SDLK_KP1, [6, "southwest"],
-   CFClient::SDLK_KP4, [7, "west"],
-   CFClient::SDLK_KP7, [8, "northwest"],
-
-   CFClient::SDLK_UP,    [1, "north"],
-   CFClient::SDLK_RIGHT, [3, "east"],
-   CFClient::SDLK_DOWN,  [5, "south"],
-   CFClient::SDLK_LEFT,  [7, "west"],
-);
-
-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 ($uni == ord ",") {
-      $::CONN->user_send ("take");
-   } elsif ($uni == ord "\t" or $uni == ord " ") {
-      $::CONN->user_send ("apply");
-   } elsif ($sym == CFClient::SDLK_KP_PLUS  || $uni == ord "+") {
-      $::CONN->user_send ("rotateshoottype +");
-   } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
-      $::CONN->user_send ("rotateshoottype -");
-   } elsif ($uni == ord "'") {
-      $self->emit ('activate_console');
-   } elsif ($uni == ord "/") {
-      $self->emit (activate_console => '/');
-   } elsif (exists $DIR{$sym}) {
-      if ($mod & CFClient::KMOD_SHIFT) {
-         $self->{shft}++;
-         $::CONN->user_send ("fire $DIR{$sym}[0]");
-      } elsif ($mod & CFClient::KMOD_CTRL) {
-         $self->{ctrl}++;
-         $::CONN->user_send ("run $DIR{$sym}[0]");
-      } 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]);
-            },
-            connect_close => sub {
-               (delete $self->{command_widget})->hide;
-               $self->focus_in;
-            },
-      ;
-      $self->{command_widget}->key_down ($ev)
-         unless $ev->{unicode} == 20;
-      return unless $self->{command_widget};
-      $self->{command_widget}->show;
-      $self->{command_widget}->focus_in;
-   }
-}
-
-sub key_up {
-   my ($self, $ev) = @_;
-
-   my $mod = $ev->{mod};
-   my $sym = $ev->{sym};
-
-   if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
-      $::CONN->user_send ("fire_stop");
-   }
-   if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
-      $::CONN->user_send ("run_stop");
+#      $self->{out_of_focus} ||= do {
+#         my $label = new CFClient::UI::Label
+#            x         => 0,
+#            y         => 0,
+#            z         => 1,
+#            ellipsise => 0,
+#            text      => "map out of focus (click map to play)";
+#
+#         $label->show;
+#         $label->update;
+#
+#         $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
+#            $label->move (
+#               ($::WIDTH  - $label->{w}) * 0.5,
+#               ($::HEIGHT - $label->{h}) * 0.5,
+#            );
+#         });
+#
+#         $label
+#      };
    }
 }
 
-sub add_command {
-   my ($self, $command, $tooltip, $widget, $cb) = @_;
-
-   (my $data = $command) =~ s/\\//g;
-
-   $tooltip =~ s/^\s+//;
-
-   $tooltip = "<big>$data</big>\n\n$tooltip";
-
-   $tooltip =~ s/\s+$//;
-
-   $self->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
-}
+sub DESTROY {
+   my $self = shift;
 
-sub clr_commands {
-   my ($self) = @_;
+   glDeleteList $self->{list};
 
-   %{$self->{command}} = ();
+   $self->SUPER::DESTROY;
 }
 
 package CFClient::MapWidget::MapMap;
@@ -401,9 +408,38 @@
    ];
 
    $self->{entry} = new CFClient::UI::Entry
-      connect_changed => sub {
+      on_changed => sub {
          $self->update_labels;
-      };
+      },
+      on_key_down => sub {
+         my ($entry, $ev) = @_;
+
+         my $self = $entry->{parent}{parent};
+
+         if ($ev->{sym} == 13) {
+            if (exists $self->{select}) {
+               $self->{last_command} = $self->{select};
+               $::CONN->user_send ($self->{select});
+               $self->hide;
+            }
+         } elsif ($ev->{sym} == 27) {
+            $self->hide;
+            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 {
+            return 0;
+         }
+
+         1
+      }
+   ;
 
    $self->{vbox}->add (
       $self->{entry},
@@ -413,6 +449,13 @@
    $self
 }
 
+sub set_prefix {
+   my ($self, $prefix) = @_;
+
+   $self->{entry}->set_text ($prefix);
+   $self->show;
+}
+
 sub size_allocate {
    my ($self, $w, $h) = @_;
 
@@ -420,30 +463,24 @@
    $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
 }
 
+sub show {
+   my ($self) = @_;
+
+   $self->SUPER::show;
+   $self->{entry}->focus_in;
+}
+
+sub hide {
+   my ($self) = @_;
+
+   $self->SUPER::hide;
+   $self->{entry}->set_text ("");
+}
+
 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);
-   }
+   $self->{entry}->key_down ($ev);
 }
 
 sub update_labels {
@@ -452,40 +489,45 @@
    my $text = $self->{entry}->get_text;
 
    length $text
-      or return $self->emit ("close");
+      or return $self->hide;
 
    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>
-      };
-
+   if ($text ne $self->{last_search}) {
       my @match;
-      my @penalty;
 
-      for (keys %{$self->{command}}) {
-         if (@penalty = $_ =~ $regexp) {
-            push @match, [$_, length join "", map "::$_", grep defined, @penalty];
+      if ($text =~ /^(.*?)\s+$/) {
+         @match = [$cmd, "(appended whitespace suppresses completion)"];
+      } else {
+         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 @penalty;
+
+         for (keys %{$self->{command}}) {
+            if (@penalty = $_ =~ $regexp) {
+               push @match, [$_, length join "", map "::$_", grep defined, @penalty];
+            }
          }
-      }
 
-      @match = map $self->{command}{$_->[0]},
-                  sort {
-                     $a->[1] <=> $b->[1]
-                        or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
-                        or (length $a->[0]) <=> (length $b->[0])
-                  } @match;
+         @match = map $self->{command}{$_->[0]},
+                     sort {
+                        $a->[1] <=> $b->[1]
+                           or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
+                           or (length $b->[0]) <=> (length $a->[0])
+                     } @match;
+      }
 
-      $self->{last_search} = $cmd;
+      $self->{last_search} = $text;
       $self->{last_match} = \@match;
 
       $self->{select_offset} = 0;