X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fconsole.pl;h=46e42ad1245806af65ea1b33f694a59c63dfca36;hb=5dd49f32f869e946267b7983499b1df741442472;hp=bc3f3a9f40309e4dc8cd50d84b724e953755b1ba;hpb=f7ce6f45eae627c1368ffea0e1e56e84fec676be;p=spider.git

diff --git a/perl/console.pl b/perl/console.pl
index bc3f3a9f..46e42ad1 100755
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -30,7 +30,7 @@ use DXVars;
 use DXDebug;
 use DXUtil;
 use IO::File;
-use Curses;
+use Curses 1.05;
 
 use Console;
 
@@ -59,7 +59,8 @@ sub do_initscr
 	
 	if ($has_colors) {
 		start_color();
-		init_pair(0, $foreground, $background);
+		init_pair("0", $foreground, $background);
+#		init_pair(0, $background, $foreground);
 		init_pair(1, COLOR_RED, $background);
 		init_pair(2, COLOR_YELLOW, $background);
 		init_pair(3, COLOR_GREEN, $background);
@@ -74,6 +75,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);
+		$scr->attrset(COLOR_PAIR(0));
 	}
 	
 	$top = $scr->subwin(LINES()-4, COLS, 0, 0);
@@ -101,9 +103,9 @@ sub do_resize
 sub cease
 {
 	my $sendz = shift;
-	if ($conn && $sendz) {
-		$conn->send_now("Z$call|bye...");
-	}
+#	if ($conn && $sendz) {
+#		$conn->send_now("Z$call|bye...");
+#	}
 	endwin();
 	dbgclose();
 	print @_ if @_;
@@ -214,7 +216,7 @@ sub rec_socket
 		cease(1);
 	}
 	if (defined $msg) {
-		my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
+		my ($sort, $call, $line) = $msg =~ /^(\w)([^\|]+)\|(.*)$/;
 		
 		if ($sort && $sort eq 'D') {
 			addtotop($line);
@@ -226,6 +228,8 @@ sub rec_socket
 		# any other sorts that might happen are silently ignored.
 		# ******************************************************
 		# ******************************************************
+	} else {
+		cease(0);
 	}
 	$top->refresh();
 	$lasttime = time; 
@@ -382,7 +386,8 @@ sub rec_stdin
 			$pos++;
 			$lth++;
 		} elsif ($r eq "\014" || $r eq "\022") {
-			#do_resize();
+			touchwin($curscr, 1);
+			refresh($curscr);
 			return;
 		} elsif ($r eq "\013") {
 			$inbuf = substr($inbuf, 0, $pos);