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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.89 by elmex, Mon Dec 4 15:17:14 2006 UTC vs.
Revision 1.92 by root, Sat Dec 9 21:26:46 2006 UTC

 use Crossfire::Protocol::Constants;
 use CFPlus;
 use CFPlus::UI;
 use CFPlus::Pod;
+use CFPlus::Macro;
+use CFPlus::Item;
 use Crossfire::Protocol::Base 0.95;
 use base 'Crossfire::Protocol::Base';
             if ($ev->{button} == 1) {
                $::CONN->user_send ("ready_skill $name");
             } elsif ($ev->{button} == 2) {
                $::CONN->user_send ("use_skill $name");
             } elsif ($ev->{button} == 3) {
+               my $shortname = CFPlus::shorten $name, 14;
                (new CFPlus::UI::Menu
                   items => [
-                     ["bind <i>ready_skill $name</i> to a key"   => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],
+                     ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
-                     ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],
+                     ["bind <i>use_skill $shortname</i> to a key"   => sub { CFPlus::Macro::quick_macro ["use_skill $name"]   }],
                   ],
                )->popup ($ev);
             } else {
                return 0;
             }
       $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
       $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
    }
 }
+sub macro_send {
+   my ($self, $macro) = @_;
+   for my $cmd (@{ $macro->{action} }) {
+      $self->send_command ($cmd);
+   }
+}
 sub user_send {
    my ($self, $command) = @_;
-   push @{$self->{record}}, $command
+   $self->{record}->($command)
       if $self->{record};
    $self->logprint ("send: ", $command);
    $self->send_command ($command);
    ::status ($command);
 }
-sub start_record {
+sub record {
-   my ($self) = @_;
+   my ($self, $cb) = @_;
-   $self->{record} = [];
+   $self->{record} = $cb;
-}
-sub stop_record {
-   my ($self) = @_;
-   return delete $self->{record};
 }
 sub map_scroll {
    my ($self, $dx, $dy) = @_;
       kw      => { hi => 0, yes => 0, no => 0 },
       has_close_button => 1,
       @_,
    );
-   Scalar::Util::weaken (my $this = $self);
+   CFPlus::weaken (my $this = $self);
    $self->connect (delete => sub { $this->destroy; 1 });
    # better use a pane...
    $self->add (my $hbox = new CFPlus::UI::HBox);
 };
 sub update_options {
    my ($self) = @_;
-   Scalar::Util::weaken $self;
+   CFPlus::weaken $self;
    $self->{options}->clear;
    $self->{options}->add ($self->{bye_button});
    for my $kw (sort keys %{ $self->{kw} }) {
 }
 sub feed {
    my ($self, $msg) = @_;
-   Scalar::Util::weaken $self;
+   CFPlus::weaken $self;
    if ($msg->{msgtype} eq "reply") {
       $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
       $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.89 by elmex, Mon Dec 4 15:17:14 2006 UTC vs. Revision 1.92 by root, Sat Dec 9 21:26:46 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.89 by elmex, Mon Dec 4 15:17:14 2006 UTC vs.
Revision 1.92 by root, Sat Dec 9 21:26:46 2006 UTC