X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fconsole.pl;h=df524beb140241de71b4e19265fc88d25281fb33;hb=5b16fd51941f17c26f8acaa35183cb8d407d16bc;hp=2be859894ad459b1ffdbf7ae0fc707a442fa7e94;hpb=9fdfb0d7573d820fb5e2db8930a9679ed6de666f;p=spider.git

diff --git a/perl/console.pl b/perl/console.pl
index 2be85989..df524beb 100755
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -79,7 +79,7 @@ sub do_initscr
 		init_pair(12, COLOR_MAGENTA, COLOR_BLUE);
 		init_pair(13, COLOR_YELLOW, COLOR_GREEN);
 		init_pair(14, COLOR_RED, COLOR_GREEN);
-		assume_default_colors($foreground, $background);
+		eval { assume_default_colors($foreground, $background) };
 	}
 	
 	$top = $scr->subwin($lines-4, $cols, 0, 0);
@@ -190,8 +190,9 @@ sub show_screen
 			my $line = $shistory[$p];
 			my $lines = measure($line);
 			last if $i + $lines > $pagel;
+			$top->addstr("\n") if $i;
 			setattr($line);
-			$top->addstr($i, 0, $line);
+			$top->addstr($line);
 			$top->attrset(COLOR_PAIR(0)) if $has_colors;
 			$i += $lines;
 		}
@@ -236,6 +237,7 @@ sub rec_socket
 		my ($sort, $call, $line) = $msg =~ /^(\w)([^\|]+)\|(.*)$/;
 		
 		if ($sort && $sort eq 'D') {
+			$line = " " unless $line;
 			addtotop($line);
 		} elsif ($sort && $sort eq 'Z') { # end, disconnect, go, away .....
 			cease(0);
@@ -267,39 +269,38 @@ sub rec_stdin
 		if ($r eq KEY_ENTER || $r eq "\n" || $r eq "\r") {
 			
 			# save the lines
-			if ($inbuf) {
-				# check for a pling and do a search back for a command
-				if ($inbuf =~ /^!/o) {
-					my $i;
-					$inbuf =~ s/^!//o;
-					for ($i = $#khistory; $i >= 0; $i--) {
-						if ($khistory[$i] =~ /^$inbuf/) {
-							$inbuf = $khistory[$i];
-							last;
-						}
-					}
-					if ($i < 0) {
-						beep();
-						return;
+			$inbuf = " " unless $inbuf;
+
+			# check for a pling and do a search back for a command
+			if ($inbuf =~ /^!/o) {
+				my $i;
+				$inbuf =~ s/^!//o;
+				for ($i = $#khistory; $i >= 0; $i--) {
+					if ($khistory[$i] =~ /^$inbuf/) {
+						$inbuf = $khistory[$i];
+						last;
 					}
 				}
-				push @khistory, $inbuf if $inbuf;
-				shift @khistory if @khistory > $maxkhist;
-				$khistpos = @khistory;
-				$bot->move(0,0);
-				$bot->clrtoeol();
-				$bot->addstr(substr($inbuf, 0, $cols));
+				if ($i < 0) {
+					beep();
+					return;
+				}
 			}
+			push @khistory, $inbuf if $inbuf;
+			shift @khistory if @khistory > $maxkhist;
+			$khistpos = @khistory;
+			$bot->move(0,0);
+			$bot->clrtoeol();
+			$bot->addstr(substr($inbuf, 0, $cols));
 
 			# add it to the monitor window
 			unless ($spos == @shistory) {
 				$spos = @shistory;
 				show_screen();
 			};
-			addtotop($inbuf) if $inbuf;
+			addtotop($inbuf);
 		
 			# send it to the cluster
-			$inbuf = " " unless $inbuf;
 			$conn->send_later("I$call|$inbuf");
 			$inbuf = "";
 			$pos = $lth = 0;
@@ -361,7 +362,7 @@ sub rec_stdin
 			$pos = 0;
 		} elsif ($r eq KEY_END || $r eq "\005") {
 			$pos = $lth;
-		} elsif ($r eq KEY_BACKSPACE || $r eq "\010") {
+		} elsif ($r eq KEY_BACKSPACE || $r eq "\010" || $r eq "\0177") {
 			if ($pos > 0) {
 				my $a = substr($inbuf, 0, $pos-1);
 				my $b = substr($inbuf, $pos) if $pos < $lth;