X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fconsole.pl;h=bf747b8631b5de32424eebd7dc3b39ef0abd5b8f;hb=ab8aa7901d27e89362945baefae347a8680ca250;hp=35924e4c08a2a02f1f2be26dcab53a28d3be6769;hpb=d9db74c1b2b9b57cb6d31e8c8c425f3636f62f87;p=spider.git diff --git a/perl/console.pl b/perl/console.pl index 35924e4c..bf747b86 100755 --- a/perl/console.pl +++ b/perl/console.pl @@ -50,6 +50,45 @@ $khistpos = 0; $spos = $pos = $lth = 0; $inbuf = ""; +# do the screen initialisation +sub do_initscr +{ + $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); + $scr->addstr(LINES()-4, 0, '-' x COLS); + $bot = $scr->subwin(3, COLS, LINES()-3, 0); + $bot->intrflush(0); + $bot->scrollok(1); + $bot->keypad(1); + $bot->move(1,0); + $scr->refresh(); + + $pagel = LINES()-4; +} + +sub do_resize +{ + undef $scr; + do_initscr(); +} + # cease communications sub cease { @@ -82,6 +121,18 @@ sub setattr } } +# measure the no of screen lines a line will take +sub measure +{ + my $line = shift; + return 0 unless $line; + + my $l = length $line; + my $lines = int ($l / COLS()); + $lines++ if $l / COLS() > $lines; + return $lines; +} + # display the top screen sub show_screen { @@ -98,26 +149,42 @@ sub show_screen } else { # anywhere else - my $p = $spos - $pages; - my $i; + my ($i, $l); + my $p = $spos-1; + for ($i = 0; $i <= $pagel && $p >= 0; ) { + $l = measure($shistory[$p]); + $i += $l; + $p-- if $i < $pagel; + } $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++) { + for ($i = 0; $i <= $pagel && $p < @shistory; $p++) { my $line = $shistory[$p]; - $line = substr($line, 0, COLS()) if length $line > COLS(); + my $lines = measure($line); + last if $i + $lines > $pagel; $top->move($i, 0); setattr($line); $top->addstr($line); $top->attrset(COLOR_PAIR(0)) if $has_colors; + $i += $lines; } $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 sub rec_socket { @@ -129,10 +196,7 @@ sub rec_socket my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/; if ($sort eq 'D') { - push @shistory, $line; - shift @shistory if @shistory > $maxshist; -# $spos = @shistory if $spos >= @shistory - 1; - show_screen(); + addtotop($line); } elsif ($sort eq 'Z') { # end, disconnect, go, away ..... cease(0); } @@ -153,10 +217,26 @@ sub rec_stdin # $prbuf =~ s/\n/\\n/; # print "sys: $r ($prbuf)\n"; if (defined $r) { + if ($r eq KEY_ENTER || $r eq "\n" || $r eq "\r") { # save the lines if ($inbuf) { + # check for a pling and do a search back for a command + if ($inbuf =~ /^!/o) { + my $i; + $inbuf =~ s/^!//o; + for ($i = $#khistory; $i >= 0; $i--) { + if ($khistory[$i] =~ /^$inbuf/) { + $inbuf = $khistory[$i]; + last; + } + } + if ($i < 0) { + beep(); + return; + } + } push @khistory, $inbuf if $inbuf; shift @khistory if @khistory > $maxkhist; $khistpos = @khistory; @@ -164,6 +244,9 @@ sub rec_stdin $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; @@ -188,7 +271,12 @@ sub rec_stdin } } elsif ($r eq KEY_PPAGE || $r eq "\032") { if ($spos > 0) { - $spos -= $pages; + my ($i, $l); + for ($i = 0; $i <= $pagel && $spos >= 0; ) { + $l = measure($shistory[$spos]); + $i += $l; + $spos-- if $i <= $pagel; + } $spos = 0 if $spos < 0; show_screen(); } else { @@ -196,7 +284,12 @@ sub rec_stdin } } elsif ($r eq KEY_NPAGE || $r eq "\026") { if ($spos < @shistory - 1) { - $spos += $pages; + my ($i, $l); + for ($i = 0; $i <= $pagel && $spos <= @shistory; ) { + $l = measure($shistory[$spos]); + $i += $l; + $spos++ if $i <= $pagel; + } $spos = @shistory if $spos > @shistory; show_screen(); } else { @@ -216,6 +309,8 @@ sub rec_stdin } } 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); @@ -240,6 +335,13 @@ sub rec_stdin beep(); } } elsif ($r ge ' ' && $r le '~') { + # move the top screen back to the bottom if you type something + if ($spos < @shistory - 1) { + $spos = @shistory; + show_screen(); + } + + # insert the character into the keyboard buffer if ($pos < $lth) { my $a = substr($inbuf, 0, $pos); my $b = substr($inbuf, $pos); @@ -250,11 +352,11 @@ sub rec_stdin $pos++; $lth++; } elsif ($r eq "\014" || $r eq "\022") { - $scr->touchwin(); - $scr->refresh(); + #do_resize(); + return; } elsif ($r eq "\013") { - $inbuf = ""; - $pos = $lth = 0; + $inbuf = substr($inbuf, 0, $pos); + $lth = length $inbuf; } else { beep(); } @@ -296,39 +398,13 @@ if (! $conn) { $SIG{'INT'} = \&sig_term; $SIG{'TERM'} = \&sig_term; +#$SIG{'WINCH'} = \&do_resize; $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); -$scr->addstr(LINES()-4, 0, '-' x COLS); -$bot = $scr->subwin(3, COLS, LINES()-3, 0); -$bot->intrflush(0); -$bot->scrollok(1); -$bot->keypad(1); -$bot->move(1,0); -$scr->refresh(); +do_initscr(); $SIG{__DIE__} = \&sig_term; -$pages = LINES()-4; - $conn->send_now("A$call|$connsort"); $conn->send_now("I$call|set/page $maxshist"); $conn->send_now("I$call|set/nobeep");