X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fconsole.pl;h=597c5eff0ee2010764a9e533732c14b8cd23a38b;hb=61db59003ac70a14ec41b3adfb36df2f7909bc88;hp=205d52f379d37b19cf9cba49093f400a00f3a6ff;hpb=517695ec47b0ab768da54c7b0830de9ed0dd4914;p=spider.git

diff --git a/perl/console.pl b/perl/console.pl
index 205d52f3..597c5eff 100755
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -23,6 +23,14 @@ BEGIN {
 	
 	unshift @INC, "$root/perl";	# this IS the right way round!
 	unshift @INC, "$root/local";
+
+	sub main::mkver
+	{
+		my $s = shift;
+		my ($v, $b) = $s =~ /(\d+\.\d+)(?:\.(\d+\.\d+))?/;
+		$main::build += sprintf "%.3f", $v;
+		$main::branch += sprintf("%.3f", $b) if $b;
+	}
 }
 
 use Msg;
@@ -32,6 +40,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 +59,9 @@ $connsort = "local";
 $khistpos = 0;
 $spos = $pos = $lth = 0;
 $inbuf = "";
+@time = ();
+
+$SIG{WINCH} = sub {@time = gettimeofday};
 
 sub mydbg
 {
@@ -114,8 +126,6 @@ sub do_resize
 	$has_colors = has_colors();
 	do_initscr();
 
-	$winch = 0;
-	$SIG{'WINCH'} = sub {$winch = 1};
 	show_screen();
 }
 
@@ -278,7 +288,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 +305,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);
@@ -332,7 +342,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;
@@ -397,7 +407,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 +514,7 @@ for (;;) {
 		$lasttime = $t;
 	}
 	my $ch = $bot->getch();
-	if ($winch) {
+	if (@time && tv_interval(\@time, [gettimeofday]) >= 1) {
 #		mydbg("Got Resize");
 #		do_resize();
 		next;