X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fconsole.pl;h=46e7a1ea6c1df7c9c8eb4e2ba09f43edd26892cc;hb=1980462a73fe3a14acc44c9a75982d8b15e9390c;hp=eae1c0ff4451a477af22765c3d36cfd3f00bc538;hpb=d4af9b75c46cddd2cc830961eb615975ed260a9e;p=spider.git

diff --git a/perl/console.pl b/perl/console.pl
index eae1c0ff..46e7a1ea 100755
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -224,6 +224,9 @@ sub addtotop
 {
 	while (@_) {
 		my $inbuf = shift;
+		if ($inbuf =~ s/\x07+$//) {
+			beep();
+		}
 		push @shistory, $inbuf;
 		shift @shistory if @shistory > $maxshist;
 	}
@@ -240,6 +243,7 @@ sub rec_socket
 	if (defined $msg) {
 		my ($sort, $call, $line) = $msg =~ /^(\w)([^\|]+)\|(.*)$/;
 		
+		$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);
@@ -274,7 +278,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) {
@@ -291,7 +295,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);
@@ -367,7 +371,7 @@ sub rec_stdin
 			$pos = 0;
 		} elsif ($r eq KEY_END || $r eq "\005") {
 			$pos = $lth;
-		} elsif ($r eq KEY_BACKSPACE || $r eq "\010" || $r eq "\0177") {
+		} elsif ($r eq KEY_BACKSPACE || $r eq "\010" || $r eq "\x7f") {
 			if ($pos > 0) {
 				my $a = substr($inbuf, 0, $pos-1);
 				my $b = substr($inbuf, $pos) if $pos < $lth;
@@ -393,7 +397,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;
@@ -482,7 +486,7 @@ $SIG{__DIE__} = \&sig_term;
 
 $conn->send_later("A$call|$connsort width=$cols");
 $conn->send_later("I$call|set/page $maxshist");
-$conn->send_later("I$call|set/nobeep");
+#$conn->send_later("I$call|set/nobeep");
 
 #Msg->set_event_handler(\*STDIN, "read" => \&rec_stdin);