sort out the filtering system

[spider.git] / perl / console.pl

diff --git a/perl/console.pl b/perl/console.pl
index 3ad62001253fc2f8e6b97103287d186749820a41..b919d07660cf9ca95d7abf13bee2fb64b8027659 100755 (executable)
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -14,13 +14,31 @@
 # 
 
 require 5.16.1;
+use strict;
 use warnings;
 
+our $root;
+our $is_win;
+our $myalias;
+our $mycall;
+our $clusteraddr;
+our $clusterport;
+our $maxshist;
+our $maxkhist;
+our $foreground;
+our $background;
+our $mycallcolor;
+our @colors;
+our $data;
+our $local_data;
+
 # search local then perl directories
 BEGIN {
        # root of directory tree for this system
        $root = "/spider"; 
        $root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
+       $local_data = "$root/local_data";
+       $data = "$root/data";
        
        unshift @INC, "$root/perl";     # this IS the right way round!
        unshift @INC, "$root/local";
@@ -52,20 +70,33 @@ use Console;
 $clusteraddr //= '127.0.0.1';
 $clusterport //= 27754;
 
-$call = "";                     # the callsign being used
-$node = "";                     # the node callsign being used
-$conn = 0;                      # the connection object for the cluster
-$lasttime = time;               # lasttime something happened on the interface
-
-$connsort = "local";
-@kh = ();
-@sh = ();
-$kpos = 0;
-$spos = $pos = $lth = 0;
-$inbuf = "";
-$lastmin = 0;
-$idle = 0;
-$inscroll = 0;
+our $call = "";                     # the callsign being used
+our $node = "";                     # the node callsign being used
+our $conn = 0;                      # the connection object for the cluster
+our $lasttime = time;               # lasttime something happened on the interface
+
+our $connsort = "local";
+our @kh = ();
+our @sh = ();
+our $kpos = 0;
+our $inbuf = "";
+our $idle = 0;
+our $inscroll = 0;
+
+my $top;
+my $bot;
+my $lines;
+my $scr;
+my $cols;
+my $pagel;
+my $has_colors;
+our $pos;
+our $lth;
+my $sh;
+
+our $spos = $pos = $lth = 0;
+
+
 
 #$SIG{WINCH} = sub {@time = gettimeofday};
 
@@ -475,6 +506,7 @@ sub rec_socket
        $lasttime = time; 
 }
 
+my $lastmin = 0;
 
 sub idle_loop
 {
@@ -505,8 +537,8 @@ sub on_connect
 {
        my $conn = shift;
        $conn->send_later("A$call|$connsort width=$cols enhanced");
-       $conn->send_later("I$call|set/page $maxshist");
-       #$conn->send_later("I$call|set/nobeep");
+       $conn->send_later("I$call|set/page " . ($maxshist-5));
+       $conn->send_later("I$call|set/nobeep");
 }
 
 sub on_disconnect
@@ -561,9 +593,6 @@ doresize();
 
 $SIG{__DIE__} = \&sig_term;
 
-my $lastmin = 0;
-
-
 $conn = IntMsg->connect($clusteraddr, $clusterport, rproc => \&rec_socket);
 $conn->{on_connect} = \&on_connect;
 $conn->{on_disconnect} = \&on_disconnect;