mega-merge of major parts of mojo

[spider.git] / perl / Console.pm

diff --git a/perl/Console.pm b/perl/Console.pm
index 052d1073a01ccf67f41d599ff0fc02449eecc06b..9dfacfb6b0a326fbbed4a317d5199494026f1b7e 100644 (file)
--- a/perl/Console.pm
+++ b/perl/Console.pm
@@ -6,7 +6,7 @@
 #
 # Copyright (c) 1999 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 # The colour pairs are:-
 #
@@ -17,7 +17,15 @@
 # 4 - CYAN, $background
 # 5 - BLUE, $background
 # 6 - MAGENTA, $background
-#
+# 7 - RED, BLUE
+# 8 - BROWN, BLUE
+# 9 - GREEN, BLUE
+# 10 - CYAN, BLUE
+# 11 - BLUE, RED
+# 12 - MAGENTA, BLUE
+# 13 - BROWN, GREEN
+# 14 - RED, GREEN
+# 
 # You can or these with A_BOLD and or A_REVERSE for a different effect
 #
 
@@ -26,33 +34,39 @@ package main;
 $maxkhist = 100;
 $maxshist = 500;
 if ($ENV{'TERM'} =~ /(xterm|ansi)/) {
-       $ENV{'TERM'} = 'color_xterm';
+#      $ENV{'TERM'} = 'color_xterm';
        $foreground = COLOR_BLACK();
        $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', 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) ],
-                  [ '^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', 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) ],
-                  [ '^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) ],
+                         );
 }