X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fconsole.pl;h=663618080dc1a69e444c6251d954cfcd0177a889;hb=refs%2Fheads%2Fnewdisc;hp=d98b95f8f18b5ef93b84ca8ee740193586d15820;hpb=e044603c96073a6b5e4517d55a7ab48819196439;p=spider.git

diff --git a/perl/console.pl b/perl/console.pl
index d98b95f8..66361808 100755
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #
 # this is the operators console.
 #
@@ -14,6 +14,7 @@
 # 
 
 require 5.004;
+use warnings;
 
 # search local then perl directories
 BEGIN {
@@ -23,11 +24,19 @@ BEGIN {
 	
 	unshift @INC, "$root/perl";	# this IS the right way round!
 	unshift @INC, "$root/local";
+	$is_win = ($^O =~ /^MS/ || $^O =~ /^OS-2/) ? 1 : 0; # is it Windows?
 }
 
+$clusteraddr = '127.0.0.1';
+$clusterport = 27754;
+
+use Mojo::IOLoop;
+
+use DXVars;
+use SysVar;
+
 use Msg;
 use IntMsg;
-use DXVars;
 use DXDebug;
 use DXUtil;
 use DXDebug;
@@ -53,8 +62,11 @@ $khistpos = 0;
 $spos = $pos = $lth = 0;
 $inbuf = "";
 @time = ();
+$lastmin = 0;
+$idle = 0;
 
-$SIG{WINCH} = sub {@time = gettimeofday};
+
+#$SIG{WINCH} = sub {@time = gettimeofday};
 
 sub mydbg
 {
@@ -84,9 +96,9 @@ sub do_initscr
 		init_pair(12, COLOR_MAGENTA, COLOR_BLUE);
 		init_pair(13, COLOR_YELLOW, COLOR_GREEN);
 		init_pair(14, COLOR_RED, COLOR_GREEN);
-		eval { assume_default_colors($foreground, $background) };
+		eval { assume_default_colors($foreground, $background) } unless $is_win;
 	}
-	
+
 	$top = $scr->subwin($lines-4, $cols, 0, 0);
 	$top->intrflush(0);
 	$top->scrollok(1);
@@ -442,6 +454,46 @@ sub rec_stdin
 	$bot->refresh();
 }
 
+sub idle_loop
+{
+	my $t;
+	
+	$t = time;
+	if ($t > $lasttime) {
+		my ($min)= (gmtime($t))[1];
+		if ($min != $lastmin) {
+			show_screen();
+			$lastmin = $min;
+		}
+		$lasttime = $t;
+	}
+	my $ch = $bot->getch();
+	if (@time && tv_interval(\@time, [gettimeofday]) >= 1) {
+		next;
+	}
+	if (defined $ch) {
+		if ($ch ne '-1') {
+			rec_stdin($ch);
+		}
+	}
+	$top->refresh() if $top->is_wintouched;
+	$bot->refresh();
+}
+
+sub on_connect
+{
+	my $conn = shift;
+	$conn->send_later("A$call|$connsort width=$cols");
+	$conn->send_later("I$call|set/page $maxshist");
+	#$conn->send_later("I$call|set/nobeep");
+}
+
+sub on_disconnect
+{
+	$conn = shift;
+	Mojo::IOLoop->remove($idle);
+	Mojo::IOLoop->stop;
+}
 
 #
 # deal with args
@@ -463,23 +515,6 @@ if ($call eq $mycall) {
 
 dbginit();
 
-$conn = IntMsg->connect("$clusteraddr", $clusterport, \&rec_socket);
-if (! $conn) {
-	if (-r "$data/offline") {
-		open IN, "$data/offline" or die;
-		while (<IN>) {
-			print $_;
-		}
-		close IN;
-	} else {
-		print "Sorry, the cluster $mycall is currently off-line\n";
-	}
-	exit(0);
-}
-
-$conn->set_error(sub{cease(0)});
-
-
 unless ($DB::VERSION) {
 	$SIG{'INT'} = \&sig_term;
 	$SIG{'TERM'} = \&sig_term;
@@ -492,40 +527,17 @@ do_resize();
 
 $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");
-
-#Msg->set_event_handler(\*STDIN, "read" => \&rec_stdin);
-
 $Text::Wrap::Columns = $cols;
 
 my $lastmin = 0;
-for (;;) {
-	my $t;
-	Msg->event_loop(1, 0.01);
-	$t = time;
-	if ($t > $lasttime) {
-		my ($min)= (gmtime($t))[1];
-		if ($min != $lastmin) {
-			show_screen();
-			$lastmin = $min;
-		}
-		$lasttime = $t;
-	}
-	my $ch = $bot->getch();
-	if (@time && tv_interval(\@time, [gettimeofday]) >= 1) {
-#		mydbg("Got Resize");
-#		do_resize();
-		next;
-	}
-	if (defined $ch) {
-		if ($ch ne '-1') {
-			rec_stdin($ch);
-		}
-	}
-	$top->refresh() if $top->is_wintouched;
-	$bot->refresh();
-}
 
-exit(0);
+
+$conn = IntMsg->connect($clusteraddr, $clusterport, rproc => \&rec_socket);
+$conn->{on_connect} = \&on_connect;
+$conn->{on_disconnect} = \&on_disconnect;
+
+$idle = Mojo::IOLoop->recurring(0.100 => \&idle_loop);
+Mojo::IOLoop->start;
+
+
+cease(0);