mega-merge of major parts of mojo

[spider.git] / perl / Console.pm

diff --git a/perl/Console.pm b/perl/Console.pm
index a6dc6613502bc3207fb6f55c787bb0867edbcf6a..9dfacfb6b0a326fbbed4a317d5199494026f1b7e 100644 (file)
--- a/perl/Console.pm
+++ b/perl/Console.pm
@@ -39,33 +39,34 @@ if ($ENV{'TERM'} =~ /(xterm|ansi)/) {
        $background = COLOR_WHITE();
        $mycallcolor = COLOR_PAIR(1);
        @colors = (
-                  [ '^DX de [\-A-Z0-9]+:\s+([57][01]\d\d\d\.|\d\d\d\d\d\d+.)', COLOR_PAIR(1) ],
-                  [ '^DX', COLOR_PAIR(5) ],
-                  [ '^To', COLOR_PAIR(3) ],
-                  [ '^(?:WWV|WCY)', COLOR_PAIR(4) ],
-                  [ '^[-A-Z0-9]+ de [-A-Z0-9]+ \d\d-\w\w\w-\d\d\d\d \d\d\d\dZ', COLOR_PAIR(0) ],
-                  [ '^[-A-Z0-9]+ de [-A-Z0-9]+ ', COLOR_PAIR(6) ],
-                  [ '^WX', COLOR_PAIR(3) ],
-                  [ '^(User|Node|Buddy)\b', COLOR_PAIR(8) ],
-                  [ '^New mail', A_BOLD|COLOR_PAIR(5) ],
-                   
-                  );
+                          [ '^[-A-Z0-9]+ de [-A-Z0-9]+ \d\d-\w\w\w-\d\d\d\d \d\d\d\dZ', COLOR_PAIR(0) ],
+                          [ '^DX de [\-A-Z0-9]+:\s+([57][01]\d\d\d\.|\d\d\d\d\d\d+.)', COLOR_PAIR(1) ],
+                          [ '-#', COLOR_PAIR(2) ],
+                          [ '^To', COLOR_PAIR(3) ],
+                          [ '^WX', COLOR_PAIR(3) ],
+                          [ '^(?:WWV|WCY)', COLOR_PAIR(4) ],
+                          [ '^DX', COLOR_PAIR(5) ],
+                          [ '^[-A-Z0-9]+ de [-A-Z0-9]+ ', COLOR_PAIR(6) ],
+                          [ '^(User|Node|Buddy)\b', COLOR_PAIR(8) ],
+                          [ '^New mail', A_BOLD|COLOR_PAIR(5) ],
+                         );
 }
 if ($ENV{'TERM'} =~ /(console|linux)/) {
        $foreground = COLOR_WHITE();
        $background = COLOR_BLACK();
        $mycallcolor = COLOR_PAIR(1);
        @colors = (
-                  [ '^DX de [\-A-Z0-9]+:\s+([57][01]\d\d\d\.|\d\d\d\d\d\d+.)', COLOR_PAIR(1) ],
-                  [ '^DX', COLOR_PAIR(4) ],
-                  [ '^To', COLOR_PAIR(3) ],
-                  [ '^(?:WWV|WCY)', COLOR_PAIR(5) ],
-                  [ '^[-A-Z0-9]+ de [-A-Z0-9]+ \d\d-\w\w\w-\d\d\d\d \d\d\d\dZ', COLOR_PAIR(0) ],
-                  [ '^[-A-Z0-9]+ de [-A-Z0-9]+ ', COLOR_PAIR(6) ],
-                  [ '^WX', COLOR_PAIR(3) ],
-                  [ '^(User|Node)\b', A_BOLD|COLOR_PAIR(8) ],
-                  [ '^New mail', A_BOLD|COLOR_PAIR(5) ],
-                  );
+                          [ '^DX de [\-A-Z0-9]+:\s+([57][01]\d\d\d\.|\d\d\d\d\d\d+.)', COLOR_PAIR(1) ],
+                          [ '^-#:', COLOR_PAIR(2) ],
+                          [ '^DX', COLOR_PAIR(4) ],
+                          [ '^To', COLOR_PAIR(3) ],
+                          [ '^(?:WWV|WCY)', COLOR_PAIR(5) ],
+                          [ '^[-A-Z0-9]+ de [-A-Z0-9]+ \d\d-\w\w\w-\d\d\d\d \d\d\d\dZ', COLOR_PAIR(0) ],
+                          [ '^[-A-Z0-9]+ de [-A-Z0-9]+ ', COLOR_PAIR(6) ],
+                          [ '^WX', COLOR_PAIR(3) ],
+                          [ '^(User|Node)\b', A_BOLD|COLOR_PAIR(8) ],
+                          [ '^New mail', A_BOLD|COLOR_PAIR(5) ],
+                         );
 }