[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/MapWidget.pm

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.9 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.14 by root, Mon Apr 24 11:54:26 2006 UTC

 package CFClient::MapWidget;
 use strict;
+use utf8;
 use List::Util qw(min max);
 use CFClient::OpenGL;
    my $mod = $ev->{mod};
    my $sym = $ev->{sym};
    if ($sym == CFClient::SDLK_KP5) {
       $::CONN->user_send ("stay fire");
+   } elsif ($sym == ord ",") {
+      $::CONN->user_send ("take");
    } elsif ($sym == ord "a") {
       $::CONN->user_send ("apply");
    } elsif ($sym == ord "'") {
       $self->emit ('activate_console');
    } elsif ($sym == ord "/") {
       $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]);
+               $::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;
    }
 }
       $::CONN->user_send ("run_stop");
    }
 }
 sub add_command {
-   my ($self, $command, $widget, $cb) = @_;
+   my ($self, $command, $tooltip, $widget, $cb) = @_;
    (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
-   push @{$self->{command}}, [$abbrev, $command];
+   push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb];
-   #warn "$command|$abbrev|$widget\n";#d#
 }
 package CFClient::MapWidget::Command;
 use strict;
    my $self = $class->SUPER::new (
       @_,
       children => [map
          CFClient::UI::Label->new (
-            can_hover => 1,
+            can_hover  => 1,
+            can_events => 1,
-            fontsize  => $_,
+            fontsize   => $_,
          ), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8
       ],
    );
    $self
    $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][1]
+   $self->{select} = $found[0][1]
       if @found;
    if (@found > 6) {
       $self->{children}[6]->set_text ("...");
    }
          $self->emit (execute => $self->{select});
          $self->emit ("close");
       }
    } elsif ($ev->{sym} == 27) {
       $self->emit ("close");
-   } elsif ($ev->{unicode}) {
+      return;
+   } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {
       $self->{search} .= chr $ev->{unicode};
       $self->update_labels;
    }
+   length $self->{search}
+      or $self->emit ("close");
 }
 1

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.9 by root, Mon Apr 24 02:41:48 2006 UTC vs. Revision 1.14 by root, Mon Apr 24 11:54:26 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.9 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.14 by root, Mon Apr 24 11:54:26 2006 UTC