From: Dirk Koopman <djk@tobit.co.uk>
Date: Thu, 8 Apr 2010 12:29:13 +0000 (+0100)
Subject: fix console.pl for Windows better
X-Git-Tag: 1.56~33
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=eb311dbba79ebae3360bda7fd7dfb05629f4d76c;p=spider.git

fix console.pl for Windows better

so that it continues to work OK on Linux.
---

diff --git a/Changes b/Changes
index 9e75c1dc..8562017b 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+08Apr10=======================================================================
+1. Modify console.pl so that it works in a Windows Cmd window. Get a Windows
+Curses ppd from: http://cpan.uwinnipeg.ca/dist/Curses.
 18Mar10=======================================================================
 1. Make privilege 0 "stick" if set on nodes
 13Mar10=======================================================================
diff --git a/perl/Version.pm b/perl/Version.pm
index 23e1786e..fc9c3a5a 100644
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
 
 $version = '1.55';
 $subversion = '0';
-$build = '66';
+$build = '67';
 
 1;
diff --git a/perl/console.pl b/perl/console.pl
index d98b95f8..0a6d7404 100755
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -23,6 +23,7 @@ BEGIN {
 	
 	unshift @INC, "$root/perl";	# this IS the right way round!
 	unshift @INC, "$root/local";
+	$is_win = ($^O =~ /^MS/ || $^O =~ /^OS-2/) ? 1 : 0; # is it Windows?
 }
 
 use Msg;
@@ -54,7 +55,7 @@ $spos = $pos = $lth = 0;
 $inbuf = "";
 @time = ();
 
-$SIG{WINCH} = sub {@time = gettimeofday};
+#$SIG{WINCH} = sub {@time = gettimeofday};
 
 sub mydbg
 {
@@ -84,9 +85,9 @@ sub do_initscr
 		init_pair(12, COLOR_MAGENTA, COLOR_BLUE);
 		init_pair(13, COLOR_YELLOW, COLOR_GREEN);
 		init_pair(14, COLOR_RED, COLOR_GREEN);
-		eval { assume_default_colors($foreground, $background) };
+		eval { assume_default_colors($foreground, $background) } unless $is_win;
 	}
-	
+
 	$top = $scr->subwin($lines-4, $cols, 0, 0);
 	$top->intrflush(0);
 	$top->scrollok(1);