Changeset 0572abcf

Timestamp:

Dec 24, 2009, 10:36:20 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.6, release-1.7, release-1.8, release-1.9

Children:

ac374fc

Parents:

d771d1b (diff), 9f026c1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'release-1.5'

Files:

• ChangeLog (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• commands.c (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• editwin.c (modified) (2 diffs)
• functions.c (modified) (1 diff)
• perl/lib/BarnOwl.pm (modified) (3 diffs)
• perl/lib/BarnOwl/Hooks.pm (modified) (1 diff)
• perl/modules/IRC/lib/BarnOwl/Module/IRC.pm (modified) (4 diffs)
• perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm (modified) (1 diff)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (5 diffs)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber/Connection.pm (modified) (1 diff)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber/ConnectionManager.pm (modified) (2 diffs)
• runtests.sh (modified) (1 diff)
• tester.c (modified) (1 diff)
• scripts/do-release (modified) (1 diff)

ChangeLog

@@ +1 @@
+1.5
+ * Allow ^Z to be rebound. -nelhage@mit.edu
+ * Skip some IRC admin messages by default, controlled by irc:skip -alexmv@mit.edu
+ * Reconnect and re-join channels on IRC disconnect -alexmv@mit.edu
+ * Correct the --with-libzephyr help string to --with-zephyr. -andersk@mit.edu
+ * Improve performance narrowing to certain filters. -nelhage@mit.edu
+ * Add completion for :filter* -adehnert@mit.edu
+ * Fix filter* -adehnert@mit.edu
+ * Mark the current mark with an asterisk -davidben@mit.edu
+ * Complete class names for the 'unsub' command. -nelhage@mit.edu
+ * Make control characters human-readable -kcr@1ts.org
+ * Further complete the show command -davidben@mit.edu
+ * Fix a bug reflowing text in the editwin. -davidben@mit.edu
+ * Reconnect to MUCs when reconnecting to Jabber. -asedeno@mit.edu
+ * Fix spurious trailing newlines in zsigs. -andersk@mit.edu
+ * Fix the behavior of the zsig variable.  -kcr@1ts.org
+ * Drop owl_animate_hack. -asedeno@mit.edu
+ * Add IRC server and channel listing to buddylist -alexmv@mit.edu
+ * Make Jabber try to reconnect when disconnected, at exponential intervals -alexmv@mit.edu
+ * Better documentation for jabberlogout. -asedeno@mit.edu
+ * jabberlogout -a --> jabberlogout -A -asedeno@mit.edu
+ * Change the default jabber resource to 'barnowl' -asedeno@mit.edu
+ * Updated Jabber documentation for consistency. -zhangc@mit.edu
+ * Document :bindkey more clearly. -geofft@mit.edu
+
 1.4
  * Fix description of edit:history-next -davidben@mit.edu

Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I m4
 
-GIT_FLAGS=$(if $(wildcard .git),-DGIT_VERSION=$(subst barnowl-,,$(shell git describe --match='barnowl-*' HEAD)))
+GIT_DESCRIPTION := $(if $(wildcard .git),$(shell git describe --match='barnowl-*' HEAD 2>/dev/null))
+GIT_FLAGS := $(if $(GIT_DESCRIPTION),-DGIT_VERSION=$(GIT_DESCRIPTION:barnowl-%=%))
 
 bin_PROGRAMS = barnowl.bin

commands.c

@@ -320 +320 @@
   OWLCMD_INT("recv:setshift", owl_command_set_shift, OWL_CTX_INTERACTIVE,
               "scrolls receive window to specified position", "", ""),
-
-  OWLCMD_VOID("recv:shiftleft", owl_command_shift_left, OWL_CTX_INTERACTIVE,
-              "scrolls receive window to the left", "", ""),
-
-  OWLCMD_VOID("recv:shiftright", owl_command_shift_right, OWL_CTX_INTERACTIVE,
-              "scrolls receive window to the left", "", ""),
 
   OWLCMD_VOID("recv:pagedown", owl_function_mainwin_pagedown, 
@@ -1361 +1355 @@
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
   owl_global_set_needrefresh(&g);
-}
-
-void owl_command_shift_left(void)
-{
-  owl_function_shift_left();
-}
-
-void owl_command_shift_right(void)
-{
-  owl_function_shift_right();
 }
 

configure.ac

@@ -1 +1 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([BarnOwl],[1.5pre1],[bug-barnowl@mit.edu])
+AC_INIT([BarnOwl],[1.5rc2],[bug-barnowl@mit.edu])
 AM_INIT_AUTOMAKE([-Wall foreign])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])

