Changes in / [19cc7b00:d4ecc78]

Files:

• perl/lib/BarnOwl/Complete/Zephyr.pm (modified) (2 diffs)
• perl/lib/BarnOwl/Completion.pm (modified) (2 diffs)
• perl/modules/IRC/lib/BarnOwl/Module/IRC.pm (modified) (1 diff)
• perl/modules/IRC/lib/BarnOwl/Module/IRC/Completion.pm (deleted)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (11 diffs)
• perlglue.xs (modified) (1 diff)
• t/completion.t (modified) (1 diff)

perl/lib/BarnOwl/Complete/Zephyr.pm

@@ -30 +30 @@
 }
 
+sub complete_sub {
+    my $ctx = shift;
+    return complete_flags($ctx,
+        [],
+        {
+            "-r" => \&complete_realm,
+        });
+}
+
 sub on_message {
     my $m = shift;
@@ -41 +50 @@
 BarnOwl::Completion::register_completer(zcrypt    => \&complete_zwrite);
 
+# TODO: Handle aliases transparently in the core completion code?
+BarnOwl::Completion::register_completer(sub       => \&complete_sub);
+BarnOwl::Completion::register_completer(subscribe => \&complete_sub);
+
 $BarnOwl::Hooks::newMessage->add("BarnOwl::Complete::Zephyr::on_message");
 

perl/lib/BarnOwl/Completion.pm

@@ -18 +18 @@
                         point_move replace_region);
 
-use List::Util qw(min first);
+use List::Util qw(max first);
 
 our %completers = ();
@@ -76 +76 @@
 sub common_prefix {
     my @words = @_;
-    my $len   = min(map {length($_)} @words);
+    my $len   = max(map {length($_)} @words);
     my $pfx = '';
     for my $i (1..$len) {

perl/modules/IRC/lib/BarnOwl/Module/IRC.pm

@@ -18 +18 @@
 use BarnOwl::Message::IRC;
 use BarnOwl::Module::IRC::Connection qw(is_private);
-use BarnOwl::Module::IRC::Completion;
 
 use Net::IRC;

perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm

@@ -19 +19 @@
 use BarnOwl::Module::Jabber::Connection;
 use BarnOwl::Module::Jabber::ConnectionManager;
-use BarnOwl::Completion::Util qw(complete_flags);
 
 use Authen::SASL qw(Perl);
@@ -63 +62 @@
 $conn ||= BarnOwl::Module::Jabber::ConnectionManager->new;
 our %vars;
-our %completion_jids;
 
 sub onStart {
@@ -166 +164 @@
 
     $blistStr .= sprintf '%-15s %s', $name, $buddy->GetJID();
-    $completion_jids{$name} = 1;
-    $completion_jids{$buddy->GetJID()} = 1;
 
     if ($res) {
@@ -431 +427 @@
                 BarnOwl::error( "Error in connect: " . join( " ", @result ) );
             } else {
-                my $roster = $conn->getRosterFromJID($jidStr);
-                $roster->fetch();
+                $conn->getRosterFromJID($jidStr)->fetch();
                 $client->PresenceSend( priority => 1 );
                 my $fullJid = $client->{SESSION}->{FULLJID} || $jidStr;
@@ -442 +437 @@
                 #queue_admin_msg("Connected to jabber as $fullJid ($client->{fileno})");
                 BarnOwl::add_dispatch($client->{fileno}, sub { $client->OwlProcess() });
-
-                # populate completion from roster.
-                for my $buddy ( $roster->jids('all') ) {
-                    my %jq  = $roster->query($buddy);
-                    my $name = $jq{name} || $buddy->GetUserID();
-                    $completion_jids{$name} = 1;
-                    $completion_jids{$buddy->GetJID()} = 1;
-                }
             }
         }
@@ -660 +647 @@
                                                    MaxChars => 0
                                                   });
-    $completion_jids{$muc} = 1;
     return;
 }
@@ -715 +701 @@
 
     my $presence = "JIDs present in " . $m->BaseJID;
-    $completion_jids{$m->BaseJID} = 1;
     if($m->Anonymous) {
         $presence .= " [anonymous MUC]";
@@ -890 +875 @@
     $name = "" unless (1 == scalar(@ARGV));
 
-    $completion_jids{$baseJID} = 1;
-    $completion_jids{$name} = 1 if $name;
-
     foreach my $to (@ARGV) {
         my %jq  = $roster->query($to);
@@ -1075 +1057 @@
 
 sub process_presence_available {
+    return unless (BarnOwl::getvar('jabber:show_logins') eq 'on');
     my ( $sid, $p ) = @_;
     my $from = $p->GetFrom('jid')->GetJID('base');
-    $completion_jids{$from} = 1;
-    return unless (BarnOwl::getvar('jabber:show_logins') eq 'on');
     my $to = $p->GetTo();
     my $type = $p->GetType();
@@ -1228 +1209 @@
               if ($connection->FindMUC(jid => $to));
         }
-
-        # Populate completion.
-        if ($dir eq 'in') {
-            $completion_jids{ $props{sender} }= 1;
-        }
-        else {
-            $completion_jids{ $props{recipient} } = 1;
-        }
     }
     elsif ( $jtype eq 'groupchat' ) {
         my $nick = $props{nick} = $from->GetResource();
         my $room = $props{room} = $from->GetJID('base');
-        $completion_jids{$room} = 1;
 
         $props{sender} = $nick || $room;
@@ -1412 +1384 @@
 }
 
-################################################################################
-### Completion
-
-sub complete_user_or_muc { return keys %completion_jids; }
-sub complete_account { return $conn->getJIDs(); }
-
-sub complete_jwrite {
-    my $ctx = shift;
-    return complete_flags($ctx,
-                          [qw(-t -i -s)],
-                          {
-                              "-a" => \&complete_account,
-                          },
-                          \&complete_user_or_muc
-        );
-}
-
-BarnOwl::Completion::register_completer(jwrite => sub { BarnOwl::Module::Jabber::complete_jwrite(@_) });
-
 1;

perlglue.xs

@@ -332 +332 @@
         CODE:
         owl_select_remove_perl_dispatch(fd);
-
-
-AV*
-all_filters()
-        PREINIT:
-                AV *filters;
-                owl_list *fl;
-                owl_filter *f;
-                int i;
-        CODE:
-        {
-                fl = owl_global_get_filterlist(&g);
-                filters = newAV();
-                for(i=0;i<owl_list_get_size(fl);i++) {
-                        f = owl_list_get_element(fl, i);
-                        av_push(filters, newSVpv(owl_filter_get_name(f), 0));
-                }
-                RETVAL = filters;
-                sv_2mortal((SV*)RETVAL);
-        }
-        OUTPUT:
-                RETVAL
 
 MODULE = BarnOwl                PACKAGE = BarnOwl::Internal

t/completion.t

@@ -122 +122 @@
 is(BarnOwl::Completion::common_prefix(qw(abc abc)), 'abc');
 
-is(BarnOwl::Completion::common_prefix('a', ''), '');
-
 ## Test complete_flags