X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fconsole.pl;h=0a6d7404ba62c066539afd4697ba2d2fafba6771;hb=eb311dbba79ebae3360bda7fd7dfb05629f4d76c;hp=f4c4a85fa37731c163379cdf3b21b9b84d609b35;hpb=ec57aa982f870daf09a1fc7839d06e52980cfb55;p=spider.git

diff --git a/perl/console.pl b/perl/console.pl
index f4c4a85f..0a6d7404 100755
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -10,7 +10,7 @@
 #
 # Copyright (c) 1999 Dirk Koopman G1TLH
 #
-# $Id$
+#
 # 
 
 require 5.004;
@@ -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;
@@ -34,6 +35,7 @@ use DXDebug;
 use IO::File;
 use Time::HiRes qw(gettimeofday tv_interval);
 use Curses 1.06;
+use Text::Wrap;
 
 use Console;
 
@@ -53,7 +55,7 @@ $spos = $pos = $lth = 0;
 $inbuf = "";
 @time = ();
 
-$SIG{WINCH} = sub {@time = gettimeofday};
+#$SIG{WINCH} = sub {@time = gettimeofday};
 
 sub mydbg
 {
@@ -83,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);
@@ -229,8 +231,13 @@ sub addtotop
 		if ($inbuf =~ s/\x07+$//) {
 			beep();
 		}
-		push @shistory, $inbuf;
-		shift @shistory if @shistory > $maxshist;
+		if (length $inbuf >= $cols) {
+			$Text::Wrap::Columns = $cols;
+			push @shistory, wrap('',"\t", $inbuf);
+		} else {
+			push @shistory, $inbuf;
+		}
+		shift @shistory while @shistory > $maxshist;
 	}
 	show_screen();
 }
@@ -334,7 +341,7 @@ sub rec_stdin
 		} elsif ($r eq KEY_PPAGE || $r eq "\032") {
 			if ($spos > 0) {
 				my ($i, $l);
-				for ($i = 0; $i <= $pagel && $spos >= 0; ) {
+				for ($i = 0; $i < $pagel-1 && $spos >= 0; ) {
 					$l = measure($shistory[$spos]);
 					$i += $l;
 					$spos-- if $i <= $pagel;
@@ -492,6 +499,8 @@ $conn->send_later("I$call|set/page $maxshist");
 
 #Msg->set_event_handler(\*STDIN, "read" => \&rec_stdin);
 
+$Text::Wrap::Columns = $cols;
+
 my $lastmin = 0;
 for (;;) {
 	my $t;