editwin.c

@@ -526 +526 @@
   do {
     werase(e->curswin);
-    if (e->topindex == -1 || e->index < e->topindex
-        || (e->index == e->topindex
-            && e->topindex > 0
-            && e->buff[e->topindex-1] != '\n'))
+
+    if (e->topindex == -1 || e->index < e->topindex)
       oe_reframe(e);
 
@@ -654 +652 @@
   }
 
+  /* recenter if needed */
+  if (start <= e->topindex)
+    owl_editwin_recenter(e);
+
   return change;
 }

functions.c

@@ -3136 +3136 @@
 #endif
 
-  if(aim && zephyr) {
-      if(owl_perlconfig_is_function("BarnOwl::Hooks::_get_blist")) {
-          char * perlblist = owl_perlconfig_execute("BarnOwl::Hooks::_get_blist()");
-          if(perlblist) {
-              owl_fmtext_append_ztext(&fm, perlblist);
-              owl_free(perlblist);
-          }
+  if (aim && zephyr) {
+    if (owl_perlconfig_is_function("BarnOwl::Hooks::_get_blist")) {
+      char * perlblist = owl_perlconfig_execute("BarnOwl::Hooks::_get_blist()");
+      if (perlblist) {
+        owl_fmtext_append_ztext(&fm, perlblist);
+        owl_free(perlblist);
       }
+    }
   }
 

perl/lib/BarnOwl.pm

@@ -38 +38 @@
 use BarnOwl::Completion;
 
+use List::Util qw(max);
+
 =head1 NAME
 
@@ -421 +423 @@
                        });
 
+    # Receive window scrolling
+    BarnOwl::new_command("recv:shiftleft",
+                        \&BarnOwl::recv_shift_left,
+                        {
+                            summary => "scrolls receive window to the left",
+                            usage => "recv:shiftleft [<amount>]",
+                            description => <<END_DESCR
+By default, scroll left by 10 columns. Passing no arguments or 0 activates this default behavior.
+Otherwise, scroll by the number of columns specified as the argument.
+END_DESCR
+                        });
+
+    BarnOwl::new_command("recv:shiftright",
+                        \&BarnOwl::recv_shift_right,
+                        {
+                            summary => "scrolls receive window to the right",
+                            usage => "recv:shiftright [<amount>]",
+                            description => <<END_DESCR
+By default, scroll right by 10 columns. Passing no arguments or 0 activates this default behavior.
+Otherwise, scroll by the number of columns specified as the argument.
+END_DESCR
+                        });
+
 }
 
@@ -485 +510 @@
 }
 
+=head3 Receive window scrolling
+
+Permit scrolling the receive window left or right by arbitrary
+amounts (with a default of 10 characters).
+
+=cut
+
+sub recv_shift_left
+{
+    my $func = shift;
+    my $delta = shift;
+    $delta = 10 unless int($delta) > 0;
+    my $shift = BarnOwl::recv_getshift();
+    if($shift > 0) {
+        BarnOwl::recv_setshift(max(0, $shift-$delta));
+    } else {
+        return "Already full left";
+    }
+}
+
+sub recv_shift_right
+{
+    my $func = shift;
+    my $delta = shift;
+    $delta = 10 unless int($delta) > 0;
+    my $shift = BarnOwl::recv_getshift();
+    BarnOwl::recv_setshift($shift+$delta);
+}
+
 =head3 default_zephyr_signature
 

perl/lib/BarnOwl/Hooks.pm

@@ -184 +184 @@
 
 sub _get_blist {
-    return join("\n", $getBuddyList->run);
+    my @results = grep defined, $getBuddyList->run;
+    s/^\s+|\s+$//sg for (@results);
+    return join("\n", grep {length($_)} @results);
 }
 

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

@@ -94 +94 @@
         my $conn = $ircnets{$net};
         my ($nick, $server) = ($conn->nick, $conn->server);
