merged changes

[spider.git] / perl / console.pl

diff --git a/perl/console.pl b/perl/console.pl
index e6f96aad9c713c9577d53eb367b9e1eed3dab909..46e42ad1245806af65ea1b33f694a59c63dfca36 100755 (executable)
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -30,9 +30,7 @@ use DXVars;
 use DXDebug;
 use DXUtil;
 use IO::File;
-use Curses;
-
-use Carp qw{cluck};
+use Curses 1.05;
 
 use Console;
 
@@ -61,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);
@@ -76,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);
@@ -103,9 +103,9 @@ sub do_resize
 sub cease
 {
        my $sendz = shift;
-       if ($conn && $sendz) {
-               $conn->send_now("Z$call|bye...\n");
-       }
+#      if ($conn && $sendz) {
+#              $conn->send_now("Z$call|bye...");
+#      }
        endwin();
        dbgclose();
        print @_ if @_;
@@ -216,13 +216,20 @@ 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);
                } elsif ($sort && $sort eq 'Z') { # end, disconnect, go, away .....
                        cease(0);
                }         
+               # ******************************************************
+               # ******************************************************
+               # any other sorts that might happen are silently ignored.
+               # ******************************************************
+               # ******************************************************
+       } else {
+               cease(0);
        }
        $top->refresh();
        $lasttime = time; 
@@ -379,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);
@@ -438,9 +446,9 @@ do_initscr();
 
 $SIG{__DIE__} = \&sig_term;
 
-$conn->send_now("A$call|$connsort");
-$conn->send_now("I$call|set/page $maxshist");
-$conn->send_now("I$call|set/nobeep");
+$conn->send_later("A$call|$connsort");
+$conn->send_later("I$call|set/page $maxshist");
+$conn->send_later("I$call|set/nobeep");
 
 Msg->set_event_handler(\*STDIN, "read" => \&rec_stdin);