Merge branch 'master' into bss

diff --combined twirssi.pl
index b00fe807628e6d0c6e0e9ba664c8baf29d430da4,61fdb1fc7fcc207a2686726927f113a069e353ac..444aac62a54b1dec79a8cf7328d54cdc3b039a34
--- 1/twirssi.pl
--- 2/twirssi.pl
+++ b/twirssi.pl
@@@ -11,8 -11,8 +11,8 @@@ $Data::Dumper::Indent = 1
  
  use vars qw($VERSION %IRSSI);
  
- $VERSION = "1.7.5";
- my ($REV) = '$Rev: 374 $' =~ /(\d+)/;
+ $VERSION = "1.7.6";
+ my ($REV) = '$Rev: 379 $' =~ /(\d+)/;
  %IRSSI = (
      authors     => 'Dan Boger',
      contact     => 'zigdon@gmail.com',
@@@ -21,7 -21,7 +21,7 @@@
        . 'Can optionally set your bitlbee /away message to same',
      license => 'GNU GPL v2',
      url     => 'http://tinyurl.com/twirssi',
-     changed => '$Date: 2009-01-19 23:31:12 -0800 (Mon, 19 Jan 2009) $',
+     changed => '$Date: 2009-01-21 09:50:42 -0800 (Wed, 21 Jan 2009) $',
  );
  
  my $window;
@@@ -611,7 -611,8 +611,7 @@@ sub do_updates 
  
      foreach my $t ( reverse @$tweets ) {
          my $text = decode_entities( $t->{text} );
 -        $text =~ s/%/%%/g;
 -        $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
 +        $text =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/g;
          $text =~ s/[\n\r]/ /g;
          my $reply = "tweet";
          if (    Irssi::settings_get_bool("show_reply_context")
@@@ -627,7 -628,8 +627,7 @@@
  
              if ($context) {
                  my $ctext = decode_entities( $context->{text} );
 -                $ctext =~ s/%/%%/g;
 -                $ctext =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
 +                $ctext =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/g;
                  $ctext =~ s/[\n\r]/ /g;
                  printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
                    $context->{id}, $username,
@@@ -664,7 -666,8 +664,7 @@@
            if exists $friends{ $t->{user}{screen_name} };
  
          my $text = decode_entities( $t->{text} );
 -        $text =~ s/%/%%/g;
 -        $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
 +        $text =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/g;
          $text =~ s/[\n\r]/ /g;
          printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
            $t->{id}, $username, $t->{user}{screen_name}, $text;
@@@ -684,7 -687,8 +684,7 @@@
  
      foreach my $t ( reverse @$tweets ) {
          my $text = decode_entities( $t->{text} );
 -        $text =~ s/%/%%/g;
 -        $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
 +        $text =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cO/g;
          $text =~ s/[\n\r]/ /g;
          printf $fh "id:%d account:%s nick:%s type:dm %s\n",
            $t->{id}, $username, $t->{sender_screen_name}, $text;
@@@ -734,16 -738,13 +734,16 @@@ sub monitor_child 
              }
  
              if ( $meta{type} eq 'tweet' ) {
 -                push @lines, "[$account%B\@$meta{nick}%n$marker] $_\n",;
 +                $window->printformat(MSGLEVEL_PUBLIC, 'twirssi_tweet',
 +                  $account, $meta{nick}, $marker, $_);
              } elsif ( $meta{type} eq 'reply' ) {
 -                push @lines, "[$account\\--> %B\@$meta{nick}%n$marker] $_\n",;
 +                $window->printformat(MSGLEVEL_PUBLIC, 'twirssi_reply',
 +                  $account, $meta{nick}, $marker, $_);
              } elsif ( $meta{type} eq 'dm' ) {
 -                push @lines, "[$account%B\@$meta{nick}%n (%WDM%n)] $_\n",;
 +                $window->printformat(MSGLEVEL_PUBLIC, 'twirssi_dm',
 +                  $account, $meta{nick}, $_);
              } elsif ( $meta{type} eq 'error' ) {
 -                push @lines, "ERROR: $_\n";
 +                $window->print("ERROR: $_", MSGLEVEL_PUBLIC);
              } elsif ( $meta{type} eq 'debug' ) {
                  print "$_" if &debug,;
              } else {
@@@ -763,6 -764,13 +763,6 @@@
  
          if ($new_last_poll) {
              print "new last_poll = $new_last_poll" if &debug;
 -            foreach my $line (@lines) {
 -                chomp $line;
 -                $window->print( $line, MSGLEVEL_PUBLIC );
 -                foreach ( $line =~ /\@([-\w]+)/ ) {
 -                    $nicks{$1} = time;
 -                }
 -            }
  
              close FILE;
              unlink $filename
@@@ -875,7 -883,9 +875,9 @@@ sub sig_complete 
              and $linestart =~ /^\/reply(?:_as)?\s*$/ )
        )
      {    # /twitter_reply gets a nick:num
-         @$complist = grep /^\Q$word/i, sort keys %{ $id_map{__indexes} };
+         $word =~ s/^@//;
+         @$complist = map { "$_:$id_map{__indexes}{$_}" } grep /^\Q$word/i,
+           sort keys %{ $id_map{__indexes} };
      }
  
      # /tweet, /tweet_as, /dm, /dm_as - complete @nicks (and nicks as the first
@@@ -904,12 -914,6 +906,12 @@@ sub event_send_text 
  
  Irssi::signal_add( "send text", "event_send_text" );
  
 +Irssi::theme_register([
 +    'twirssi_tweet', '[$0%B@$1%n$2] $3',
 +    'twirssi_reply', '[$0\--> %B@$1%n$2] $3',
 +    'twirssi_dm',    '[$0%B@$1%n (%WDM%n)] $2',
 +]);
 +
  Irssi::settings_add_str( "twirssi", "twitter_window",     "twitter" );
  Irssi::settings_add_str( "twirssi", "bitlbee_server",     "bitlbee" );
  Irssi::settings_add_str( "twirssi", "short_url_provider", "TinyURL" );
@@@ -929,6 -933,11 +931,11 @@@ Irssi::settings_add_bool( "twirssi", "t
  Irssi::settings_add_bool( "twirssi", "tweet_window_input",        0 );
  $window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );
  
+ if (!$window) {
+   $window = Irssi::Windowitem::window_create (Irssi::settings_get_str('twitter_window'), 1);
+   $window->set_name (Irssi::settings_get_str('twitter_window'));
+ }
+ 
  if ($window) {
      Irssi::command_bind( "dm",               "cmd_direct" );
      Irssi::command_bind( "dm_as",            "cmd_direct_as" );
@@@ -1030,4 -1039,3 +1037,4 @@@
            . " or change the value of twitter_window.  Then, reload twirssi." );
  }
  
 +# vim: set sts=4 expandtab: