Add branch from yitz.

diff --git a/scripts/ack.pl b/scripts/ack.pl
index ea2d27831d17d11bc517ee400f0952c6d032cf59..6015d1f509921d0d443534174e77959c8f667cf1 100644 (file)
--- a/scripts/ack.pl
+++ b/scripts/ack.pl
@@ -1,32 +1,58 @@
-#!/usr/bin/perl
-# vim: ts=2 sw=2 expandtab
-
+#! /usr/bin/perl
+# $Id$
+ 
 # Ack: Jump to the next active window, with tiebreakers.
-
+ 
 use warnings;
 use strict;
-
+ 
 use Irssi;
-
+ 
 ### Script header.
-
-our $VERSION = '1.000';
-
+ 
+use vars qw($VERSION);
+$VERSION = do {my@r=(q$Revision: 0.0$=~/\d+/g);sprintf"%d."."%04d"x$#r,@r};
+ 
 use vars qw(%IRSSI);
 %IRSSI = (
   name        => 'ack',
   authors     => 'Rocco Caputo',
   contact     => 'rcaputo@cpan.org',
-  url         => 'http://github.com/rcaputo/irssi-ack',
+  url         => '(none yet)',
   license     => 'Perl',
   description => 'Jump to the next active window, with tiebreakers.',
 );
+ 
+# Sort by last_spoke if enabled
+my @last_spoke;
+sub recentlySpoke
+{
+       my ($windowA, $windowB) = @_;
+       return 0 unless(Irssi::settings_get_bool('ack_use_last_spoke'));
+       my ($refnumA, $refnumB) = ($windowA->{'refnum'}, $windowB->{'refnum'});
+       for my $refnum (@last_spoke)
+       {
+               return -1 if ($refnum == $refnumA);
+               return  1 if ($refnum == $refnumB);
+       }
+       return 0;
+}
 
-# Jump to an active channel.
+ 
+# Sort by priority if enabled
+sub highPriority
+{
+       my ($window, @list) = @_;
+       return 0 unless(Irssi::settings_get_bool('ack_use_priority'));
+       return 1 if (grep {$window->{refnum} == $_} @list);
+       return 0;
+}
 
+# Jump to an active channel.
 sub cmd_ack {
   my ($cmd, $server, $window) = @_;
-
+       my @list = split(/ /, lc(Irssi::settings_get_str('ack_high_priority')));
+ 
   # We sort the data_level in reverse order because higher numbers
   # mean "more important".  If the data_level is equal between two
   # windows, then we jump to the window that has been upbated least
@@ -34,17 +60,58 @@ sub cmd_ack {
   #
   # Currently that's the window with the earliest (oldest) last line
   # of text.
-
+ 
   my @windows = sort {
-    ($b->{data_level} <=> $a->{data_level}) ||
-    ($a->{last_line}  <=> $b->{last_line} )
+    ($b->{data_level}        <=> $a->{data_level})               ||
+       (highPriority($b, @list) <=> highPriority($a, @list))        ||
+       (recentlySpoke($a, $b))                                      ||
+    ($a->{refnum}            <=> $b->{refnum} )                  ||
+    ($a->{last_line}         <=> $b->{last_line} ) 
   }
   grep { $_->{data_level} }  # Must have some activity.
   Irssi::windows();
-
+ 
   # Jump to the first window.  How hard can it be?
   $windows[0]->set_active() if @windows;
 }
+ 
+sub cmd_ack_add
+{
+       my ($input, $server, $window) = @_;
+       my @list = split(/ /, lc(Irssi::settings_get_str('ack_high_priority')));
+       my $num = Irssi::active_win()->{refnum};
+       return if grep {$_ == $num} @list;
+       Irssi::settings_set_str('ack_high_priority', join(' ', @list, $num));
+}
+
+sub cmd_ack_del
+{
+       my ($input, $server, $window) = @_;
+       my @list = split(/ /, lc(Irssi::settings_get_str('ack_high_priority')));
+       my $num = Irssi::active_win()->{refnum};
+       @list = grep {$_ != $num} @list;
+       Irssi::settings_set_str('ack_high_priority', join(' ', @list));
+}
+
+# Track the window number you last_spoke in
+sub cmd_own_public
+{
+       my ($server, $msg, $target) = @_;
+       my $window = $server->window_find_item($target);
+       my $refnum = $window->{'refnum'};
+       # First remove the refnum from the list if it exists
+       @last_spoke = grep {$_ != $refnum}  @last_spoke;
+       # And shift the refnum back to the start
+       unshift @last_spoke, $refnum;
+}
+
 
 # Usage: /ack ... probably bind it to Meta-A or something.
-Irssi::command_bind("ack", "cmd_ack");
+Irssi::command_bind("ack", "cmd_ack"); 
+Irssi::command_bind("ack_del", "cmd_ack_del"); 
+Irssi::command_bind("ack_add", "cmd_ack_add"); 
+Irssi::signal_add("message own_public", "cmd_own_public"); 
+Irssi::settings_add_str('misc', 'ack_high_priority', '');
+Irssi::settings_add_bool('misc', 'ack_use_priority', 0);
+Irssi::settings_add_bool('misc', 'ack_use_last_spoke', 0);
+