X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fconsole.pl;h=0cb15bd0fbc0171446f40fde6151ee100621f8d7;hb=dc999e28c96ebb4589dbdda8435a548ade15a37d;hp=02a2e476831ef0567d21dc7c384c8d27a52c84bb;hpb=6e80184b4c2c222a7ab1f7ededb9e9af2be9c236;p=spider.git diff --git a/perl/console.pl b/perl/console.pl index 02a2e476..0cb15bd0 100755 --- a/perl/console.pl +++ b/perl/console.pl @@ -33,6 +33,23 @@ use Curses; use Carp qw{cluck}; +use Console; + +# +# initialisation +# + +$call = ""; # the callsign being used +$conn = 0; # the connection object for the cluster +$lasttime = time; # lasttime something happened on the interface + +$connsort = "local"; +@khistory = (); +@shistory = (); +$khistpos = 0; +$spos = $pos = $lth = 0; +$inbuf = ""; + # cease communications sub cease { @@ -42,15 +59,72 @@ sub cease } endwin(); dbgclose(); -# $SIG{__WARN__} = sub {my $a = shift; cluck($a); }; - sleep(1); + print @_ if @_; exit(0); } # terminate program from signal sub sig_term { - cease(1); + cease(1, @_); +} + +# determine the colour of the line +sub setattr +{ + if ($has_colors) { + foreach my $ref (@colors) { + if ($_[0] =~ m{$$ref[0]}) { + $top->attrset($$ref[1]); + last; + } + } + } +} + +# display the top screen +sub show_screen +{ + if ($spos == @shistory - 1) { + + # if we really are scrolling thru at the end of the history + my $line = $shistory[-1]; + $top->addstr("\n") if $spos > 0; + setattr($line); + $top->addstr($line); + $top->attrset(COLOR_PAIR(0)) if $has_colors; + $spos = @shistory; + + } else { + + # anywhere else + my $p = $spos - $pages; + my $i; + $p = 0 if $p < 0; + + $top->move(0, 0); + $top->attrset(COLOR_PAIR(0)) if $has_colors; + $top->clrtobot(); + for ($i = 0; $i < $pages && $p < @shistory; $i++, $p++) { + my $line = $shistory[$p]; + $line = substr($line, 0, COLS()) if length $line > COLS(); + $top->move($i, 0); + setattr($line); + $top->addstr($line); + $top->attrset(COLOR_PAIR(0)) if $has_colors; + } + $spos = $p; + } + $top->refresh(); +} + +# add a line to the end of the top screen +sub addtotop +{ + my $inbuf = shift; + push @shistory, $inbuf; + shift @shistory if @shistory > $maxshist; + show_screen(); } # handle incoming messages @@ -64,7 +138,7 @@ sub rec_socket my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/; if ($sort eq 'D') { - $top->addstr("\n$line"); + addtotop($line); } elsif ($sort eq 'Z') { # end, disconnect, go, away ..... cease(0); } @@ -89,34 +163,54 @@ sub rec_stdin # save the lines if ($inbuf) { - push @history, $inbuf if $inbuf; - shift @history if @history > $maxhist; - $histpos = @history; + push @khistory, $inbuf if $inbuf; + shift @khistory if @khistory > $maxkhist; + $khistpos = @khistory; $bot->move(0,0); + $bot->clrtoeol(); $bot->addstr(substr($inbuf, 0, COLS)); } + + # add it to the monitor window + addtotop($inbuf) if $inbuf; # send it to the cluster $inbuf = " " unless $inbuf; $conn->send_later("I$call|$inbuf"); $inbuf = ""; $pos = $lth = 0; - } elsif ($r eq KEY_UP || $r eq KEY_PPAGE || $r eq "\020") { - if ($histpos > 0) { - --$histpos; - $inbuf = $history[$histpos]; + } elsif ($r eq KEY_UP || $r eq "\020") { + if ($khistpos > 0) { + --$khistpos; + $inbuf = $khistory[$khistpos]; $pos = $lth = length $inbuf; } else { beep(); } - } elsif ($r eq KEY_DOWN || $r eq KEY_NPAGE || $r eq "\016") { - if ($histpos < @history - 1) { - ++$histpos; - $inbuf = $history[$histpos]; + } elsif ($r eq KEY_DOWN || $r eq "\016") { + if ($khistpos < @khistory - 1) { + ++$khistpos; + $inbuf = $khistory[$khistpos]; $pos = $lth = length $inbuf; } else { beep(); } + } elsif ($r eq KEY_PPAGE || $r eq "\032") { + if ($spos > 0) { + $spos -= $pages; + $spos = 0 if $spos < 0; + show_screen(); + } else { + beep(); + } + } elsif ($r eq KEY_NPAGE || $r eq "\026") { + if ($spos < @shistory - 1) { + $spos += $pages; + $spos = @shistory if $spos > @shistory; + show_screen(); + } else { + beep(); + } } elsif ($r eq KEY_LEFT || $r eq "\002") { if ($pos > 0) { --$pos; @@ -129,8 +223,10 @@ sub rec_stdin } else { beep(); } - } elsif ($r eq KEY_HOME) { + } elsif ($r eq KEY_HOME || $r eq "\001") { $pos = 0; + } elsif ($r eq KEY_END || $r eq "\005") { + $pos = $lth; } elsif ($r eq KEY_BACKSPACE || $r eq "\010") { if ($pos > 0) { my $a = substr($inbuf, 0, $pos-1); @@ -165,11 +261,11 @@ sub rec_stdin $pos++; $lth++; } elsif ($r eq "\014" || $r eq "\022") { - $scr->touchwin(); - $scr->refresh(); +# curscr()->refresh(); + return; } elsif ($r eq "\013") { - $inbuf = ""; - $pos = $lth = 0; + $inbuf = substr($inbuf, 0, $pos); + $lth = length $inbuf; } else { beep(); } @@ -182,21 +278,6 @@ sub rec_stdin } -# -# initialisation -# - -$call = ""; # the callsign being used -$conn = 0; # the connection object for the cluster -$lasttime = time; # lasttime something happened on the interface - -$connsort = "local"; -@history = (); -$histpos = 0; -$maxhist = 100; -$pos = $lth = 0; -$inbuf = ""; - # # deal with args # @@ -231,6 +312,19 @@ $SIG{'HUP'} = 'IGNORE'; $scr = new Curses; raw(); noecho(); +$has_colors = has_colors(); + +if ($has_colors) { + start_color(); + init_pair(0, $foreground, $background); + init_pair(1, COLOR_RED, $background); + init_pair(2, COLOR_YELLOW, $background); + init_pair(3, COLOR_GREEN, $background); + init_pair(4, COLOR_CYAN, $background); + init_pair(5, COLOR_BLUE, $background); + init_pair(6, COLOR_MAGENTA, $background); +} + $top = $scr->subwin(LINES()-4, COLS, 0, 0); $top->intrflush(0); $top->scrollok(1); @@ -244,10 +338,10 @@ $scr->refresh(); $SIG{__DIE__} = \&sig_term; -$pages = LINES()-6; +$pages = LINES()-4; $conn->send_now("A$call|$connsort"); -$conn->send_now("I$call|set/page $pages"); +$conn->send_now("I$call|set/page $maxshist"); $conn->send_now("I$call|set/nobeep"); Msg->set_event_handler(\*STDIN, "read" => \&rec_stdin);