X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fconsole.pl;h=ceac24e278890d1275fa6f904761d1993355061e;hb=a89e605f6679f19b1365061bad1ba93b36293814;hp=bf747b8631b5de32424eebd7dc3b39ef0abd5b8f;hpb=ab8aa7901d27e89362945baefae347a8680ca250;p=spider.git

diff --git a/perl/console.pl b/perl/console.pl
index bf747b86..ceac24e2 100755
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -81,6 +81,7 @@ sub do_initscr
 	$scr->refresh();
 	
 	$pagel = LINES()-4;
+	$mycallcolor = COLOR_PAIR(1) unless $mycallcolor;
 }
 
 sub do_resize
@@ -139,7 +140,7 @@ sub show_screen
 	if ($spos == @shistory - 1) {
 
 		# if we really are scrolling thru at the end of the history
-		my $line = $shistory[-1];
+		my $line = $shistory[$spos];
 		$top->addstr("\n") if $spos > 0;
 		setattr($line);
 		$top->addstr($line);
@@ -151,7 +152,7 @@ sub show_screen
 		# anywhere else
 		my ($i, $l);
 		my $p = $spos-1;
-		for ($i = 0; $i <= $pagel && $p >= 0; ) {
+		for ($i = 0; $i < $pagel && $p >= 0; ) {
 			$l = measure($shistory[$p]);
 			$i += $l;
 			$p-- if $i < $pagel;
@@ -161,19 +162,27 @@ sub show_screen
 		$top->move(0, 0);
 		$top->attrset(COLOR_PAIR(0)) if $has_colors;
 		$top->clrtobot();
-		for ($i = 0; $i <= $pagel && $p < @shistory; $p++) {
+		for ($i = 0; $i < $pagel && $p < @shistory; $p++) {
 			my $line = $shistory[$p];
 			my $lines = measure($line);
 			last if $i + $lines > $pagel;
-			$top->move($i, 0);
 			setattr($line);
-			$top->addstr($line);
+			$top->addstr($i, 0, $line);
 			$top->attrset(COLOR_PAIR(0)) if $has_colors;
 			$i += $lines;
 		}
 		$spos = $p;
+		$spos = @shistory if $spos > @shistory;
 	}
-	$top->refresh();
+    my $shl = @shistory;
+	my $add = "-$spos-$shl";
+    $scr->addstr(LINES()-4, 0, '-' x (COLS() - (length($call) + length($add))));
+	$scr->attrset($mycallcolor) if $has_colors;
+	$scr->addstr("$call");
+	$scr->attrset(COLOR_PAIR(0)) if $has_colors;
+    $scr->addstr($add);
+	$scr->refresh();
+#	$top->refresh();
 }
 
 # add a line to the end of the top screen
@@ -195,9 +204,9 @@ sub rec_socket
 	if (defined $msg) {
 		my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
 		
-		if ($sort eq 'D') {
+		if ($sort && $sort eq 'D') {
 			addtotop($line);
-		} elsif ($sort eq 'Z') { # end, disconnect, go, away .....
+		} elsif ($sort && $sort eq 'Z') { # end, disconnect, go, away .....
 			cease(0);
 		}	  
 	}
@@ -246,6 +255,10 @@ sub rec_stdin
 			}
 
 			# add it to the monitor window
+			unless ($spos == @shistory) {
+				$spos = @shistory;
+				show_screen();
+			};
 			addtotop($inbuf) if $inbuf;
 		
 			# send it to the cluster
@@ -290,7 +303,7 @@ sub rec_stdin
 					$i += $l;
 					$spos++ if $i <= $pagel;
 				}
-				$spos = @shistory if $spos > @shistory;
+				$spos = @shistory if $spos >= @shistory - 1;
 				show_screen();
 			} else {
 				beep();
@@ -336,7 +349,7 @@ sub rec_stdin
 			}
 		} elsif ($r ge ' ' && $r le '~') {
 			# move the top screen back to the bottom if you type something
-			if ($spos < @shistory - 1) {
+			if ($spos < @shistory) {
 				$spos = @shistory;
 				show_screen();
 			}
@@ -413,7 +426,7 @@ Msg->set_event_handler(\*STDIN, "read" => \&rec_stdin);
 
 for (;;) {
 	my $t;
-	Msg->event_loop(1, 0.010);
+	Msg->event_loop(1, 1);
 	$top->refresh() if $top->is_wintouched;
 	$bot->refresh();
 	$t = time;