X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fconsole.pl;h=f4c4a85fa37731c163379cdf3b21b9b84d609b35;hb=2538c30a81811749c0cdaf55b8c9f65ee7c5167d;hp=ceeaa9459be7fcb6b79951416eead418d40e7166;hpb=422c57889c45bafa6cbcef9b28a8230f0f3c95f6;p=spider.git

diff --git a/perl/console.pl b/perl/console.pl
index ceeaa945..f4c4a85f 100755
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -32,6 +32,7 @@ use DXDebug;
 use DXUtil;
 use DXDebug;
 use IO::File;
+use Time::HiRes qw(gettimeofday tv_interval);
 use Curses 1.06;
 
 use Console;
@@ -50,6 +51,9 @@ $connsort = "local";
 $khistpos = 0;
 $spos = $pos = $lth = 0;
 $inbuf = "";
+@time = ();
+
+$SIG{WINCH} = sub {@time = gettimeofday};
 
 sub mydbg
 {
@@ -114,8 +118,6 @@ sub do_resize
 	$has_colors = has_colors();
 	do_initscr();
 
-	$winch = 0;
-	$SIG{'WINCH'} = sub {$winch = 1};
 	show_screen();
 }
 
@@ -243,7 +245,7 @@ sub rec_socket
 	if (defined $msg) {
 		my ($sort, $call, $line) = $msg =~ /^(\w)([^\|]+)\|(.*)$/;
 		
-		$line =~ s/[\x00-\x06\x08\x0a-\x19\x1b-\x1f\x80-\x9f\xf0-\xff]/./g;         # immutable CSI sequence + control characters
+		$line =~ s/[\x00-\x06\x08\x0a-\x19\x1b-\x1f\x80-\x9f]/./g;         # immutable CSI sequence + control characters
 		if ($sort && $sort eq 'D') {
 			$line = " " unless length($line);
 			addtotop($line);
@@ -278,7 +280,7 @@ sub rec_stdin
 		if ($r eq KEY_ENTER || $r eq "\n" || $r eq "\r") {
 			
 			# save the lines
-			$inbuf = " " unless length($inbuf);
+			$inbuf = " " unless length $inbuf;
 
 			# check for a pling and do a search back for a command
 			if ($inbuf =~ /^!/o) {
@@ -295,7 +297,7 @@ sub rec_stdin
 					return;
 				}
 			}
-			push @khistory, $inbuf if $inbuf;
+			push @khistory, $inbuf if length $inbuf;
 			shift @khistory if @khistory > $maxkhist;
 			$khistpos = @khistory;
 			$bot->move(0,0);
@@ -397,7 +399,7 @@ sub rec_stdin
 		} elsif ($r eq KEY_RESIZE || $r eq "\0632") {
 			do_resize();
 			return;
-		} elsif (defined is_pctext($r)) {
+		} elsif (defined $r && is_pctext($r)) {
 			# move the top screen back to the bottom if you type something
 			if ($spos < @shistory) {
 				$spos = @shistory;
@@ -504,7 +506,7 @@ for (;;) {
 		$lasttime = $t;
 	}
 	my $ch = $bot->getch();
-	if ($winch) {
+	if (@time && tv_interval(\@time, [gettimeofday]) >= 1) {
 #		mydbg("Got Resize");
 #		do_resize();
 		next;