From 12331e4a86eaadbd1c0013b8c557f69a219f792a Mon Sep 17 00:00:00 2001
From: Geraint Edwards <gedge-oss@yadn.org>
Date: Sat, 6 Nov 2010 12:35:41 +0000
Subject: [PATCH] allow different accounts and searches to have their own
 window

---
 twirssi.pl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/twirssi.pl b/twirssi.pl
index eef1cbb..ce33831 100644
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -1722,7 +1722,7 @@ sub monitor_child {
                 print "First call, not printing updates" if &debug;
             } else {
                 foreach my $line (@lines) {
-                    &window( $line->[1], $line->[2] )->printformat(
+                    &window( $line->[1], $line->[2], $line->[3] )->printformat(
                         $line->[0],
                         "twirssi_" . $line->[1],
                         @$line[ 2 .. $#$line - 1 ],
@@ -2163,14 +2163,20 @@ sub window {
     my $uname = shift || "default";
 
     $type = "search" if $type eq 'search_once';
+    my $topic = ($type eq 'search' ? shift : '');
 
     my $win;
     if ( exists $state{__windows}{$type} ) {
+        my $uname_svc = $uname;
+        $uname_svc =~ s/:\s*$/\@$defservice/;
         $win =
              $state{__windows}{$type}{$uname}
+          || $state{__windows}{$type}{lc $uname_svc}
+          || $state{__windows}{$type}{lc $topic}
           || $state{__windows}{$type}{$user}
           || $state{__windows}{$type}{default}
           || $settings{window};
+        print "win($type, $uname, $uname_svc, $topic) -> $win" if (&debug);
     } else {
         $win = $settings{window};
     }