-        $list .= BarnOwl::Style::boldify("IRC channels for $net ($nick\@$server)\n");
+        $list .= BarnOwl::Style::boldify("IRC channels for $net ($nick\@$server)");
+        $list .= "\n";
 
         for my $chan (keys %channels) {
@@ -100 +101 @@
             $list .= "  $chan\n";
         }
-        $list .= "\n";
     }
 
@@ -167 +167 @@
 
     BarnOwl::new_command(
-        'irc-disconnect' => mk_irc_command( \&cmd_disconnect ),
+        'irc-disconnect' => \&cmd_disconnect,
         {
             summary => 'Disconnect from an IRC server',
@@ -391 +391 @@
 
 sub cmd_disconnect {
-    my $cmd = shift;
-    my $conn = shift;
-    $conn->conn->disconnect;
-    return;
+    # Such a hack
+    local *get_connection_by_alias = sub {
+        my $key = shift;
+        return $ircnets{$key} if exists $ircnets{$key};
+        return $reconnect{$key}{conn} if exists $reconnect{$key};
+        die("No such ircnet: $key\n");
+    };
+
+    mk_irc_command(
+        sub {
+            my $cmd = shift;
+            my $conn = shift;
+            if ($conn->conn->connected) {
+                $conn->conn->disconnect;
+            } elsif ($reconnect{$conn->alias}) {
+                BarnOwl::admin_message('IRC',
+                                       "[" . $conn->alias . "] Reconnect cancelled");
+                delete $reconnect{$conn->alias};
+            }
+        }
+    )->(@_);
 }
 

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

@@ -322 +322 @@
             },
         } );
+    $BarnOwl::Module::IRC::reconnect{$self->alias}{conn} = $self;
 }
 

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

@@ -136 +136 @@
 
     foreach my $jid ( $conn->getJIDs() ) {
-
-        next unless $conn->jidActive($jid) or $conn->tryReconnect($jid);
+        next if $conn->jidActive($jid);
+        $conn->tryReconnect($jid);
+    }
+
+    foreach my $jid ( $conn->getJIDs() ) {
+        next unless $conn->jidActive($jid);
 
         my $client = $conn->getConnectionFromJID($jid);
@@ -210 +214 @@
     my $roster = $conn->getRosterFromJID($jid);
     if ($roster) {
-        $blist .= "\n" . BarnOwl::Style::boldify("Jabber roster for $jid\n");
+        $blist .= BarnOwl::Style::boldify("Jabber roster for $jid\n");
 
         my @gTexts = ();
@@ -465 +469 @@
                     }
                 );
-                my $roster = $conn->getRosterFromJID($jidStr);
-                $roster->fetch();
-                $client->PresenceSend( priority => 1 );
-                my $fullJid = $client->{SESSION}->{FULLJID} || $jidStr;
-                $conn->renameConnection($jidStr, $fullJid);
-                queue_admin_msg("Connected to jabber as $fullJid");
-                # The remove_io_dispatch() method is called from the
-                # ConnectionManager's removeConnection() method.
-                $client->{fileno} = $client->getSocket()->fileno();
-                #queue_admin_msg("Connected to jabber as $fullJid ($client->{fileno})");
-                BarnOwl::add_io_dispatch($client->{fileno}, 'r', sub { $client->OwlProcess($fullJid) });
-
-                # 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;
-                }
-                $vars{idletime} |= BarnOwl::getidletime();
-                unless (exists $vars{keepAliveTimer}) {
-                    $vars{keepAliveTimer} = BarnOwl::Timer->new({
-                        'after' => 5,
-                        'interval' => 5,
-                        'cb' => sub { BarnOwl::Module::Jabber::do_keep_alive_and_auto_away(@_) }
-                                                                });
-                }
+                $client->onConnect($conn, $jidStr);
             }
         }
@@ -1059 +1037 @@
 sub process_incoming_chat_message {
     my ( $sid, $j ) = @_;
-    if ($j->DefinedBody()) {
+    if ($j->DefinedBody() || BarnOwl::getvar('jabber:spew') eq 'on') {
         BarnOwl::queue_message( j2o( $j, { direction => 'in',
                                            sid => $sid } ) );
@@ -1105 +1083 @@
     #    }
     #
-    if(BarnOwl::getvar('jabber:spew') eq 'on') {
+    if ($j->DefinedBody() || BarnOwl::getvar('jabber:spew') eq 'on') {
         BarnOwl::queue_message( BarnOwl::Message->new(%jhash) );
     }

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

@@ -163 +163 @@
 }
 
+=head2 OnConnect
+
+Actions to perform on connecting and reconnecting.
+
+=cut
+
+sub onConnect {
+    my $self = shift;
+    my $conn = shift;
+    my $jidStr = shift;
+
+    my $fullJid = $self->{SESSION}->{FULLJID} || $jidStr;
+    my $roster = $conn->getRosterFromJID($jidStr);
+
+    $roster->fetch();
+    $self->PresenceSend( priority => 1 );
+
+    $conn->renameConnection($jidStr, $fullJid);
+    BarnOwl::admin_message('Jabber', "Connected to jabber as $fullJid");
+    # The remove_io_dispatch() method is called from the
+    # ConnectionManager's removeConnection() method.
+    $self->{fileno} = $self->getSocket()->fileno();
+    BarnOwl::add_io_dispatch($self->{fileno}, 'r', sub { $self->OwlProcess($fullJid) });
+
+    # populate completion from roster.
+    for my $buddy ( $roster->jids('all') ) {
+        my %jq  = $roster->query($buddy);
+        my $name = $jq{name} || $buddy->GetUserID();
+        $BarnOwl::Module::Jabber::completion_jids{$name} = 1;
+        $BarnOwl::Module::Jabber::completion_jids{$buddy->GetJID()} = 1;
+    }
+    $BarnOwl::Module::Jabber::vars{idletime} |= BarnOwl::getidletime();
+    unless (exists $BarnOwl::Module::Jabber::vars{keepAliveTimer}) {
+        $BarnOwl::Module::Jabber::vars{keepAliveTimer} =
+            BarnOwl::Timer->new({
+                'after' => 5,
+                'interval' => 5,
+                'cb' => sub { BarnOwl::Module::Jabber::do_keep_alive_and_auto_away(@_) }
+                                });
+    }
+}
+
 =head1 SEE ALSO
 

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

@@ -85 +85 @@
     $self->{$jidStr}->{ReconnectAt} = time + $self->{$jidStr}->{ReconnectBackoff};
 
-    my $status = $self->{$jidStr}->{Client}->Connect;
+    my $client = $self->{$jidStr}->{Client};
+    my $status = $client->Connect;
     return 0 unless $status;
 
-    my @result = $self->{$jidStr}->{Client}->AuthSend( %{ $self->{$jidStr}->{Auth} } );
+    my @result = $client->AuthSend( %{ $self->{$jidStr}->{Auth} } );
     if ( !@result || $result[0] ne 'ok' ) {
         $self->removeConnection($jidStr);
@@ -94 +95 @@
         return 0;
     }
-
-    BarnOwl::admin_message(Jabber => "Reconnected to jabber as $jidStr");
-    $self->{$jidStr}{Status} = "available";
-
-    foreach my $muc ($self->{$jidStr}->{Client}->MUCs()) {
+    $self->{$jidStr}->{Roster} = $client->Roster();
+    $self->{$jidStr}->{Status} = "available";
+    $client->onConnect($self, $jidStr);
+    foreach my $muc ($client->MUCs()) {
         $muc->Join($muc->{ARGS});
     }

runtests.sh

@@ -1 +1 @@
 #!/bin/sh
-prove t/ --perl ./perl_tester
+HARNESS_PERL=./perl_tester exec prove t/

tester.c

@@ -223 +223 @@
   owl_filter *f1, *f2, *f3, *f4, *f5;
 
-  owl_list_create(&(g.filterlist));
+  owl_dict_create(&g.filters);
+  g.filterlist = NULL;
   owl_message_init(&m);
   owl_message_set_type_zephyr(&m);

scripts/do-release

@@ -31 +31 @@
 if [ ! "$force" ] && [ "$VERS" != "$(head -1 ChangeLog)" ]; then
     die "No ChangeLog entry for version $VERS, aborting."
+fi
+
+head=$(git symbolic-ref HEAD)
+head=${head#refs/heads/}
+
+git rev-parse --verify -q $head >/dev/null 2>&1
+git rev-parse --verify -q origin/$head >/dev/null 2>&1
+if [ -n "$(git rev-list $head..origin/$head)" ]; then
+    die "$head is not up to date. Aborting."
 fi