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

Comparing deliantra/Deliantra-Client/DC/Macro.pm (file contents):
Revision 1.1 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.4 by root, Sat Dec 9 22:28:11 2006 UTC

    $window->connect (key_up   => $key_cb);
    $window->connect (key_down => $key_cb);
    $window->grab_focus;
    $window->show;
+}
+# find macro by event
+sub match_event($) {
+   my ($ev) = @_;
+   grep {
+      if (my $key = $_->{accelkey}) {
+         $key->[1] == $ev->{sym}
+            && $key->[0] == ($ev->{mod} & $MODIFIER_MASK)
+      } else {
+         0
+      }
+   } @{ $::PROFILE->{macro} || [] }
 }
 sub keyboard_setup {
    my $kbd_setup = new CFPlus::UI::VBox;
             can_events => 1,
             on_button_down => $macro_cb,
          );
          $macros->add (1, $y, new CFPlus::UI::Label
-            text       => (join "; ", @{ $macro->{action} }),
+            text       => (join "; ", @{ $macro->{action} || [] }),
             tooltip    => $tooltip_commands . $tooltip_common,
             expand     => 1,
             ellipsise  => 3,
             can_hover  => 1,
             can_events => 1,
 }
 # this is a shortcut method that asks for a binding
 # and then just binds it.
 sub quick_macro {
-   my ($self, $cmds, $end_cb) = @_;
+   my ($cmds, $end_cb) = @_;
    my $macro = {
       action => $cmds,
    };
    trigger_edit $macro, sub {
       if ($_[0]) {
          push @{ $::PROFILE->{macro} }, $macro;
          $REFRESH_MACRO_LIST->();
       }

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